-
Notifications
You must be signed in to change notification settings - Fork 161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(query-builder): support for nested queries and other improvements #14647
Open
igdmdimitrov
wants to merge
260
commits into
master
Choose a base branch
from
dmdimitrov/query-builder-improvements
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+14,930
−8,939
Open
Changes from all commits
Commits
Show all changes
260 commits
Select commit
Hold shift + click to select a range
5dd941f
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 673a333
chore(*): fix update of search tree
igdmdimitrov 9521415
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova efb44c8
chore(*): Revert "feat(query-builder): Added request to backend on tr…
gedinakova c99619b
feat(query-builder): extract tree into separate component
igdmdimitrov 030c9c7
feat(query-builder): go in edit mode from inner query and fixes
igdmdimitrov 63d1fca
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 07c801f
feat(query-builder): fix creating inner query
igdmdimitrov a889e68
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova fb742d4
feat(query-builder): add expand/collapse for inner queries
igdmdimitrov 43928a9
feat(query-builder): restore expanded and add select all in return fi…
igdmdimitrov e52210d
feat(query-builder): Modified input model to reflect specification
Otixa f91764b
Merge branch 'mcherkasov/qb-model-update' into dmdimitrov/query-build…
Otixa bc5ff52
feat(query-builder): Added missing properties in tests
Otixa c120dc8
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 15fb61a
feat(query-builder): add confirmation dialog on entity change
igdmdimitrov 518e363
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 1bfb30e
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 56b400a
feat(query-builder): add tooltip and bug fixes
igdmdimitrov 1a1df9a
feat(query-builder): move icon service back to query builder
igdmdimitrov 5f2a72b
feat(query-builder): fix lint errors and add header import in dev demo
teodosiah 50b0dd2
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova ee6f1d3
feat(query-builder): fix circular dependency issue
teodosiah 1d7f1ea
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 822ca70
chore(*): Fix error with type missmatch for date pickers in ESF custo…
gedinakova 9eb2d09
refactor(query-builder): implement the new styling
desig9stein 81af7ab
feat(query-builder): Don't show group controls while adding a new group
Otixa 3ad70eb
feat(query-builder): Partial fix for filtering logic changes in children
Otixa ec70f6a
feat(query-builder): Made select dropdowns close on outside click
Otixa b7a5209
feat(query-builder): Fixed date formatting in condition chips
Otixa 8c5b33e
Merge branch 'master' into dmdimitrov/query-builder-improvements
simeonoff 3c8ba1b
Merge branch 'master' into dmdimitrov/query-builder-improvements
simeonoff 1255912
refactor(query-builder): rename variables
desig9stein cd94333
deps(theming): bump to latest beta containing changes
simeonoff 342cb7a
fix(*): Moved level calculation into a getter to avoid console exception
gedinakova 8fbcbf5
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 2c1dd93
feat(query-builder): fix model and lint errors
teodosiah f025bac
feat(query-builder): Added bindings for overlay settings where missing
Otixa d9ce868
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa 91a5719
feat(query-builder): Added checks for undefined fields
Otixa 36e04c1
feat(query-builder): Fixed return fields overlay positioning
Otixa 28a92c3
feat(query-builder): Fixed return fields overlay positioning
Otixa 4bbaf69
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 17d2147
fix(query-builder): fix combo dd header styles
desig9stein def2c0e
fix(query-builder): use the appropriate class for the dropdown item
desig9stein 93e82c8
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova cb05ada
feat(query-builder): Added request to backend on tree change
Otixa ab67c28
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 8227a97
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 6ef538d
feat(query-builder): Fixed operand reset after entity switch
Otixa 042c2e1
fix(QB): Fixed the expressionTree's entity loss.
gedinakova 3a759df
fix(QB): Fixed the error when adding a new condition initially.
gedinakova b934405
feat(query-builder): add search value template directive, adjust adv …
igdmdimitrov 5f1d906
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 9da6292
feat(query-builder): Revert displaying of controls for new groups
Otixa 7fd78ec
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa 8bce79d
chore(*): fix entity and return fields visibility
igdmdimitrov b8873a0
feat(query-builder): hide in and notIn in advanced filtering
igdmdimitrov 7d7baae
feat(query-builder): search value template improvements
igdmdimitrov 976777c
feat(query-builder): export directive
igdmdimitrov 766705e
fix(QB): Removed in/notIn from filtering UIs.
gedinakova 82b6c7d
feat(query-builder): handling setting search value from template
igdmdimitrov 916a3cb
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov a4f22e9
fix(QB): Removed in/not in from filtering UI properly.
gedinakova 8ef68b5
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 6c18028
fix(query-builder): Removed unused refs
ivanvpetrov 6dc907e
feat(query-builder): fix new group options and improve emit on change
igdmdimitrov b073b2b
feat(query-builder): show condition name in tooltip on unary conditions
igdmdimitrov 816eba9
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 97456d0
chore(*): fix tooltip on unary condition
igdmdimitrov 99bded9
feat(query-builder): support fields input
igdmdimitrov 022e8d8
fix(QB): Added guards for this.entities.
gedinakova 1930b4f
fix(combo): select all item colors
desig9stein 08fb13b
feat(query-builder): returned init function in expressionTree setter
ivanvpetrov 19c137d
refactor(query-builder): clean the scss
desig9stein 9f505aa
fix(query-builder): Fixed failing tests due to field rename and const…
Otixa 3616048
feat(query-builder): change theming version in projects package.json
teodosiah a1cb9df
Merge branch 'mcherkasobv/qb-fix-fields-tests' into dmdimitrov/query-…
Otixa a74e772
fix(query-builder): Post-merge fixups
Otixa 59cd066
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa 8460a5c
chore(query-builder): Marked find, findIndex as deprecated
Otixa 69170b1
fix(query-builder): Fixed fieldName in templates post rename
Otixa 7d58abf
Add Query Builder tests (#14671)
teodosiah 37ad702
feat(query-builder): fix parent commit/cancel edit mode behavior
teodosiah 420656a
feat(query-builder): add checkbox and prop whether to show entity cha…
igdmdimitrov 286eee1
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 715256a
docs(query-builder): Documented breaking change in IFilteringExpression
Otixa 9b6d520
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa c72041a
test(query-builder): add showEntityChangeDialog tests
teodosiah 94c57f8
test(query-builder): add context menu and/or buttons resource strings
teodosiah ebe8407
fix(query-builder): fix searchValueTemplate is now propagated to chil…
ivanvpetrov 5f22ecc
fix(query-builder): fix circular dependancy issue
ivanvpetrov 649b9f8
feat(query-builder): add funct. for using default template in the cus…
ivanvpetrov ebc4088
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov 487eddc
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 8417835
build(igniteui-theming): update to 14.2.0-beta.1
desig9stein 8886291
refactor(query-builder): add styles for query builder dialog
desig9stein ff2b663
fix(query-builder): fix PR comments. Improved test
ivanvpetrov 6b910b9
feat(query-builder): update theming package
igdmdimitrov e227e70
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 48a5bbf
fix(query-builder): test confirm button name change
ivanvpetrov 528923c
fix(query-builder): fix edit/close buttons now tabindexed properly
ivanvpetrov f7cb983
fix(query-builder): fix edti/add button event handlers shifted up on …
ivanvpetrov 6a7d640
fix(query-builder): Add max-width and stretch the input fields, combo…
desig9stein 42fe247
fix(query-builder): Align button at the end of the row, add line-heig…
desig9stein 4f8ec92
fix(query-builder): remove margin for bootstrap title, fix color for …
desig9stein 25765e9
Merge remote-tracking branch 'origin/master' into dmdimitrov/query-bu…
desig9stein 9e69a73
chore(igniteui-theming): update to latest beta
desig9stein 5e52300
fix(query-builder): fix jumping and indigo border-radius for legend i…
desig9stein 79108fe
fix(query-builder): fix chips size
desig9stein cc3b1f7
fix(query-builder): Fix title in indigo, fix spacing between icons.
desig9stein 54e1fa4
feat(query-builder): fixes for input labels
igdmdimitrov e3616a6
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 8d77e67
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 38add57
test(query-builder): fix failing tests
teodosiah deabe57
fix(query-builder): adjust tooltip and fix details accessibility
igdmdimitrov de73312
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 0b9f9de
fix(query-builder): fix chip size
desig9stein 6d66d34
fix(query-builder): test details button is now tabble
ivanvpetrov 5f29d2e
Merge branch 'master' into dmdimitrov/query-builder-improvements
desig9stein 9059fee
feat(query-builder): update dev sample to have all data types
igdmdimitrov 10b4c5b
chore(query-builder): Made conditionName optional
Otixa 1993b3b
fix(query-builder): the action area size
desig9stein a0842de
fix(query-builder): fix chip label opacity
desig9stein abe8c42
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova d7dfe81
feat(query-builder): migrate fields to entities
igdmdimitrov 5fac732
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 0320f7a
chore(*): update to latest theming
igdmdimitrov a235e1b
chore(query-builder): Revert searchVal type to any in IFilteringExpre…
Otixa 550685a
fix(query-builder): disable date & time pickers when nested query
igdmdimitrov 67bc4fb
feat(query-builder): update changelog
igdmdimitrov 3f9c322
chore(*): update changelog
igdmdimitrov fee8b0a
feat(query-builder): add props descriptions
igdmdimitrov 5c9b2e1
deps(theming): bump to latest beta
simeonoff b7a7e34
fix(query-builder): replace expression icons with icon buttons to imp…
desig9stein 7b1add2
fix(query-builder): make sure that the close dialog button is on the …
desig9stein 57d14a4
Merge branch 'master' into dmdimitrov/query-builder-improvements
simeonoff 34c68bf
feat(query-builder): add isNested prop to IFilteringOperation (#14879)
ivanvpetrov 248a072
feat(i18n): Updating localization
randriova 16beb35
test(query-builder): add thorough In/NotIn tests
ivanvpetrov 7db76a6
Merge branch 'master' into dmdimitrov/query-builder-improvements
teodosiah 7740b62
Merge remote-tracking branch 'origin/master' into dmdimitrov/query-bu…
desig9stein 5d267da
feat(query-builder): make some props of FieldType optional
igdmdimitrov 5b270e9
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov a7ee519
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov f8c2cac
test(query-builder): fix failing AF tests
teodosiah 2efdde6
feat(query-builder): disable commit if nested query has no return fields
igdmdimitrov 4e6fb60
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov b159f3a
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov ee4757b
chore(*): remove required from return fields combo
igdmdimitrov 71dcc72
chore(*): revert if conditions
igdmdimitrov b88f16a
fix(query-builder): Fixed conditionName not propagating on commit
Otixa 2bc8b5d
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa b155f3e
chore(query-builder): commit/discard fields tests, mark QB tree comp …
teodosiah 2fa39b1
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
teodosiah 22aa835
feat(query-builder): add field formatter & support object search valu…
teodosiah c9e92a1
fix(query-builder): incorrect filtering by number search val
teodosiah 81916da
feat(query-builder): add public api for commit and discard current st…
igdmdimitrov d4314a5
fix(query-builder): sample custom search template formatter
ivanvpetrov 0056177
feat(query-builder): save and restore inner query state on commit/dis…
igdmdimitrov 138243b
refactor(query-builder): simple select from
ivanvpetrov a2fe072
refactor(query-builder): simple select from
ivanvpetrov d724e2e
feat(query-builder): add isAdvancedFiltering method
ivanvpetrov b6df4f3
fix(query-builder): now root group is not initialized
ivanvpetrov 7cffe44
chore(*): additional checks
igdmdimitrov 37bbd58
fix(query-builder): fixed bug with rootGroup initialization
ivanvpetrov 62c6fe9
fix(query-builder): don't recreate rootgroup if the same
igdmdimitrov 89f6d8b
chore(*): remove leftover comment
igdmdimitrov 1b447da
Merge branch 'dmdimitrov/query-builder-improvements' into ipetrov/que…
igdmdimitrov f7118a2
test(query-builder): fix several legacy tests
ivanvpetrov 3a37c79
feat(query-builder): add test for editing condition of inner query
igdmdimitrov 1b1b487
fix(query-builder): cancommit logic and test
ivanvpetrov b4d680a
Merge branch 'dmdimitrov/query-builder-improvements' into ipetrov/que…
ivanvpetrov f917b4a
Query builder simple select from (#14985)
ivanvpetrov 97d367f
test(query-builder): fix more legacy tests
ivanvpetrov 85a27b4
test(query-builder): fix more legacy tests
ivanvpetrov 588bcb3
Merge branch 'ipetrov/query-builder-simple-select-from-new' into dmdi…
ivanvpetrov 8df21e1
test(query-builder): fix empty Query Builder message
ivanvpetrov 9d68a92
fix(*): Guard the fields array where necessary.
gedinakova 73e3019
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 33199c2
test(query-builder): fix localization test
ivanvpetrov 8852677
feat(query-builder): fix current group change on new group creation
igdmdimitrov 8b53134
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 8c643fb
feat(query-builder): don't show inner tree if not in edit mode and no…
igdmdimitrov a974892
feat(query-builder): fix current group when add group in the middle
igdmdimitrov 9b266d1
test(query-builder): fix end group buttons test
ivanvpetrov 902cfdb
feat(query-builder): fix selected return fields when array is empty
igdmdimitrov 7b949a9
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov 62e98ba
chore(*): removed leftover console log
igdmdimitrov e8e2821
test(query-builder): add one more scenario on commit/discard changes
ivanvpetrov bfad333
test(query-builder): fix child group test
ivanvpetrov 15f411c
feat(query-builder): add isSearchValueInputDisabled method
ivanvpetrov 48008a2
feat(query-builder): add disabled input for unary and nested
ivanvpetrov 9e9f7cb
chore(*): update changelog and comments
igdmdimitrov 641cc4d
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 2bdb67f
chore(*): update potential release version
igdmdimitrov c4a667b
test(query-builder): fix searchValue input replacement timing
ivanvpetrov 8a00ac7
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 40babcf
fix(query-builder): delete empty groups - #14882
igdmdimitrov 21825fe
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov d0cd054
feat(query-builder): revert disabled input for unary and nested commit
ivanvpetrov 15e6c41
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov efb074c
feat(query-builder): select only one return field in inner query (#15…
igdmdimitrov c502ff6
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
teodosiah ecbfae4
fix(query-builder): change theming package version to 14.3.1-beta.1
teodosiah 1d5c183
feat(query-builder): added rehydration to expression trees (#14887)
Otixa 1184ae2
Merge branch 'master' into dmdimitrov/query-builder-improvements
igdmdimitrov 7d2e74d
chore(*): merge from master
igdmdimitrov 159b583
chore(*): fix build and update theming version
igdmdimitrov 927dc7d
Query-builder conditions Drag&Drop functionality (take 2 - no chip ga…
ivanvpetrov d9a211c
chore(*): Update package-lock.json.
gedinakova b60129a
fix(query-builder): reverted to simpler sample
ivanvpetrov 02bcf80
refactor(query-builder): service addressed some todos
ivanvpetrov 11d5d74
chore(*): update package-lock
igdmdimitrov 029aaeb
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov e3fc208
fix(query-builder): test keyboard test improved
ivanvpetrov 9694aee
refactor(query-builder): text for drop ghost localized
ivanvpetrov a9c79b5
chore(lint): Removed .scss extensions
gedinakova 9c5729e
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
gedinakova 8cfeb42
chore(*): fix lint build errors
igdmdimitrov f930e1d
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov b757634
fix(query-builder): fix sample formatter & AF add buttons test
teodosiah ebf11c8
fix(query-builder): searchValue type Set -> Array
teodosiah 921c0bf
refactor(query-builder): rename subquery-background to subquery-heade…
desig9stein d33b6e9
fix(query-builder): scroll to the bottom in AF dialog on add condition
teodosiah 4f27f45
chore(*): Revert d33b6e9 commit
teodosiah 4b3b48c
fix(query-builder): scroll to the bottom on add condition
teodosiah eed54ea
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 6f5a22c
chore(*): update import for IChangeCheckboxEventArgs
igdmdimitrov a55ab4d
refactor(query-builder): change the gap under the from/elect fields t…
desig9stein 0a89eb9
refactor(query-builder): strings are now constants
ivanvpetrov bc757cc
fix(query-builder): various requests from reviews
ivanvpetrov 2c9fb05
chore(query-builder): zindex set for presentational purposes
ivanvpetrov 851f5be
feat(query-builder): Fixed error when dragging a condition into an em…
Otixa e8e5f64
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
Otixa ab34f1b
fix(query-builder): zindex of drag ghost is now properly set
ivanvpetrov 63e7831
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
ivanvpetrov c003890
fix(query-builder): show add expr button for all chips
teodosiah f6923bb
fix(query-builder): test ware failing due to z-index set
ivanvpetrov c964fe3
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
ivanvpetrov fad621a
chore(query-builder): consolelog removed
ivanvpetrov 5b30ffa
Update projects/igniteui-angular/src/lib/query-builder/query-builder.…
teodosiah d6e4fb2
Update projects/igniteui-angular/src/lib/query-builder/query-builder.…
teodosiah ff1cad1
fix(query-builder): fix add condition & hover chip test
teodosiah b472892
feat(query-builder): move css selectors and other to common file and …
igdmdimitrov 0e43c8a
Merge branch 'dmdimitrov/query-builder-improvements' of https://githu…
igdmdimitrov 5bb7665
feat(query-builder): add behavioral changes to the changelog
teodosiah 3a4104a
Query-Builder Focus on dropped chip after Drag&Drop (#15343)
ivanvpetrov d8606fc
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova 70e9181
Merge branch 'master' into dmdimitrov/query-builder-improvements
gedinakova File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
{ | ||
"git.ignoreLimitWarning": true, | ||
"javascript.preferences.quoteStyle": "single", | ||
"typescript.preferences.quoteStyle": "single" | ||
"typescript.preferences.quoteStyle": "single", | ||
"cSpell.words": [ | ||
"ghostclass", | ||
"ungroup" | ||
] | ||
} |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the drag & drop functionality