@finos/legend-query-builder 0.6.26 → 0.6.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/lib/components/QueryBuilder.d.ts.map +1 -1
  2. package/lib/components/QueryBuilder.js +27 -27
  3. package/lib/components/QueryBuilder.js.map +1 -1
  4. package/lib/components/QueryBuilderComponentTestUtils.d.ts.map +1 -1
  5. package/lib/components/QueryBuilderComponentTestUtils.js +4 -5
  6. package/lib/components/QueryBuilderComponentTestUtils.js.map +1 -1
  7. package/lib/components/QueryBuilderConstantExpressionPanel.d.ts.map +1 -1
  8. package/lib/components/QueryBuilderConstantExpressionPanel.js +5 -4
  9. package/lib/components/QueryBuilderConstantExpressionPanel.js.map +1 -1
  10. package/lib/components/QueryBuilderDiffPanel.d.ts.map +1 -1
  11. package/lib/components/QueryBuilderDiffPanel.js +2 -2
  12. package/lib/components/QueryBuilderDiffPanel.js.map +1 -1
  13. package/lib/components/QueryBuilderParametersPanel.d.ts.map +1 -1
  14. package/lib/components/QueryBuilderParametersPanel.js +13 -8
  15. package/lib/components/QueryBuilderParametersPanel.js.map +1 -1
  16. package/lib/components/QueryBuilderPropertyExpressionEditor.d.ts.map +1 -1
  17. package/lib/components/QueryBuilderPropertyExpressionEditor.js +10 -2
  18. package/lib/components/QueryBuilderPropertyExpressionEditor.js.map +1 -1
  19. package/lib/components/QueryBuilder_TestID.d.ts +3 -1
  20. package/lib/components/QueryBuilder_TestID.d.ts.map +1 -1
  21. package/lib/components/QueryBuilder_TestID.js +2 -0
  22. package/lib/components/QueryBuilder_TestID.js.map +1 -1
  23. package/lib/components/explorer/QueryBuilderExplorerPanel.d.ts.map +1 -1
  24. package/lib/components/explorer/QueryBuilderExplorerPanel.js +2 -2
  25. package/lib/components/explorer/QueryBuilderExplorerPanel.js.map +1 -1
  26. package/lib/components/explorer/QueryBuilderMilestoningEditor.d.ts.map +1 -1
  27. package/lib/components/explorer/QueryBuilderMilestoningEditor.js +2 -2
  28. package/lib/components/explorer/QueryBuilderMilestoningEditor.js.map +1 -1
  29. package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.d.ts.map +1 -1
  30. package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.js +2 -2
  31. package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.js.map +1 -1
  32. package/lib/components/shared/CustomDatePicker.d.ts +33 -0
  33. package/lib/components/shared/CustomDatePicker.d.ts.map +1 -1
  34. package/lib/components/shared/CustomDatePicker.js +4 -4
  35. package/lib/components/shared/CustomDatePicker.js.map +1 -1
  36. package/lib/components/shared/QueryBuilderVariableSelector.d.ts +1 -1
  37. package/lib/components/shared/QueryBuilderVariableSelector.d.ts.map +1 -1
  38. package/lib/components/shared/QueryBuilderVariableSelector.js +12 -1
  39. package/lib/components/shared/QueryBuilderVariableSelector.js.map +1 -1
  40. package/lib/components/watermark/QueryBuilderWatermark.d.ts.map +1 -1
  41. package/lib/components/watermark/QueryBuilderWatermark.js +2 -2
  42. package/lib/components/watermark/QueryBuilderWatermark.js.map +1 -1
  43. package/lib/index.css +2 -2
  44. package/lib/index.css.map +1 -1
  45. package/lib/package.json +9 -9
  46. package/lib/stores/QueryBuilderState.d.ts +2 -0
  47. package/lib/stores/QueryBuilderState.d.ts.map +1 -1
  48. package/lib/stores/QueryBuilderState.js +6 -0
  49. package/lib/stores/QueryBuilderState.js.map +1 -1
  50. package/package.json +16 -16
  51. package/src/components/QueryBuilder.tsx +8 -6
  52. package/src/components/QueryBuilderComponentTestUtils.tsx +6 -5
  53. package/src/components/QueryBuilderConstantExpressionPanel.tsx +12 -11
  54. package/src/components/QueryBuilderDiffPanel.tsx +2 -3
  55. package/src/components/QueryBuilderParametersPanel.tsx +13 -7
  56. package/src/components/QueryBuilderPropertyExpressionEditor.tsx +27 -7
  57. package/src/components/QueryBuilder_TestID.ts +2 -0
  58. package/src/components/explorer/QueryBuilderExplorerPanel.tsx +2 -3
  59. package/src/components/explorer/QueryBuilderMilestoningEditor.tsx +2 -3
  60. package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx +3 -6
  61. package/src/components/shared/CustomDatePicker.tsx +3 -3
  62. package/src/components/shared/QueryBuilderVariableSelector.tsx +18 -4
  63. package/src/components/watermark/QueryBuilderWatermark.tsx +2 -6
  64. package/src/stores/QueryBuilderState.ts +8 -0
@@ -52,6 +52,7 @@ export class QueryBuilderState {
52
52
  textEditorState;
53
53
  unsupportedQueryState;
54
54
  observableContext;
55
+ titleOfQuery;
55
56
  queryCompileState = ActionState.create();
56
57
  showFunctionsExplorerPanel = false;
57
58
  showParametersPanel = false;
@@ -72,6 +73,7 @@ export class QueryBuilderState {
72
73
  fetchStructureState: observable,
73
74
  filterState: observable,
74
75
  watermarkState: observable,
76
+ titleOfQuery: observable,
75
77
  checkEntitlementsState: observable,
76
78
  resultState: observable,
77
79
  textEditorState: observable,
@@ -94,6 +96,7 @@ export class QueryBuilderState {
94
96
  setClass: action,
95
97
  setMapping: action,
96
98
  setRuntimeValue: action,
99
+ setTitleOfQuery: action,
97
100
  resetQueryResult: action,
98
101
  resetQueryContent: action,
99
102
  changeClass: action,
@@ -171,6 +174,9 @@ export class QueryBuilderState {
171
174
  setRuntimeValue(val) {
172
175
  this.runtimeValue = val;
173
176
  }
177
+ setTitleOfQuery(val) {
178
+ this.titleOfQuery = val;
179
+ }
174
180
  get isQuerySupported() {
175
181
  return !this.unsupportedQueryState.rawLambda;
176
182
  }
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderState.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,MAAM,EACN,IAAI,EACJ,UAAU,EACV,cAAc,EACd,QAAQ,EACR,UAAU,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,WAAW,EACX,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAKL,mBAAmB,EACnB,gBAAgB,EAChB,mCAAmC,EACnC,2BAA2B,EAC3B,SAAS,EACT,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,EACf,mBAAmB,EACnB,8BAA8B,EAC9B,gCAAgC,GACjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAKjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,EAAE,kCAAkC,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,kCAAkC,EAAE,MAAM,sDAAsD,CAAC;AAE1G,MAAM,OAAgB,iBAAiB;IACrC,gBAAgB,CAAgC;IAChD,iBAAiB,CAAoB;IAErC,oBAAoB,CAAmC;IACvD,aAAa,CAA4B;IACzC,sBAAsB,CAA8B;IACpD,eAAe,CAA8B;IAC7C,aAAa,CAA6B;IAC1C,gBAAgB,CAA+B;IAC/C,mBAAmB,CAAkC;IACrD,WAAW,CAA0B;IACrC,cAAc,CAA6B;IAC3C,sBAAsB,CAAqC;IAC3D,eAAe,GACb,kCAAkC,EAAE,CAAC;IACvC,WAAW,CAA0B;IACrC,eAAe,CAA8B;IAC7C,qBAAqB,CAAoC;IACzD,iBAAiB,CAAkB;IAEnC,iBAAiB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IACzC,0BAA0B,GAAG,KAAK,CAAC;IACnC,mBAAmB,GAAG,KAAK,CAAC;IAC5B,kBAAkB,GAAG,KAAK,CAAC;IAC3B,qBAAqB,GAAG,KAAK,CAAC;IAE9B,KAAK,CAAqB;IAC1B,OAAO,CAAuB;IAC9B,YAAY,CAAuB;IAEnC,2EAA2E;IAC3E,yDAAyD;IACzD,oCAAoC,CAAuC;IAE3E,YACE,gBAA+C,EAC/C,iBAAoC;QAEpC,cAAc,CAAC,IAAI,EAAE;YACnB,aAAa,EAAE,UAAU;YACzB,eAAe,EAAE,UAAU;YAC3B,aAAa,EAAE,UAAU;YACzB,sBAAsB,EAAE,UAAU;YAClC,mBAAmB,EAAE,UAAU;YAC/B,WAAW,EAAE,UAAU;YACvB,cAAc,EAAE,UAAU;YAC1B,sBAAsB,EAAE,UAAU;YAClC,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,UAAU;YAC3B,qBAAqB,EAAE,UAAU;YACjC,0BAA0B,EAAE,UAAU;YACtC,mBAAmB,EAAE,UAAU;YAC/B,kBAAkB,EAAE,UAAU;YAC9B,qBAAqB,EAAE,UAAU;YACjC,oBAAoB,EAAE,UAAU;YAChC,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,UAAU;YACnB,YAAY,EAAE,UAAU;YAExB,gBAAgB,EAAE,QAAQ;YAC1B,gBAAgB,EAAE,QAAQ;YAC1B,gBAAgB,EAAE,QAAQ;YAE1B,6BAA6B,EAAE,MAAM;YACrC,sBAAsB,EAAE,MAAM;YAC9B,qBAAqB,EAAE,MAAM;YAC7B,wBAAwB,EAAE,MAAM;YAChC,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,MAAM;YAEvB,gBAAgB,EAAE,MAAM;YACxB,iBAAiB,EAAE,MAAM;YACzB,WAAW,EAAE,MAAM;YACnB,aAAa,EAAE,MAAM;YAErB,gBAAgB,EAAE,MAAM;YACxB,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAE3C,IAAI,CAAC,gBAAgB,GAAG,IAAI,4BAA4B,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAyB,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,aAAa,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,sBAAsB,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,mBAAmB,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAC;QACrE,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,sBAAsB,GAAG,IAAI,kCAAkC,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,qBAAqB,GAAG,IAAI,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAe,CAC1C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,0BAA0B,EAAE,CAClE,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,gCAAgC,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,0BAA0B;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,IAAI,+CAA+C;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,YAAY;QACd,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,CAC5D,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CACrC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAC9C,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAC5B,CAAC;QACF,OAAO,CAAC,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,6BAA6B,CAAC,GAAY;QACxC,IAAI,CAAC,0BAA0B,GAAG,GAAG,CAAC;IACxC,CAAC;IAED,sBAAsB,CAAC,GAAY;QACjC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjC,CAAC;IAED,qBAAqB,CAAC,GAAY;QAChC,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC;IAChC,CAAC;IAED,wBAAwB,CAAC,GAAY;QACnC,IAAI,CAAC,qBAAqB,GAAG,GAAG,CAAC;IACnC,CAAC;IAED,QAAQ,CAAC,GAAsB;QAC7B,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,GAAwB;QACjC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,GAAwB;QACtC,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;IAC1B,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC;IAC/C,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,eAAe,CAAC;YAClD,GAAG,EAAE,yBAAyB,CAAC,OAAO;YACtC,MAAM,EAAE,GAAG,EAAE;gBACX,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,KAAK,CACnC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC1C,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,qDAAqD;IACrD,6GAA6G;IAC7G,cAAc,CAAC,QAA4B;QACzC,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC;YACzC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC5C,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,CACjE,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAC3D,CAAC;IACJ,CAAC;IAED,gBAAgB;QACd,MAAM,WAAW,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACtD,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,eAAe,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,qBAAqB,GAAG,IAAI,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,gBAAgB,GAAG,IAAI,4BAA4B,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,kCAAkC,GACtC,IAAI,CAAC,aAAa,CAAC,kCAAkC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAyB,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,kCAAkC,EAAE;YACtC,IAAI,CAAC,aAAa,CAAC,kCAAkC;gBACnD,kCAAkC,CAAC;SACtC;QACD,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,aAAa,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,sBAAsB,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,sBAAsB,GAAG,IAAI,kCAAkC,CAAC,IAAI,CAAC,CAAC;QAE3E,MAAM,uCAAuC,GAC3C,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAC;QACrE,IACE,uCAAuC;YACvC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,EAC5C;YACA,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAC3C,uCAAuC,CACxC,CAAC;SACH;IACH,CAAC;IAED,WAAW,CAAC,GAAU;QACpB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC;QACrC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,EAAE,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAY,EAAE,OAAwC;QAClE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE;YAC9B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,EAAE,CAAC;SACxD;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,aAAa,CAAC,GAAY;QACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,UAAU,CAAC,OAA4C;QACrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,2BAA2B,CAC7D,CAAC,CAAC,SAAS,CACZ,CACF,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,YAAY,CACrC,IAAI,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,CACtE,CAAC;YACF,OAAO,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;SACnE;QACD,OAAO,gCAAgC,CACrC,mBAAmB,CAAC,IAAI,EAAE;YACxB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC;SAC/D,CAAC,EACF,IAAI,CAAC,iBAAiB,CACvB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,KAAgB;QAClC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,KAAgB;QAC/B,IAAI;YACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAEzB,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;gBAC/B,MAAM,SAAS,GAAG,0BAA0B,CAC1C,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,uBAAuB,CACzD,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,8BAA8B,CAChE,KAAK,CACN,EACD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC7B,EACD,IAAI,CAAC,iBAAiB,CACvB,CAAC;gBACF,MAAM,0BAA0B,GAAG,aAAa,CAC9C,SAAS,EACT,2BAA2B,EAC3B,4DAA4D,CAC7D,CAAC;gBACF,0BAA0B,CACxB,oBAAoB,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAC1D,IAAI,CACL,CAAC;aACH;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;aACnC;SACF;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACjD,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzB,MAAM,UAAU,GAAG,8BAA8B,CAC/C,KAAK,EACL,IAAI,CAAC,iBAAiB,CACvB;iBACE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,0BAA0B,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAC1D;iBACA,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAC5C,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SACrC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,WAAiD;QAEjD,IAAI;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;SAC1B;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,qBAAqB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACzE;IACH,CAAC;IAED,CAAC,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE;YAC9B,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;YAChE,YAAY;YACZ,IAAI;gBACF,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBACpD,wEAAwE;gBACxE,8CAA8C;gBAC9C,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,mBAAmB,CAC5D,IAAI,CAAC,UAAU,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,EAChD,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAC5B,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAChC,CAAW,CAAC;gBACb,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;aAC9D;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAC7B,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EACxD,KAAK,CACN,CAAC;gBACF,IAAI,8BAA8B,GAAG,IAAI,CAAC;gBAC1C,kEAAkE;gBAClE,+DAA+D;gBAC/D,IAAI,KAAK,YAAY,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,EAAE;oBAChE,8BAA8B;wBAC5B,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,sBAAsB,CAC7D,KAAK,CACN,CAAC;iBACL;gBAED,4DAA4D;gBAC5D,IAAI,8BAA8B,EAAE;oBAClC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,qGAAqG,CACtG,CAAC;oBACF,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;oBAChE,2DAA2D;oBAC3D,8EAA8E;oBAC9E,gFAAgF;oBAChF,8EAA8E;oBAC9E,6BAA6B;oBAC7B,wDAAwD;iBACzD;qBAAM;oBACL,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,uBAAuB,KAAK,CAAC,OAAO,EAAE,CACvC,CAAC;iBACH;aACF;oBAAS;gBACR,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;aACnC;SACF;aAAM,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,0BAA0B,CAAC,IAAI,EAAE;YACxE,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI;gBACF,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBACpD,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,mBAAmB,CAC5D,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,MAAM,EAC1C,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAC5B,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAChC,CAAW,CAAC;gBACb,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;aAC9D;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,KAAK,YAAY,gBAAgB,EAAE;oBACrC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAC7B,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EACxD,KAAK,CACN,CAAC;oBACF,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,uBAAuB,KAAK,CAAC,OAAO,EAAE,CACvC,CAAC;oBACF,MAAM,uBAAuB,GAAG,mCAAmC,CACjE,KAAK,CAAC,iBAAiB,CACxB,CAAC;oBACF,IAAI,uBAAuB,EAAE;wBAC3B,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;qBACjD;iBACF;aACF;oBAAS;gBACR,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;aACnC;SACF;IACH,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,gBAAgB,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACH,kCAAkC;QAChC,mEAAmE;QACnE,MAAM,UAAU,GAAG,IAAI,gCAAgC,CACrD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,CACvB,CAAC;QACF,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAClC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC5C,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,mBAAmB;YAChD,IAAI,CAAC,qBAAqB;YAC1B,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,eAAe;YACpB,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,cAAc;YACnB,IAAI,CAAC,sBAAsB;YAC3B,IAAI,CAAC,mBAAmB,CAAC,cAAc;SACxC,CAAC,CAAC;IACL,CAAC;CACF;AAED;;;;;;;;;GASG;AACH,MAAM,OAAO,gCAAiC,SAAQ,iBAAiB;CAAG"}
1
+ {"version":3,"file":"QueryBuilderState.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderState.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-query-builder",
3
- "version": "0.6.26",
3
+ "version": "0.6.27",
4
4
  "description": "Legend query builder core",
5
5
  "keywords": [
6
6
  "legend",
@@ -41,17 +41,17 @@
41
41
  "test:watch": "jest --watch"
42
42
  },
43
43
  "dependencies": {
44
- "@ag-grid-community/client-side-row-model": "29.0.0",
45
- "@ag-grid-community/core": "29.0.0",
46
- "@ag-grid-community/react": "29.0.0",
47
- "@ag-grid-community/styles": "29.0.0",
48
- "@finos/legend-application": "10.2.17",
49
- "@finos/legend-art": "5.0.26",
50
- "@finos/legend-graph": "22.2.8",
51
- "@finos/legend-server-depot": "4.3.2",
52
- "@finos/legend-shared": "6.2.19",
53
- "@finos/legend-storage": "3.0.34",
54
- "@testing-library/react": "13.4.0",
44
+ "@ag-grid-community/client-side-row-model": "29.1.0",
45
+ "@ag-grid-community/core": "29.1.0",
46
+ "@ag-grid-community/react": "29.1.0",
47
+ "@ag-grid-community/styles": "29.1.0",
48
+ "@finos/legend-application": "10.2.18",
49
+ "@finos/legend-art": "5.0.27",
50
+ "@finos/legend-graph": "22.3.0",
51
+ "@finos/legend-server-depot": "4.4.0",
52
+ "@finos/legend-shared": "6.2.20",
53
+ "@finos/legend-storage": "3.0.35",
54
+ "@testing-library/react": "14.0.0",
55
55
  "@types/papaparse": "5.3.7",
56
56
  "@types/react": "18.0.28",
57
57
  "@types/react-dom": "18.0.11",
@@ -65,14 +65,14 @@
65
65
  "serializr": "3.0.2"
66
66
  },
67
67
  "devDependencies": {
68
- "@finos/legend-dev-utils": "2.0.41",
69
- "@jest/globals": "29.4.2",
68
+ "@finos/legend-dev-utils": "2.0.42",
69
+ "@jest/globals": "29.4.3",
70
70
  "cross-env": "7.0.3",
71
71
  "eslint": "8.34.0",
72
- "jest": "29.4.2",
72
+ "jest": "29.4.3",
73
73
  "npm-run-all": "4.1.5",
74
74
  "rimraf": "4.1.2",
75
- "sass": "1.58.1",
75
+ "sass": "1.58.3",
76
76
  "typescript": "4.9.5"
77
77
  },
78
78
  "peerDependencies": {
@@ -39,6 +39,7 @@ import {
39
39
  ModalFooter,
40
40
  ModalHeader,
41
41
  BlankPanelContent,
42
+ ModalFooterButton,
42
43
  } from '@finos/legend-art';
43
44
  import { QueryBuilderFilterPanel } from './filter/QueryBuilderFilterPanel.js';
44
45
  import { QueryBuilderExplorerPanel } from './explorer/QueryBuilderExplorerPanel.js';
@@ -233,12 +234,7 @@ const renderCheckEntitlementsEditor = (
233
234
  </BlankPanelContent>
234
235
  </ModalBody>
235
236
  <ModalFooter>
236
- <button
237
- className="btn modal__footer__close-btn"
238
- onClick={handleClose}
239
- >
240
- Close
241
- </button>
237
+ <ModalFooterButton text="Close" onClick={handleClose} />
242
238
  </ModalFooter>
243
239
  </Modal>
244
240
  </Dialog>
@@ -370,6 +366,12 @@ export const QueryBuilder = observer(
370
366
  )}
371
367
  </div>
372
368
  <div className="query-builder__sub-header__content__actions">
369
+ <div
370
+ title="Query title"
371
+ className="query-builder__sub-header__query__title"
372
+ >
373
+ {queryBuilderState.titleOfQuery}
374
+ </div>
373
375
  <div className="query-builder__sub-header__actions">
374
376
  <DropdownMenu
375
377
  className="query-builder__sub-header__custom-action"
@@ -62,9 +62,15 @@ export const TEST__setUpQueryBuilder = async (
62
62
  entities,
63
63
  graphManagerState.graphBuildState,
64
64
  );
65
+
66
+ const history = createMemoryHistory();
67
+ const navigator = new WebApplicationNavigator(history);
68
+ TEST__provideMockedWebApplicationNavigator({ mock: navigator });
69
+
65
70
  const applicationStore = TEST__provideMockedApplicationStore(
66
71
  TEST__getGenericApplicationConfig(),
67
72
  pluginManager,
73
+ { navigator },
68
74
  );
69
75
 
70
76
  const queryBuilderState = new INTERNAL__BasicQueryBuilderState(
@@ -93,11 +99,6 @@ export const TEST__setUpQueryBuilder = async (
93
99
  );
94
100
  }
95
101
 
96
- const history = createMemoryHistory();
97
- const navigator = new WebApplicationNavigator(history);
98
- applicationStore.navigator = navigator;
99
- TEST__provideMockedWebApplicationNavigator({ mock: navigator });
100
-
101
102
  const renderResult = render(
102
103
  <Router history={history}>
103
104
  <TEST__ApplicationStoreProvider
@@ -28,6 +28,7 @@ import {
28
28
  Modal,
29
29
  ModalBody,
30
30
  ModalFooter,
31
+ ModalFooterButton,
31
32
  ModalHeader,
32
33
  PanelFormSection,
33
34
  PanelFormTextField,
@@ -49,6 +50,7 @@ import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEd
49
50
  import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
50
51
  import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
51
52
  import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
53
+ import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
52
54
 
53
55
  // Note: We currently only allow constant variables for primitive types of multiplicity ONE.
54
56
  // This is why we don't show multiplicity in the editor.
@@ -135,7 +137,7 @@ const QueryBuilderConstantExpressionEditor = observer(
135
137
  Type
136
138
  </div>
137
139
  <div className="panel__content__form__section__header__prompt">
138
- Data type of the parameter.
140
+ Data type of the constant.
139
141
  </div>
140
142
  <CustomSelectorInput
141
143
  placeholder="Choose a type..."
@@ -172,17 +174,13 @@ const QueryBuilderConstantExpressionEditor = observer(
172
174
  </ModalBody>
173
175
  <ModalFooter>
174
176
  {isCreating && (
175
- <button
176
- className="btn modal__footer__close-btn btn--dark"
177
+ <ModalFooterButton
178
+ text="Create"
179
+ inProgress={Boolean(validationMessage)}
177
180
  onClick={onAction}
178
- disabled={Boolean(validationMessage)}
179
- >
180
- Create
181
- </button>
181
+ />
182
182
  )}
183
- <button className="btn modal__footer__close-btn" onClick={close}>
184
- Close
185
- </button>
183
+ <ModalFooterButton text="Close" onClick={close} />
186
184
  </ModalFooter>
187
185
  </Modal>
188
186
  </Dialog>
@@ -226,7 +224,10 @@ export const QueryBuilderConstantExpressionPanel = observer(
226
224
  };
227
225
 
228
226
  return (
229
- <div className="panel query-builder__variables">
227
+ <div
228
+ data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_CONSTANTS}
229
+ className="panel query-builder__variables"
230
+ >
230
231
  <div className="panel__header">
231
232
  <div className="panel__header__title">
232
233
  <div className="panel__header__title__label">constants</div>
@@ -26,6 +26,7 @@ import {
26
26
  Dialog,
27
27
  disposeDiffEditor,
28
28
  useResizeDetector,
29
+ Button,
29
30
  } from '@finos/legend-art';
30
31
  import { observer } from 'mobx-react-lite';
31
32
  import { editor as monacoEditorAPI } from 'monaco-editor';
@@ -195,9 +196,7 @@ export const QueryBuilderDiffViewPanel = observer(
195
196
  )}
196
197
  </div>
197
198
  <div className="query-builder__diff-panel__actions">
198
- <button className="btn btn--dark" onClick={close}>
199
- Close
200
- </button>
199
+ <Button text="close" onClick={close} />
201
200
  </div>
202
201
  </div>
203
202
  </div>
@@ -52,6 +52,7 @@ import { variableExpression_setName } from '../stores/shared/ValueSpecificationM
52
52
  import { LambdaParameterState } from '../stores/shared/LambdaParameterState.js';
53
53
  import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEditor.js';
54
54
  import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
55
+ import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
55
56
 
56
57
  type MultiplicityOption = { label: string; value: Multiplicity };
57
58
 
@@ -71,12 +72,16 @@ const VariableExpressionEditor = observer(
71
72
  const { queryBuilderState, lambdaParameterState } = props;
72
73
  const applicationStore = useApplicationStore();
73
74
  const queryParametersState = queryBuilderState.parametersState;
75
+ const allVariableNames = queryBuilderState.allVariableNames;
74
76
  const isCreating =
75
77
  !queryParametersState.parameterStates.includes(lambdaParameterState);
76
78
  const varState = lambdaParameterState.parameter;
77
79
  const multiplity = varState.multiplicity;
78
80
  const validationMessage = !varState.name
79
81
  ? `Parameter name can't be empty`
82
+ : allVariableNames.filter((e) => e === varState.name).length >
83
+ (isCreating ? 0 : 1)
84
+ ? 'Parameter Name Already Exists'
80
85
  : (isCreating &&
81
86
  queryParametersState.parameterStates.find(
82
87
  (p) => p.parameter.name === varState.name,
@@ -200,13 +205,11 @@ const VariableExpressionEditor = observer(
200
205
  </ModalBody>
201
206
  <ModalFooter>
202
207
  {isCreating && (
203
- <button
204
- className="btn modal__footer__close-btn btn--dark"
208
+ <ModalFooterButton
209
+ text="Create"
210
+ inProgress={Boolean(validationMessage)}
205
211
  onClick={onAction}
206
- disabled={Boolean(validationMessage)}
207
- >
208
- Create
209
- </button>
212
+ />
210
213
  )}
211
214
  <ModalFooterButton onClick={close} text="Close" />
212
215
  </ModalFooter>
@@ -247,7 +250,10 @@ export const QueryBuilderParametersPanel = observer(
247
250
  };
248
251
 
249
252
  return (
250
- <div className="panel query-builder__variables">
253
+ <div
254
+ data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PARAMETERS}
255
+ className="panel query-builder__variables"
256
+ >
251
257
  <div className="panel__header">
252
258
  <div className="panel__header__title">
253
259
  <div className="panel__header__title__label">parameters</div>
@@ -25,6 +25,7 @@ import {
25
25
  ModalHeader,
26
26
  ModalBody,
27
27
  ModalFooter,
28
+ ModalFooterButton,
28
29
  } from '@finos/legend-art';
29
30
  import { observer } from 'mobx-react-lite';
30
31
  import {
@@ -304,7 +305,25 @@ export const QueryBuilderPropertyExpressionEditor = observer(
304
305
  const { propertyExpressionState } = props;
305
306
  const handleClose = (): void =>
306
307
  propertyExpressionState.setIsEditingDerivedProperty(false);
307
-
308
+ const isParameterCompatibleWithDerivedProperty = (
309
+ variable: VariableExpression,
310
+ derivedProperties: QueryBuilderDerivedPropertyExpressionState[],
311
+ ): boolean =>
312
+ Boolean(
313
+ derivedProperties.find((dp) => {
314
+ if (!variable.genericType?.value.rawType) {
315
+ return false;
316
+ }
317
+ return (
318
+ isSuperType(
319
+ dp.derivedProperty.genericType.value.rawType,
320
+ variable.genericType.value.rawType,
321
+ ) ||
322
+ dp.derivedProperty.genericType.value.rawType.name ===
323
+ variable.genericType.value.rawType.name
324
+ );
325
+ }),
326
+ );
308
327
  return (
309
328
  <Dialog
310
329
  open={Boolean(
@@ -334,16 +353,17 @@ export const QueryBuilderPropertyExpressionEditor = observer(
334
353
  <ModalBody className="query-builder__variables__modal__body">
335
354
  <VariableSelector
336
355
  queryBuilderState={propertyExpressionState.queryBuilderState}
356
+ filterBy={(v: VariableExpression) =>
357
+ isParameterCompatibleWithDerivedProperty(
358
+ v,
359
+ propertyExpressionState.derivedPropertyExpressionStates,
360
+ )
361
+ }
337
362
  />
338
363
  </ModalBody>
339
364
  </ModalBody>
340
365
  <ModalFooter>
341
- <button
342
- className="btn modal__footer__close-btn"
343
- onClick={handleClose}
344
- >
345
- Done
346
- </button>
366
+ <ModalFooterButton text="Done" onClick={handleClose} />
347
367
  </ModalFooter>
348
368
  </Modal>
349
369
  </Dialog>
@@ -27,4 +27,6 @@ export enum QUERY_BUILDER_TEST_ID {
27
27
  QUERY_BUILDER_EXPLORER = 'query__builder__explorer',
28
28
  QUERY_BUILDER_PROPERTY_SEARCH_PANEL = 'query__builder__property__search__panel',
29
29
  QUERY_BUILDER_RESULT_PANEL = 'query__builder__result__panel',
30
+ QUERY_BUILDER_PARAMETERS = 'query-builder__parameters',
31
+ QUERY_BUILDER_CONSTANTS = 'query-builder__constants',
30
32
  }
@@ -52,6 +52,7 @@ import {
52
52
  ModalBody,
53
53
  ModalFooter,
54
54
  ModalHeader,
55
+ ModalFooterButton,
55
56
  } from '@finos/legend-art';
56
57
  import {
57
58
  type QueryBuilderExplorerTreeDragSource,
@@ -266,9 +267,7 @@ const QueryBuilderExplorerPreviewDataModal = observer(
266
267
  )}
267
268
  </ModalBody>
268
269
  <ModalFooter>
269
- <button className="btn modal__footer__close-btn" onClick={close}>
270
- Close
271
- </button>
270
+ <ModalFooterButton text="Close" onClick={close} />
272
271
  </ModalFooter>
273
272
  </Modal>
274
273
  </Dialog>
@@ -35,6 +35,7 @@ import {
35
35
  Modal,
36
36
  ModalBody,
37
37
  ModalFooter,
38
+ ModalFooterButton,
38
39
  ModalHeader,
39
40
  PanelEntryDropZonePlaceholder,
40
41
  PanelFormSection,
@@ -279,9 +280,7 @@ export const MilestoningParametersEditor = observer(
279
280
  </div>
280
281
  </ModalBody>
281
282
  <ModalFooter>
282
- <button className="btn modal__footer__close-btn" onClick={close}>
283
- Close
284
- </button>
283
+ <ModalFooterButton text="Close" onClick={close} />
285
284
  </ModalFooter>
286
285
  </Modal>
287
286
  </Dialog>
@@ -42,6 +42,7 @@ import {
42
42
  Modal,
43
43
  ModalFooter,
44
44
  PanelFormSection,
45
+ ModalFooterButton,
45
46
  } from '@finos/legend-art';
46
47
  import { assertErrorThrown, guaranteeNonNullable } from '@finos/legend-shared';
47
48
  import { observer } from 'mobx-react-lite';
@@ -513,13 +514,9 @@ const QueryBuilderWindowColumnModalEditor = observer(
513
514
  </div>
514
515
  <ModalFooter>
515
516
  {createNewWindow ? (
516
- <button className="btn modal__footer__close-btn" onClick={create}>
517
- Create
518
- </button>
517
+ <ModalFooterButton text="Create" onClick={create} />
519
518
  ) : (
520
- <button className="btn modal__footer__close-btn" onClick={close}>
521
- Close
522
- </button>
519
+ <ModalFooterButton text="Close" onClick={close} />
523
520
  )}
524
521
  </ModalFooter>
525
522
  </Modal>
@@ -56,7 +56,7 @@ import {
56
56
  valueSpecification_setGenericType,
57
57
  } from '../../stores/shared/ValueSpecificationModifierHelper.js';
58
58
 
59
- enum CUSTOM_DATE_PICKER_OPTION {
59
+ export enum CUSTOM_DATE_PICKER_OPTION {
60
60
  ABSOLUTE_DATE = 'Absolute Date',
61
61
  ABSOLUTE_TIME = 'Absolute Time',
62
62
  TODAY = 'Today',
@@ -431,7 +431,7 @@ const buildPureDurationEnumValue = (
431
431
  };
432
432
 
433
433
  /**
434
- * Generate the pure date ajust() function based on the CustomDateOption.
434
+ * Generate the pure date adjust() function based on the CustomDateOption.
435
435
  */
436
436
  const buildPureAdjustDateFunction = (
437
437
  customDateOption: CustomDateOption,
@@ -634,7 +634,7 @@ const buildCustomDateOption = (
634
634
  /**
635
635
  * Build DatePickerOption from pure date functions or PrimitiveInstanceValue
636
636
  */
637
- const buildDatePickerOption = (
637
+ export const buildDatePickerOption = (
638
638
  valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
639
639
  ): DatePickerOption => {
640
640
  if (valueSpecification instanceof SimpleFunctionExpression) {
@@ -23,9 +23,10 @@ import {
23
23
  TimesIcon,
24
24
  useDragPreviewLayer,
25
25
  } from '@finos/legend-art';
26
- import type {
27
- ValueSpecification,
28
- VariableExpression,
26
+ import {
27
+ SimpleFunctionExpression,
28
+ type ValueSpecification,
29
+ type VariableExpression,
29
30
  } from '@finos/legend-graph';
30
31
  import { observer } from 'mobx-react-lite';
31
32
  import { useDrag } from 'react-dnd';
@@ -36,6 +37,7 @@ import {
36
37
  QUERY_BUILDER_VARIABLE_DND_TYPE,
37
38
  VariableInfoTooltip,
38
39
  } from './BasicValueSpecificationEditor.js';
40
+ import { buildDatePickerOption } from './CustomDatePicker.js';
39
41
 
40
42
  export const VariableViewer = observer(
41
43
  (props: {
@@ -50,8 +52,19 @@ export const VariableViewer = observer(
50
52
  }) => {
51
53
  const { variable, constantValue, actions, isReadOnly, queryBuilderState } =
52
54
  props;
55
+
56
+ const getNameOfValue = (value: ValueSpecification): string | undefined => {
57
+ if (value instanceof SimpleFunctionExpression) {
58
+ const possibleDateLabel = buildDatePickerOption(value).label;
59
+ if (possibleDateLabel) {
60
+ return possibleDateLabel;
61
+ }
62
+ }
63
+ return getValueSpecificationStringValue(value);
64
+ };
65
+
53
66
  const valueString = constantValue
54
- ? getValueSpecificationStringValue(constantValue)
67
+ ? getNameOfValue(constantValue)
55
68
  : undefined;
56
69
  const name = variable.name;
57
70
  const variableType = variable.genericType?.value.rawType;
@@ -159,6 +172,7 @@ export const VariableSelector = observer(
159
172
  queryBuilderState.constantState.constants.filter((c) =>
160
173
  filterBy ? filterBy(c.variable) : true,
161
174
  );
175
+
162
176
  return (
163
177
  <>
164
178
  <PanelFormListItems title="Available parameters">
@@ -25,6 +25,7 @@ import {
25
25
  ModalFooter,
26
26
  ModalHeader,
27
27
  PanelFormSection,
28
+ ModalFooterButton,
28
29
  } from '@finos/legend-art';
29
30
  import {
30
31
  areMultiplicitiesEqual,
@@ -169,12 +170,7 @@ export const QueryBuilderWatermarkEditor = observer(
169
170
  </PanelForm>
170
171
  </ModalBody>
171
172
  <ModalFooter>
172
- <button
173
- className="btn modal__footer__close-btn"
174
- onClick={handleClose}
175
- >
176
- Done
177
- </button>
173
+ <ModalFooterButton text="Done" onClick={handleClose} />
178
174
  </ModalFooter>
179
175
  </Modal>
180
176
  </Dialog>
@@ -99,6 +99,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
99
99
  textEditorState: QueryBuilderTextEditorState;
100
100
  unsupportedQueryState: QueryBuilderUnsupportedQueryState;
101
101
  observableContext: ObserverContext;
102
+ titleOfQuery: string | undefined;
102
103
 
103
104
  queryCompileState = ActionState.create();
104
105
  showFunctionsExplorerPanel = false;
@@ -126,6 +127,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
126
127
  fetchStructureState: observable,
127
128
  filterState: observable,
128
129
  watermarkState: observable,
130
+ titleOfQuery: observable,
129
131
  checkEntitlementsState: observable,
130
132
  resultState: observable,
131
133
  textEditorState: observable,
@@ -151,6 +153,8 @@ export abstract class QueryBuilderState implements CommandRegistrar {
151
153
  setMapping: action,
152
154
  setRuntimeValue: action,
153
155
 
156
+ setTitleOfQuery: action,
157
+
154
158
  resetQueryResult: action,
155
159
  resetQueryContent: action,
156
160
  changeClass: action,
@@ -253,6 +257,10 @@ export abstract class QueryBuilderState implements CommandRegistrar {
253
257
  this.runtimeValue = val;
254
258
  }
255
259
 
260
+ setTitleOfQuery(val: string | undefined): void {
261
+ this.titleOfQuery = val;
262
+ }
263
+
256
264
  get isQuerySupported(): boolean {
257
265
  return !this.unsupportedQueryState.rawLambda;
258
266
  }