@finos/legend-application-query 5.2.5 → 5.2.6
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.
- package/lib/components/explorer/QueryBuilderExplorerPanel.d.ts +3 -0
- package/lib/components/explorer/QueryBuilderExplorerPanel.d.ts.map +1 -1
- package/lib/components/explorer/QueryBuilderExplorerPanel.js +19 -1
- package/lib/components/explorer/QueryBuilderExplorerPanel.js.map +1 -1
- package/lib/index.css +2 -2
- package/lib/index.css.map +1 -1
- package/lib/package.json +2 -2
- package/lib/stores/explorer/QueryBuilderExplorerState.d.ts +4 -0
- package/lib/stores/explorer/QueryBuilderExplorerState.d.ts.map +1 -1
- package/lib/stores/explorer/QueryBuilderExplorerState.js +15 -5
- package/lib/stores/explorer/QueryBuilderExplorerState.js.map +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.d.ts.map +1 -1
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.js +9 -4
- package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.js.map +1 -1
- package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.d.ts +2 -1
- package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.js +41 -3
- package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.js.map +1 -1
- package/package.json +9 -9
- package/src/components/explorer/QueryBuilderExplorerPanel.tsx +55 -0
- package/src/stores/explorer/QueryBuilderExplorerState.ts +29 -8
- package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts +19 -9
- package/src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts +75 -1
|
@@ -26,6 +26,10 @@ export var QUERY_BUILDER_EXPLORER_TREE_DND_TYPE;
|
|
|
26
26
|
QUERY_BUILDER_EXPLORER_TREE_DND_TYPE["ENUM_PROPERTY"] = "ENUM_PROPERTY";
|
|
27
27
|
QUERY_BUILDER_EXPLORER_TREE_DND_TYPE["PRIMITIVE_PROPERTY"] = "PRIMITIVE_PROPERTY";
|
|
28
28
|
})(QUERY_BUILDER_EXPLORER_TREE_DND_TYPE = QUERY_BUILDER_EXPLORER_TREE_DND_TYPE || (QUERY_BUILDER_EXPLORER_TREE_DND_TYPE = {}));
|
|
29
|
+
export const getPropertyNodeId = (parentId, propertyName) => (parentId ? `${parentId}.${propertyName}` : propertyName);
|
|
30
|
+
export const getPropertyNodeIdForSubType = (parentId, subClassPath) => parentId
|
|
31
|
+
? `${parentId}${TYPE_CAST_TOKEN}${subClassPath}`
|
|
32
|
+
: `${TYPE_CAST_TOKEN}${subClassPath}`;
|
|
29
33
|
export class QueryBuilderExplorerTreeNodeData {
|
|
30
34
|
isSelected;
|
|
31
35
|
isOpen;
|
|
@@ -191,9 +195,9 @@ export const getQueryBuilderPropertyNodeData = (property, parentNode, modelCover
|
|
|
191
195
|
parentNode.property._OWNER === property._OWNER) {
|
|
192
196
|
return undefined;
|
|
193
197
|
}
|
|
194
|
-
const propertyNode = new QueryBuilderExplorerTreePropertyNodeData(
|
|
198
|
+
const propertyNode = new QueryBuilderExplorerTreePropertyNodeData(getPropertyNodeId(parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
195
199
|
? ''
|
|
196
|
-
:
|
|
200
|
+
: parentNode.id, property.name), property.name, `${parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
197
201
|
? `${VARIABLE_REFERENCE_TOKEN}x`
|
|
198
202
|
: parentNode.dndText}.${property.name}`, property, parentNode.id, isPartOfDerivedPropertyBranch, mappingNodeData);
|
|
199
203
|
if (propertyNode.type instanceof Class) {
|
|
@@ -203,9 +207,9 @@ export const getQueryBuilderPropertyNodeData = (property, parentNode, modelCover
|
|
|
203
207
|
return propertyNode;
|
|
204
208
|
};
|
|
205
209
|
export const getQueryBuilderSubTypeNodeData = (subclass, parentNode, modelCoverageAnalysisResult) => {
|
|
206
|
-
const subTypeNode = new QueryBuilderExplorerTreeSubTypeNodeData(
|
|
207
|
-
?
|
|
208
|
-
:
|
|
210
|
+
const subTypeNode = new QueryBuilderExplorerTreeSubTypeNodeData(getPropertyNodeIdForSubType(parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
211
|
+
? ''
|
|
212
|
+
: parentNode.id, subclass.path), subclass.name, `${parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
209
213
|
? `${VARIABLE_REFERENCE_TOKEN}${DEFAULT_LAMBDA_VARIABLE_NAME}${ARROW_FUNCTION_TOKEN}${extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE)}(${TYPE_CAST_TOKEN}${subclass.path})`
|
|
210
214
|
: `${parentNode.dndText}${ARROW_FUNCTION_TOKEN}${extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE)}(${TYPE_CAST_TOKEN}${subclass.path})`}`, subclass, parentNode.id, false, generateSubtypeNodeMappingData(subclass, parentNode.mappingData, modelCoverageAnalysisResult), parentNode instanceof QueryBuilderExplorerTreePropertyNodeData
|
|
211
215
|
? parentNode.property.multiplicity
|
|
@@ -271,6 +275,7 @@ export class QueryBuilderExplorerState {
|
|
|
271
275
|
treeData;
|
|
272
276
|
humanizePropertyName = true;
|
|
273
277
|
showUnmappedProperties = false;
|
|
278
|
+
highlightUsedProperties = true;
|
|
274
279
|
propertySearchPanelState;
|
|
275
280
|
mappingModelCoverageAnalysisResult;
|
|
276
281
|
mappingModelCoverageAnalysisState = ActionState.create();
|
|
@@ -279,12 +284,14 @@ export class QueryBuilderExplorerState {
|
|
|
279
284
|
queryBuilderState: false,
|
|
280
285
|
previewDataState: false,
|
|
281
286
|
treeData: observable.ref,
|
|
287
|
+
highlightUsedProperties: observable,
|
|
282
288
|
setTreeData: action,
|
|
283
289
|
refreshTree: action,
|
|
284
290
|
refreshTreeData: action,
|
|
285
291
|
setHumanizePropertyName: action,
|
|
286
292
|
setShowUnmappedProperties: action,
|
|
287
293
|
previewData: flow,
|
|
294
|
+
setHighlightUsedProperties: action,
|
|
288
295
|
analyzeMappingModelCoverage: flow,
|
|
289
296
|
});
|
|
290
297
|
this.queryBuilderState = queryBuilderState;
|
|
@@ -307,6 +314,9 @@ export class QueryBuilderExplorerState {
|
|
|
307
314
|
setShowUnmappedProperties(val) {
|
|
308
315
|
this.showUnmappedProperties = val;
|
|
309
316
|
}
|
|
317
|
+
setHighlightUsedProperties(val) {
|
|
318
|
+
this.highlightUsedProperties = val;
|
|
319
|
+
}
|
|
310
320
|
refreshTreeData() {
|
|
311
321
|
const _class = this.queryBuilderState.querySetupState._class;
|
|
312
322
|
const _mapping = this.queryBuilderState.querySetupState.mapping;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderExplorerState.js","sourceRoot":"","sources":["../../../src/stores/explorer/QueryBuilderExplorerState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"QueryBuilderExplorerState.js","sourceRoot":"","sources":["../../../src/stores/explorer/QueryBuilderExplorerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAOL,yBAAyB,EACzB,0BAA0B,EAC1B,KAAK,EACL,kBAAkB,EAClB,WAAW,EACX,4BAA4B,EAC5B,wBAAwB,EACxB,aAAa,EACb,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,wBAAwB,EACxB,4BAA4B,EAC5B,IAAI,EACJ,oBAAoB,EACpB,WAAW,EACX,eAAe,EACf,QAAQ,EACR,WAAW,EACX,cAAc,EACd,kBAAkB,GAEnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,MAAM,EACN,IAAI,EACJ,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,UAAU,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,+BAA+B,EAC/B,4BAA4B,GAE7B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAEjG,MAAM,CAAN,IAAY,oCAKX;AALD,WAAY,oCAAoC;IAC9C,qDAAa,CAAA;IACb,yEAAiC,CAAA;IACjC,uEAA+B,CAAA;IAC/B,iFAAyC,CAAA;AAC3C,CAAC,EALW,oCAAoC,GAApC,oCAAoC,KAApC,oCAAoC,QAK/C;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAgB,EAChB,YAAoB,EACZ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,QAAgB,EAChB,YAAoB,EACZ,EAAE,CACV,QAAQ;IACN,CAAC,CAAC,GAAG,QAAQ,GAAG,eAAe,GAAG,YAAY,EAAE;IAChD,CAAC,CAAC,GAAG,eAAe,GAAG,YAAY,EAAE,CAAC;AAM1C,MAAM,OAAgB,gCAAgC;IACpD,UAAU,CAAuB;IACjC,MAAM,CAAuB;IAC7B,EAAE,CAAS;IACX,KAAK,CAAS;IACd,OAAO,CAAS;IAChB,WAAW,GAAa,EAAE,CAAC;IAC3B,6BAA6B,CAAU;IACvC,IAAI,CAAO;IACX,WAAW,CAAkC;IAE7C,YACE,EAAU,EACV,KAAa,EACb,OAAe,EACf,6BAAsC,EACtC,IAAU,EACV,WAA4C;QAE5C,cAAc,CAAC,IAAI,EAAE;YACnB,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,MAAM;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;QACnE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,aAAa,CAAC,GAAwB;QACpC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;CACF;AAOD,MAAM,OAAO,oCAAqC,SAAQ,gCAAgC;CAAG;AAE7F,MAAM,OAAO,wCAAyC,SAAQ,gCAAgC;IAC5F,QAAQ,CAAmB;IAC3B,QAAQ,CAAS;IAEjB,YACE,EAAU,EACV,KAAa,EACb,OAAe,EACf,QAA0B,EAC1B,QAAgB,EAChB,6BAAsC,EACtC,WAA4C;QAE5C,KAAK,CACH,EAAE,EACF,KAAK,EACL,OAAO,EACP,6BAA6B,EAC7B,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAClC,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,OAAO,uCAAwC,SAAQ,gCAAgC;IAC3F,QAAQ,CAAQ;IAChB,QAAQ,CAAS;IACjB,YAAY,CAAe;IAE3B,YACE,EAAU,EACV,KAAa,EACb,OAAe,EACf,QAAe,EACf,QAAgB,EAChB,6BAAsC,EACtC,WAA4C,EAC5C,YAA0B;QAE1B,KAAK,CACH,EAAE,EACF,KAAK,EACL,OAAO,EACP,6BAA6B,EAC7B,QAAQ,EACR,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,+CAA+C,GAAG,CAC7D,QAAoD,EACpD,IAA8C,EAC9C,KAAgB,EAChB,sBAA0D,EAC9B,EAAE;IAC9B,MAAM,eAAe,GAAG,KAAK,CAAC,sBAAsB,CAClD,yBAAyB,CAAC,GAAG,CAC9B,CAAC;IACF,MAAM,8BAA8B,GAAG,IAAI,kBAAkB,CAC3D,4BAA4B,EAC5B,eAAe,CAChB,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,0BAA0B,CACvD,EAAE,EACF,eAAe,CAChB,CAAC;IACF,kBAAkB,CAAC,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,iBAAiB,GACnB,kBAAkB,CAAC;IACrB,IAAI,UAAU,GACZ,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACjC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,WAAW,GAAqC,IAAI,CAAC;IACzD,OACE,UAAU,YAAY,wCAAwC;QAC9D,UAAU,YAAY,uCAAuC,EAC7D;QACA,IAAI,wBAAwB,CAAC;QAC7B,IAAI,UAAU,YAAY,uCAAuC,EAAE;YACjE,wBAAwB,GAAG,IAAI,wBAAwB,CACrD,0BAA0B,CAAC,iCAAiC,CAAC,OAAO,CAAC,EACrE,eAAe,CAChB,CAAC;SACH;aAAM;YACL,wBAAwB,GAAG,IAAI,0BAA0B,CACvD,EAAE,EACF,eAAe,CAChB,CAAC;YACF,wBAAwB,CAAC,IAAI,GAAG,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SAC3E;QACD,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAClE,IACE,iBAAiB,YAAY,wBAAwB;YACrD,iBAAiB,CACf,iBAAiB,CAAC,YAAY,EAC9B,iCAAiC,CAAC,OAAO,CAC1C,EACD;YACA,MAAM,QAAQ,GAAG,IAAI,aAAa,CAChC,eAAe,EACf,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CACvE,CAAC;YACF,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACnD;QACD,iBAAiB,GAAG,wBAAwB,CAAC;QAC7C,WAAW,GAAG,UAAU,CAAC;QACzB,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACrD,IACE,CAAC,UAAU;YACX,CAAC,WAAW,YAAY,wCAAwC;gBAC9D,WAAW,YAAY,uCAAuC,CAAC,EACjE;YACA,KAAK,MAAM,YAAY,IAAI,sBAAsB,EAAE;gBACjD,IAAI,YAAY,CAAC,EAAE,KAAK,WAAW,CAAC,QAAQ,EAAE;oBAC5C,UAAU,GAAG,YAAY,CAAC;oBAC1B,MAAM;iBACP;aACF;SACF;KACF;IACD,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IACxE,IAAI,iBAAiB,YAAY,wBAAwB,EAAE;QACzD,MAAM,QAAQ,GAAG,IAAI,aAAa,CAChC,eAAe,EACf,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CACvE,CAAC;QACF,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACnD;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,QAA0B,EAC1B,iBAAkD,EAClD,2BAA+D,EAC9B,EAAE;IACnC,+FAA+F;IAC/F,iDAAiD;IACjD,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAClC,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CACtE,QAAQ,CAAC,IAAI,CACd,CAAC;QACF,IACE,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK;YACnD,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,YAAY,IAAI,EAClD;YACA,IAAI,UAAU,EAAE;gBACd,OAAO;oBACL,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,GAAG,CAC5D,UAAU,YAAY,oBAAoB;wBACxC,CAAC,CAAC,UAAU,CAAC,UAAU;wBACvB,CAAC,CAAE,UAAiC,CAAC,QAAQ,CAChD;iBACF,CAAC;aACH;SACF;QACD,OAAO,EAAE,MAAM,EAAE,UAAU,KAAK,SAAS,EAAE,CAAC;KAC7C;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CACrC,QAAe,EACf,iBAAkD,EAClD,2BAA+D,EAC9B,EAAE;IACnC,+FAA+F;IAC/F,iDAAiD;IACjD,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAClC,MAAM,cAAc,GAAG,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,oBAAoB,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,IAAI,CACxE,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,GAAG,CAC3D,cAAc,CAAC,CAAC,CAA0B,CAAC,UAAU,CACvD;aACF,CAAC;SACH;aAAM,IAAI,iBAAiB,CAAC,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,EAAE;YAChE,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,iBAAiB,CAAC,YAAY;aAC7C,CAAC;SACH;KACF;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAa,EACb,2BAA+D,EAC9B,EAAE,CAAC,CAAC;IACrC,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;CAC5E,CAAC,CAAC;AAEH,MAAM,wCAAwC,GAAG,CAC/C,IAAsC,EAC5B,EAAE;IACZ,MAAM,YAAY,GAAG,IAAI,CAAC,IAAa,CAAC;IACxC,MAAM,iBAAiB,GAAG,CACxB,IAAI,YAAY,uCAAuC;QACrD,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACxC,CAAC,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,4BAA4B,CAAC,YAAY,CAAC,CAC3C,CACN,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CACpD,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAC7D,CAAC;IACF,OAAO,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,QAA0B,EAC1B,UAA4C,EAC5C,2BAA+D,EACT,EAAE;IACxD,MAAM,eAAe,GAAG,+BAA+B,CACrD,QAAQ,EACR,UAAU,CAAC,WAAW,EACtB,2BAA2B,CAC5B,CAAC;IACF,MAAM,6BAA6B,GACjC,QAAQ,YAAY,eAAe;QACnC,UAAU,CAAC,6BAA6B;QACxC,CAAC,UAAU,YAAY,wCAAwC;YAC7D,UAAU,CAAC,QAAQ,YAAY,eAAe,CAAC,CAAC;IACpD,mEAAmE;IACnE,oEAAoE;IACpE,wDAAwD;IACxD,wDAAwD;IACxD,yDAAyD;IACzD,IACE,QAAQ,YAAY,QAAQ;QAC5B,UAAU,YAAY,wCAAwC;QAC9D,UAAU,CAAC,QAAQ,YAAY,QAAQ;QACvC,QAAQ,CAAC,MAAM,YAAY,WAAW;QACtC,UAAU,CAAC,QAAQ,CAAC,MAAM,YAAY,WAAW;QACjD,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAC9C;QACA,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,YAAY,GAAG,IAAI,wCAAwC,CAC/D,iBAAiB,CACf,UAAU,YAAY,oCAAoC;QACxD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,UAAU,CAAC,EAAE,EACjB,QAAQ,CAAC,IAAI,CACd,EACD,QAAQ,CAAC,IAAI,EACb,GACE,UAAU,YAAY,oCAAoC;QACxD,CAAC,CAAC,GAAG,wBAAwB,GAAG;QAChC,CAAC,CAAC,UAAU,CAAC,OACjB,IAAI,QAAQ,CAAC,IAAI,EAAE,EACnB,QAAQ,EACR,UAAU,CAAC,EAAE,EACb,6BAA6B,EAC7B,eAAe,CAChB,CAAC;IACF,IAAI,YAAY,CAAC,IAAI,YAAY,KAAK,EAAE;QACtC,YAAY,CAAC,WAAW;YACtB,wCAAwC,CAAC,YAAY,CAAC,CAAC;KAC1D;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,QAAe,EACf,UAA4C,EAC5C,2BAA+D,EACtB,EAAE;IAC3C,MAAM,WAAW,GAAG,IAAI,uCAAuC,CAC7D,2BAA2B,CACzB,UAAU,YAAY,oCAAoC;QACxD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,UAAU,CAAC,EAAE,EACjB,QAAQ,CAAC,IAAI,CACd,EACD,QAAQ,CAAC,IAAI,EACb,GACE,UAAU,YAAY,oCAAoC;QACxD,CAAC,CAAC,GAAG,wBAAwB,GAAG,4BAA4B,GAAG,oBAAoB,GAAG,0BAA0B,CAC5G,iCAAiC,CAAC,OAAO,CAC1C,IAAI,eAAe,GAAG,QAAQ,CAAC,IAAI,GAAG;QACzC,CAAC,CAAC,GACE,UAAU,CAAC,OACb,GAAG,oBAAoB,GAAG,0BAA0B,CAClD,iCAAiC,CAAC,OAAO,CAC1C,IAAI,eAAe,GAAG,QAAQ,CAAC,IAAI,GAC1C,EAAE,EACF,QAAQ,EACR,UAAU,CAAC,EAAE,EACb,KAAK,EACL,8BAA8B,CAC5B,QAAQ,EACR,UAAU,CAAC,WAAW,EACtB,2BAA2B,CAC5B,EACD,UAAU,YAAY,wCAAwC;QAC5D,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY;QAClC,CAAC,CAAC,UAAU,YAAY,uCAAuC;YAC/D,CAAC,CAAC,UAAU,CAAC,YAAY;YACzB,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAC3B,CAAC;IACF,WAAW,CAAC,WAAW;QACrB,wCAAwC,CAAC,WAAW,CAAC,CAAC;IACxD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,SAAgB,EAChB,2BAA+D,EACnB,EAAE;IAC9C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,GAAG,EAA4C,CAAC;IAClE,MAAM,WAAW,GAAG,kBAAkB,CACpC,SAAS,EACT,2BAA2B,CAC5B,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,oCAAoC,CAC3D,iBAAiB,EACjB,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,IAAI,EACd,KAAK,EACL,SAAS,EACT,WAAW,CACZ,CAAC;IACF,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC9B,qBAAqB,CAAC,SAAS,CAAC;SAC7B,MAAM,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;SAC/C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC5C,IAAI,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9D;SACA,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpB,MAAM,oBAAoB,GAAG,+BAA+B,CAC1D,QAAQ,EACR,YAAY,EACZ,2BAA2B,CAC5B,CAAC;QACF,IAAI,oBAAoB,EAAE;YACxB,cAAc,CAAC,YAAY,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAClE,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;SAC1D;IACH,CAAC,CAAC,CAAC;IACL,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACzC,MAAM,mBAAmB,GAAG,8BAA8B,CACxD,QAAQ,EACR,YAAY,EACZ,2BAA2B,CAC5B,CAAC;QACF,cAAc,CAAC,YAAY,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACjE,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,OAAO,oCAAoC;IAC/C,uBAAuB,GAAG,KAAK,CAAC;IAChC,YAAY,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAuC;IAElD;QACE,kBAAkB,CAAC,IAAI,EAAE;YACvB,WAAW,EAAE,UAAU,CAAC,GAAG;YAC3B,eAAe,EAAE,MAAM;YACvB,0BAA0B,EAAE,MAAM;YAClC,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,GAAW;QACzB,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;IAC1B,CAAC;IAED,0BAA0B,CAAC,GAAY;QACrC,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,GAAwC;QACrD,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;CACF;AAED,MAAM,OAAO,yBAAyB;IACpC,iBAAiB,CAAoB;IACrC,gBAAgB,GAAG,IAAI,oCAAoC,EAAE,CAAC;IAC9D,QAAQ,CAA0D;IAClE,oBAAoB,GAAG,IAAI,CAAC;IAC5B,sBAAsB,GAAG,KAAK,CAAC;IAC/B,uBAAuB,GAAG,IAAI,CAAC;IAC/B,wBAAwB,CAAuC;IAC/D,kCAAkC,CAAsC;IACxE,iCAAiC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IAEzD,YAAY,iBAAoC;QAC9C,kBAAkB,CAAC,IAAI,EAAE;YACvB,iBAAiB,EAAE,KAAK;YACxB,gBAAgB,EAAE,KAAK;YACvB,QAAQ,EAAE,UAAU,CAAC,GAAG;YACxB,uBAAuB,EAAE,UAAU;YACnC,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,MAAM;YACnB,eAAe,EAAE,MAAM;YACvB,uBAAuB,EAAE,MAAM;YAC/B,yBAAyB,EAAE,MAAM;YACjC,WAAW,EAAE,IAAI;YACjB,0BAA0B,EAAE,MAAM;YAClC,2BAA2B,EAAE,IAAI;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,wBAAwB,GAAG,IAAI,oCAAoC,CACtE,IAAI,CAAC,iBAAiB,CACvB,CAAC;IACJ,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,oBAAoB,CACzB,IAAI,CAAC,QAAQ,EACb,2DAA2D,CAC5D,CAAC;IACJ,CAAC;IAED,WAAW,CACT,GAA2D;QAE3D,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACtB,CAAC;IAED,WAAW;QACT,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SACtC;IACH,CAAC;IAED,uBAAuB,CAAC,GAAY;QAClC,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;IAClC,CAAC;IAED,yBAAyB,CAAC,GAAY;QACpC,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC;IACpC,CAAC;IAED,0BAA0B,CAAC,GAAY;QACrC,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,eAAe;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC;QAChE,IAAI,CAAC,WAAW,CACd,MAAM,IAAI,QAAQ,IAAI,IAAI,CAAC,kCAAkC;YAC3D,CAAC,CAAC,uBAAuB,CACrB,MAAM,EACN,IAAI,CAAC,kCAAkC,CACxC;YACH,CAAC,CAAC,SAAS,CACd,CAAC;IACJ,CAAC;IAED,CAAC,2BAA2B;QAC1B,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAAE;YAClD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAiC,CAAC,UAAU,EAAE,CAAC;YACpF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAiC,CAAC,UAAU,CAC/E,sBAAsB,CACvB,CAAC;YACF,IAAI;gBACF,IAAI,CAAC,kCAAkC,GAAG,CAAC,MAAM,UAAU,CACzD,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,2BAA2B,CAC/E,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAC9C,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC/C,CACF,CAAuC,CAAC;gBACzC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC;aACxD;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACpE;YACD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAiC,CAAC,IAAI,EAAE,CAAC;SAC/E;IACH,CAAC;IAED,CAAC,WAAW,CACV,IAA8C;QAE9C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,YAAY,CAAC;QACpE,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CACnD,oCAAoC,IAAI,CAAC,QAAQ,CAAC,IAAI,6BAA6B,CACpF,CAAC;YACF,OAAO;SACR;QACD,IACE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM;YACxB,CAAC,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,MAAM;YAC9C,CAAC,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAC/C;YACA,OAAO;SACR;QACD,IACE,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB;aAClD,uBAAuB,EAC1B;YACA,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CACnD,oCAAoC,IAAI,CAAC,QAAQ,CAAC,IAAI,8CAA8C,CACrG,CAAC;YACF,OAAO;SACR;QACD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,eAAe,CACnE,IAAI,CAAC,QAAQ,CAAC,IAAI,CACnB,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,0BAA0B,CAC9E,IAAI,CACL,CAAC;QACF,MAAM,kBAAkB,GAAG,+CAA+C,CACxE,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,mBAAmB,EACxD,IAAI,EACJ,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAC9C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,wBAAwB;aAC1D,sBAAsB,CAC1B,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7D,IAAI;YACF,QAAQ,YAAY,CAAC,IAAI,EAAE;gBACzB,KAAK,cAAc,CAAC,MAAM,CAAC;gBAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;gBAC5B,KAAK,cAAc,CAAC,OAAO,CAAC;gBAC5B,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC;oBACzB,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,cAAc,CACzE,4BAA4B,CAC1B,IAAI,CAAC,iBAAiB,EACtB,kBAAkB,CACnB,EACD,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAC9C,OAAO,EACP,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC/C,CAAoB,CAAC;oBACxB,UAAU,CACR,aAAa,EACb,kBAAkB,EAClB,gCAAgC,CACjC,CAAC;oBACF,MAAM,iBAAiB,GACrB,aAAa,CAAC,MAAiC,CAAC;oBAClD,uBAAuB;oBACvB,MAAM,2BAA2B,GAAG;wBAClC,OAAO,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC;wBACjC,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;4BACpD,MAAM,EAAE;gCACN,MAAM;gCACN,oBAAoB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CACpD,GAAG,CACM;6BACZ;yBACF,CAAC,CAAC;qBACJ,CAAC;oBACF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,cAAc,CAClE,2BAA2B,CAC5B,CAAC;oBACF,MAAM;iBACP;gBACD,KAAK,cAAc,CAAC,OAAO,CAAC;gBAC5B,KAAK,cAAc,CAAC,MAAM,CAAC;gBAC3B,KAAK,cAAc,CAAC,IAAI,CAAC;gBACzB,KAAK,cAAc,CAAC,UAAU,CAAC;gBAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC,CAAC;oBAC5B,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,cAAc,CACzE,+BAA+B,CAC7B,IAAI,CAAC,iBAAiB,EACtB,kBAAkB,CACnB,EACD,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAC9C,OAAO,EACP,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC/C,CAAoB,CAAC;oBACxB,UAAU,CACR,aAAa,EACb,kBAAkB,EAClB,gCAAgC,CACjC,CAAC;oBACF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,cAAc,CAClE,aAAa,CAAC,MAAiC,CAChD,CAAC;oBACF,MAAM;iBACP;gBACD;oBACE,MAAM,IAAI,yBAAyB,CACjC,4CAA4C,YAAY,CAAC,IAAI,GAAG,CACjE,CAAC;aACL;SACF;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CACnD,oCAAoC,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,KAAK,CAAC,OAAO,EAAE,CACnF,CAAC;YACF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,cAAc,CAClE,SAAS,CACV,CAAC;SACH;gBAAS;YACR,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,0BAA0B,CAC9E,KAAK,CACN,CAAC;SACH;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAGL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAGvB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAGL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAGvB,sBAAsB,EAGvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,gCAAgC,EACrC,wCAAwC,EAEzC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAMpE,qBAAa,kCAAmC,YAAW,YAAY;IACrE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,EAAE,sBAAsB,CAAC;gBAG3B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,kBAAkB,EAAE,sBAAsB;IAU5C,IAAI,IAAI,IAAI,IAAI,CAEf;CACF;AAED,MAAM,WAAW,8BACf,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpD,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AA6CD;;GAEG;AACH,eAAO,MAAM,uBAAuB,SAC5B,kBAAkB,KACvB,8BASF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAC1B,8BAA8B,KACvC,OAA8C,CAAC;AA6ClD,eAAO,MAAM,qBAAqB,aACtB,8BAA8B,QAClC,kCAAkC,KACvC,IAGF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,8BAA8B,oBACtB,SAAS,gCAAgC,CAAC,QACtD,wCAAwC,qBAC3B,iBAAiB,KACnC,IAkGF,CAAC"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { assertType, addUniqueEntry, deleteEntry } from '@finos/legend-shared';
|
|
17
|
-
import { PropertyExplicitReference, Class, PropertyGraphFetchTree, PackageableElementExplicitReference, } from '@finos/legend-graph';
|
|
17
|
+
import { PropertyExplicitReference, Class, PropertyGraphFetchTree, PackageableElementExplicitReference, TYPE_CAST_TOKEN, } from '@finos/legend-graph';
|
|
18
18
|
import { QueryBuilderExplorerTreePropertyNodeData, QueryBuilderExplorerTreeSubTypeNodeData, } from '../../explorer/QueryBuilderExplorerState.js';
|
|
19
19
|
import { graphFetchTree_addSubTree, graphFetchTree_removeSubTree, } from '@finos/legend-application';
|
|
20
20
|
export class QueryBuilderGraphFetchTreeNodeData {
|
|
@@ -37,13 +37,16 @@ export class QueryBuilderGraphFetchTreeNodeData {
|
|
|
37
37
|
return this.tree.property.value.genericType.value.rawType;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
const generateNodeId = (property,
|
|
40
|
+
const generateNodeId = (property, parentNodeId) => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}`;
|
|
41
|
+
const generateNodeIdForSubType = (property, subType, parentNodeId) => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}${TYPE_CAST_TOKEN}${subType.path}`;
|
|
41
42
|
const buildGraphFetchSubTree = (tree, parentNode, nodes) => {
|
|
42
43
|
assertType(tree, PropertyGraphFetchTree, 'Graph fetch sub-tree must be a property graph fetch tree');
|
|
43
44
|
const property = tree.property.value;
|
|
44
45
|
const subType = tree.subType?.value;
|
|
45
46
|
const parentNodeId = parentNode?.id;
|
|
46
|
-
const node = new QueryBuilderGraphFetchTreeNodeData(
|
|
47
|
+
const node = new QueryBuilderGraphFetchTreeNodeData(subType
|
|
48
|
+
? generateNodeIdForSubType(property, subType, parentNodeId)
|
|
49
|
+
: generateNodeId(property, parentNodeId), property.name, parentNodeId, tree);
|
|
47
50
|
tree.subTrees.forEach((subTree) => {
|
|
48
51
|
const subTreeNode = buildGraphFetchSubTree(subTree, node, nodes);
|
|
49
52
|
addUniqueEntry(node.childrenIds, subTreeNode.id);
|
|
@@ -146,7 +149,9 @@ export const addQueryBuilderPropertyNode = (treeData, explorerTreeData, node, qu
|
|
|
146
149
|
let parentNode = undefined;
|
|
147
150
|
let newSubTree;
|
|
148
151
|
for (const propertyGraphFetchTree of propertyGraphFetchTrees) {
|
|
149
|
-
currentNodeId =
|
|
152
|
+
currentNodeId = propertyGraphFetchTree.subType?.value
|
|
153
|
+
? generateNodeIdForSubType(propertyGraphFetchTree.property.value, propertyGraphFetchTree.subType.value, currentNodeId)
|
|
154
|
+
: generateNodeId(propertyGraphFetchTree.property.value, currentNodeId);
|
|
150
155
|
const existingGraphFetchNode = treeData.nodes.get(currentNodeId);
|
|
151
156
|
if (existingGraphFetchNode) {
|
|
152
157
|
parentNode = existingGraphFetchNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAKL,yBAAyB,EACzB,KAAK,EACL,sBAAsB,EACtB,mCAAmC,
|
|
1
|
+
{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
|
|
|
22
22
|
import { QueryBuilderPostFilterState } from './post-filter/QueryBuilderPostFilterState.js';
|
|
23
23
|
import type { QueryBuilderPostFilterOperator } from './post-filter/QueryBuilderPostFilterOperator.js';
|
|
24
24
|
import type { QueryBuilderAggregateOperator } from './aggregation/QueryBuilderAggregateOperator.js';
|
|
25
|
-
import { QueryBuilderDerivationProjectionColumnState,
|
|
25
|
+
import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, type QueryBuilderProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
|
|
26
26
|
import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
|
|
27
27
|
export declare class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
|
|
28
28
|
columns: QueryBuilderProjectionColumnState[];
|
|
@@ -55,5 +55,6 @@ export declare class QueryBuilderProjectionState extends QueryBuilderFetchStruct
|
|
|
55
55
|
addNewBlankDerivation(): void;
|
|
56
56
|
revealCompilationError(compilationError: CompilationError): boolean;
|
|
57
57
|
clearCompilationError(): void;
|
|
58
|
+
get usedPropertyNodeIds(): string[];
|
|
58
59
|
}
|
|
59
60
|
//# sourceMappingURL=QueryBuilderProjectionState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,KAAK,WAAW,EAUjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,KAAK,WAAW,EAUjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,KAAK,gBAAgB,EAUtB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAE7F,OAAO,EAAE,6CAA6C,EAAE,MAAM,qDAAqD,CAAC;AACpH,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,iDAAiD,CAAC;AAEtG,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAEpG,OAAO,EACL,2CAA2C,EAC3C,uCAAuC,EACvC,KAAK,iCAAiC,EACvC,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAM7F,qBAAa,2BAA4B,SAAQ,6CAA6C;IAC5F,OAAO,EAAE,iCAAiC,EAAE,CAAM;IAClD,gBAAgB,EAAE,4BAA4B,CAAC;IAC/C,eAAe,EAAE,2BAA2B,CAAC;IAC7C,sBAAsB,EAAE,2BAA2B,CAAC;IACpD,oCAAoC,UAAS;IAC7C,mBAAmB,UAAS;IAE5B,mBAAmB,EAAE,8BAA8B,EAAE,CACV;IAC3C,oBAAoB,EAAE,6BAA6B,EAAE,CACR;gBAG3C,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;IAgCtD,IAAI,WAAW,IAAI,2CAA2C,EAAE,CAI/D;IAED,IAAI,cAAc,IAAI,OAAO,CAI5B;IAED,IAAI,gBAAgB,IAAI,MAAM,EAAE,GAAG,SAAS,CAc3C;IAED,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIzC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IA8CxD,qCAAqC,CACnC,2BAA2B,EAAE,uCAAuC,GACnE,IAAI;IA8BP,aAAa,CACX,MAAM,EAAE,iCAAiC,EACzC,MAAM,EAAE,iCAAiC,GACxC,IAAI;IAuBP,YAAY,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAc1D,SAAS,CACP,GAAG,EAAE,iCAAiC,EACtC,OAAO,CAAC,EAAE;QACR;;;;;WAKG;QACH,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KACnC,GACA,IAAI;IAuBP,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IA8C1D,qBAAqB,IAAI,IAAI;IAa7B,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;IA2BnE,qBAAqB,IAAI,IAAI;IAQ7B,IAAI,mBAAmB,IAAI,MAAM,EAAE,CA+DlC;CACF"}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { action, flowResult, makeObservable, observable, flow, computed, } from 'mobx';
|
|
17
17
|
import { LogEvent, assertErrorThrown, changeEntry, guaranteeType, deleteEntry, addUniqueEntry, guaranteeNonNullable, findLast, filterByType, } from '@finos/legend-shared';
|
|
18
|
-
import { GRAPH_MANAGER_EVENT, extractSourceInformationCoordinates, LAMBDA_PIPE, RawLambda, isStubbed_RawLambda, } from '@finos/legend-graph';
|
|
19
|
-
import { DEFAULT_LAMBDA_VARIABLE_NAME, QUERY_BUILDER_SOURCE_ID_LABEL, } from '../../../QueryBuilder_Const.js';
|
|
18
|
+
import { GRAPH_MANAGER_EVENT, extractSourceInformationCoordinates, LAMBDA_PIPE, RawLambda, isStubbed_RawLambda, AbstractPropertyExpression, matchFunctionName, SimpleFunctionExpression, } from '@finos/legend-graph';
|
|
19
|
+
import { DEFAULT_LAMBDA_VARIABLE_NAME, QUERY_BUILDER_SOURCE_ID_LABEL, QUERY_BUILDER_SUPPORTED_FUNCTIONS, } from '../../../QueryBuilder_Const.js';
|
|
20
20
|
import { QueryBuilderAggregationState } from './aggregation/QueryBuilderAggregationState.js';
|
|
21
21
|
import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
|
|
22
22
|
import { QueryBuilderFetchStructureImplementationState } from '../QueryBuilderFetchStructureImplementationState.js';
|
|
@@ -24,7 +24,8 @@ import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
|
|
|
24
24
|
import { QueryBuilderPostFilterState } from './post-filter/QueryBuilderPostFilterState.js';
|
|
25
25
|
import { getQueryBuilderCorePostFilterOperators } from './post-filter/QueryBuilderPostFilterOperatorLoader.js';
|
|
26
26
|
import { getQueryBuilderCoreAggregrationOperators } from './aggregation/QueryBuilderAggregateOperatorLoader.js';
|
|
27
|
-
import { QueryBuilderDerivationProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
|
|
27
|
+
import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
|
|
28
|
+
import { getPropertyNodeId, getPropertyNodeIdForSubType, } from '../../explorer/QueryBuilderExplorerState.js';
|
|
28
29
|
export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
|
|
29
30
|
columns = [];
|
|
30
31
|
aggregationState;
|
|
@@ -199,5 +200,42 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
|
|
|
199
200
|
clearCompilationError() {
|
|
200
201
|
this.derivations.forEach((derivationProjectionColumnState) => derivationProjectionColumnState.derivationLambdaEditorState.setCompilationError(undefined));
|
|
201
202
|
}
|
|
203
|
+
get usedPropertyNodeIds() {
|
|
204
|
+
let usedNodeIds = [];
|
|
205
|
+
this.columns.forEach((column) => {
|
|
206
|
+
if (column instanceof QueryBuilderSimpleProjectionColumnState) {
|
|
207
|
+
let nodeIds = [];
|
|
208
|
+
const subClassNames = [];
|
|
209
|
+
let currentPropertyExpression = column.propertyExpressionState.propertyExpression;
|
|
210
|
+
while (currentPropertyExpression instanceof AbstractPropertyExpression) {
|
|
211
|
+
nodeIds.push(currentPropertyExpression.func.name);
|
|
212
|
+
currentPropertyExpression = guaranteeNonNullable(currentPropertyExpression.parametersValues[0]);
|
|
213
|
+
if (currentPropertyExpression instanceof SimpleFunctionExpression &&
|
|
214
|
+
matchFunctionName(currentPropertyExpression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE) &&
|
|
215
|
+
currentPropertyExpression.parametersValues.length >= 1 &&
|
|
216
|
+
currentPropertyExpression.parametersValues[1]?.genericType?.value
|
|
217
|
+
.rawType.path) {
|
|
218
|
+
nodeIds.push(currentPropertyExpression.parametersValues[1]?.genericType?.value
|
|
219
|
+
.rawType.path);
|
|
220
|
+
subClassNames.push(currentPropertyExpression.parametersValues[1]?.genericType?.value
|
|
221
|
+
.rawType.path);
|
|
222
|
+
currentPropertyExpression = guaranteeNonNullable(currentPropertyExpression.parametersValues[0]);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
nodeIds = nodeIds.reverse();
|
|
226
|
+
if (nodeIds.length &&
|
|
227
|
+
subClassNames.includes(guaranteeNonNullable(nodeIds[0]))) {
|
|
228
|
+
nodeIds[0] = getPropertyNodeIdForSubType('', guaranteeNonNullable(nodeIds[0]));
|
|
229
|
+
}
|
|
230
|
+
for (let i = 1; i < nodeIds.length; i++) {
|
|
231
|
+
nodeIds[i] = subClassNames.includes(guaranteeNonNullable(nodeIds[i]))
|
|
232
|
+
? getPropertyNodeIdForSubType(guaranteeNonNullable(nodeIds[i - 1]), guaranteeNonNullable(nodeIds[i]))
|
|
233
|
+
: getPropertyNodeId(guaranteeNonNullable(nodeIds[i - 1]), guaranteeNonNullable(nodeIds[i]));
|
|
234
|
+
}
|
|
235
|
+
usedNodeIds = usedNodeIds.concat(nodeIds);
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
return usedNodeIds;
|
|
239
|
+
}
|
|
202
240
|
}
|
|
203
241
|
//# sourceMappingURL=QueryBuilderProjectionState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionState.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,GACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,mBAAmB,EACnB,mCAAmC,EACnC,WAAW,EACX,SAAS,EACT,mBAAmB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-application-query",
|
|
3
|
-
"version": "5.2.
|
|
3
|
+
"version": "5.2.6",
|
|
4
4
|
"description": "Legend Query application core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -46,12 +46,12 @@
|
|
|
46
46
|
"@ag-grid-community/client-side-row-model": "28.1.1",
|
|
47
47
|
"@ag-grid-community/core": "28.1.1",
|
|
48
48
|
"@ag-grid-community/react": "28.1.1",
|
|
49
|
-
"@finos/legend-application": "7.1.
|
|
50
|
-
"@finos/legend-art": "3.0.
|
|
51
|
-
"@finos/legend-graph": "14.0.
|
|
52
|
-
"@finos/legend-server-depot": "3.0.
|
|
53
|
-
"@finos/legend-shared": "6.0.
|
|
54
|
-
"@finos/legend-storage": "3.0.
|
|
49
|
+
"@finos/legend-application": "7.1.5",
|
|
50
|
+
"@finos/legend-art": "3.0.3",
|
|
51
|
+
"@finos/legend-graph": "14.0.5",
|
|
52
|
+
"@finos/legend-server-depot": "3.0.8",
|
|
53
|
+
"@finos/legend-shared": "6.0.3",
|
|
54
|
+
"@finos/legend-storage": "3.0.7",
|
|
55
55
|
"@testing-library/react": "13.3.0",
|
|
56
56
|
"@types/react": "18.0.17",
|
|
57
57
|
"@types/react-dom": "18.0.6",
|
|
@@ -71,10 +71,10 @@
|
|
|
71
71
|
"serializr": "2.0.5"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
|
-
"@finos/legend-dev-utils": "2.0.
|
|
74
|
+
"@finos/legend-dev-utils": "2.0.13",
|
|
75
75
|
"@jest/globals": "29.0.1",
|
|
76
76
|
"cross-env": "7.0.3",
|
|
77
|
-
"eslint": "8.
|
|
77
|
+
"eslint": "8.23.0",
|
|
78
78
|
"jest": "29.0.1",
|
|
79
79
|
"npm-run-all": "4.1.5",
|
|
80
80
|
"rimraf": "3.0.2",
|
|
@@ -85,6 +85,8 @@ import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
|
|
|
85
85
|
import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
|
|
86
86
|
import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
|
|
87
87
|
import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
|
|
88
|
+
import type { QueryBuilderFetchStructureState } from '../../stores/fetch-structure/QueryBuilderFetchStructureState.js';
|
|
89
|
+
import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
|
|
88
90
|
|
|
89
91
|
const checkForDeprecatedNode = (
|
|
90
92
|
node: QueryBuilderExplorerTreeNodeData,
|
|
@@ -111,6 +113,38 @@ const checkForDeprecatedNode = (
|
|
|
111
113
|
return false;
|
|
112
114
|
};
|
|
113
115
|
|
|
116
|
+
export const isNodeAlreadyUsed = (
|
|
117
|
+
node: QueryBuilderExplorerTreeNodeData,
|
|
118
|
+
fetchStructureState: QueryBuilderFetchStructureState,
|
|
119
|
+
): boolean => {
|
|
120
|
+
if (
|
|
121
|
+
node instanceof QueryBuilderExplorerTreeRootNodeData &&
|
|
122
|
+
(fetchStructureState.projectionState.columns.filter(
|
|
123
|
+
(column) => column instanceof QueryBuilderSimpleProjectionColumnState,
|
|
124
|
+
).length > 0 ||
|
|
125
|
+
(fetchStructureState.graphFetchTreeState.treeData !== undefined &&
|
|
126
|
+
fetchStructureState.graphFetchTreeState.treeData.rootIds.length > 0))
|
|
127
|
+
) {
|
|
128
|
+
return true;
|
|
129
|
+
}
|
|
130
|
+
return (
|
|
131
|
+
fetchStructureState.projectionState.usedPropertyNodeIds.includes(node.id) ||
|
|
132
|
+
(fetchStructureState.graphFetchTreeState.treeData !== undefined &&
|
|
133
|
+
fetchStructureState.graphFetchTreeState.treeData.rootIds.length > 0 &&
|
|
134
|
+
(Array.from(
|
|
135
|
+
guaranteeNonNullable(
|
|
136
|
+
fetchStructureState.graphFetchTreeState.treeData,
|
|
137
|
+
).nodes.values(),
|
|
138
|
+
).find((n) => n.id === node.id) !== undefined ||
|
|
139
|
+
Array.from(
|
|
140
|
+
guaranteeNonNullable(
|
|
141
|
+
fetchStructureState.graphFetchTreeState.treeData,
|
|
142
|
+
).nodes.values(),
|
|
143
|
+
).find((n) => n.id.split(TYPE_CAST_TOKEN)[0] === node.id) !==
|
|
144
|
+
undefined))
|
|
145
|
+
);
|
|
146
|
+
};
|
|
147
|
+
|
|
114
148
|
export const QueryBuilderSubclassInfoTooltip: React.FC<{
|
|
115
149
|
subclass: Class;
|
|
116
150
|
path: string;
|
|
@@ -429,6 +463,13 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
|
|
|
429
463
|
!node.mappingData.mapped,
|
|
430
464
|
'query-builder-explorer-tree__node__container--selected':
|
|
431
465
|
node.isSelected,
|
|
466
|
+
|
|
467
|
+
'query-builder-explorer-tree__node__container--highlighted':
|
|
468
|
+
explorerState.highlightUsedProperties &&
|
|
469
|
+
isNodeAlreadyUsed(
|
|
470
|
+
node,
|
|
471
|
+
explorerState.queryBuilderState.fetchStructureState,
|
|
472
|
+
),
|
|
432
473
|
},
|
|
433
474
|
)}
|
|
434
475
|
title={
|
|
@@ -744,6 +785,10 @@ export const QueryBuilderExplorerPanel = observer(
|
|
|
744
785
|
explorerState.setHumanizePropertyName(
|
|
745
786
|
!explorerState.humanizePropertyName,
|
|
746
787
|
);
|
|
788
|
+
const toggleHighlightUsedProperties = (): void =>
|
|
789
|
+
explorerState.setHighlightUsedProperties(
|
|
790
|
+
!explorerState.highlightUsedProperties,
|
|
791
|
+
);
|
|
747
792
|
const togglePropertySearch = (): void => {
|
|
748
793
|
if (explorerState.treeData) {
|
|
749
794
|
if (!propertySearchPanelState.isSearchPanelOpen) {
|
|
@@ -823,6 +868,16 @@ export const QueryBuilderExplorerPanel = observer(
|
|
|
823
868
|
Humanize Property Name
|
|
824
869
|
</MenuContentItemLabel>
|
|
825
870
|
</MenuContentItem>
|
|
871
|
+
<MenuContentItem onClick={toggleHighlightUsedProperties}>
|
|
872
|
+
<MenuContentItemIcon>
|
|
873
|
+
{explorerState.highlightUsedProperties ? (
|
|
874
|
+
<CheckIcon />
|
|
875
|
+
) : null}
|
|
876
|
+
</MenuContentItemIcon>
|
|
877
|
+
<MenuContentItemLabel>
|
|
878
|
+
Highlight already used properties
|
|
879
|
+
</MenuContentItemLabel>
|
|
880
|
+
</MenuContentItem>
|
|
826
881
|
</MenuContent>
|
|
827
882
|
}
|
|
828
883
|
menuProps={{
|
|
@@ -85,6 +85,19 @@ export enum QUERY_BUILDER_EXPLORER_TREE_DND_TYPE {
|
|
|
85
85
|
PRIMITIVE_PROPERTY = 'PRIMITIVE_PROPERTY',
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
export const getPropertyNodeId = (
|
|
89
|
+
parentId: string,
|
|
90
|
+
propertyName: string,
|
|
91
|
+
): string => (parentId ? `${parentId}.${propertyName}` : propertyName);
|
|
92
|
+
|
|
93
|
+
export const getPropertyNodeIdForSubType = (
|
|
94
|
+
parentId: string,
|
|
95
|
+
subClassPath: string,
|
|
96
|
+
): string =>
|
|
97
|
+
parentId
|
|
98
|
+
? `${parentId}${TYPE_CAST_TOKEN}${subClassPath}`
|
|
99
|
+
: `${TYPE_CAST_TOKEN}${subClassPath}`;
|
|
100
|
+
|
|
88
101
|
export interface QueryBuilderExplorerTreeDragSource {
|
|
89
102
|
node: QueryBuilderExplorerTreePropertyNodeData;
|
|
90
103
|
}
|
|
@@ -385,11 +398,12 @@ export const getQueryBuilderPropertyNodeData = (
|
|
|
385
398
|
return undefined;
|
|
386
399
|
}
|
|
387
400
|
const propertyNode = new QueryBuilderExplorerTreePropertyNodeData(
|
|
388
|
-
|
|
401
|
+
getPropertyNodeId(
|
|
389
402
|
parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
390
403
|
? ''
|
|
391
|
-
:
|
|
392
|
-
|
|
404
|
+
: parentNode.id,
|
|
405
|
+
property.name,
|
|
406
|
+
),
|
|
393
407
|
property.name,
|
|
394
408
|
`${
|
|
395
409
|
parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
@@ -414,11 +428,12 @@ export const getQueryBuilderSubTypeNodeData = (
|
|
|
414
428
|
modelCoverageAnalysisResult: MappingModelCoverageAnalysisResult,
|
|
415
429
|
): QueryBuilderExplorerTreeSubTypeNodeData => {
|
|
416
430
|
const subTypeNode = new QueryBuilderExplorerTreeSubTypeNodeData(
|
|
417
|
-
|
|
431
|
+
getPropertyNodeIdForSubType(
|
|
418
432
|
parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
419
|
-
?
|
|
420
|
-
:
|
|
421
|
-
|
|
433
|
+
? ''
|
|
434
|
+
: parentNode.id,
|
|
435
|
+
subclass.path,
|
|
436
|
+
),
|
|
422
437
|
subclass.name,
|
|
423
438
|
`${
|
|
424
439
|
parentNode instanceof QueryBuilderExplorerTreeRootNodeData
|
|
@@ -464,7 +479,6 @@ const getQueryBuilderTreeData = (
|
|
|
464
479
|
'@dummy_rootNode',
|
|
465
480
|
rootClass.name,
|
|
466
481
|
rootClass.path,
|
|
467
|
-
|
|
468
482
|
false,
|
|
469
483
|
rootClass,
|
|
470
484
|
mappingData,
|
|
@@ -536,6 +550,7 @@ export class QueryBuilderExplorerState {
|
|
|
536
550
|
treeData?: TreeData<QueryBuilderExplorerTreeNodeData> | undefined;
|
|
537
551
|
humanizePropertyName = true;
|
|
538
552
|
showUnmappedProperties = false;
|
|
553
|
+
highlightUsedProperties = true;
|
|
539
554
|
propertySearchPanelState: QueryBuilderPropertySearchPanelState;
|
|
540
555
|
mappingModelCoverageAnalysisResult?: MappingModelCoverageAnalysisResult;
|
|
541
556
|
mappingModelCoverageAnalysisState = ActionState.create();
|
|
@@ -545,12 +560,14 @@ export class QueryBuilderExplorerState {
|
|
|
545
560
|
queryBuilderState: false,
|
|
546
561
|
previewDataState: false,
|
|
547
562
|
treeData: observable.ref,
|
|
563
|
+
highlightUsedProperties: observable,
|
|
548
564
|
setTreeData: action,
|
|
549
565
|
refreshTree: action,
|
|
550
566
|
refreshTreeData: action,
|
|
551
567
|
setHumanizePropertyName: action,
|
|
552
568
|
setShowUnmappedProperties: action,
|
|
553
569
|
previewData: flow,
|
|
570
|
+
setHighlightUsedProperties: action,
|
|
554
571
|
analyzeMappingModelCoverage: flow,
|
|
555
572
|
});
|
|
556
573
|
|
|
@@ -587,6 +604,10 @@ export class QueryBuilderExplorerState {
|
|
|
587
604
|
this.showUnmappedProperties = val;
|
|
588
605
|
}
|
|
589
606
|
|
|
607
|
+
setHighlightUsedProperties(val: boolean): void {
|
|
608
|
+
this.highlightUsedProperties = val;
|
|
609
|
+
}
|
|
610
|
+
|
|
590
611
|
refreshTreeData(): void {
|
|
591
612
|
const _class = this.queryBuilderState.querySetupState._class;
|
|
592
613
|
const _mapping = this.queryBuilderState.querySetupState.mapping;
|