@finos/legend-query-builder 3.0.2 → 3.0.3
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/components/QueryBuilderResultPanel.d.ts.map +1 -1
- package/lib/components/QueryBuilderResultPanel.js +6 -14
- package/lib/components/QueryBuilderResultPanel.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderFetchStructurePanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderFetchStructurePanel.js +3 -1
- package/lib/components/fetch-structure/QueryBuilderFetchStructurePanel.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderGraphFetchTreePanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderGraphFetchTreePanel.js +2 -1
- package/lib/components/fetch-structure/QueryBuilderGraphFetchTreePanel.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.js +8 -2
- package/lib/components/fetch-structure/QueryBuilderTDSWindowPanel.js.map +1 -1
- package/lib/index.css +16 -0
- package/lib/package.json +1 -1
- package/lib/stores/QueryBuilderState.d.ts +1 -1
- package/lib/stores/QueryBuilderState.d.ts.map +1 -1
- package/lib/stores/QueryBuilderState.js +3 -3
- package/lib/stores/QueryBuilderState.js.map +1 -1
- package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.d.ts +2 -1
- package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.js +2 -1
- package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.js.map +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.d.ts +9 -7
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js +15 -9
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js.map +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js.map +1 -1
- package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.d.ts +2 -1
- package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.js +9 -2
- package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.js.map +1 -1
- package/lib/stores/fetch-structure/tds/window/QueryBuilderWindowState.d.ts +8 -1
- package/lib/stores/fetch-structure/tds/window/QueryBuilderWindowState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/window/QueryBuilderWindowState.js +36 -4
- package/lib/stores/fetch-structure/tds/window/QueryBuilderWindowState.js.map +1 -1
- package/package.json +1 -1
- package/src/components/QueryBuilderResultPanel.tsx +7 -15
- package/src/components/fetch-structure/QueryBuilderFetchStructurePanel.tsx +9 -3
- package/src/components/fetch-structure/QueryBuilderGraphFetchTreePanel.tsx +2 -4
- package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx +16 -4
- package/src/stores/QueryBuilderState.ts +3 -3
- package/src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts +4 -2
- package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts +23 -15
- package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts +1 -1
- package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts +11 -2
- package/src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts +53 -4
@@ -140,7 +140,7 @@ export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementati
|
|
140
140
|
// deduplicate
|
141
141
|
return Array.from(new Set(nodeIDs).values());
|
142
142
|
}
|
143
|
-
get
|
143
|
+
get fetchStructureValidationIssues() {
|
144
144
|
const hasDuplicatedProjectionColumns = this.projectionColumns.some((column) => this.projectionColumns.filter((c) => c.columnName === column.columnName)
|
145
145
|
.length > 1);
|
146
146
|
if (hasDuplicatedProjectionColumns) {
|
@@ -150,7 +150,14 @@ export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementati
|
|
150
150
|
if (hasNoProjectionColumns) {
|
151
151
|
return ['Query has no projection columns'];
|
152
152
|
}
|
153
|
-
return
|
153
|
+
return [];
|
154
|
+
}
|
155
|
+
get allValidationIssues() {
|
156
|
+
const fetchStructureValidationIssues = [
|
157
|
+
...this.fetchStructureValidationIssues,
|
158
|
+
...this.windowState.windowValidationIssues,
|
159
|
+
];
|
160
|
+
return fetchStructureValidationIssues;
|
154
161
|
}
|
155
162
|
get tdsColumns() {
|
156
163
|
const aggregationStateCols = this.aggregationState.columns.map((c) => c.projectionColumnState);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderTDSState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSState.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"QueryBuilderTDSState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,MAAM,EACN,UAAU,EACV,cAAc,EACd,UAAU,EACV,IAAI,EACJ,QAAQ,GACT,MAAM,MAAM,CAAC;AACd,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,QAAQ,EACR,YAAY,EAEZ,SAAS,EACT,yBAAyB,EACzB,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAKL,mBAAmB,EACnB,mCAAmC,EACnC,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,KAAK,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,wBAAwB,EACxB,kBAAkB,EAClB,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,gCAAgC,EAChC,4BAA4B,GAC7B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,uCAAuC,EAAE,MAAM,+CAA+C,CAAC;AACxG,OAAO,EACL,8BAA8B,EAC9B,6CAA6C,GAC9C,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAE3F,OAAO,EAAE,sCAAsC,EAAE,MAAM,uDAAuD,CAAC;AAE/G,OAAO,EAAE,wCAAwC,EAAE,MAAM,sDAAsD,CAAC;AAChH,OAAO,EACL,2CAA2C,EAC3C,uCAAuC,GAExC,MAAM,mDAAmD,CAAC;AAE3D,OAAO,EACL,+CAA+C,EAC/C,kCAAkC,EAClC,iCAAiC,GAElC,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,qBAAqB,EACrB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AACnG,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,qDAAqD,CAAC;AAEzG,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAGpF,uEAAuE;AACvE,MAAM,CAAN,IAAY,kCAEX;AAFD,WAAY,kCAAkC;IAC5C,iDAAW,CAAA;AACb,CAAC,EAFW,kCAAkC,GAAlC,kCAAkC,KAAlC,kCAAkC,QAE7C;AAED,MAAM,OAAO,oBACX,SAAQ,6CAA6C;IAG5C,gBAAgB,CAA+B;IAC/C,eAAe,CAA8B;IAC7C,WAAW,CAA0B;IACrC,sBAAsB,CAA8B;IAC7D,iBAAiB,GAAwC,EAAE,CAAC;IAC5D,oCAAoC,GAAG,KAAK,CAAC;IAC7C,mBAAmB,CAAU;IAC7B,mBAAmB,GAAG,KAAK,CAAC;IAE5B,mBAAmB,GACjB,sCAAsC,EAAE,CAAC;IAC3C,oBAAoB,GAClB,wCAAwC,EAAE,CAAC;IAC7C,mBAAmB,GACjB,kCAAkC,EAAE,CAAC;IAEvC,YACE,iBAAoC,EACpC,mBAAoD;QAEpD,KAAK,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QAE9C,cAAc,CAAC,IAAI,EAAE;YACnB,iBAAiB,EAAE,UAAU;YAC7B,oCAAoC,EAAE,UAAU;YAChD,mBAAmB,EAAE,UAAU;YAC/B,mBAAmB,EAAE,UAAU;YAC/B,sCAAsC,EAAE,QAAQ;YAChD,WAAW,EAAE,QAAQ;YACrB,cAAc,EAAE,QAAQ;YACxB,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,MAAM;YAClB,aAAa,EAAE,MAAM;YACrB,UAAU,EAAE,MAAM;YAClB,sBAAsB,EAAE,MAAM;YAC9B,sBAAsB,EAAE,MAAM;YAC9B,kCAAkC,EAAE,IAAI;SACzC,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,eAAe,GAAG,IAAI,2BAA2B,CACpD,IAAI,EACJ,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,IAAI,4BAA4B,CACtD,IAAI,EACJ,IAAI,CAAC,oBAAoB,CAC1B,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAuB,CAC5C,IAAI,EACJ,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,IAAI,CAAC,mBAAmB;YACtB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,cAAc,CAAC,eAAe,CACpE,yBAAyB,CAAC,sBAAsB,CACjD,IAAI,KAAK,CAAC;IACf,CAAC;IAED,IAAI,IAAI;QACN,OAAO,8BAA8B,CAAC,sBAAsB,CAAC;IAC/D,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAClC,YAAY,CAAC,2CAA2C,CAAC,CAC1D,CAAC;IACJ,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAC1B,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAAC,WAAW,CACnE,CAAC;IACJ,CAAC;IAED,IAAa,sCAAsC;QACjD,OAAO,CACL,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,SAAS;YAC5C,IAAI,CAAC,mBAAmB;YACxB,IAAI,CAAC,mBAAmB,CACzB,CAAC;IACJ,CAAC;IAED,IAAI,+BAA+B;QACjC,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,MAAM,YAAY,uCAAuC,EAAE;gBAC7D,IAAI,MAAM,GAAuB,EAAE,CAAC;gBACpC,IAAI,iBAAiB,GACnB,MAAM,CAAC,uBAAuB,CAAC,kBAAkB,CAAC;gBACpD,OAAO,iBAAiB,YAAY,0BAA0B,EAAE;oBAC9D,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/C,iBAAiB,GAAG,oBAAoB,CACtC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CACtC,CAAC;oBACF,OAAO,iBAAiB,YAAY,wBAAwB,EAAE;wBAC5D,IACE,iBAAiB,CACf,iBAAiB,CAAC,YAAY,EAC9B,iCAAiC,CAAC,OAAO,CAC1C;4BACD,iBAAiB,CAAC,gBAAgB,CAAC,MAAM,IAAI,CAAC;4BAC9C,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK;iCACtD,OAAO,YAAY,KAAK,EAC3B;4BACA,2DAA2D;4BAC3D,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,YAAY,KAAK,CAAC,EAAE;gCACjD,MAAM,CAAC,IAAI,CACT,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK;qCACtD,OAAO,CACX,CAAC;6BACH;4BACD,iBAAiB,GAAG,oBAAoB,CACtC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CACtC,CAAC;yBACH;6BAAM;4BACL,8BAA8B;4BAC9B,OAAO;yBACR;qBACF;iBACF;gBACD,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAC9B,MAAM,GAAG,GAAa,EAAE,CAAC;gBAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACtC,MAAM,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrD,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,IAAI,YAAY,YAAY,KAAK,EAAE;wBACjC,kBAAkB,CAAC,YAAY,CAAC;6BAC7B,MAAM,CAAC,YAAY,CAAC;6BACpB,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClB,GAAG,CAAC,IAAI,CACN,iCAAiC,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAC3D,CACF,CAAC;wBACJ,QAAQ,CAAC,IAAI,CACX,iCAAiC,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,CACjE,CAAC;qBACH;yBAAM;wBACL,MAAM,EAAE,GAAG,kCAAkC,CAC3C,UAAU,EACV,YAAY,CACb,CAAC;wBACF,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBAClB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBACd;iBACF;gBAED,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QAEH,cAAc;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,8BAA8B;QAChC,MAAM,8BAA8B,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAChE,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC;aACrE,MAAM,GAAG,CAAC,CAChB,CAAC;QACF,IAAI,8BAA8B,EAAE;YAClC,OAAO,CAAC,yCAAyC,CAAC,CAAC;SACpD;QACD,MAAM,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC;QACnE,IAAI,sBAAsB,EAAE;YAC1B,OAAO,CAAC,iCAAiC,CAAC,CAAC;SAC5C;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,mBAAmB;QACrB,MAAM,8BAA8B,GAAG;YACrC,GAAG,IAAI,CAAC,8BAA8B;YACtC,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB;SAC3C,CAAC;QAEF,OAAO,8BAA8B,CAAC;IACxC,CAAC;IAED,IAAI,UAAU;QACZ,MAAM,oBAAoB,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAC5D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAC/B,CAAC;QACF,2CAA2C;QAC3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CACrD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;QACF,OAAO;YACL,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO;YAChC,GAAG,iBAAiB;YACpB,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAED,IAAa,uBAAuB;QAClC,OAAO,CAAC,kCAAkC,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAEQ,iBAAiB,CAAC,MAAc;QACvC,QAAQ,MAAM,EAAE;YACd,KAAK,kCAAkC,CAAC,GAAG;gBACzC,OAAO;oBACL,WAAW,EAAE,WAAW,CAAC,QAAQ;oBACjC,mBAAmB,EAAE,8BAA8B,CAAC,GAAG;iBACxD,CAAC;YAEJ;gBACE,MAAM,IAAI,yBAAyB,CACjC,+BAA+B,MAAM,EAAE,CACxC,CAAC;SACL;IACH,CAAC;IAED,iBAAiB,CAAC,GAA+B;QAC/C,OAAO,CACL,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAC1E,CAAC;IACJ,CAAC;IAEQ,UAAU;QACjB,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,MAAkC;QAC9C,OAAO,OAAO,CACZ;YACE,GAAG,IAAI,CAAC,eAAe,CAAC,oBAAoB;YAC5C,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB;SACzC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,GAAG,YAAY,gCAAgC,EAAE;gBACnD,OAAO,MAAM,YAAY,gCAAgC;oBACvD,CAAC,CAAC,MAAM,KAAK,GAAG;oBAChB,CAAC,CAAC,GAAG,CAAC,qBAAqB,KAAK,MAAM,CAAC;aAC1C;YACD,OAAO,GAAG,KAAK,MAAM,CAAC;QACxB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,MAAyB;QACrC,OAAO;IACT,CAAC;IAED,oBAAoB,CAClB,cAA8B,EAC9B,OAAqC;QAErC,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,GAAY;QACjC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjC,CAAC;IAED,sBAAsB,CAAC,GAAY;QACjC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjC,CAAC;IAED,CAAC,kCAAkC;QACjC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;QAC7C,MAAM,kCAAkC,GAAG,IAAI,GAAG,EAG/C,CAAC;QACJ,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,+BAA+B,EAAE,EAAE;YAC3D,IAAI,CAAC,mBAAmB,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE;gBAChE,OAAO,CAAC,GAAG,CACT,+BAA+B,CAAC,2BAA2B,CAAC,QAAQ,EACpE,+BAA+B,CAAC,MAAM,CACvC,CAAC;gBACF,kCAAkC,CAAC,GAAG,CACpC,+BAA+B,CAAC,2BAA2B,CAAC,QAAQ,EACpE,+BAA+B,CAChC,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,oCAAoC,GAAG,IAAI,CAAC;YACjD,IAAI;gBACF,MAAM,eAAe,GACnB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,iBAAiB,CAC5E,OAAO,CACR,CAAwB,CAAC;gBAC5B,eAAe,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE;oBAC3C,MAAM,+BAA+B,GACnC,kCAAkC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC9C,+BAA+B,EAAE,2BAA2B,CAAC,eAAe,CAC1E,+BAA+B,CAAC,2BAA2B,CAAC,mBAAmB,CAC7E,WAAW,CACZ,CACF,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CACtD,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EACpD,KAAK,CACN,CAAC;aACH;oBAAS;gBACR,IAAI,CAAC,oCAAoC,GAAG,KAAK,CAAC;aACnD;SACF;IACH,CAAC;IAED,qCAAqC,CACnC,2BAAoE;QAEpE,oCAAoC;QACpC,MAAM,kBAAkB,GAAG,uCAAuC,CAChE,2BAA2B,CAAC,mBAAmB,EAC/C,CAAC,2BAA2B,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,EACxE,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC/C,CAAC;QACF,MAAM,qBAAqB,GACzB,IAAI,2CAA2C,CAC7C,IAAI,EACJ,aAAa,CACX,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,0BAA0B,CAC9E,kBAAkB,EAClB,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC/C,EACD,SAAS,CACV,CACF,CAAC;QACJ,qBAAqB,CAAC,aAAa,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;QAE5E,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,qBAAqB,CAAC,CAAC;QAEvE,iCAAiC;QACjC,UAAU,CACR,qBAAqB,CAAC,2BAA2B,CAAC,kCAAkC,CAClF,KAAK,CACN,CACF,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACvE,CAAC;IAED,aAAa,CACX,MAAyC,EACzC,MAAyC;QAEzC,4DAA4D;QAC5D,MAAM,kCAAkC,GACtC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAChC,CAAC,iBAAiB,EAAE,EAAE,CACpB,iBAAiB,CAAC,qBAAqB,KAAK,MAAM,CACrD,CAAC;QACJ,IAAI,kCAAkC,EAAE;YACtC,kCAAkC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SAC3D;QAED,wDAAwD;QACxD,MAAM,6BAA6B,GACjC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAC1C,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,KAAK,MAAM,CACtD,CAAC;QACJ,IAAI,6BAA6B,EAAE;YACjC,6BAA6B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACtD;QAED,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,CAAC,OAAO,GAAG,EAAE,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,GAAsC;QACjD,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAEzC,mDAAmD;QACnD,MAAM,4BAA4B,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACrE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,KAAK,GAAG,CACjD,CAAC;QACF,IAAI,4BAA4B,EAAE;YAChC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;IAClD,CAAC;IAED,SAAS,CACP,GAAsC,EACtC,OAQC;QAED,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAE5C,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE;YACzB,0CAA0C;YAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB;iBAC5C,KAAK,EAAE;iBACP,IAAI,CACH,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CACb,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACjC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAClD;gBACC,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAC;gBACN,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACjC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAClD;oBACC,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,CAAC,CAAC,CACT,CAAC;SACL;IACH,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,WAAmB;QACjD,IACE,WAAW,GAAG,CAAC;YACf,WAAW,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM;YAC5C,WAAW,GAAG,CAAC;YACf,WAAW,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAC5C;YACA,OAAO;SACR;QAED,MAAM,YAAY,GAAG,oBAAoB,CACvC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CACpC,CAAC;QAEF,uDAAuD;QACvD,MAAM,sBAAsB,GAAG,QAAQ,CACrC,IAAI,CAAC,iBAAiB,EACtB,CAAC,aAAa,EAAE,EAAE,CAChB,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACjC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,KAAK,aAAa,CAC3D,CACJ,CAAC;QAEF,MAAM,2BAA2B,GAAG,sBAAsB;YACxD,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,sBAAsB,CAAC;YAC5D,CAAC,CAAC,CAAC,CAAC;QACN,IACE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAChC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,KAAK,YAAY,CAC1D,EACD;YACA,oDAAoD;YACpD,0DAA0D;YAC1D,WAAW,GAAG,IAAI,CAAC,GAAG,CACpB,WAAW,EACX,IAAI,CAAC,GAAG,CACN,2BAA2B,GAAG,CAAC,EAC/B,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAClC,CACF,CAAC;SACH;aAAM;YACL,wDAAwD;YACxD,4DAA4D;YAC5D,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;SAClE;QAED,OAAO;QACP,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;IAC9D,CAAC;IAED,qBAAqB;QACnB,MAAM,UAAU,GAAG,IAAI,2CAA2C,CAChE,IAAI,EACJ,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,2BAA2B,CAC/E,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAC5B,CACF,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3B,UAAU,CAAC,2BAA2B,CAAC,eAAe,CACpD,GAAG,4BAA4B,GAAG,WAAW,IAAI,CAClD,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,gBAAkC;QACvD,MAAM,kBAAkB,GAAG,mCAAmC,CAC5D,gBAAgB,CAAC,iBAAiB,CACnC,CAAC;QACF,IACE,kBAAkB;YAClB,kBAAkB,CAAC,MAAM,KAAK,CAAC;YAC/B,kBAAkB,CAAC,CAAC,CAAC,KAAK,6BAA6B,CAAC,aAAa;YACrE,kBAAkB,CAAC,CAAC,CAAC,KAAK,6BAA6B,CAAC,UAAU,EAClE;YACA,MAAM,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAC3D,CAAC,qBAAqB,EAAE,EAAE,CACxB,qBAAqB,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,CACvD,CAAC;YACF,IACE,yBAAyB;gBACzB,2CAA2C,EAC3C;gBACA,yBAAyB,CAAC,2BAA2B,CAAC,mBAAmB,CACvE,gBAAgB,CACjB,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,+BAA+B,EAAE,EAAE,CAC3D,+BAA+B,CAAC,2BAA2B,CAAC,mBAAmB,CAC7E,SAAS,CACV,CACF,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,IAA8C;QAC1D,IAAI,CAAC,SAAS,CACZ,IAAI,uCAAuC,CACzC,IAAI,EACJ,+CAA+C,CAC7C,IAAI,EACJ,IAAI,CAAC,iBAAiB,CAAC,aAAa,CACrC,EACD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,oBAAoB,CAC1D,CACF,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,KAAiD;QAC/D,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC1B,IAAI,CAAC,SAAS,CACZ,IAAI,uCAAuC,CACzC,IAAI,EACJ,+CAA+C,CAC7C,SAAS,EACT,IAAI,CAAC,iBAAiB,CAAC,aAAa,CACrC,EACD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,oBAAoB,CAC1D,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,0BAA0B,CAAC,QAAoB;QAC7C,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC;YACtE,OAAO,EACL,4EAA4E;YAC9E,IAAI,EAAE,eAAe,CAAC,OAAO;YAC7B,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,qBAAqB,CAAC,oBAAoB;oBAChD,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,mBAAmB,CAClE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CACvB;iBACF;gBACD;oBACE,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,qBAAqB,CAAC,OAAO;oBACnC,OAAO,EAAE,IAAI;iBACd;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,iCAAiC,CAAC,QAAoB;QACpD,IACE,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC;QACjC,gFAAgF;QAChF,iFAAiF;QACjF,gCAAgC;UAChC;YACA,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC;gBACtE,OAAO,EACL,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;oBAC7D,CAAC,CAAC,qLAAqL;oBACvL,CAAC,CAAC,+GAA+G;gBACrH,IAAI,EAAE,eAAe,CAAC,OAAO;gBAC7B,OAAO,EAAE;oBACP;wBACE,KAAK,EAAE,SAAS;wBAChB,IAAI,EAAE,qBAAqB,CAAC,oBAAoB;wBAChD,OAAO,EACL,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,mBAAmB,CACzD,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CACvB;qBACJ;oBACD;wBACE,KAAK,EAAE,QAAQ;wBACf,IAAI,EAAE,qBAAqB,CAAC,OAAO;wBACnC,OAAO,EAAE,IAAI;qBACd;iBACF;aACF,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC;IAED,cAAc,CAAC,QAA4B;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACvC,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CACtC,YAAY,CAAC,2CAA2C,CAAC,CAC1D,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAC5B,oGAAoG;YACpG,OAAO,KAAK,CAAC;SACd;QACD,MAAM,gBAAgB,GAAG,OAAO;aAC7B,MAAM,CAAC,YAAY,CAAC,uCAAuC,CAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,gBAAgB;YACnD,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACjC,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,eAAe;YACpB,IAAI,CAAC,sBAAsB;SAC5B,CAAC,CAAC;IACL,CAAC;CACF"}
|
@@ -24,6 +24,10 @@ export declare const QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE = "WINDOW_COLUMN";
|
|
24
24
|
export interface QueryBuilderWindowColumnDragSource {
|
25
25
|
columnState: QueryBuilderTDSColumnState;
|
26
26
|
}
|
27
|
+
interface QueryBuilderInvalidWindowColumnName {
|
28
|
+
invalidColumnName: string;
|
29
|
+
missingColumnName: string;
|
30
|
+
}
|
27
31
|
export type QueryBuilderWindowDropTarget = QueryBuilderProjectionColumnDragSource | QueryBuilderWindowColumnDragSource;
|
28
32
|
export declare class WindowGroupByColumnSortByState implements Hashable {
|
29
33
|
columnState: QueryBuilderTDSColumnState;
|
@@ -80,13 +84,16 @@ export declare class QueryBuilderWindowState implements Hashable {
|
|
80
84
|
editColumn: QueryBuilderWindowColumnState | undefined;
|
81
85
|
constructor(tdsState: QueryBuilderTDSState, operators: QueryBuilderTDS_WindowOperator[]);
|
82
86
|
get isEmpty(): boolean;
|
83
|
-
get
|
87
|
+
get invalidWindowColumnNames(): QueryBuilderInvalidWindowColumnName[];
|
88
|
+
get windowValidationIssues(): string[];
|
84
89
|
get referencedTDSColumns(): QueryBuilderTDSColumnState[];
|
85
90
|
setEditColumn(col: QueryBuilderWindowColumnState | undefined): void;
|
86
91
|
findOperator(func: string): QueryBuilderTDS_WindowOperator | undefined;
|
87
92
|
addWindowColumn(windowCol: QueryBuilderWindowColumnState): void;
|
88
93
|
removeColumn(column: QueryBuilderWindowColumnState): void;
|
89
94
|
moveColumn(fromIndex: number, toIndex: number): void;
|
95
|
+
isColumnOrderValid(columnName: string, indexRange: number): boolean;
|
90
96
|
get hashCode(): string;
|
91
97
|
}
|
98
|
+
export {};
|
92
99
|
//# sourceMappingURL=QueryBuilderWindowState.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderWindowState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"QueryBuilderWindowState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts"],"names":[],"mappings":"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"}
|
@@ -230,7 +230,8 @@ export class QueryBuilderWindowState {
|
|
230
230
|
makeObservable(this, {
|
231
231
|
windowColumns: observable,
|
232
232
|
editColumn: observable,
|
233
|
-
|
233
|
+
invalidWindowColumnNames: computed,
|
234
|
+
windowValidationIssues: computed,
|
234
235
|
addWindowColumn: action,
|
235
236
|
removeColumn: action,
|
236
237
|
moveColumn: action,
|
@@ -242,13 +243,39 @@ export class QueryBuilderWindowState {
|
|
242
243
|
get isEmpty() {
|
243
244
|
return !this.windowColumns.length;
|
244
245
|
}
|
245
|
-
get
|
246
|
+
get invalidWindowColumnNames() {
|
247
|
+
const invalidColNames = [];
|
248
|
+
const windowCols = this.windowColumns;
|
249
|
+
windowCols.forEach((item, index) => {
|
250
|
+
if (item.operationState instanceof
|
251
|
+
QueryBuilderTDS_WindowAggreationOperatorState) {
|
252
|
+
if (item.operationState.columnState instanceof
|
253
|
+
QueryBuilderWindowColumnState) {
|
254
|
+
const windowColumnName = item.operationState.columnState.columnName;
|
255
|
+
const hasExistingColumn = item.windowState.isColumnOrderValid(windowColumnName, index);
|
256
|
+
if (!hasExistingColumn) {
|
257
|
+
invalidColNames.push({
|
258
|
+
invalidColumnName: item.columnName,
|
259
|
+
missingColumnName: windowColumnName,
|
260
|
+
});
|
261
|
+
}
|
262
|
+
}
|
263
|
+
}
|
264
|
+
});
|
265
|
+
return invalidColNames;
|
266
|
+
}
|
267
|
+
get windowValidationIssues() {
|
268
|
+
const invalidWindowColumnNames = this.invalidWindowColumnNames;
|
269
|
+
const issues = [];
|
270
|
+
invalidWindowColumnNames.forEach((item) => {
|
271
|
+
issues.push(`Column '${item.invalidColumnName}' cannot exist before column name '${item.missingColumnName}'`);
|
272
|
+
});
|
246
273
|
const hasDuplicatedWindowColumns = this.windowColumns.some((column) => this.windowColumns.filter((c) => c.columnName === column.columnName)
|
247
274
|
.length > 1);
|
248
275
|
if (hasDuplicatedWindowColumns) {
|
249
|
-
|
276
|
+
issues.push(`Query has duplicated window columns`);
|
250
277
|
}
|
251
|
-
return
|
278
|
+
return issues;
|
252
279
|
}
|
253
280
|
get referencedTDSColumns() {
|
254
281
|
return uniq(this.windowColumns.map((c) => c.referencedTDSColumns).flat());
|
@@ -273,6 +300,11 @@ export class QueryBuilderWindowState {
|
|
273
300
|
this.windowColumns[toIndex] = fromCol;
|
274
301
|
}
|
275
302
|
}
|
303
|
+
isColumnOrderValid(columnName, indexRange) {
|
304
|
+
return this.windowColumns
|
305
|
+
.slice(0, indexRange)
|
306
|
+
.some((col) => col.columnName === columnName);
|
307
|
+
}
|
276
308
|
get hashCode() {
|
277
309
|
return hashArray([
|
278
310
|
QUERY_BUILDER_STATE_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_STATE,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderWindowState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,iBAAiB,EAAa,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,SAAS,EACT,IAAI,GAEL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAK9E,MAAM,CAAC,MAAM,oCAAoC,GAAG,eAAe,CAAC;
|
1
|
+
{"version":3,"file":"QueryBuilderWindowState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -485,17 +485,13 @@ export const QueryBuilderResultPanel = observer(
|
|
485
485
|
],
|
486
486
|
});
|
487
487
|
};
|
488
|
-
const queryValidationIssues = queryBuilderState.validationIssues;
|
489
|
-
const queryWindowValidationIssues =
|
490
|
-
fetchStructureImplementation instanceof QueryBuilderTDSState
|
491
|
-
? fetchStructureImplementation.windowState.validationIssues
|
492
|
-
: undefined;
|
493
|
-
const queryWindowStateIsValid = !queryWindowValidationIssues;
|
494
488
|
|
495
|
-
const
|
496
|
-
|
489
|
+
const allValidationIssues = queryBuilderState.allValidationIssues;
|
490
|
+
|
491
|
+
const isSupportedQueryValid = allValidationIssues.length === 0;
|
492
|
+
|
497
493
|
const isQueryValid =
|
498
|
-
!queryBuilderState.isQuerySupported ||
|
494
|
+
!queryBuilderState.isQuerySupported || isSupportedQueryValid;
|
499
495
|
|
500
496
|
const runQuery = (): void => {
|
501
497
|
resultState.pressedRunQuery.inProgress();
|
@@ -624,12 +620,8 @@ export const QueryBuilderResultPanel = observer(
|
|
624
620
|
onClick={runQuery}
|
625
621
|
tabIndex={-1}
|
626
622
|
title={
|
627
|
-
|
628
|
-
? `Query is not valid:\n${
|
629
|
-
.map((issue) => `\u2022 ${issue}`)
|
630
|
-
.join('\n')}`
|
631
|
-
: queryWindowValidationIssues
|
632
|
-
? `Query is not valid:\n${queryWindowValidationIssues
|
623
|
+
allValidationIssues.length
|
624
|
+
? `Query is not valid:\n${allValidationIssues
|
633
625
|
.map((issue) => `\u2022 ${issue}`)
|
634
626
|
.join('\n')}`
|
635
627
|
: undefined
|
@@ -83,9 +83,15 @@ export const QueryBuilderFetchStructurePanel = observer(
|
|
83
83
|
<div className="panel__header">
|
84
84
|
<div className="panel__header__title">
|
85
85
|
<div className="panel__header__title__label">fetch structure</div>
|
86
|
-
|
87
|
-
|
88
|
-
|
86
|
+
{fetchStructureState.implementation.fetchStructureValidationIssues
|
87
|
+
.length !== 0 && (
|
88
|
+
<QueryBuilderPanelIssueCountBadge
|
89
|
+
issues={
|
90
|
+
fetchStructureState.implementation
|
91
|
+
.fetchStructureValidationIssues
|
92
|
+
}
|
93
|
+
/>
|
94
|
+
)}
|
89
95
|
</div>
|
90
96
|
<div className="panel__header__actions">
|
91
97
|
<div className="query-builder__fetch__structure__modes">
|
@@ -281,7 +281,6 @@ const PureSerializationConfigModal = observer(
|
|
281
281
|
config.setInclueEnumType(Boolean(value))
|
282
282
|
}
|
283
283
|
/>
|
284
|
-
|
285
284
|
<PanelFormBooleanField
|
286
285
|
name="Remove Properties With Null Values"
|
287
286
|
value={config.removePropertiesWithNullValues}
|
@@ -290,7 +289,6 @@ const PureSerializationConfigModal = observer(
|
|
290
289
|
config.setRemovePropertiesWithNullValues(Boolean(value))
|
291
290
|
}
|
292
291
|
/>
|
293
|
-
|
294
292
|
<PanelFormBooleanField
|
295
293
|
name="Remove properties with empty sets"
|
296
294
|
value={config.removePropertiesWithEmptySets}
|
@@ -299,7 +297,6 @@ const PureSerializationConfigModal = observer(
|
|
299
297
|
config.setRemovePropertiesWithEmptySets(Boolean(value))
|
300
298
|
}
|
301
299
|
/>
|
302
|
-
|
303
300
|
<PanelFormBooleanField
|
304
301
|
name="Use Fully Qualified Type Path"
|
305
302
|
value={config.fullyQualifiedTypePath}
|
@@ -644,7 +641,8 @@ export const QueryBuilderGraphFetchTreeExplorer = observer(
|
|
644
641
|
pureSerializationState={serializationState}
|
645
642
|
graphFetchState={graphFetchState}
|
646
643
|
config={
|
647
|
-
serializationState.config ??
|
644
|
+
serializationState.config ??
|
645
|
+
PureSerializationConfig.createDefault()
|
648
646
|
}
|
649
647
|
/>
|
650
648
|
)}
|
@@ -693,6 +693,12 @@ const QueryBuilderWindowColumnEditor = observer(
|
|
693
693
|
const isDuplicatedColumnName =
|
694
694
|
tdsState.isDuplicateColumn(windowColumnState);
|
695
695
|
|
696
|
+
const isInvalidColumnName = windowState.invalidWindowColumnNames.some(
|
697
|
+
(col) =>
|
698
|
+
col.invalidColumnName === windowColumnState.columnName ||
|
699
|
+
col.missingColumnName === windowColumnState.columnName,
|
700
|
+
);
|
701
|
+
|
696
702
|
// window columns
|
697
703
|
const windowOptions = windowColumnState.possibleReferencedColumns;
|
698
704
|
const addWindowOptions = windowOptions.filter(
|
@@ -1082,7 +1088,11 @@ const QueryBuilderWindowColumnEditor = observer(
|
|
1082
1088
|
value={windowColumnState.columnName}
|
1083
1089
|
onChange={changeColumnName}
|
1084
1090
|
validationErrorMessage={
|
1085
|
-
isDuplicatedColumnName
|
1091
|
+
isDuplicatedColumnName
|
1092
|
+
? 'Duplicated column'
|
1093
|
+
: isInvalidColumnName
|
1094
|
+
? 'Invalid column order'
|
1095
|
+
: undefined
|
1086
1096
|
}
|
1087
1097
|
/>
|
1088
1098
|
</div>
|
@@ -1175,9 +1185,11 @@ export const QueryBuilderTDSWindowPanel = observer(
|
|
1175
1185
|
<div className="panel__header">
|
1176
1186
|
<div className="panel__header__title">
|
1177
1187
|
<div className="panel__header__title__label">Window Function</div>
|
1178
|
-
|
1179
|
-
|
1180
|
-
|
1188
|
+
{tdsWindowState.windowValidationIssues.length && (
|
1189
|
+
<QueryBuilderPanelIssueCountBadge
|
1190
|
+
issues={tdsWindowState.windowValidationIssues}
|
1191
|
+
/>
|
1192
|
+
)}
|
1181
1193
|
</div>
|
1182
1194
|
<div className="panel__header__actions">
|
1183
1195
|
<button
|
@@ -145,7 +145,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
|
|
145
145
|
|
146
146
|
sideBarClassName: computed,
|
147
147
|
isQuerySupported: computed,
|
148
|
-
|
148
|
+
allValidationIssues: computed,
|
149
149
|
|
150
150
|
setShowFunctionsExplorerPanel: action,
|
151
151
|
setShowParametersPanel: action,
|
@@ -554,8 +554,8 @@ export abstract class QueryBuilderState implements CommandRegistrar {
|
|
554
554
|
}
|
555
555
|
}
|
556
556
|
|
557
|
-
get
|
558
|
-
return this.fetchStructureState.implementation.
|
557
|
+
get allValidationIssues(): string[] {
|
558
|
+
return this.fetchStructureState.implementation.allValidationIssues;
|
559
559
|
}
|
560
560
|
|
561
561
|
/**
|
@@ -45,7 +45,8 @@ export abstract class QueryBuilderFetchStructureImplementationState
|
|
45
45
|
) {
|
46
46
|
makeObservable(this, {
|
47
47
|
usedExplorerTreePropertyNodeIDs: computed,
|
48
|
-
|
48
|
+
fetchStructureValidationIssues: computed,
|
49
|
+
allValidationIssues: computed,
|
49
50
|
hashCode: computed,
|
50
51
|
});
|
51
52
|
|
@@ -55,7 +56,8 @@ export abstract class QueryBuilderFetchStructureImplementationState
|
|
55
56
|
|
56
57
|
abstract get type(): string;
|
57
58
|
abstract get usedExplorerTreePropertyNodeIDs(): string[];
|
58
|
-
abstract get
|
59
|
+
abstract get fetchStructureValidationIssues(): string[];
|
60
|
+
abstract get allValidationIssues(): string[];
|
59
61
|
|
60
62
|
abstract onClassChange(_class: Class | undefined): void;
|
61
63
|
abstract revealCompilationError(compilationError: CompilationError): boolean;
|
@@ -72,22 +72,15 @@ const DEFAULT_PURE_CONFIG_TYPE_NAME = '@type';
|
|
72
72
|
|
73
73
|
export class PureSerializationConfig {
|
74
74
|
typeKeyName: string;
|
75
|
-
includeType: boolean;
|
76
|
-
includeEnumType: boolean;
|
77
|
-
removePropertiesWithNullValues: boolean;
|
78
|
-
removePropertiesWithEmptySets: boolean;
|
79
|
-
fullyQualifiedTypePath: boolean;
|
80
|
-
includeObjectReference: boolean;
|
75
|
+
includeType: boolean | undefined;
|
76
|
+
includeEnumType: boolean | undefined;
|
77
|
+
removePropertiesWithNullValues: boolean | undefined;
|
78
|
+
removePropertiesWithEmptySets: boolean | undefined;
|
79
|
+
fullyQualifiedTypePath: boolean | undefined;
|
80
|
+
includeObjectReference: boolean | undefined;
|
81
81
|
|
82
82
|
constructor() {
|
83
|
-
// default values
|
84
83
|
this.typeKeyName = DEFAULT_PURE_CONFIG_TYPE_NAME;
|
85
|
-
this.includeType = true;
|
86
|
-
this.includeEnumType = true;
|
87
|
-
this.removePropertiesWithNullValues = true;
|
88
|
-
this.removePropertiesWithEmptySets = false;
|
89
|
-
this.fullyQualifiedTypePath = true;
|
90
|
-
this.includeObjectReference = false;
|
91
84
|
makeObservable(this, {
|
92
85
|
typeKeyName: observable,
|
93
86
|
includeType: observable,
|
@@ -106,6 +99,17 @@ export class PureSerializationConfig {
|
|
106
99
|
});
|
107
100
|
}
|
108
101
|
|
102
|
+
static createDefault(): PureSerializationConfig {
|
103
|
+
const config = new PureSerializationConfig();
|
104
|
+
config.typeKeyName = DEFAULT_PURE_CONFIG_TYPE_NAME;
|
105
|
+
config.includeType = true;
|
106
|
+
config.includeEnumType = true;
|
107
|
+
config.removePropertiesWithNullValues = true;
|
108
|
+
config.removePropertiesWithEmptySets = false;
|
109
|
+
config.fullyQualifiedTypePath = true;
|
110
|
+
return config;
|
111
|
+
}
|
112
|
+
|
109
113
|
setTypeName(val: string): void {
|
110
114
|
this.typeKeyName = val;
|
111
115
|
}
|
@@ -343,8 +347,12 @@ export class QueryBuilderGraphFetchTreeState
|
|
343
347
|
return Array.from(new Set(ids).values());
|
344
348
|
}
|
345
349
|
|
346
|
-
get
|
347
|
-
return
|
350
|
+
get fetchStructureValidationIssues(): string[] {
|
351
|
+
return [];
|
352
|
+
}
|
353
|
+
|
354
|
+
get allValidationIssues(): string[] {
|
355
|
+
return [];
|
348
356
|
}
|
349
357
|
|
350
358
|
override initialize(): void {
|
@@ -122,7 +122,7 @@ export const buildPureSerializationConfig = (
|
|
122
122
|
const property = Object.getOwnPropertyNames(config).find(
|
123
123
|
(p) => p === classProperty.name,
|
124
124
|
);
|
125
|
-
if (property) {
|
125
|
+
if (property && config[property] !== undefined) {
|
126
126
|
const keyExpressionInstance = new KeyExpressionInstanceValue();
|
127
127
|
// key expression
|
128
128
|
const keyInstance = new PrimitiveInstanceValue(
|
@@ -267,7 +267,7 @@ export class QueryBuilderTDSState
|
|
267
267
|
return Array.from(new Set(nodeIDs).values());
|
268
268
|
}
|
269
269
|
|
270
|
-
get
|
270
|
+
get fetchStructureValidationIssues(): string[] {
|
271
271
|
const hasDuplicatedProjectionColumns = this.projectionColumns.some(
|
272
272
|
(column) =>
|
273
273
|
this.projectionColumns.filter((c) => c.columnName === column.columnName)
|
@@ -280,7 +280,16 @@ export class QueryBuilderTDSState
|
|
280
280
|
if (hasNoProjectionColumns) {
|
281
281
|
return ['Query has no projection columns'];
|
282
282
|
}
|
283
|
-
return
|
283
|
+
return [];
|
284
|
+
}
|
285
|
+
|
286
|
+
get allValidationIssues(): string[] {
|
287
|
+
const fetchStructureValidationIssues = [
|
288
|
+
...this.fetchStructureValidationIssues,
|
289
|
+
...this.windowState.windowValidationIssues,
|
290
|
+
];
|
291
|
+
|
292
|
+
return fetchStructureValidationIssues;
|
284
293
|
}
|
285
294
|
|
286
295
|
get tdsColumns(): QueryBuilderTDSColumnState[] {
|
@@ -38,6 +38,11 @@ export interface QueryBuilderWindowColumnDragSource {
|
|
38
38
|
columnState: QueryBuilderTDSColumnState;
|
39
39
|
}
|
40
40
|
|
41
|
+
interface QueryBuilderInvalidWindowColumnName {
|
42
|
+
invalidColumnName: string;
|
43
|
+
missingColumnName: string;
|
44
|
+
}
|
45
|
+
|
41
46
|
export type QueryBuilderWindowDropTarget =
|
42
47
|
| QueryBuilderProjectionColumnDragSource
|
43
48
|
| QueryBuilderWindowColumnDragSource;
|
@@ -333,7 +338,8 @@ export class QueryBuilderWindowState implements Hashable {
|
|
333
338
|
makeObservable(this, {
|
334
339
|
windowColumns: observable,
|
335
340
|
editColumn: observable,
|
336
|
-
|
341
|
+
invalidWindowColumnNames: computed,
|
342
|
+
windowValidationIssues: computed,
|
337
343
|
addWindowColumn: action,
|
338
344
|
removeColumn: action,
|
339
345
|
moveColumn: action,
|
@@ -347,16 +353,53 @@ export class QueryBuilderWindowState implements Hashable {
|
|
347
353
|
return !this.windowColumns.length;
|
348
354
|
}
|
349
355
|
|
350
|
-
get
|
356
|
+
get invalidWindowColumnNames(): QueryBuilderInvalidWindowColumnName[] {
|
357
|
+
const invalidColNames: QueryBuilderInvalidWindowColumnName[] = [];
|
358
|
+
const windowCols = this.windowColumns;
|
359
|
+
windowCols.forEach((item, index) => {
|
360
|
+
if (
|
361
|
+
item.operationState instanceof
|
362
|
+
QueryBuilderTDS_WindowAggreationOperatorState
|
363
|
+
) {
|
364
|
+
if (
|
365
|
+
item.operationState.columnState instanceof
|
366
|
+
QueryBuilderWindowColumnState
|
367
|
+
) {
|
368
|
+
const windowColumnName = item.operationState.columnState.columnName;
|
369
|
+
const hasExistingColumn = item.windowState.isColumnOrderValid(
|
370
|
+
windowColumnName,
|
371
|
+
index,
|
372
|
+
);
|
373
|
+
if (!hasExistingColumn) {
|
374
|
+
invalidColNames.push({
|
375
|
+
invalidColumnName: item.columnName,
|
376
|
+
missingColumnName: windowColumnName,
|
377
|
+
});
|
378
|
+
}
|
379
|
+
}
|
380
|
+
}
|
381
|
+
});
|
382
|
+
return invalidColNames;
|
383
|
+
}
|
384
|
+
|
385
|
+
get windowValidationIssues(): string[] {
|
386
|
+
const invalidWindowColumnNames = this.invalidWindowColumnNames;
|
387
|
+
const issues = [];
|
388
|
+
invalidWindowColumnNames.forEach((item) => {
|
389
|
+
issues.push(
|
390
|
+
`Column '${item.invalidColumnName}' cannot exist before column name '${item.missingColumnName}'`,
|
391
|
+
);
|
392
|
+
});
|
393
|
+
|
351
394
|
const hasDuplicatedWindowColumns = this.windowColumns.some(
|
352
395
|
(column) =>
|
353
396
|
this.windowColumns.filter((c) => c.columnName === column.columnName)
|
354
397
|
.length > 1,
|
355
398
|
);
|
356
399
|
if (hasDuplicatedWindowColumns) {
|
357
|
-
|
400
|
+
issues.push(`Query has duplicated window columns`);
|
358
401
|
}
|
359
|
-
return
|
402
|
+
return issues;
|
360
403
|
}
|
361
404
|
|
362
405
|
get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
|
@@ -388,6 +431,12 @@ export class QueryBuilderWindowState implements Hashable {
|
|
388
431
|
}
|
389
432
|
}
|
390
433
|
|
434
|
+
isColumnOrderValid(columnName: string, indexRange: number): boolean {
|
435
|
+
return this.windowColumns
|
436
|
+
.slice(0, indexRange)
|
437
|
+
.some((col) => col.columnName === columnName);
|
438
|
+
}
|
439
|
+
|
391
440
|
get hashCode(): string {
|
392
441
|
return hashArray([
|
393
442
|
QUERY_BUILDER_STATE_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_STATE,
|