@finos/legend-query-builder 4.16.4 → 4.16.5
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/components/data-cube/QueryBuilderDataCube.d.ts.map +1 -1
- package/lib/components/data-cube/QueryBuilderDataCube.js +1 -1
- package/lib/components/data-cube/QueryBuilderDataCube.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts +4 -4
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts.map +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js +8 -8
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js.map +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeHelper.js +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeHelper.js.map +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.d.ts +4 -4
- package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.d.ts.map +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.js +3 -3
- package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.js.map +1 -1
- package/package.json +5 -5
- package/src/components/data-cube/QueryBuilderDataCube.tsx +4 -1
- package/src/stores/data-cube/QueryBuilderDataCubeEngine.ts +8 -9
- package/src/stores/data-cube/QueryBuilderDataCubeHelper.ts +1 -1
- package/src/stores/data-cube/QueryBuilderDataCubeViewerState.ts +8 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCube.d.ts","sourceRoot":"","sources":["../../../src/components/data-cube/QueryBuilderDataCube.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAYH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,2DAA2D,CAAC;AAEjH,eAAO,MAAM,mBAAmB,WACtB;IACN,KAAK,EAAE,+BAA+B,CAAC;IACvC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;CACH;;
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCube.d.ts","sourceRoot":"","sources":["../../../src/components/data-cube/QueryBuilderDataCube.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAYH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,2DAA2D,CAAC;AAEjH,eAAO,MAAM,mBAAmB,WACtB;IACN,KAAK,EAAE,+BAA+B,CAAC;IACvC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;CACH;;CAqDF,CAAC"}
|
|
@@ -29,6 +29,6 @@ export const QueryDataCubeViewer = observer((props) => {
|
|
|
29
29
|
'query-builder-data-cube__dialog--expanded': options?.fullScreen,
|
|
30
30
|
}), children: [_jsx("div", { className: "query-builder-data-cube__dialog__header", children: _jsx("div", { className: "query-builder-data-cube__dialog__header__actions", children: _jsx("button", { className: "query-builder-data-cube__dialog__header__action", tabIndex: -1, onClick: close, title: "Close", children: _jsx(TimesIcon, {}) }) }) }), _jsx("div", { className: clsx('query-builder-data-cube__dialog__content', {
|
|
31
31
|
'query-builder-data-cube__dialog__content-full': options?.fullScreen,
|
|
32
|
-
}), children: _jsx(DataCube, {
|
|
32
|
+
}), children: _jsx(DataCube, { specification: state.specification, engine: state.engine }) }), !options?.fullScreen && (_jsx(ModalFooter, { children: _jsx(ModalFooterButton, { onClick: close, children: "Close" }) }))] }) }));
|
|
33
33
|
});
|
|
34
34
|
//# sourceMappingURL=QueryBuilderDataCube.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCube.js","sourceRoot":"","sources":["../../../src/components/data-cube/QueryBuilderDataCube.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,SAAS,GACV,MAAM,mBAAmB,CAAC;AAG3B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CACzC,CAAC,KAMA,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxC,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,EACd,OAAO,EAAE;YACP,IAAI,EAAE,8BAA8B;YACpC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,IAAI,CAAC,uBAAuB,EAAE;gBACnC,qDAAqD,EACnD,OAAO,EAAE,UAAU;aACtB,CAAC;SACH,YAED,MAAC,KAAK,IACJ,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,IAAI,CAAC,8CAA8C,EAAE;gBAC9D,2CAA2C,EAAE,OAAO,EAAE,UAAU;aACjE,CAAC,aAEF,cAAK,SAAS,EAAC,yCAAyC,YACtD,cAAK,SAAS,EAAC,kDAAkD,YAC/D,iBACE,SAAS,EAAC,iDAAiD,EAC3D,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,KAAK,EACd,KAAK,EAAC,OAAO,YAEb,KAAC,SAAS,KAAG,GACN,GACL,GACF,EACN,cACE,SAAS,EAAE,IAAI,CAAC,0CAA0C,EAAE;wBAC1D,+CAA+C,EAC7C,OAAO,EAAE,UAAU;qBACtB,CAAC,YAEF,KAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCube.js","sourceRoot":"","sources":["../../../src/components/data-cube/QueryBuilderDataCube.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,SAAS,GACV,MAAM,mBAAmB,CAAC;AAG3B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CACzC,CAAC,KAMA,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxC,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,EACd,OAAO,EAAE;YACP,IAAI,EAAE,8BAA8B;YACpC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,IAAI,CAAC,uBAAuB,EAAE;gBACnC,qDAAqD,EACnD,OAAO,EAAE,UAAU;aACtB,CAAC;SACH,YAED,MAAC,KAAK,IACJ,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,IAAI,CAAC,8CAA8C,EAAE;gBAC9D,2CAA2C,EAAE,OAAO,EAAE,UAAU;aACjE,CAAC,aAEF,cAAK,SAAS,EAAC,yCAAyC,YACtD,cAAK,SAAS,EAAC,kDAAkD,YAC/D,iBACE,SAAS,EAAC,iDAAiD,EAC3D,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,KAAK,EACd,KAAK,EAAC,OAAO,YAEb,KAAC,SAAS,KAAG,GACN,GACL,GACF,EACN,cACE,SAAS,EAAE,IAAI,CAAC,0CAA0C,EAAE;wBAC1D,+CAA+C,EAC7C,OAAO,EAAE,UAAU;qBACtB,CAAC,YAEF,KAAC,QAAQ,IACP,aAAa,EAAE,KAAK,CAAC,aAAa,EAClC,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,GACE,EACL,CAAC,OAAO,EAAE,UAAU,IAAI,CACvB,KAAC,WAAW,cACV,KAAC,iBAAiB,IAAC,OAAO,EAAE,KAAK,sBAA2B,GAChD,CACf,IACK,GACD,CACV,CAAC;AACJ,CAAC,CACF,CAAC"}
|
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { V1_Lambda, RawLambda, TDSExecutionResult, type GraphManagerState, type V1_ValueSpecification, type ParameterValue } from '@finos/legend-graph';
|
|
17
|
-
import { DataCubeEngine, DataCubeSource, type CompletionItem,
|
|
17
|
+
import { DataCubeEngine, DataCubeSource, type CompletionItem, DataCubeSpecification } from '@finos/legend-data-cube';
|
|
18
18
|
import { LogService, type PlainObject } from '@finos/legend-shared';
|
|
19
19
|
declare class QueryBuilderDataCubeSource extends DataCubeSource {
|
|
20
20
|
mapping?: string | undefined;
|
|
@@ -29,7 +29,7 @@ export declare class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
29
29
|
readonly runtimePath: string | undefined;
|
|
30
30
|
readonly parameters: object | undefined;
|
|
31
31
|
constructor(selectQuery: RawLambda, parameterValues: ParameterValue[] | undefined, mappingPath: string | undefined, runtimePath: string | undefined, graphManagerState: GraphManagerState);
|
|
32
|
-
|
|
32
|
+
processSource(sourceData: PlainObject): Promise<QueryBuilderDataCubeSource>;
|
|
33
33
|
parseValueSpecification(code: string, returnSourceInformation?: boolean): Promise<V1_ValueSpecification>;
|
|
34
34
|
getValueSpecificationCode(value: V1_ValueSpecification, pretty?: boolean | undefined): Promise<string>;
|
|
35
35
|
getQueryTypeahead(code: string, baseQuery: V1_Lambda, source: DataCubeSource): Promise<CompletionItem[]>;
|
|
@@ -44,8 +44,8 @@ export declare class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
44
44
|
buildExecutionContext(source: DataCubeSource): import("@finos/legend-graph").V1_AppliedFunction | undefined;
|
|
45
45
|
private buildRawLambdaFromValueSpec;
|
|
46
46
|
private getSourceFunctionExpression;
|
|
47
|
-
|
|
48
|
-
getRelationType(
|
|
47
|
+
generateInitialSpecification(): Promise<DataCubeSpecification>;
|
|
48
|
+
getRelationType(lambda: RawLambda): Promise<import("@finos/legend-graph").RelationTypeMetadata>;
|
|
49
49
|
}
|
|
50
50
|
export {};
|
|
51
51
|
//# sourceMappingURL=QueryBuilderDataCubeEngine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EAET,kBAAkB,EAKlB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,cAAc,EACd,cAAc,EAGd,KAAK,cAAc,EACnB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EAET,kBAAkB,EAKlB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,cAAc,EACd,cAAc,EAGd,KAAK,cAAc,EACnB,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,UAAU,EACV,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,cAAM,0BAA2B,SAAQ,cAAc;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,qBAAa,0BAA2B,SAAQ,cAAc;IAC5D,QAAQ,CAAC,UAAU,aAAoB;IACvC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGtC,WAAW,EAAE,SAAS,EACtB,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,EAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,EAAE,iBAAiB;IAYvB,aAAa,CAAC,UAAU,EAAE,WAAW;IAerC,uBAAuB,CACpC,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO;IAWpB,yBAAyB,CACtC,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS;IAQf,iBAAiB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc;IAmBT,0BAA0B,CACvC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,cAAc;IAKT,8BAA8B,CAC3C,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,MAAM,EAAE,cAAc;IAYT,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;;;;;;IAmC3D,qBAAqB,CAAC,MAAM,EAAE,cAAc;IAkBrD,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,2BAA2B;IAmB7B,4BAA4B;IAQ5B,eAAe,CAAC,MAAM,EAAE,SAAS;CAQxC"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { V1_Lambda, RawLambda, RelationalExecutionActivities, TDSExecutionResult, V1_deserializeRawValueSpecification, V1_deserializeValueSpecification, V1_RawLambda, V1_serializeValueSpecification, LAMBDA_PIPE, } from '@finos/legend-graph';
|
|
17
|
-
import { _elementPtr, DataCubeEngine, DataCubeSource, _function, DataCubeFunction,
|
|
17
|
+
import { _elementPtr, DataCubeEngine, DataCubeSource, _function, DataCubeFunction, DataCubeSpecification, } from '@finos/legend-data-cube';
|
|
18
18
|
import { guaranteeType, isNonNullable, LogService, } from '@finos/legend-shared';
|
|
19
19
|
class QueryBuilderDataCubeSource extends DataCubeSource {
|
|
20
20
|
mapping;
|
|
@@ -37,7 +37,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
37
37
|
this.parameterValues = parameterValues;
|
|
38
38
|
this.parameters = selectQuery.parameters;
|
|
39
39
|
}
|
|
40
|
-
async
|
|
40
|
+
async processSource(sourceData) {
|
|
41
41
|
// TODO: this is an abnormal usage of this method, this is the place
|
|
42
42
|
// where we can enforce which source this engine supports, instead
|
|
43
43
|
// of hardcoding the logic like this.
|
|
@@ -124,15 +124,15 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
124
124
|
}
|
|
125
125
|
return srcFuncExp;
|
|
126
126
|
}
|
|
127
|
-
async
|
|
127
|
+
async generateInitialSpecification() {
|
|
128
128
|
const columns = (await this.getRelationType(this.selectInitialQuery))
|
|
129
129
|
.columns;
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
return
|
|
130
|
+
const specification = new DataCubeSpecification();
|
|
131
|
+
specification.query = `~[${columns.map((e) => `'${e.name}'`)}]->select()`;
|
|
132
|
+
return specification;
|
|
133
133
|
}
|
|
134
|
-
async getRelationType(
|
|
135
|
-
const relationType = await this.graphState.graphManager.getLambdaRelationType(
|
|
134
|
+
async getRelationType(lambda) {
|
|
135
|
+
const relationType = await this.graphState.graphManager.getLambdaRelationType(lambda, this.graphState.graph);
|
|
136
136
|
return relationType;
|
|
137
137
|
}
|
|
138
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeEngine.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EACT,6BAA6B,EAC7B,kBAAkB,EAClB,mCAAmC,EACnC,gCAAgC,EAChC,YAAY,EACZ,8BAA8B,EAI9B,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EACX,cAAc,EACd,cAAc,EACd,SAAS,EACT,gBAAgB,EAEhB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeEngine.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export const createDataCubeViewerStateFromQueryBuilder = async (queryBuilderStat
|
|
|
35
35
|
const lambda = queryBuilderState.buildQuery();
|
|
36
36
|
const engine = new QueryBuilderDataCubeEngine(lambda, parameterValues, mappingPath, runtimePath, queryBuilderState.graphManagerState);
|
|
37
37
|
queryBuilderState.setLambdaWriteMode(currentLambdaWriterMode);
|
|
38
|
-
const query = await engine.
|
|
38
|
+
const query = await engine.generateInitialSpecification();
|
|
39
39
|
return new QueryBuilderDataCubeViewerState(query, engine);
|
|
40
40
|
};
|
|
41
41
|
//# sourceMappingURL=QueryBuilderDataCubeHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeHelper.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,gCAAgC,GAEjC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,MAAM,CAAC,MAAM,yCAAyC,GAAG,KAAK,EAC5D,iBAAoC,EACkB,EAAE;IACxD,MAAM,WAAW,GACf,iBAAiB,CAAC,qBAAqB,CAAC,YAAY;QACpD,cAAc;QACZ,CAAC,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,YAAY,CAAC,kBAAkB;aACpE,KAAK,CAAC,IAAI;QACf,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC;IAC1E,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,eAAe,CAAC;IAClE,kCAAkC;IAClC,iBAAiB,CAAC,kBAAkB,CAClC,gCAAgC,CAAC,qBAAqB,CACvD,CAAC;IACF,MAAM,eAAe,GAAG,6BAA6B,CACnD,iBAAiB,CAAC,eAAe,CAAC,eAAe,EACjD,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,0BAA0B,CAC3C,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,iBAAiB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeHelper.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,gCAAgC,GAEjC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,MAAM,CAAC,MAAM,yCAAyC,GAAG,KAAK,EAC5D,iBAAoC,EACkB,EAAE;IACxD,MAAM,WAAW,GACf,iBAAiB,CAAC,qBAAqB,CAAC,YAAY;QACpD,cAAc;QACZ,CAAC,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,YAAY,CAAC,kBAAkB;aACpE,KAAK,CAAC,IAAI;QACf,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC;IAC1E,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,eAAe,CAAC;IAClE,kCAAkC;IAClC,iBAAiB,CAAC,kBAAkB,CAClC,gCAAgC,CAAC,qBAAqB,CACvD,CAAC;IACF,MAAM,eAAe,GAAG,6BAA6B,CACnD,iBAAiB,CAAC,eAAe,CAAC,eAAe,EACjD,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,0BAA0B,CAC3C,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,iBAAiB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,4BAA4B,EAAE,CAAC;IAC1D,OAAO,IAAI,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC5D,CAAC,CAAC"}
|
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import type {
|
|
16
|
+
import type { DataCubeSpecification } from '@finos/legend-data-cube';
|
|
17
17
|
import type { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
|
|
18
18
|
export declare class QueryBuilderDataCubeViewerState {
|
|
19
|
-
|
|
20
|
-
engine: QueryBuilderDataCubeEngine;
|
|
21
|
-
constructor(
|
|
19
|
+
readonly specification: DataCubeSpecification;
|
|
20
|
+
readonly engine: QueryBuilderDataCubeEngine;
|
|
21
|
+
constructor(specification: DataCubeSpecification, engine: QueryBuilderDataCubeEngine);
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=QueryBuilderDataCubeViewerState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeViewerState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeViewerState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,qBAAa,+BAA+B;IAC1C,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;gBAG1C,aAAa,EAAE,qBAAqB,EACpC,MAAM,EAAE,0BAA0B;CAKrC"}
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
export class QueryBuilderDataCubeViewerState {
|
|
17
|
-
|
|
17
|
+
specification;
|
|
18
18
|
engine;
|
|
19
|
-
constructor(
|
|
20
|
-
this.
|
|
19
|
+
constructor(specification, engine) {
|
|
20
|
+
this.specification = specification;
|
|
21
21
|
this.engine = engine;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeViewerState.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAO,+BAA+B;
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeViewerState.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAO,+BAA+B;IACjC,aAAa,CAAwB;IACrC,MAAM,CAA6B;IAE5C,YACE,aAAoC,EACpC,MAAkC;QAElC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-query-builder",
|
|
3
|
-
"version": "4.16.
|
|
3
|
+
"version": "4.16.5",
|
|
4
4
|
"description": "Legend query builder core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@finos/legend-application": "16.0.24",
|
|
46
46
|
"@finos/legend-art": "7.1.81",
|
|
47
|
-
"@finos/legend-code-editor": "2.0.
|
|
48
|
-
"@finos/legend-data-cube": "0.1.
|
|
49
|
-
"@finos/legend-graph": "32.1.
|
|
50
|
-
"@finos/legend-lego": "2.0.
|
|
47
|
+
"@finos/legend-code-editor": "2.0.45",
|
|
48
|
+
"@finos/legend-data-cube": "0.1.5",
|
|
49
|
+
"@finos/legend-graph": "32.1.3",
|
|
50
|
+
"@finos/legend-lego": "2.0.48",
|
|
51
51
|
"@finos/legend-server-depot": "6.0.80",
|
|
52
52
|
"@finos/legend-shared": "11.0.3",
|
|
53
53
|
"@finos/legend-storage": "3.0.122",
|
|
@@ -72,7 +72,10 @@ export const QueryDataCubeViewer = observer(
|
|
|
72
72
|
options?.fullScreen,
|
|
73
73
|
})}
|
|
74
74
|
>
|
|
75
|
-
<DataCube
|
|
75
|
+
<DataCube
|
|
76
|
+
specification={state.specification}
|
|
77
|
+
engine={state.engine}
|
|
78
|
+
/>
|
|
76
79
|
</div>
|
|
77
80
|
{!options?.fullScreen && (
|
|
78
81
|
<ModalFooter>
|
|
@@ -35,7 +35,7 @@ import {
|
|
|
35
35
|
_function,
|
|
36
36
|
DataCubeFunction,
|
|
37
37
|
type CompletionItem,
|
|
38
|
-
|
|
38
|
+
DataCubeSpecification,
|
|
39
39
|
} from '@finos/legend-data-cube';
|
|
40
40
|
import {
|
|
41
41
|
guaranteeType,
|
|
@@ -75,7 +75,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
75
75
|
this.parameters = selectQuery.parameters;
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
-
override async
|
|
78
|
+
override async processSource(sourceData: PlainObject) {
|
|
79
79
|
// TODO: this is an abnormal usage of this method, this is the place
|
|
80
80
|
// where we can enforce which source this engine supports, instead
|
|
81
81
|
// of hardcoding the logic like this.
|
|
@@ -239,19 +239,18 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
239
239
|
return srcFuncExp;
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
-
async
|
|
242
|
+
async generateInitialSpecification() {
|
|
243
243
|
const columns = (await this.getRelationType(this.selectInitialQuery))
|
|
244
244
|
.columns;
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
return query;
|
|
245
|
+
const specification = new DataCubeSpecification();
|
|
246
|
+
specification.query = `~[${columns.map((e) => `'${e.name}'`)}]->select()`;
|
|
247
|
+
return specification;
|
|
249
248
|
}
|
|
250
249
|
|
|
251
|
-
async getRelationType(
|
|
250
|
+
async getRelationType(lambda: RawLambda) {
|
|
252
251
|
const relationType =
|
|
253
252
|
await this.graphState.graphManager.getLambdaRelationType(
|
|
254
|
-
|
|
253
|
+
lambda,
|
|
255
254
|
this.graphState.graph,
|
|
256
255
|
);
|
|
257
256
|
return relationType;
|
|
@@ -54,6 +54,6 @@ export const createDataCubeViewerStateFromQueryBuilder = async (
|
|
|
54
54
|
queryBuilderState.graphManagerState,
|
|
55
55
|
);
|
|
56
56
|
queryBuilderState.setLambdaWriteMode(currentLambdaWriterMode);
|
|
57
|
-
const query = await engine.
|
|
57
|
+
const query = await engine.generateInitialSpecification();
|
|
58
58
|
return new QueryBuilderDataCubeViewerState(query, engine);
|
|
59
59
|
};
|
|
@@ -14,15 +14,18 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import type {
|
|
17
|
+
import type { DataCubeSpecification } from '@finos/legend-data-cube';
|
|
18
18
|
import type { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
|
|
19
19
|
|
|
20
20
|
export class QueryBuilderDataCubeViewerState {
|
|
21
|
-
|
|
22
|
-
engine: QueryBuilderDataCubeEngine;
|
|
21
|
+
readonly specification: DataCubeSpecification;
|
|
22
|
+
readonly engine: QueryBuilderDataCubeEngine;
|
|
23
23
|
|
|
24
|
-
constructor(
|
|
25
|
-
|
|
24
|
+
constructor(
|
|
25
|
+
specification: DataCubeSpecification,
|
|
26
|
+
engine: QueryBuilderDataCubeEngine,
|
|
27
|
+
) {
|
|
28
|
+
this.specification = specification;
|
|
26
29
|
this.engine = engine;
|
|
27
30
|
}
|
|
28
31
|
}
|