Fix issue #795 on the menu builder #796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…submenu needs to be applied first.
resslinger
added a commit
that referenced
this pull request
Mar 22, 2021
* [src/Menu]: Fix an issue on the menu builder. Filters on childs of a submenu needs to be applied first. (#796) * [tests/Console]: Fix an error on the artisan command tests. (#811) * [Resources/Views]: Fix @iNJECTiON directive on the blade views files. (#813) * Update README (#815) * Update configuration file links (#817) * [resources/views]: Fix inject directive on brand-logo-xl blade file. * [tests]: Fix menu builder tests for low php version compatibility. (#829) * fix adminlte version (#831) Co-authored-by: Diego Smania <diego.smania@gmail.com> Co-authored-by: Diego Smania <shidersz@hotmail.com>
resslinger
added a commit
that referenced
this pull request
Apr 9, 2021
* Add Blade-x components (#721) * initial commit * fix service provider * Apply fixes from StyleCI (#722) Co-authored-by: Florian Ressel <lacodimizer@users.noreply.github.com> * remove L6 * [src]: Conditionally load the blade components. Restore laravel 6 support. * [src]: Fix CS. * [src]: Remove wrong line. * [src]: Remove use statement. * [src/Components]: Move components views to resources/views and fix the render() method. * [tests]: Add new test to check components are loaded. * [tests]: fix test method name. * [src]: Order the components by name on the service provider load method. * [src]: Fix CS. * [src]: Add missing components. * Add base set of tests for the blade-x components. (#737) * [tests/Components]: Add base set of test for the blade-x components. * [tests]: Create alternative testsuite for Laravel 6.x versions and update run-tests workflow. * Fix CS * Improve some blade-x components (#738) * [Components]: Add a new base input-group component that supports a label, append slot, prepend slots and error feedback. * [Components]: Improve the input component, this component now extends input-group component. * [Components]: Fix CS * [Components]: Improve the textarea component, this component now extends input-group component. * [Components]: Improve the select component, this component now extends input-group component. * [Components]: Generalize the submit component and transforms it to button component. * [Components/InputGroupComponent]: Move the invalid feedback block outise the input group. * [Components]: Improve the input-file component, this component now extends input-group component. * [tests]: Fix CS. * Improve Blade-X Components (#741) * [Components]: Improve the input-file component when using size attribute. * [Components]: Improve the select2 component, now extends from input group component. * [Components]: Improve the select-bs (previous select-icon) component, now extends from input group component. * [Components]: Fix CS. * [Components]: The option component was dropped, there is no benefit from it. * Improve Date-Range Component (#742) * [Components]: Improve the date-range component, now extends from input group component. * [Components]: Code normalization on some blade files. * [Components]: Improve the input-color component, now extends from input group component. (#748) * [Components]: Improve the text-editor component, now extends from input group component. (#751) * [Components]: Improve the button component, label is now optional. (#753) * [Components]: Improve the input-slider component, now extends from input group component. (#754) * [Components]: Improve the input-switch component, now extends from input group component. (#755) * Improve the input-date component (#757) * [Components]: Improve the input-date component, now extends from input group component. * [Plugins]: Moment is now included when installing Tempus Dominus plugin. * Improve the Alert component (#759) * [Components]: Improve the alert component. * [Components]: Add comments fixes on input-date component. * [Components]: Drop the input-tag component because do not provide Bootstrap 4 support. (#760) * [Components]: Improve the callout component. (#761) * Improve the progress component (#766) * [Components]: Improve the progress component. * [Components]: The animated attribute now enables stripes on the Progress component. * Improve the Modal component (#767) * [Components]: Improve the Modal component. * [Components]: Fix CS on Modal component. * [Components]: Improve the Card component. (#768) * [Components]: Improve the ProfileWidget and ProfileWidgetItem components. (#769) * Improve ProfileWidget and Profile Items components. (#772) * [Components]: Improve the ProfileWidget and ProfileItems components. * [Components]: Fix Code Style. * [Components]: Update Service Provider and tests. * [Components]: Improve the Small Box component. (#776) * Improve the Info Box component (#780) * [Components]: Improve the Info Box component. * [Components]: Typo and comments fixes. * [Components]: Fix Code Style. * Improve the Datatables component (#791) * [Components]: Improve the Datatables component. * [Components]: Fix in-code documentation. * [Components]: Fix multiple in-code documentation. Co-authored-by: Florian Ressel <lacodimizer@users.noreply.github.com> Co-authored-by: Diego Smania <diego.smania@gmail.com> Co-authored-by: Diego Smania <63609705+Shidersz@users.noreply.github.com> * Merge next into master (#833) * [src/Menu]: Fix an issue on the menu builder. Filters on childs of a submenu needs to be applied first. (#796) * [tests/Console]: Fix an error on the artisan command tests. (#811) * [Resources/Views]: Fix @iNJECTiON directive on the blade views files. (#813) * Update README (#815) * Update configuration file links (#817) * [resources/views]: Fix inject directive on brand-logo-xl blade file. * [tests]: Fix menu builder tests for low php version compatibility. (#829) * fix adminlte version (#831) Co-authored-by: Diego Smania <diego.smania@gmail.com> Co-authored-by: Diego Smania <shidersz@hotmail.com> * Update AdminLTE to v3.1 to start integration. (#834) * [Composer]: Update AdminLTE to v3.1 to start integration. * [src/Console]: Remove plugin: FullcalendarPlugins because no longer exists on the new adminlte. * Improve Select component to support AdminLTE 3.1 (#836) * [Components/Select]: Remove w-100 class for compatibility with AdminLTE v3.1.0 * [Components/Tests]: Remove test for class w-100 on select component. * [Components/Select2]: Remove w-100 class for compatibility with AdminLTE v3.1.0 (#837) * [Components]: Improve the invalid style for the input groups and add default value for some parameters. (#840) * Additional classes for input group element (#847) * Additional classes for input group element #846 * Fix style check * [Components/InputGroup]: Fix constructor and make package normalization. * [Components/InputGroup]: Improve tests to cover the new inputGroupClass property. Co-authored-by: Diego Smania <diego.smania@gmail.com> * Propagate the new input-group-class attribute to all components (#848) * [src/Components]: Propagate the new input-group-class attribute to all components. * [src/Components]: Propagate the new input-group-class property to all components that extends from inputGroupComponent. * Improve the invalid style for input-switch and input-slider components (#852) * [Components]: Improve the invalid style for input-switch and input-slider components. * [Components]: Improve the invalid style for text-editor component. * [Resources/Views]: fix slide-down visual issue on sidebar after loading page. (#853) Co-authored-by: Florian Ressel <lacodimizer@users.noreply.github.com> Co-authored-by: Diego Smania <diego.smania@gmail.com> Co-authored-by: Diego Smania <63609705+Shidersz@users.noreply.github.com> Co-authored-by: Diego Smania <shidersz@hotmail.com> Co-authored-by: Wajdi Jurry <creations.forum@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's in this PR?
Fix the issue #795 related to the menu builder class. When the item is a submenu, we need to transform all the child items first. These items need to be transformed first because some of the submenu filters (like the
ActiveFilter) depends on these results.In addition, some test are created to cover these cases.
Checklist