@finos/legend-application-query 13.8.1 → 13.8.2

package/lib/stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js

@@ -19,16 +19,28 @@ import { resolveVersion, } from '@finos/legend-server-depot';
 import { LegendSDLC, } from '@finos/legend-graph';
 import { generateDataProductNativeRoute, generateDataProductModelRoute, } from '../../../__lib__/LegendQueryNavigation.js';
 import { compareLabelFn } from '@finos/legend-art';
+import { ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-dsl-data-space/application';
 import { flowResult } from 'mobx';
 export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBuilderState {
     depotServerClient;
     project;
+    onLegacyDataSpaceChange;
     productSelectorState;
-    constructor(applicationStore, graphManagerState, workflow, actionConfig, dataProduct, artifact, executionState, depotServerClient, project, onDataProductChange, productSelectorState, onExecutionContextChange, onClassChange, config, sourceInfo) {
+    constructor(applicationStore, graphManagerState, workflow, actionConfig, dataProduct, artifact, executionState, depotServerClient, project, onDataProductChange, productSelectorState, onLegacyDataSpaceChange, onExecutionContextChange, onClassChange, config, sourceInfo) {
         super(applicationStore, graphManagerState, workflow, dataProduct, artifact, actionConfig, executionState, undefined, onDataProductChange, onExecutionContextChange, onClassChange, config, sourceInfo);
         this.project = project;
         this.depotServerClient = depotServerClient;
         this.productSelectorState = productSelectorState;
+        this.onLegacyDataSpaceChange = onLegacyDataSpaceChange;
+    }
+    handleDataProductChange(val) {
+        if (val instanceof ResolvedDataSpaceEntityWithOrigin &&
+            this.onLegacyDataSpaceChange) {
+            this.onLegacyDataSpaceChange(val);
+        }
+        else {
+            super.handleDataProductChange(val);
+        }
     }
     get dataProductOptions() {
         const graphOptions = super.dataProductOptions;
@@ -42,8 +54,6 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
         return [...graphOptions, ...uniqueDepotOptions].sort(compareLabelFn);
     }
     *loadEntities() {
-        yield flowResult(super.loadEntities());
-        // also ensure the shared selector has loaded depot-level entities
         if (!this.productSelectorState.isCompletelyLoaded) {
             yield flowResult(this.productSelectorState.loadProducts());
         }

package/lib/stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryDataProductQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LegendQueryDataProductQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.ts"],"names":[],"mappings":"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"}

package/lib/stores/data-space/DataProductQueryCreatorStore.d.ts

@@ -20,7 +20,7 @@ import { type QueryBuilderState } from '@finos/legend-query-builder';
 import { type ProjectGAVCoordinates, type DepotEntityWithOrigin } from '@finos/legend-storage';
 import { QueryEditorStore, type QueryPersistConfiguration } from '../QueryEditorStore.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
-import { type DataSpaceQueryBuilderState, ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-dsl-data-space/application';
+import { type DataSpaceQueryBuilderState, type ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-dsl-data-space/application';
 import { DataProductSelectorState } from './DataProductSelectorState.js';
 import { type VisitedLegacyDataProduct, type VisitedDataProduct } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
 import { LegendQueryBareQueryBuilderState } from './LegendQueryBareQueryBuilderState.js';

package/lib/stores/data-space/DataProductQueryCreatorStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataProductQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataProductQueryCreatorStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataProductQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataProductQueryCreatorStore.ts"],"names":[],"mappings":"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"}

package/lib/stores/data-space/DataProductQueryCreatorStore.js

@@ -20,7 +20,8 @@ import { QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
 import { parseGACoordinates, } from '@finos/legend-storage';
 import { getDataSpace, } from '@finos/legend-extension-dsl-data-space/graph';
 import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, } from '../QueryEditorStore.js';
-import { ResolvedDataSpaceEntityWithOrigin, createQueryClassTaggedValue, createQueryDataSpaceTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
+import { createQueryClassTaggedValue, createQueryDataSpaceTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
+import { createQueryDataProductTaggedValue } from '../../components/data-product/QueryDataProductUtil.js';
 import { DataProductSelectorState } from './DataProductSelectorState.js';
 import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 import { createVisitedDataSpaceId, createVisitedDataProductId, hasDataSpaceInfoBeenVisited, createSimpleVisitedDataspace, createSimpleVisitedDataProduct, } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
@@ -197,12 +198,9 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
         const artifact = _artifact ??
             (await this.fetchDataProductArtifact(queryableDataProduct.groupId, queryableDataProduct.artifactId, queryableDataProduct.versionId, queryableDataProduct.dataProductPath));
         const queryBuilderState = await this.buildDataProductQueryBuilderState(queryableDataProduct.groupId, queryableDataProduct.artifactId, queryableDataProduct.versionId, queryableDataProduct.dataProductPath, artifact, queryableDataProduct.id, queryableDataProduct.dataProductType, async (dataProductInfo) => {
-            if (dataProductInfo instanceof ResolvedDataSpaceEntityWithOrigin) {
-                flowResult(this.changeDataSpace(dataProductInfo)).catch(this.applicationStore.alertUnhandledError);
-            }
-            else {
-                flowResult(this.changeDataProduct(dataProductInfo)).catch(this.applicationStore.alertUnhandledError);
-            }
+            flowResult(this.changeDataProduct(dataProductInfo)).catch(this.applicationStore.alertUnhandledError);
+        }, (dataSpaceInfo) => {
+            flowResult(this.changeDataSpace(dataSpaceInfo)).catch(this.applicationStore.alertUnhandledError);
         }, this.productSelectorState);
         // add to visited data products
         this.addVisitedProduct(queryableDataProduct, artifact);
@@ -321,7 +319,15 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
                     if (this.queryBuilderState?.class) {
                         taggedValues.push(createQueryClassTaggedValue(this.queryBuilderState.class.path));
                     }
-                    taggedValues.push(createQueryDataSpaceTaggedValue(element.path));
+                    if (element instanceof QueryableDataProduct) {
+                        // For new DataProducts, use the 'dataProduct' tagged value so the
+                        // query is not mis-classified as a DataSpace when reopened.
+                        taggedValues.push(createQueryDataProductTaggedValue(element.path));
+                    }
+                    else {
+                        // Legacy DataSpace-based products use the 'dataSpace' tagged value.
+                        taggedValues.push(createQueryDataSpaceTaggedValue(element.path));
+                    }
                     query.taggedValues = taggedValues;
                 },
             };
@@ -378,7 +384,9 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
                 }),
             ];
             val.taggedValues = [
-                createQueryDataSpaceTaggedValue(this.queryableElement.path),
+                this.queryableElement instanceof QueryableDataProduct
+                    ? createQueryDataProductTaggedValue(this.queryableElement.path)
+                    : createQueryDataSpaceTaggedValue(this.queryableElement.path),
             ];
             val.combineTaggedValuesCondition = true;
         }

package/lib/stores/data-space/DataProductQueryCreatorStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataProductQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataProductQueryCreatorStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataProductQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataProductQueryCreatorStore.ts"],"names":[],"mappings":"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"}

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.d.ts

@@ -18,7 +18,7 @@ import { type DataSpaceExecutionContext, type DataSpace, type DataSpaceExecutabl
 import { type DataSpaceOption } from '@finos/legend-extension-dsl-data-space/application-query';
 import { type DepotServerClient } from '@finos/legend-server-depot';
 import { LegendSDLC, type Class, type GraphData, type GraphManagerState, type Runtime } from '@finos/legend-graph';
-import { ExtraOptionsConfig, type QueryBuilderActionConfig, type QueryBuilderConfig, type QueryBuilderWorkflowState } from '@finos/legend-query-builder';
+import { type QueryBuilderActionConfig, type QueryBuilderConfig, type QueryBuilderWorkflowState } from '@finos/legend-query-builder';
 import type { LegendQueryApplicationStore } from '../../LegendQueryBaseStore.js';
 import type { GeneratorFn } from '@finos/legend-shared';
 import type { DepotEntityWithOrigin, ProjectGAVCoordinates, QueryableSourceInfo } from '@finos/legend-storage';
@@ -30,8 +30,9 @@ export declare class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQuer
     applicationStore: LegendQueryApplicationStore;
     depotServerClient: DepotServerClient;
     project: ProjectGAVCoordinates;
-    extraOptionsConfig: ExtraOptionsConfig<DepotEntityWithOrigin>;
+    readonly onDataProductChange: (val: DepotEntityWithOrigin) => void;
     productSelectorState: DataProductSelectorState;
+    TEMPORARY__setupPanelContentRenderer: () => React.ReactNode;
     constructor(applicationStore: LegendQueryApplicationStore, graphManagerState: GraphManagerState, workflow: QueryBuilderWorkflowState, actionConfig: QueryBuilderActionConfig, dataSpace: DataSpace, executionContext: DataSpaceExecutionContext, isLightGraphEnabled: boolean, depotServerClient: DepotServerClient, project: ProjectGAVCoordinates, prioritizeEntityFunc: ((val: ResolvedDataSpaceEntityWithOrigin) => boolean) | undefined, onDataSpaceChange: (val: ResolvedDataSpaceEntityWithOrigin) => Promise<void>, productSelectorState: DataProductSelectorState, onDataProductChange: (val: DepotEntityWithOrigin) => void, dataSpaceAnalysisResult?: DataSpaceAnalysisResult | undefined, onExecutionContextChange?: ((val: DataSpaceExecutionContext) => void) | undefined, onRuntimeChange?: ((val: Runtime) => void) | undefined, onClassChange?: ((val: Class) => void) | undefined, config?: QueryBuilderConfig | undefined, sourceInfo?: QueryableSourceInfo | undefined);
     get isAdvancedDataSpaceSearchEnabled(): boolean;
     get canVisitTemplateQuery(): boolean;

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js

@@ -19,7 +19,8 @@ import { generateDataSpaceQueryCreatorRoute, generateDataSpaceTemplateQueryCreat
 import { DataSpaceAdvancedSearchState, } from '@finos/legend-extension-dsl-data-space/application-query';
 import { resolveVersion, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
 import { GraphDataWithOrigin, LegendSDLC, RuntimePointer, } from '@finos/legend-graph';
-import { ExtraOptionsConfig, } from '@finos/legend-query-builder';
+import {} from '@finos/legend-query-builder';
+import { renderLegendQueryDataSpaceQueryBuilderSetupPanelContent } from '../../../components/data-space/LegendQueryDataSpaceQueryBuilder.js';
 import { createViewProjectHandler, createViewSDLCProjectHandler, } from '../DataSpaceQueryBuilderHelper.js';
 import { flowResult } from 'mobx';
 /**
@@ -28,16 +29,15 @@ import { flowResult } from 'mobx';
 export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilderState {
     depotServerClient;
     project;
+    onDataProductChange;
     productSelectorState;
+    TEMPORARY__setupPanelContentRenderer = () => renderLegendQueryDataSpaceQueryBuilderSetupPanelContent(this);
     constructor(applicationStore, graphManagerState, workflow, actionConfig, dataSpace, executionContext, isLightGraphEnabled, depotServerClient, project, prioritizeEntityFunc, onDataSpaceChange, productSelectorState, onDataProductChange, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, config, sourceInfo) {
         super(applicationStore, graphManagerState, workflow, actionConfig, dataSpace, executionContext, isLightGraphEnabled, prioritizeEntityFunc, onDataSpaceChange, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, config, sourceInfo);
         this.project = project;
         this.depotServerClient = depotServerClient;
         this.productSelectorState = productSelectorState;
-        this.extraOptionsConfig = new ExtraOptionsConfig('DataProduct', 'DEPOT_ENTITY_WITH_ORIGIN', productSelectorState.dataProducts?.map((e) => ({
-            label: e.name,
-            value: e,
-        })), undefined, onDataProductChange, undefined, undefined);
+        this.onDataProductChange = onDataProductChange;
     }
     get isAdvancedDataSpaceSearchEnabled() {
         return true;
@@ -55,10 +55,6 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
         this.entities = dataspaces;
         if (products) {
             this.productSelectorState.setDataProducts(products);
-            this.extraOptionsConfig.setOptions(products.map((e) => ({
-                label: e.path,
-                value: e,
-            })));
         }
         return this;
     }
@@ -93,12 +89,6 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
                     yield flowResult(this.productSelectorState.loadProducts());
                 }
                 this.entities = this.productSelectorState.legacyDataProducts;
-                if (this.productSelectorState.dataProducts) {
-                    this.extraOptionsConfig.setOptions(this.productSelectorState.dataProducts.map((e) => ({
-                        label: e.name,
-                        value: e,
-                    })));
-                }
                 this.loadEntitiesState.pass();
             }
             catch {

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.8.1",
+  "version": "13.8.2",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -44,14 +44,14 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.101",
+    "@finos/legend-application": "16.0.102",
     "@finos/legend-art": "7.1.145",
     "@finos/legend-code-editor": "2.0.160",
-    "@finos/legend-data-cube": "0.3.76",
-    "@finos/legend-extension-dsl-data-space": "10.4.204",
+    "@finos/legend-data-cube": "0.3.77",
+    "@finos/legend-extension-dsl-data-space": "10.4.205",
     "@finos/legend-graph": "32.4.0",
-    "@finos/legend-lego": "2.0.178",
-    "@finos/legend-query-builder": "4.17.96",
+    "@finos/legend-lego": "2.0.179",
+    "@finos/legend-query-builder": "4.17.97",
     "@finos/legend-server-depot": "6.1.10",
     "@finos/legend-server-lakehouse": "0.3.41",
     "@finos/legend-shared": "11.0.23",
@@ -62,10 +62,10 @@
     "@types/react-dom": "19.0.4",
     "mobx": "6.13.6",
     "mobx-react-lite": "4.1.0",
-    "oidc-client-ts": "^3.2.0",
+    "oidc-client-ts": "3.2.0",
     "react": "19.0.1",
     "react-dom": "19.0.1",
-    "react-oidc-context": "^3.3.0",
+    "react-oidc-context": "3.3.0",
     "reactflow": "11.11.4",
     "serializr": "3.0.3"
   },

package/src/components/__test-utils__/QueryEditorComponentTestUtils.tsx

@@ -577,6 +577,7 @@ export const TEST__setUpDataProductExistingQueryEditor = async (
     ),
     undefined,
     undefined,
+    undefined,
     MOCK__editorStore.applicationStore.config.options.queryBuilderConfig,
     {
       groupId: 'test.group',
@@ -778,6 +779,7 @@ export const TEST__setUpDataProductNativeExistingQueryEditor = async (
     ),
     undefined,
     undefined,
+    undefined,
     MOCK__editorStore.applicationStore.config.options.queryBuilderConfig,
     {
       groupId: 'test.group',

package/src/components/data-product/LegendQueryDataProductQueryBuilder.tsx

@@ -45,6 +45,7 @@ import { observer } from 'mobx-react-lite';
 import { LakehouseRuntime } from '@finos/legend-graph';
 import { useEffect, useState } from 'react';
 import type { LegendQueryDataProductQueryBuilderState } from '../../stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
+import { formatDataProductOptionLabel } from '../shared/LegendQueryDataProductOptionLabel.js';
 import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 
 /**
@@ -240,6 +241,12 @@ const LegendDataProductQueryBuilderSetupPanelContent = observer(
         <div className="query-builder__setup__config-group__content">
           <DataProductQueryBuilderSetupFormContent
             queryBuilderState={queryBuilderState}
+            formatOptionLabel={formatDataProductOptionLabel}
+            isLoading={
+              queryBuilderState.productSelectorState.loadProductsState
+                .isInProgress ||
+              queryBuilderState.loadDataProductModelState.isInProgress
+            }
           />
         </div>
         {executionState instanceof

package/src/components/data-product/QueryDataProductUtil.ts

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  QUERY_PROFILE_PATH,
+  QueryTaggedValue,
+  isValidFullPath,
+  type Query,
+} from '@finos/legend-graph';
+
+export const QUERY_PROFILE_TAG_DATA_PRODUCT = 'dataProduct';
+
+export const createQueryDataProductTaggedValue = (
+  dataProductPath: string,
+): QueryTaggedValue => {
+  const taggedValue = new QueryTaggedValue();
+  taggedValue.profile = QUERY_PROFILE_PATH;
+  taggedValue.tag = QUERY_PROFILE_TAG_DATA_PRODUCT;
+  taggedValue.value = dataProductPath;
+  return taggedValue;
+};
+
+export const getDataProductQueryExecutionInfo = (
+  query: Query,
+): string | undefined => {
+  const dataProductTaggedValue = query.taggedValues?.find(
+    (taggedValue) =>
+      taggedValue.profile === QUERY_PROFILE_PATH &&
+      taggedValue.tag === QUERY_PROFILE_TAG_DATA_PRODUCT &&
+      isValidFullPath(taggedValue.value),
+  );
+  return dataProductTaggedValue?.value;
+};