@finos/legend-application-repl 0.0.50 → 0.0.52

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 (68) hide show
  1. package/lib/components/dataCube/DataCube.d.ts.map +1 -1
  2. package/lib/components/dataCube/DataCube.js +1 -3
  3. package/lib/components/dataCube/DataCube.js.map +1 -1
  4. package/lib/components/dataCube/editor/DataCubeEditor.d.ts.map +1 -1
  5. package/lib/components/dataCube/editor/DataCubeEditor.js +3 -7
  6. package/lib/components/dataCube/editor/DataCubeEditor.js.map +1 -1
  7. package/lib/components/dataCube/editor/DataCubeEditorColumnsPanel.js +6 -6
  8. package/lib/components/dataCube/editor/DataCubeEditorColumnsPanel.js.map +1 -1
  9. package/lib/components/dataCube/editor/DataCubeEditorColumnsSelector.js +5 -5
  10. package/lib/components/dataCube/editor/DataCubeEditorColumnsSelector.js.map +1 -1
  11. package/lib/components/dataCube/{editor/DataCubeEditorFilterPanel.d.ts → filter/DataCubeEditorFilter.d.ts} +2 -2
  12. package/lib/components/dataCube/filter/DataCubeEditorFilter.d.ts.map +1 -0
  13. package/lib/components/dataCube/{editor/DataCubeEditorFilterPanel.js → filter/DataCubeEditorFilter.js} +44 -39
  14. package/lib/components/dataCube/filter/DataCubeEditorFilter.js.map +1 -0
  15. package/lib/index.css +1 -1
  16. package/lib/package.json +1 -1
  17. package/lib/stores/dataCube/DataCubeState.d.ts +2 -0
  18. package/lib/stores/dataCube/DataCubeState.d.ts.map +1 -1
  19. package/lib/stores/dataCube/DataCubeState.js +4 -1
  20. package/lib/stores/dataCube/DataCubeState.js.map +1 -1
  21. package/lib/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.d.ts.map +1 -1
  22. package/lib/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.js +2 -2
  23. package/lib/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.js.map +1 -1
  24. package/lib/stores/dataCube/editor/DataCubeEditorColumnsPanelState.d.ts.map +1 -1
  25. package/lib/stores/dataCube/editor/DataCubeEditorColumnsPanelState.js +6 -2
  26. package/lib/stores/dataCube/editor/DataCubeEditorColumnsPanelState.js.map +1 -1
  27. package/lib/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.d.ts +5 -5
  28. package/lib/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.d.ts.map +1 -1
  29. package/lib/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.js +22 -18
  30. package/lib/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.js.map +1 -1
  31. package/lib/stores/dataCube/editor/DataCubeEditorState.d.ts +1 -5
  32. package/lib/stores/dataCube/editor/DataCubeEditorState.d.ts.map +1 -1
  33. package/lib/stores/dataCube/editor/DataCubeEditorState.js +3 -10
  34. package/lib/stores/dataCube/editor/DataCubeEditorState.js.map +1 -1
  35. package/lib/stores/dataCube/{editor/DataCubeEditorFilterPanelState.d.ts → filter/DataCubeFilterEditorState.d.ts} +10 -11
  36. package/lib/stores/dataCube/filter/DataCubeFilterEditorState.d.ts.map +1 -0
  37. package/lib/stores/dataCube/{editor/DataCubeEditorFilterPanelState.js → filter/DataCubeFilterEditorState.js} +27 -15
  38. package/lib/stores/dataCube/filter/DataCubeFilterEditorState.js.map +1 -0
  39. package/lib/stores/dataCube/grid/DataCubeGridConfigurationBuilder.d.ts.map +1 -1
  40. package/lib/stores/dataCube/grid/DataCubeGridConfigurationBuilder.js +33 -9
  41. package/lib/stores/dataCube/grid/DataCubeGridConfigurationBuilder.js.map +1 -1
  42. package/lib/stores/dataCube/grid/DataCubeGridControllerState.d.ts +1 -1
  43. package/lib/stores/dataCube/grid/DataCubeGridControllerState.d.ts.map +1 -1
  44. package/lib/stores/dataCube/grid/DataCubeGridControllerState.js.map +1 -1
  45. package/lib/stores/dataCube/grid/DataCubeGridMenuBuilder.d.ts +1 -1
  46. package/lib/stores/dataCube/grid/DataCubeGridMenuBuilder.d.ts.map +1 -1
  47. package/lib/stores/dataCube/grid/DataCubeGridMenuBuilder.js +25 -13
  48. package/lib/stores/dataCube/grid/DataCubeGridMenuBuilder.js.map +1 -1
  49. package/package.json +4 -4
  50. package/src/components/dataCube/DataCube.tsx +1 -3
  51. package/src/components/dataCube/editor/DataCubeEditor.tsx +11 -21
  52. package/src/components/dataCube/editor/DataCubeEditorColumnsPanel.tsx +8 -8
  53. package/src/components/dataCube/editor/DataCubeEditorColumnsSelector.tsx +5 -5
  54. package/src/components/dataCube/{editor/DataCubeEditorFilterPanel.tsx → filter/DataCubeEditorFilter.tsx} +100 -79
  55. package/src/stores/dataCube/DataCubeState.ts +4 -1
  56. package/src/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.ts +4 -2
  57. package/src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts +7 -3
  58. package/src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts +21 -17
  59. package/src/stores/dataCube/editor/DataCubeEditorState.tsx +7 -11
  60. package/src/stores/dataCube/{editor/DataCubeEditorFilterPanelState.ts → filter/DataCubeFilterEditorState.tsx} +48 -28
  61. package/src/stores/dataCube/grid/DataCubeGridConfigurationBuilder.tsx +35 -9
  62. package/src/stores/dataCube/grid/DataCubeGridControllerState.ts +1 -0
  63. package/src/stores/dataCube/grid/DataCubeGridMenuBuilder.tsx +37 -16
  64. package/tsconfig.json +2 -2
  65. package/lib/components/dataCube/editor/DataCubeEditorFilterPanel.d.ts.map +0 -1
  66. package/lib/components/dataCube/editor/DataCubeEditorFilterPanel.js.map +0 -1
  67. package/lib/stores/dataCube/editor/DataCubeEditorFilterPanelState.d.ts.map +0 -1
  68. package/lib/stores/dataCube/editor/DataCubeEditorFilterPanelState.js.map +0 -1
@@ -65,8 +65,8 @@ export class DataCubeFilterEditorConditionTreeNode extends DataCubeFilterEditorT
65
65
  setValue(value) {
66
66
  this.value = value
67
67
  ? isObservable(value)
68
- ? makeObservable(value, { value: observable })
69
- : value
68
+ ? value
69
+ : makeObservable(value, { value: observable })
70
70
  : undefined;
71
71
  }
72
72
  updateValue(value) {
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeQueryFilterEditorState.js","sourceRoot":"","sources":["../../../../../src/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeQueryFilterEditorState.js","sourceRoot":"","sources":["../../../../../src/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorColumnsPanelState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACL,wCAAwC,EAExC,kCAAkC,EACnC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAG9E,qBAAa,uCAAwC,SAAQ,kCAAkC,CAAC,wCAAwC,CAAC;IAC9H,WAAW,CAAC,MAAM,EAAE,wCAAwC;IAOrE,IAAa,gBAAgB,+CAO5B;CACF;AAED,qBAAa,+BACX,YAAW,6BAA6B;IAExC,QAAQ,CAAC,QAAQ,EAAG,aAAa,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAG,mBAAmB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAG,uCAAuC,CAAC;IAE5D,aAAa,EAAE,2BAA2B,EAAE,CAAM;gBAEtC,MAAM,EAAE,mBAAmB;IAiCvC;;;;;;;OAOG;IACH,+BAA+B;IAyB/B,gBAAgB,CAAC,OAAO,EAAE,2BAA2B,EAAE;IAIvD,YAAY,CACV,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB;IAgBtC,aAAa,CACX,WAAW,EAAE,qBAAqB,EAClC,YAAY,EAAE,qBAAqB;CAUtC"}
1
+ {"version":3,"file":"DataCubeEditorColumnsPanelState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACL,wCAAwC,EAExC,kCAAkC,EACnC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAG9E,qBAAa,uCAAwC,SAAQ,kCAAkC,CAAC,wCAAwC,CAAC;IAC9H,WAAW,CAAC,MAAM,EAAE,wCAAwC;IAOrE,IAAa,gBAAgB,+CAO5B;CACF;AAED,qBAAa,+BACX,YAAW,6BAA6B;IAExC,QAAQ,CAAC,QAAQ,EAAG,aAAa,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAG,mBAAmB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAG,uCAAuC,CAAC;IAE5D,aAAa,EAAE,2BAA2B,EAAE,CAAM;gBAEtC,MAAM,EAAE,mBAAmB;IAiCvC;;;;;;;OAOG;IACH,+BAA+B;IAyB/B,gBAAgB,CAAC,OAAO,EAAE,2BAA2B,EAAE;IAIvD,YAAY,CACV,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB;IAmBtC,aAAa,CACX,WAAW,EAAE,qBAAqB,EAClC,YAAY,EAAE,qBAAqB;CAWtC"}
@@ -15,7 +15,7 @@
15
15
  */
16
16
  import { action, makeObservable, observable } from 'mobx';
17
17
  import {} from '../core/DataCubeQuerySnapshot.js';
18
- import { DataCubeEditorColumnsSelectorColumnState, DataCubeEditorColumnsSelectorColumnsVisibility, DataCubeEditorColumnsSelectorState, } from './DataCubeEditorColumnsSelectorState.js';
18
+ import { DataCubeEditorColumnsSelectorColumnState, DataCubeEditorColumnsSelectorHiddenColumnsVisibility, DataCubeEditorColumnsSelectorState, } from './DataCubeEditorColumnsSelectorState.js';
19
19
  import {} from '../core/DataCubeConfiguration.js';
20
20
  import { DataCubeMutableColumnConfiguration } from './DataCubeMutableConfiguration.js';
21
21
  export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColumnsSelectorState {
@@ -42,7 +42,7 @@ export class DataCubeEditorColumnsPanelState {
42
42
  this.editor = editor;
43
43
  this.dataCube = editor.dataCube;
44
44
  this.selector = new DataCubeEditorBasicColumnsSelectorState(editor, {
45
- initialColumnsVisibility: DataCubeEditorColumnsSelectorColumnsVisibility.HIDDEN,
45
+ initialHiddenColumnsVisibility: DataCubeEditorColumnsSelectorHiddenColumnsVisibility.HIDDEN,
46
46
  onChange: (selector) => {
47
47
  // populate a default configuration for the newly selected columns
48
48
  selector.selectedColumns
@@ -84,6 +84,9 @@ export class DataCubeEditorColumnsPanelState {
84
84
  this.selector.setSelectedColumns(
85
85
  // extract selected columns from the configuration since the configuration specifies the order
86
86
  // taking into account the group extended columns
87
+ // NOTE: since select() is applied before grouping/aggregation, it's technicaly not possible to
88
+ // unselect the group extended columns, so we will take advantage of the `hidden` property to show
89
+ // group extended columns that are not hidden as selected
87
90
  configuration.columns.map((col) => {
88
91
  const column = this.selector.getColumn(col.name);
89
92
  return new DataCubeEditorColumnsSelectorColumnState(column.name, column.type);
@@ -93,6 +96,7 @@ export class DataCubeEditorColumnsPanelState {
93
96
  this.propagateColumnSelectionChanges();
94
97
  newSnapshot.data.selectColumns = this.selector.selectedColumns
95
98
  // TODO: filter by group extended columns
99
+ // and translate unselection to hidden columns in column configuration
96
100
  .map((col) => ({
97
101
  name: col.name,
98
102
  type: col.type,
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorColumnsPanelState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeEditorColumnsPanelState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts"],"names":[],"mappings":"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"}
@@ -20,7 +20,7 @@ export declare class DataCubeEditorColumnsSelectorColumnState {
20
20
  readonly type: string;
21
21
  constructor(name: string, type: string);
22
22
  }
23
- export declare enum DataCubeEditorColumnsSelectorColumnsVisibility {
23
+ export declare enum DataCubeEditorColumnsSelectorHiddenColumnsVisibility {
24
24
  VISIBLE = "visible",
25
25
  VISIBLE_WITH_WARNING = "visible-with-warning",
26
26
  HIDDEN = "hidden"
@@ -32,12 +32,12 @@ export declare abstract class DataCubeEditorColumnsSelectorState<T extends DataC
32
32
  availableColumnsSearchText: string;
33
33
  selectedColumnsSearchText: string;
34
34
  readonly onChange?: ((selector: DataCubeEditorColumnsSelectorState<T>) => void) | undefined;
35
- columnsVisibility: DataCubeEditorColumnsSelectorColumnsVisibility;
35
+ hiddenColumnsVisibility: DataCubeEditorColumnsSelectorHiddenColumnsVisibility;
36
36
  constructor(editor: DataCubeEditorState, options?: {
37
- initialColumnsVisibility?: DataCubeEditorColumnsSelectorColumnsVisibility | undefined;
37
+ initialHiddenColumnsVisibility?: DataCubeEditorColumnsSelectorHiddenColumnsVisibility | undefined;
38
38
  onChange?: ((select: DataCubeEditorColumnsSelectorState<T>) => void) | undefined;
39
39
  });
40
- setColumnsVisibility(visibility: DataCubeEditorColumnsSelectorColumnsVisibility): void;
40
+ setHiddenColumnsVisibility(val: DataCubeEditorColumnsSelectorHiddenColumnsVisibility): void;
41
41
  abstract get availableColumns(): T[];
42
42
  get availableColumnsForDisplay(): T[];
43
43
  get selectedColumnsForDisplay(): T[];
@@ -45,6 +45,6 @@ export declare abstract class DataCubeEditorColumnsSelectorState<T extends DataC
45
45
  setAvailableColumnsSearchText(val: string): void;
46
46
  setSelectedColumnsSearchText(val: string): void;
47
47
  getColumn(colName: string): T;
48
- abstract cloneColumn(column: T): T;
48
+ protected abstract cloneColumn(column: T): T;
49
49
  }
50
50
  //# sourceMappingURL=DataCubeEditorColumnsSelectorState.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorColumnsSelectorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE,qBAAa,wCAAwC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIvC;AAED,oBAAY,8CAA8C;IACxD,OAAO,YAAY;IACnB,oBAAoB,yBAAyB;IAC7C,MAAM,WAAW;CAClB;AAED,8BAAsB,kCAAkC,CACtD,CAAC,SAAS,wCAAwC;IAElD,QAAQ,CAAC,QAAQ,EAAG,aAAa,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAG,mBAAmB,CAAC;IAEtC,eAAe,EAAE,CAAC,EAAE,CAAM;IAE1B,0BAA0B,SAAM;IAChC,yBAAyB,SAAM;IAE/B,QAAQ,CAAC,QAAQ,CAAC,EACd,CAAC,CAAC,QAAQ,EAAE,kCAAkC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAC3D,SAAS,CAAC;IACd,iBAAiB,EAAG,8CAA8C,CAAC;gBAGjE,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EAAE;QACR,wBAAwB,CAAC,EACrB,8CAA8C,GAC9C,SAAS,CAAC;QACd,QAAQ,CAAC,EACL,CAAC,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GACzD,SAAS,CAAC;KACf;IA4BH,oBAAoB,CAClB,UAAU,EAAE,8CAA8C;IAK5D,QAAQ,KAAK,gBAAgB,IAAI,CAAC,EAAE,CAAC;IAErC,IAAI,0BAA0B,IAAI,CAAC,EAAE,CAepC;IAED,IAAI,yBAAyB,IAAI,CAAC,EAAE,CASnC;IAED,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE;IAK3B,6BAA6B,CAAC,GAAG,EAAE,MAAM;IAIzC,4BAA4B,CAAC,GAAG,EAAE,MAAM;IAIxC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;IAO7B,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;CACnC"}
1
+ {"version":3,"file":"DataCubeEditorColumnsSelectorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE,qBAAa,wCAAwC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIvC;AAED,oBAAY,oDAAoD;IAC9D,OAAO,YAAY;IACnB,oBAAoB,yBAAyB;IAC7C,MAAM,WAAW;CAClB;AAED,8BAAsB,kCAAkC,CACtD,CAAC,SAAS,wCAAwC;IAElD,QAAQ,CAAC,QAAQ,EAAG,aAAa,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAG,mBAAmB,CAAC;IAEtC,eAAe,EAAE,CAAC,EAAE,CAAM;IAE1B,0BAA0B,SAAM;IAChC,yBAAyB,SAAM;IAE/B,QAAQ,CAAC,QAAQ,CAAC,EACd,CAAC,CAAC,QAAQ,EAAE,kCAAkC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAC3D,SAAS,CAAC;IACd,uBAAuB,EAAG,oDAAoD,CAAC;gBAG7E,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EAAE;QACR,8BAA8B,CAAC,EAC3B,oDAAoD,GACpD,SAAS,CAAC;QACd,QAAQ,CAAC,EACL,CAAC,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GACzD,SAAS,CAAC;KACf;IA6BH,0BAA0B,CACxB,GAAG,EAAE,oDAAoD;IAK3D,QAAQ,KAAK,gBAAgB,IAAI,CAAC,EAAE,CAAC;IAErC,IAAI,0BAA0B,IAAI,CAAC,EAAE,CAepC;IAED,IAAI,yBAAyB,IAAI,CAAC,EAAE,CASnC;IAED,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE;IAQ3B,6BAA6B,CAAC,GAAG,EAAE,MAAM;IAIzC,4BAA4B,CAAC,GAAG,EAAE,MAAM;IAIxC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;IAO7B,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;CAC7C"}
@@ -23,12 +23,12 @@ export class DataCubeEditorColumnsSelectorColumnState {
23
23
  this.type = type;
24
24
  }
25
25
  }
26
- export var DataCubeEditorColumnsSelectorColumnsVisibility;
27
- (function (DataCubeEditorColumnsSelectorColumnsVisibility) {
28
- DataCubeEditorColumnsSelectorColumnsVisibility["VISIBLE"] = "visible";
29
- DataCubeEditorColumnsSelectorColumnsVisibility["VISIBLE_WITH_WARNING"] = "visible-with-warning";
30
- DataCubeEditorColumnsSelectorColumnsVisibility["HIDDEN"] = "hidden";
31
- })(DataCubeEditorColumnsSelectorColumnsVisibility || (DataCubeEditorColumnsSelectorColumnsVisibility = {}));
26
+ export var DataCubeEditorColumnsSelectorHiddenColumnsVisibility;
27
+ (function (DataCubeEditorColumnsSelectorHiddenColumnsVisibility) {
28
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility["VISIBLE"] = "visible";
29
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility["VISIBLE_WITH_WARNING"] = "visible-with-warning";
30
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility["HIDDEN"] = "hidden";
31
+ })(DataCubeEditorColumnsSelectorHiddenColumnsVisibility || (DataCubeEditorColumnsSelectorHiddenColumnsVisibility = {}));
32
32
  export class DataCubeEditorColumnsSelectorState {
33
33
  dataCube;
34
34
  editor;
@@ -36,7 +36,7 @@ export class DataCubeEditorColumnsSelectorState {
36
36
  availableColumnsSearchText = '';
37
37
  selectedColumnsSearchText = '';
38
38
  onChange;
39
- columnsVisibility;
39
+ hiddenColumnsVisibility;
40
40
  constructor(editor, options) {
41
41
  makeObservable(this, {
42
42
  availableColumns: computed,
@@ -48,33 +48,37 @@ export class DataCubeEditorColumnsSelectorState {
48
48
  setAvailableColumnsSearchText: action,
49
49
  selectedColumnsSearchText: observable,
50
50
  setSelectedColumnsSearchText: action,
51
- columnsVisibility: observable,
52
- setColumnsVisibility: action,
51
+ hiddenColumnsVisibility: observable,
52
+ setHiddenColumnsVisibility: action,
53
53
  });
54
54
  this.editor = editor;
55
55
  this.dataCube = editor.dataCube;
56
56
  this.onChange = options?.onChange;
57
- this.columnsVisibility =
58
- options?.initialColumnsVisibility ??
59
- DataCubeEditorColumnsSelectorColumnsVisibility.VISIBLE;
57
+ this.hiddenColumnsVisibility =
58
+ options?.initialHiddenColumnsVisibility ??
59
+ // default to show hidden columns
60
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility.VISIBLE;
60
61
  }
61
- setColumnsVisibility(visibility) {
62
- this.columnsVisibility = visibility;
62
+ setHiddenColumnsVisibility(val) {
63
+ this.hiddenColumnsVisibility = val;
63
64
  }
64
65
  get availableColumnsForDisplay() {
65
66
  return this.availableColumns
66
67
  .filter((column) => !this.selectedColumns.find((col) => column.name === col.name))
67
68
  .sort((a, b) => a.name.localeCompare(b.name))
68
- .filter((column) => this.columnsVisibility !==
69
- DataCubeEditorColumnsSelectorColumnsVisibility.HIDDEN ||
69
+ .filter((column) => this.hiddenColumnsVisibility !==
70
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility.HIDDEN ||
70
71
  !this.editor.columnProperties.columns.find((col) => col.name === column.name)?.hideFromView);
71
72
  }
72
73
  get selectedColumnsForDisplay() {
73
- return this.selectedColumns.filter((column) => this.columnsVisibility !==
74
- DataCubeEditorColumnsSelectorColumnsVisibility.HIDDEN ||
74
+ return this.selectedColumns.filter((column) => this.hiddenColumnsVisibility !==
75
+ DataCubeEditorColumnsSelectorHiddenColumnsVisibility.HIDDEN ||
75
76
  !this.editor.columnProperties.columns.find((col) => col.name === column.name)?.hideFromView);
76
77
  }
77
78
  setSelectedColumns(val) {
79
+ // NOTE: since we have a list of columns available which we treat as
80
+ // "templates" to select from, we need to clone these columns in order
81
+ // to avoid modifying the original available columns
78
82
  this.selectedColumns = val.map((col) => this.cloneColumn(col));
79
83
  this.onChange?.(this);
80
84
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorColumnsSelectorState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,OAAO,wCAAwC;IAC1C,IAAI,CAAS;IACb,IAAI,CAAS;IAEtB,YAAY,IAAY,EAAE,IAAY;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,MAAM,CAAN,IAAY,8CAIX;AAJD,WAAY,8CAA8C;IACxD,qEAAmB,CAAA;IACnB,+FAA6C,CAAA;IAC7C,mEAAiB,CAAA;AACnB,CAAC,EAJW,8CAA8C,KAA9C,8CAA8C,QAIzD;AAED,MAAM,OAAgB,kCAAkC;IAG7C,QAAQ,CAAiB;IACzB,MAAM,CAAuB;IAEtC,eAAe,GAAQ,EAAE,CAAC;IAE1B,0BAA0B,GAAG,EAAE,CAAC;IAChC,yBAAyB,GAAG,EAAE,CAAC;IAEtB,QAAQ,CAEH;IACd,iBAAiB,CAAkD;IAEnE,YACE,MAA2B,EAC3B,OAOC;QAED,cAAc,CAAC,IAAI,EAAE;YACnB,gBAAgB,EAAE,QAAQ;YAC1B,0BAA0B,EAAE,QAAQ;YACpC,yBAAyB,EAAE,QAAQ;YAEnC,eAAe,EAAE,UAAU;YAC3B,kBAAkB,EAAE,MAAM;YAE1B,0BAA0B,EAAE,UAAU;YACtC,6BAA6B,EAAE,MAAM;YAErC,yBAAyB,EAAE,UAAU;YACrC,4BAA4B,EAAE,MAAM;YAEpC,iBAAiB,EAAE,UAAU;YAC7B,oBAAoB,EAAE,MAAM;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC;QAClC,IAAI,CAAC,iBAAiB;YACpB,OAAO,EAAE,wBAAwB;gBACjC,8CAA8C,CAAC,OAAO,CAAC;IAC3D,CAAC;IAED,oBAAoB,CAClB,UAA0D;QAE1D,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;IACtC,CAAC;IAID,IAAI,0BAA0B;QAC5B,OAAO,IAAI,CAAC,gBAAgB;aACzB,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CACT,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAChE;aACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC5C,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,CAAC,iBAAiB;YACpB,8CAA8C,CAAC,MAAM;YACvD,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACxC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAClC,EAAE,YAAY,CAClB,CAAC;IACN,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAChC,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,CAAC,iBAAiB;YACpB,8CAA8C,CAAC,MAAM;YACvD,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACxC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAClC,EAAE,YAAY,CAClB,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,GAAQ;QACzB,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,6BAA6B,CAAC,GAAW;QACvC,IAAI,CAAC,0BAA0B,GAAG,GAAG,CAAC;IACxC,CAAC;IAED,4BAA4B,CAAC,GAAW;QACtC,IAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED,SAAS,CAAC,OAAe;QACvB,OAAO,oBAAoB,CACzB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,EACzD,sBAAsB,OAAO,GAAG,CACjC,CAAC;IACJ,CAAC;CAGF"}
1
+ {"version":3,"file":"DataCubeEditorColumnsSelectorState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts"],"names":[],"mappings":"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"}
@@ -23,12 +23,9 @@ import { DataCubeEditorColumnPropertiesPanelState } from './DataCubeEditorColumn
23
23
  import { DataCubeEditorColumnsPanelState } from './DataCubeEditorColumnsPanelState.js';
24
24
  import { DataCubeEditorVerticalPivotsPanelState } from './DataCubeEditorVerticalPivotsPanelState.js';
25
25
  import { SingletonModeDisplayState } from '../../LayoutManagerState.js';
26
- import { DataCubeEditorFilterPanelState } from './DataCubeEditorFilterPanelState.js';
27
26
  export declare enum DataCubeEditorTab {
28
27
  GENERAL_PROPERTIES = "General Properties",
29
28
  COLUMN_PROPERTIES = "Column Properties",
30
- EXTENDED_COLUMNS = "Extended Columns",
31
- FILTER = "Filter",
32
29
  COLUMNS = "Columns",
33
30
  VERTICAL_PIVOTS = "Vertical Pivots",
34
31
  HORIZONTAL_PIVOTS = "Horizontal Pivots",
@@ -37,13 +34,12 @@ export declare enum DataCubeEditorTab {
37
34
  }
38
35
  export declare class DataCubeEditorState extends DataCubeQuerySnapshotController {
39
36
  readonly display: SingletonModeDisplayState;
37
+ readonly code: DataCubeEditorCodePanelState;
40
38
  readonly generalProperties: DataCubeEditorGeneralPropertiesPanelState;
41
39
  readonly columnProperties: DataCubeEditorColumnPropertiesPanelState;
42
- readonly filter: DataCubeEditorFilterPanelState;
43
40
  readonly columns: DataCubeEditorColumnsPanelState;
44
41
  readonly verticalPivots: DataCubeEditorVerticalPivotsPanelState;
45
42
  readonly sorts: DataCubeEditorSortsPanelState;
46
- readonly code: DataCubeEditorCodePanelState;
47
43
  currentTab: DataCubeEditorTab;
48
44
  constructor(dataCube: DataCubeState);
49
45
  setCurrentTab(val: DataCubeEditorTab): void;
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorState.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAE,yCAAyC,EAAE,MAAM,gDAAgD,CAAC;AAC3G,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,OAAO,EAAE,sCAAsC,EAAE,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF,oBAAY,iBAAiB;IAC3B,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,gBAAgB,qBAAqB;IACrC,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,mBAAoB,SAAQ,+BAA+B;IACtE,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAC5C,QAAQ,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;IACtE,QAAQ,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;IACpE,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,OAAO,EAAE,+BAA+B,CAAC;IAClD,QAAQ,CAAC,cAAc,EAAE,sCAAsC,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAE5C,UAAU,oBAAwC;gBAEtC,QAAQ,EAAE,aAAa;IA0BnC,aAAa,CAAC,GAAG,EAAE,iBAAiB;IAIpC,YAAY;IAuBG,aAAa,CAC1B,QAAQ,EAAE,qBAAqB,EAC/B,gBAAgB,EAAE,qBAAqB,GAAG,SAAS;CActD"}
1
+ {"version":3,"file":"DataCubeEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorState.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAE,yCAAyC,EAAE,MAAM,gDAAgD,CAAC;AAC3G,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,OAAO,EAAE,sCAAsC,EAAE,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,oBAAY,iBAAiB;IAC3B,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,OAAO,YAAY;IACnB,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,mBAAoB,SAAQ,+BAA+B;IACtE,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAE5C,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAE5C,QAAQ,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;IACtE,QAAQ,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;IAEpE,QAAQ,CAAC,OAAO,EAAE,+BAA+B,CAAC;IAClD,QAAQ,CAAC,cAAc,EAAE,sCAAsC,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAE9C,UAAU,oBAAwC;gBAEtC,QAAQ,EAAE,aAAa;IAyBnC,aAAa,CAAC,GAAG,EAAE,iBAAiB;IAIpC,YAAY;IAsBG,aAAa,CAC1B,QAAQ,EAAE,qBAAqB,EAC/B,gBAAgB,EAAE,qBAAqB,GAAG,SAAS;CAatD"}
@@ -27,13 +27,10 @@ import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
27
27
  import { DataCubeEditorVerticalPivotsPanelState } from './DataCubeEditorVerticalPivotsPanelState.js';
28
28
  import { SingletonModeDisplayState } from '../../LayoutManagerState.js';
29
29
  import { DataCubeEditor } from '../../../components/dataCube/editor/DataCubeEditor.js';
30
- import { DataCubeEditorFilterPanelState } from './DataCubeEditorFilterPanelState.js';
31
30
  export var DataCubeEditorTab;
32
31
  (function (DataCubeEditorTab) {
33
32
  DataCubeEditorTab["GENERAL_PROPERTIES"] = "General Properties";
34
33
  DataCubeEditorTab["COLUMN_PROPERTIES"] = "Column Properties";
35
- DataCubeEditorTab["EXTENDED_COLUMNS"] = "Extended Columns";
36
- DataCubeEditorTab["FILTER"] = "Filter";
37
34
  DataCubeEditorTab["COLUMNS"] = "Columns";
38
35
  DataCubeEditorTab["VERTICAL_PIVOTS"] = "Vertical Pivots";
39
36
  DataCubeEditorTab["HORIZONTAL_PIVOTS"] = "Horizontal Pivots";
@@ -42,25 +39,23 @@ export var DataCubeEditorTab;
42
39
  })(DataCubeEditorTab || (DataCubeEditorTab = {}));
43
40
  export class DataCubeEditorState extends DataCubeQuerySnapshotController {
44
41
  display;
42
+ code;
45
43
  generalProperties;
46
44
  columnProperties;
47
- filter;
48
45
  columns;
49
46
  verticalPivots;
50
47
  sorts;
51
- code;
52
48
  currentTab = DataCubeEditorTab.GENERAL_PROPERTIES;
53
49
  constructor(dataCube) {
54
50
  super(dataCube);
55
51
  makeObservable(this, {
56
- applyChanges: action,
57
52
  currentTab: observable,
58
53
  setCurrentTab: action,
54
+ applyChanges: action,
59
55
  });
60
56
  this.display = new SingletonModeDisplayState(this.dataCube.repl.layout, 'Properties', () => _jsx(DataCubeEditor, { dataCube: this.dataCube }));
61
57
  this.generalProperties = new DataCubeEditorGeneralPropertiesPanelState(this);
62
58
  this.columnProperties = new DataCubeEditorColumnPropertiesPanelState(this);
63
- this.filter = new DataCubeEditorFilterPanelState(this);
64
59
  this.columns = new DataCubeEditorColumnsPanelState(this);
65
60
  this.verticalPivots = new DataCubeEditorVerticalPivotsPanelState(this);
66
61
  this.sorts = new DataCubeEditorSortsPanelState(this);
@@ -72,13 +67,12 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
72
67
  applyChanges() {
73
68
  const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
74
69
  const snapshot = baseSnapshot.clone();
75
- // NOTE: column selection must be processed first so necassary
70
+ // NOTE: column selection must be processed first so necessary
76
71
  // prunings can be done to make sure other panel stats are in sync
77
72
  // with the current column selection
78
73
  this.columns.buildSnapshot(snapshot, baseSnapshot);
79
74
  this.verticalPivots.buildSnapshot(snapshot, baseSnapshot);
80
75
  this.sorts.buildSnapshot(snapshot, baseSnapshot);
81
- this.filter.buildSnapshot(snapshot, baseSnapshot);
82
76
  // grid configuration must be processed before processing columns' configuration
83
77
  // to properly generate the container configuration
84
78
  this.generalProperties.buildSnapshot(snapshot, baseSnapshot);
@@ -93,7 +87,6 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
93
87
  this.columns.applySnaphot(snapshot, configuration);
94
88
  this.verticalPivots.applySnaphot(snapshot, configuration);
95
89
  this.sorts.applySnaphot(snapshot, configuration);
96
- this.filter.applySnaphot(snapshot, configuration);
97
90
  this.generalProperties.applySnaphot(snapshot, configuration);
98
91
  this.columnProperties.applySnaphot(snapshot, configuration);
99
92
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeEditorState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorState.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeEditorState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorState.tsx"],"names":[],"mappings":"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"}
@@ -14,18 +14,17 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
17
- import type { DataCubeEditorState } from './DataCubeEditorState.js';
18
17
  import type { DataCubeState } from '../DataCubeState.js';
19
- import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
20
- import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
21
18
  import { type DataCubeFilterEditorTree, type DataCubeFilterEditorTreeNode, DataCubeFilterEditorConditionGroupTreeNode } from '../core/filter/DataCubeQueryFilterEditorState.js';
22
- export declare class DataCubeEditorFilterPanelState implements DataCubeQueryEditorPanelState {
23
- readonly dataCube: DataCubeState;
24
- readonly editor: DataCubeEditorState;
19
+ import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
20
+ import { type DataCubeColumnConfiguration } from '../core/DataCubeConfiguration.js';
21
+ import { SingletonModeDisplayState } from '../../LayoutManagerState.js';
22
+ export declare class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
23
+ readonly display: SingletonModeDisplayState;
25
24
  tree: DataCubeFilterEditorTree;
26
25
  selectedNode?: DataCubeFilterEditorTreeNode | undefined;
27
- constructor(editor: DataCubeEditorState);
28
- get columns(): import("../core/DataCubeQuerySnapshot.js").DataCubeQuerySnapshotColumn[];
26
+ columns: DataCubeColumnConfiguration[];
27
+ constructor(dataCube: DataCubeState);
29
28
  initializeTree(): void;
30
29
  refreshTree(): void;
31
30
  get selectedGroupNode(): DataCubeFilterEditorConditionGroupTreeNode | undefined;
@@ -52,7 +51,7 @@ export declare class DataCubeEditorFilterPanelState implements DataCubeQueryEdit
52
51
  * except if the specified node is a group node, then a new (default) condition will be added.
53
52
  */
54
53
  layerFilterNode(baseNode: DataCubeFilterEditorTreeNode): void;
55
- applySnaphot(snapshot: DataCubeQuerySnapshot, configuration: DataCubeConfiguration): void;
56
- buildSnapshot(newSnapshot: DataCubeQuerySnapshot, baseSnapshot: DataCubeQuerySnapshot): void;
54
+ applySnapshot(snapshot: DataCubeQuerySnapshot, previousSnapshot: DataCubeQuerySnapshot | undefined): Promise<void>;
55
+ applyChanges(): void;
57
56
  }
58
- //# sourceMappingURL=DataCubeEditorFilterPanelState.d.ts.map
57
+ //# sourceMappingURL=DataCubeFilterEditorState.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DataCubeFilterEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/filter/DataCubeFilterEditorState.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAM9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,4BAA4B,EACjC,0CAA0C,EAI3C,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,qBAAa,yBAA0B,SAAQ,+BAA+B;IAC5E,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAE5C,IAAI,EAAE,wBAAwB,CAAC;IAC/B,YAAY,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;IACxD,OAAO,EAAE,2BAA2B,EAAE,CAAM;gBAEhC,QAAQ,EAAE,aAAa;IA+BnC,cAAc;IAkBd,WAAW;IAIX,IAAI,iBAAiB,IACjB,0CAA0C,GAC1C,SAAS,CAKZ;IAED,eAAe,CAAC,IAAI,EAAE,4BAA4B,GAAG,SAAS;IAI9D,OAAO,CAAC,qBAAqB;IA+B7B;;;;OAIG;IACH,aAAa,CAAC,QAAQ,EAAE,4BAA4B;IAkBpD;;;;;;OAMG;IACH,gBAAgB,CAAC,YAAY,EAAE,4BAA4B;IA2D3D;;;;;OAKG;IACH,eAAe,CAAC,QAAQ,EAAE,4BAA4B;IA8BvC,aAAa,CAC1B,QAAQ,EAAE,qBAAqB,EAC/B,gBAAgB,EAAE,qBAAqB,GAAG,SAAS,GAClD,OAAO,CAAC,IAAI,CAAC;IAyBhB,YAAY;CAab"}
@@ -1,3 +1,4 @@
1
+ import { jsx as _jsx } from "react/jsx-runtime";
1
2
  /**
2
3
  * Copyright (c) 2020-present, Goldman Sachs
3
4
  *
@@ -17,16 +18,23 @@ import { action, computed, makeObservable, observable } from 'mobx';
17
18
  import { DataCubeQueryFilterGroupOperator, DataCubeQueryFilterOperator, } from '../core/DataCubeQueryEngine.js';
18
19
  import { deepClone, getNonNullableEntry, guaranteeNonNullable, } from '@finos/legend-shared';
19
20
  import { DataCubeFilterEditorConditionGroupTreeNode, DataCubeFilterEditorConditionTreeNode, buildFilterEditorTree, buildFilterQuerySnapshot, } from '../core/filter/DataCubeQueryFilterEditorState.js';
20
- export class DataCubeEditorFilterPanelState {
21
- dataCube;
22
- editor;
21
+ import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
22
+ import { DataCubeConfiguration, } from '../core/DataCubeConfiguration.js';
23
+ import { SingletonModeDisplayState } from '../../LayoutManagerState.js';
24
+ import { DataCubeFilterEditor } from '../../../components/dataCube/filter/DataCubeEditorFilter.js';
25
+ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
26
+ display;
23
27
  tree;
24
28
  selectedNode;
25
- constructor(editor) {
29
+ columns = [];
30
+ constructor(dataCube) {
31
+ super(dataCube);
26
32
  makeObservable(this, {
27
33
  tree: observable.ref,
28
34
  initializeTree: action,
29
35
  refreshTree: action,
36
+ columns: observable,
37
+ applySnapshot: action,
30
38
  selectedNode: observable,
31
39
  selectedGroupNode: computed,
32
40
  setSelectedNode: action,
@@ -34,16 +42,11 @@ export class DataCubeEditorFilterPanelState {
34
42
  removeFilterNode: action,
35
43
  layerFilterNode: action,
36
44
  });
37
- this.dataCube = editor.dataCube;
38
- this.editor = editor;
45
+ this.display = new SingletonModeDisplayState(this.dataCube.repl.layout, 'Filter', () => _jsx(DataCubeFilterEditor, { dataCube: this.dataCube }));
39
46
  this.tree = {
40
47
  nodes: new Map(),
41
48
  };
42
49
  }
43
- get columns() {
44
- // TODO: include leaf-extended columns
45
- return this.editor.columns.sourceColumns;
46
- }
47
50
  initializeTree() {
48
51
  if (this.tree.root === undefined && this.tree.nodes.size === 0) {
49
52
  const root = new DataCubeFilterEditorConditionGroupTreeNode(undefined, DataCubeQueryFilterGroupOperator.AND, undefined);
@@ -74,8 +77,8 @@ export class DataCubeEditorFilterPanelState {
74
77
  return new DataCubeFilterEditorConditionTreeNode(undefined, baseNode.column, baseNode.operation, deepClone(baseNode.value), baseNode.not);
75
78
  }
76
79
  else if (baseNode instanceof DataCubeFilterEditorConditionGroupTreeNode) {
77
- if (this.editor.columnProperties.columns.length !== 0) {
78
- const columnConfig = getNonNullableEntry(this.editor.columnProperties.columns, 0);
80
+ if (this.columns.length !== 0) {
81
+ const columnConfig = getNonNullableEntry(this.columns, 0);
79
82
  const column = {
80
83
  name: columnConfig.name,
81
84
  type: columnConfig.type,
@@ -188,7 +191,10 @@ export class DataCubeEditorFilterPanelState {
188
191
  }
189
192
  }
190
193
  }
191
- applySnaphot(snapshot, configuration) {
194
+ async applySnapshot(snapshot, previousSnapshot) {
195
+ const configuration = DataCubeConfiguration.serialization.fromJson(snapshot.data.configuration);
196
+ // NOTE: filtering group extended columns is not supported
197
+ this.columns = configuration.columns.filter((column) => !snapshot.data.groupExtendedColumns.find((col) => col.name === column.name));
192
198
  this.tree.nodes = new Map();
193
199
  this.tree.root = snapshot.data.filter
194
200
  ? buildFilterEditorTree(snapshot.data.filter, undefined, this.tree.nodes, (op) => this.dataCube.engine.getFilterOperation(op))
@@ -196,10 +202,16 @@ export class DataCubeEditorFilterPanelState {
196
202
  this.setSelectedNode(undefined);
197
203
  this.refreshTree();
198
204
  }
199
- buildSnapshot(newSnapshot, baseSnapshot) {
205
+ applyChanges() {
206
+ const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
207
+ const newSnapshot = baseSnapshot.clone();
200
208
  newSnapshot.data.filter = this.tree.root
201
209
  ? buildFilterQuerySnapshot(this.tree.root)
202
210
  : undefined;
211
+ newSnapshot.finalize();
212
+ if (newSnapshot.hashCode !== baseSnapshot.hashCode) {
213
+ this.publishSnapshot(newSnapshot);
214
+ }
203
215
  }
204
216
  }
205
- //# sourceMappingURL=DataCubeEditorFilterPanelState.js.map
217
+ //# sourceMappingURL=DataCubeFilterEditorState.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DataCubeFilterEditorState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/filter/DataCubeFilterEditorState.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeGridConfigurationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridConfigurationBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;yFAKyF;AAEzF,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAGV,WAAW,EAEZ,MAAM,yBAAyB,CAAC;AAgCjC,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAc1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AA0TzD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,WAAW,CA+G5E;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,QAAQ,EAAE,aAAa,GACtB,WAAW,CA8Hb"}
1
+ {"version":3,"file":"DataCubeGridConfigurationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridConfigurationBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;yFAKyF;AAEzF,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAGV,WAAW,EAEZ,MAAM,yBAAyB,CAAC;AAgCjC,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAc1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgUzD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,WAAW,CAgI5E;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,QAAQ,EAAE,aAAa,GACtB,WAAW,CAiIb"}
@@ -206,10 +206,15 @@ function _sizeSpec(columnData) {
206
206
  //
207
207
  // TODO: if we support column resize to fit content, should we disable this behavior?
208
208
  resizable: column.fixedWidth === undefined,
209
- // suppressAutoSize: columnConfiguration.fixedWidth !== undefined,
209
+ suppressAutoSize: column.fixedWidth !== undefined,
210
+ suppressSizeToFit: column.fixedWidth !== undefined,
210
211
  width: column.fixedWidth,
211
212
  minWidth: Math.max(column.minWidth ?? INTERNAL__GRID_CLIENT_COLUMN_MIN_WIDTH, INTERNAL__GRID_CLIENT_COLUMN_MIN_WIDTH),
212
213
  maxWidth: column.maxWidth,
214
+ // Make sure the column spans the width if possible so when total width
215
+ // is less than grid width, removing/adding one column will cause the other
216
+ // columns to take/give up space
217
+ flex: column.fixedWidth === undefined ? 1 : undefined,
213
218
  };
214
219
  }
215
220
  function _sortSpec(columnData) {
@@ -232,7 +237,8 @@ function _rowGroupSpec(columnData) {
232
237
  const groupByCol = _findCol(data.groupBy?.columns, column.name);
233
238
  return {
234
239
  enableRowGroup: column.kind === DataCubeColumnKind.DIMENSION,
235
- enableValue: column.kind === DataCubeColumnKind.MEASURE,
240
+ enableValue: false, // disable GUI interactions to modify this column's aggregate function
241
+ allowedAggFuncs: [], // disable GUI for options of the agg functions
236
242
  rowGroup: Boolean(groupByCol),
237
243
  rowGroupIndex: groupByCol
238
244
  ? (data.groupBy?.columns.indexOf(groupByCol) ?? null)
@@ -243,8 +249,7 @@ function _rowGroupSpec(columnData) {
243
249
  // in the editor.
244
250
  // But we need to set this to make sure sorting works when row grouping
245
251
  // is used, so we use a dummy value here.
246
- aggFunc: 'sum',
247
- allowedAggFuncs: [],
252
+ aggFunc: () => 0,
248
253
  };
249
254
  }
250
255
  // --------------------------------- MAIN ---------------------------------
@@ -288,17 +293,33 @@ export function generateBaseGridOptions(dataCube) {
288
293
  },
289
294
  onBodyScrollEnd: () => grid.setScrollHintText(undefined),
290
295
  scrollbarWidth: 10,
296
+ alwaysShowVerticalScroll: true, // this is needed to ensure
291
297
  // -------------------------------------- CONTEXT MENU --------------------------------------
292
298
  preventDefaultOnContextMenu: true, // prevent showing the browser's context menu
293
299
  columnMenu: 'new', // ensure context menu works on header
294
300
  // NOTE: dynamically generate the content of the context menu to make sure the items are not stale
295
- getContextMenuItems: (params) => grid.controller.menuBuilder?.(params) ?? [],
296
- getMainMenuItems: (params) => grid.controller.menuBuilder?.(params) ?? [],
301
+ getContextMenuItems: (params) => grid.controller.menuBuilder?.(params, false) ?? [],
302
+ getMainMenuItems: (params) => grid.controller.menuBuilder?.(params, true) ?? [],
303
+ // NOTE: when right-clicking empty space in the header, a menu will show up
304
+ // with 2 default options: 'Choose Columns` and `Reset Columns`, which is not
305
+ // a desired behavior, so we hide the popup menu immediately
306
+ onColumnMenuVisibleChanged: (event) => {
307
+ if (!event.column) {
308
+ event.api.hidePopupMenu();
309
+ }
310
+ },
297
311
  // -------------------------------------- COLUMN SIZING --------------------------------------
298
312
  autoSizePadding: INTERNAL__GRID_CLIENT_AUTO_RESIZE_PADDING,
313
+ // ensure columns are resized to fit the grid width initially and on window resize
314
+ // NOTE: this has to be used with `alwaysShowVerticalScroll` to ensure accurate sizing
315
+ // otherwise on initial load, the computation will be done when no data is rendered,
316
+ // so when data is rendered and the vertical scrollbar shows up, it will block a part of
317
+ // the last column.
299
318
  autoSizeStrategy: {
300
- // resize to fit content initially
301
- type: 'fitCellContents',
319
+ type: 'fitGridWidth',
320
+ },
321
+ onGridSizeChanged: (event) => {
322
+ event.api.sizeColumnsToFit();
302
323
  },
303
324
  // -------------------------------------- TOOLTIP --------------------------------------
304
325
  tooltipShowDelay: INTERNAL__GRID_CLIENT_TOOLTIP_SHOW_DELAY,
@@ -412,6 +433,8 @@ export function generateGridOptionsFromSnapshot(snapshot, configuration, dataCub
412
433
  justifyContent: 'space-between',
413
434
  display: 'flex',
414
435
  },
436
+ cellDataType: 'text',
437
+ flex: 1,
415
438
  // TODO: display: coloring, text, etc.
416
439
  // TODO: pinning (should we pin this left by default?)
417
440
  // TODO: tooltip
@@ -423,7 +446,8 @@ export function generateGridOptionsFromSnapshot(snapshot, configuration, dataCub
423
446
  {
424
447
  colId: INTERNAL__GRID_CLIENT_FILTER_TRIGGER_COLUMN_ID,
425
448
  hide: true,
426
- enableValue: false,
449
+ enableValue: false, // disable GUI interactions to modify this column's aggregate function
450
+ allowedAggFuncs: [], // disable GUI for options of the agg functions
427
451
  enablePivot: false,
428
452
  enableRowGroup: false,
429
453
  filter: 'agTextColumnFilter',