@finos/legend-application-query 13.7.205 → 13.8.1

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

@@ -20,7 +20,7 @@ import type { ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-
 import type { DepotEntityWithOrigin } from '@finos/legend-storage';
 import { type QueryEditorStore } from '../QueryEditorStore.js';
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
-import { DataProductSelectorState } from './DataSpaceQueryCreatorStore.js';
+import { DataProductSelectorState } from './DataProductSelectorState.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
 export declare class LegendQueryBareQueryBuilderState extends BaseQueryBuilderState {
     applicationStore: LegendQueryApplicationStore;

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

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryBareQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/LegendQueryBareQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EACL,KAAK,kBAAkB,EAEvB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AAC5G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AACxG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK3E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,qBAAa,gCAAiC,SAAQ,qBAAqB;IACjE,gBAAgB,EAAE,2BAA2B,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE;QACvB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iCAAiC,KAAK,IAAI,CAAC;QACpE,mBAAmB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAC;KAC3D,CAAC;IAEO,oCAAoC,QAAO,KAAK,CAAC,SAAS,CAChB;IAEnD,mBAAmB,UAAS;IAC5B,mBAAmB,EAAG,OAAO,CAAC;IAC9B,oBAAoB,EAAE,wBAAwB,CAAC;IAG/C,mBAAmB,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;gBAG7D,WAAW,EAAE,gBAAgB,EAC7B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE;QACd,iBAAiB,EAAE,CAAC,GAAG,EAAE,iCAAiC,KAAK,IAAI,CAAC;QACpE,mBAAmB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAC;KAC3D,EACD,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,oBAAoB,EAAE,wBAAwB,GAAG,SAAS;IA0B5D,IAAa,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,uBAAuB,IAAI,IAAI;IAe/B,uBAAuB,IAAI,IAAI;CAGhC"}
+{"version":3,"file":"LegendQueryBareQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/LegendQueryBareQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EACL,KAAK,kBAAkB,EAEvB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AAC5G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AACxG,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKzE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,qBAAa,gCAAiC,SAAQ,qBAAqB;IACjE,gBAAgB,EAAE,2BAA2B,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE;QACvB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iCAAiC,KAAK,IAAI,CAAC;QACpE,mBAAmB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAC;KAC3D,CAAC;IAEO,oCAAoC,QAAO,KAAK,CAAC,SAAS,CAChB;IAEnD,mBAAmB,UAAS;IAC5B,mBAAmB,EAAG,OAAO,CAAC;IAC9B,oBAAoB,EAAE,wBAAwB,CAAC;IAG/C,mBAAmB,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;gBAG7D,WAAW,EAAE,gBAAgB,EAC7B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE;QACd,iBAAiB,EAAE,CAAC,GAAG,EAAE,iCAAiC,KAAK,IAAI,CAAC;QACpE,mBAAmB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAC;KAC3D,EACD,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,oBAAoB,EAAE,wBAAwB,GAAG,SAAS;IA0B5D,IAAa,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,uBAAuB,IAAI,IAAI;IAe/B,uBAAuB,IAAI,IAAI;CAGhC"}

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

@@ -20,7 +20,7 @@ import { QueryBuilderDataBrowserWorkflow, BaseQueryBuilderState, } from '@finos/
 import { QueryBuilderActionConfig_QueryApplication, } from '../QueryEditorStore.js';
 import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/data-space/DataSpaceQuerySetup.js';
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
-import { DataProductSelectorState } from './DataSpaceQueryCreatorStore.js';
+import { DataProductSelectorState } from './DataProductSelectorState.js';
 import { createViewProjectHandler, createViewSDLCProjectHandler, } from './DataSpaceQueryBuilderHelper.js';
 export class LegendQueryBareQueryBuilderState extends BaseQueryBuilderState {
     editorStore;

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

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryBareQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/data-space/LegendQueryBareQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAA0B,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAA0B,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EAEL,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,yCAAyC,GAE1C,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,0CAA0C,EAAE,MAAM,oDAAoD,CAAC;AAChH,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AACxG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAG1C,MAAM,OAAO,gCAAiC,SAAQ,qBAAqB;IAEzE,WAAW,CAAmB;IACrB,iBAAiB,CAAoB;IACrC,cAAc,CAGrB;IAEO,oCAAoC,GAAG,GAAoB,EAAE,CACpE,0CAA0C,CAAC,IAAI,CAAC,CAAC;IAEnD,mBAAmB,GAAG,KAAK,CAAC;IAC5B,mBAAmB,CAAW;IAC9B,oBAAoB,CAA2B;IAE/C,iBAAiB;IACjB,mBAAmB,CAA4C;IAE/D,YACE,WAA6B,EAC7B,gBAA6C,EAC7C,iBAAoC,EACpC,iBAAoC,EACpC,cAGC,EACD,MAAsC,EACtC,oBAA0D;QAE1D,KAAK,CACH,gBAAgB,EAChB,iBAAiB,EACjB,+BAA+B,CAAC,QAAQ,EACxC,MAAM,CACP,CAAC;QAEF,cAAc,CAAC,IAAI,EAAE;YACnB,mBAAmB,EAAE,UAAU;YAC/B,uBAAuB,EAAE,MAAM;YAC/B,uBAAuB,EAAE,MAAM;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAC3D,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,oBAAoB;YACvB,oBAAoB;gBACpB,IAAI,wBAAwB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,wCAAwC,CAAC;IAClD,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,IAAI,4BAA4B,CACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB;YACE,WAAW,EAAE,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAC5D,eAAe,EAAE,4BAA4B,CAC3C,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,CACvB;SACF,CACF,CAAC;IACJ,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;CACF"}
+{"version":3,"file":"LegendQueryBareQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/data-space/LegendQueryBareQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAA0B,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAA0B,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EAEL,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,yCAAyC,GAE1C,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,0CAA0C,EAAE,MAAM,oDAAoD,CAAC;AAChH,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AACxG,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAG1C,MAAM,OAAO,gCAAiC,SAAQ,qBAAqB;IAEzE,WAAW,CAAmB;IACrB,iBAAiB,CAAoB;IACrC,cAAc,CAGrB;IAEO,oCAAoC,GAAG,GAAoB,EAAE,CACpE,0CAA0C,CAAC,IAAI,CAAC,CAAC;IAEnD,mBAAmB,GAAG,KAAK,CAAC;IAC5B,mBAAmB,CAAW;IAC9B,oBAAoB,CAA2B;IAE/C,iBAAiB;IACjB,mBAAmB,CAA4C;IAE/D,YACE,WAA6B,EAC7B,gBAA6C,EAC7C,iBAAoC,EACpC,iBAAoC,EACpC,cAGC,EACD,MAAsC,EACtC,oBAA0D;QAE1D,KAAK,CACH,gBAAgB,EAChB,iBAAiB,EACjB,+BAA+B,CAAC,QAAQ,EACxC,MAAM,CACP,CAAC;QAEF,cAAc,CAAC,IAAI,EAAE;YACnB,mBAAmB,EAAE,UAAU;YAC/B,uBAAuB,EAAE,MAAM;YAC/B,uBAAuB,EAAE,MAAM;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAC3D,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,oBAAoB;YACvB,oBAAoB;gBACpB,IAAI,wBAAwB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,wCAAwC,CAAC;IAClD,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,IAAI,4BAA4B,CACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB;YACE,WAAW,EAAE,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAC5D,eAAe,EAAE,4BAA4B,CAC3C,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,CACvB;SACF,CACF,CAAC;IACJ,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;CACF"}

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

@@ -20,8 +20,9 @@ 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 { LegendQueryApplicationStore } from '../../LegendQueryBaseStore.js';
-import { type GeneratorFn } from '@finos/legend-shared';
+import type { GeneratorFn } from '@finos/legend-shared';
 import type { DepotEntityWithOrigin, ProjectGAVCoordinates, QueryableSourceInfo } from '@finos/legend-storage';
+import type { DataProductSelectorState } from '../DataProductSelectorState.js';
 /**
  * Legend Query DataSpace query builder state.
  */
@@ -29,9 +30,9 @@ export declare class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQuer
     applicationStore: LegendQueryApplicationStore;
     depotServerClient: DepotServerClient;
     project: ProjectGAVCoordinates;
-    disableDataProducts: boolean;
     extraOptionsConfig: ExtraOptionsConfig<DepotEntityWithOrigin>;
-    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>, dataSpaceAnalysisResult?: DataSpaceAnalysisResult | undefined, onExecutionContextChange?: ((val: DataSpaceExecutionContext) => void) | undefined, onRuntimeChange?: ((val: Runtime) => void) | undefined, onClassChange?: ((val: Class) => void) | undefined, config?: QueryBuilderConfig | undefined, sourceInfo?: QueryableSourceInfo | undefined);
+    productSelectorState: DataProductSelectorState;
+    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;
     get sdlc(): LegendSDLC;

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":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,iCAAiC,EAClC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,KAAK,yBAAyB,EAE9B,KAAK,SAAS,EACd,KAAK,iCAAiC,EACtC,KAAK,uBAAuB,EAC7B,MAAM,8CAA8C,CAAC;AAKtD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,UAAU,EAEV,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC/B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAKjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EACV,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE/E;;GAEG;AACH,qBAAa,qCAAsC,SAAQ,0BAA0B;IAC3E,gBAAgB,EAAE,2BAA2B,CAAC;IACtD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,qBAAqB,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;IACtE,oBAAoB,EAAE,wBAAwB,CAAC;gBAG7C,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,yBAAyB,EACnC,YAAY,EAAE,wBAAwB,EACtC,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,yBAAyB,EAC3C,mBAAmB,EAAE,OAAO,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,qBAAqB,EAC9B,oBAAoB,EAChB,CAAC,CAAC,GAAG,EAAE,iCAAiC,KAAK,OAAO,CAAC,GACrD,SAAS,EACb,iBAAiB,EAAE,CACjB,GAAG,EAAE,iCAAiC,KACnC,OAAO,CAAC,IAAI,CAAC,EAClB,oBAAoB,EAAE,wBAAwB,EAC9C,mBAAmB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,EACzD,uBAAuB,CAAC,EAAE,uBAAuB,GAAG,SAAS,EAC7D,wBAAwB,CAAC,EACrB,CAAC,CAAC,GAAG,EAAE,yBAAyB,KAAK,IAAI,CAAC,GAC1C,SAAS,EACb,eAAe,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,EACtD,aAAa,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,EAClD,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,EACvC,UAAU,CAAC,EAAE,mBAAmB,GAAG,SAAS;IAoC9C,IAAa,gCAAgC,IAAI,OAAO,CAEvD;IAED,IAAa,qBAAqB,IAAI,OAAO,CAE5C;IAED,IAAI,IAAI,IAAI,UAAU,CAMrB;IAED,IAAa,mBAAmB,IAAI,OAAO,CAE1C;IAED,WAAW,CACT,UAAU,EAAE,iCAAiC,EAAE,GAAG,SAAS,EAC3D,QAAQ,EAAE,qBAAqB,EAAE,GAAG,SAAS,GAC5C,qCAAqC;IAc/B,4BAA4B,IAAI,IAAI;IAiC7C,IAAa,uBAAuB,IAAI,eAAe,CAetD;IAES,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC;IAwBlC,kBAAkB,CACzB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,iCAAiC,GAC1C,IAAI;IA4BE,uBAAuB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IA2BnD,YAAY,IAAI,SAAS;CAGnC"}

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

@@ -14,27 +14,30 @@
  * limitations under the License.
  */
 import { DataSpaceQueryBuilderState, ResolvedDataSpaceEntityWithOrigin, } from '@finos/legend-extension-dsl-data-space/application';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH, DataSpaceServiceExecutableInfo, extractDataSpaceInfo, } from '@finos/legend-extension-dsl-data-space/graph';
+import { DataSpaceServiceExecutableInfo, } from '@finos/legend-extension-dsl-data-space/graph';
 import { generateDataSpaceQueryCreatorRoute, generateDataSpaceTemplateQueryCreatorRoute, } from '../../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { DataSpaceAdvancedSearchState, } from '@finos/legend-extension-dsl-data-space/application-query';
-import { DepotScope, extractDepotEntityInfo, resolveVersion, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
-import { CORE_PURE_PATH, GraphDataWithOrigin, LegendSDLC, RuntimePointer, } from '@finos/legend-graph';
+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 { createViewProjectHandler, createViewSDLCProjectHandler, } from '../DataSpaceQueryBuilderHelper.js';
-import { assertErrorThrown, LogEvent, } from '@finos/legend-shared';
-import { APPLICATION_EVENT } from '@finos/legend-application';
+import { flowResult } from 'mobx';
 /**
  * Legend Query DataSpace query builder state.
  */
 export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilderState {
     depotServerClient;
     project;
-    disableDataProducts = false;
-    constructor(applicationStore, graphManagerState, workflow, actionConfig, dataSpace, executionContext, isLightGraphEnabled, depotServerClient, project, prioritizeEntityFunc, onDataSpaceChange, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, config, sourceInfo) {
+    productSelectorState;
+    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.extraOptionsConfig = new ExtraOptionsConfig('DataProduct', 'DEPOT_ENTITY_WITH_ORIGIN', undefined, undefined, (val) => val.path, undefined, undefined);
+        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);
     }
     get isAdvancedDataSpaceSearchEnabled() {
         return true;
@@ -51,6 +54,7 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
     withOptions(dataspaces, products) {
         this.entities = dataspaces;
         if (products) {
+            this.productSelectorState.setDataProducts(products);
             this.extraOptionsConfig.setOptions(products.map((e) => ({
                 label: e.path,
                 value: e,
@@ -83,31 +87,22 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
     *loadEntities() {
         if (this.entities === undefined) {
             this.loadEntitiesState.inProgress();
-            const toGetSnapShot = this.project.versionId === SNAPSHOT_VERSION_ALIAS;
             try {
-                // use promise
-                this.entities = (yield this.depotServerClient.getEntitiesByClassifier(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
-                    scope: toGetSnapShot ? DepotScope.SNAPSHOT : DepotScope.RELEASES,
-                })).map((storedEntity) => extractDataSpaceInfo(storedEntity, toGetSnapShot));
-                const dataProducts = this.disableDataProducts
-                    ? []
-                    : (yield this.depotServerClient.getEntitiesSummaryByClassifier(CORE_PURE_PATH.DATA_PRODUCT, {
-                        scope: DepotScope.RELEASES,
-                        summary: true,
-                    })).map((storedEntity) => {
-                        return extractDepotEntityInfo(storedEntity, false);
-                    });
-                this.extraOptionsConfig.setOptions(dataProducts.map((e) => ({
-                    label: e.name,
-                    value: e,
-                })));
+                // If the selector already has data, use it; otherwise trigger loading
+                if (!this.productSelectorState.isCompletelyLoaded) {
+                    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 (error) {
-                assertErrorThrown(error);
+            catch {
                 this.loadEntitiesState.fail();
-                this.applicationStore.notificationService.notifyError(error);
-                this.applicationStore.logService.error(LogEvent.create(APPLICATION_EVENT.GENERIC_FAILURE), error);
             }
         }
     }

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.7.205",
+  "version": "13.8.1",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -46,13 +46,14 @@
   "dependencies": {
     "@finos/legend-application": "16.0.101",
     "@finos/legend-art": "7.1.145",
-    "@finos/legend-code-editor": "2.0.159",
-    "@finos/legend-data-cube": "0.3.75",
-    "@finos/legend-extension-dsl-data-space": "10.4.202",
-    "@finos/legend-graph": "32.3.39",
-    "@finos/legend-lego": "2.0.177",
-    "@finos/legend-query-builder": "4.17.94",
+    "@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-graph": "32.4.0",
+    "@finos/legend-lego": "2.0.178",
+    "@finos/legend-query-builder": "4.17.96",
     "@finos/legend-server-depot": "6.1.10",
+    "@finos/legend-server-lakehouse": "0.3.41",
     "@finos/legend-shared": "11.0.23",
     "@finos/legend-storage": "3.0.144",
     "@testing-library/dom": "10.4.0",

package/src/__lib__/LegendQueryNavigation.ts

@@ -23,6 +23,7 @@ import {
   stringifyQueryParams,
 } from '@finos/legend-shared';
 import { generateGAVCoordinates } from '@finos/legend-storage';
+import { DataProductAccessType } from '@finos/legend-graph';
 
 export enum LEGEND_QUERY_ROUTE_PATTERN_TOKEN {
   GAV = 'gav',
@@ -35,8 +36,8 @@ export enum LEGEND_QUERY_ROUTE_PATTERN_TOKEN {
 export enum DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN {
   GAV = 'gav',
   DATA_PRODUCT_PATH = 'dataProductPath',
-  EXECUTION_TYPE = 'type',
-  EXECUTION_CONTEXT_KEY = 'executionKey',
+  DATA_PRODUCT_ACCESS_TYPE = 'accessType',
+  DATA_PRODUCT_ACCESS_ID = 'accessId',
 }
 
 export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
@@ -52,41 +53,87 @@ export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   CREATE_FROM_SERVICE_QUERY: `/create-from-service/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV}/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH}`,
   EDIT_EXISTING_QUERY: `/edit/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID}`,
   DATA_CUBE_EXISTING_QUERY: `/edit/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID}/cube`,
-  DATA_PRODUCT: `/data-product/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_TYPE}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT_KEY}`,
+  DATA_PRODUCT: `/data-product/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_TYPE}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_ID}`,
 });
 
 // DataProduct
 
-export enum DATA_PRODUCT_EXECUTION_TYPE {
-  NATIVE = 'native',
-  ACCESS_GROUPS = 'access_groups',
-}
+export type DataProductPathParams = {
+  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH]: string;
+  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_TYPE]: string;
+  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_ID]: string;
+};
 
+/**
+ * Generates a data product route for the given access type.
+ */
 export const generateDataProductRoute = (
   groupId: string,
   artifactId: string,
   versionId: string,
   dataProductPath: string,
   executionType: string,
-  executionContextKey: string,
+  accessPointId: string,
 ): string =>
   generatePath(LEGEND_QUERY_ROUTE_PATTERN.DATA_PRODUCT, {
+    [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_TYPE]:
+      executionType,
     [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]:
       generateGAVCoordinates(groupId, artifactId, versionId),
     [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH]:
       dataProductPath,
-    [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_TYPE]:
-      executionType,
-    [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT_KEY]:
-      executionContextKey,
+    [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_ID]:
+      accessPointId,
   });
 
-export type DataProductPathParams = {
-  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: string;
-  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH]: string;
-  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_TYPE]: string;
-  [DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT_KEY]: string;
-};
+export const generateDataProductNativeRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  dataProductPath: string,
+  accessPointId: string,
+): string =>
+  generateDataProductRoute(
+    groupId,
+    artifactId,
+    versionId,
+    dataProductPath,
+    DataProductAccessType.NATIVE,
+    accessPointId,
+  );
+
+export const generateDataProductModelRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  dataProductPath: string,
+  accessPointId: string,
+): string =>
+  generateDataProductRoute(
+    groupId,
+    artifactId,
+    versionId,
+    dataProductPath,
+    DataProductAccessType.MODEL,
+    accessPointId,
+  );
+
+export const generateDataProductLakehouseRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  dataProductPath: string,
+  accessPointId: string,
+): string =>
+  generateDataProductRoute(
+    groupId,
+    artifactId,
+    versionId,
+    dataProductPath,
+    DataProductAccessType.LAKEHOUSE,
+    accessPointId,
+  );
 
 // setup
 
@@ -291,3 +338,14 @@ export const EXTERNAL_APPLICATION_NAVIGATION__generateNewDataCubeUrl = (
   `${dataCubeApplicationUrl}?sourceData=${encodeURIComponent(
     btoa(JSON.stringify(sourceData)),
   )}`;
+
+/**
+ * @external_application_navigation This depends on Legend Marketplace routing and is hardcoded so it's potentially brittle
+ */
+export const EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl =
+  (
+    marketplaceApplicationUrl: string,
+    dataProductId: string,
+    deploymentId: string,
+  ): string =>
+    `${marketplaceApplicationUrl}/dataProduct/deployed/${dataProductId}/${deploymentId}`;

package/src/__lib__/LegendQueryUserDataHelper.ts

@@ -27,17 +27,27 @@ import {
   createVisitedDataspaceFromInfo,
   createIdFromDataSpaceInfo,
   createVisitedDataSpaceId,
+  createVisitedDataProductId,
+  type VisitedLegacyDataProduct,
   type VisitedDataProduct,
 } from './LegendQueryUserDataSpaceHelper.js';
 import type { ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-dsl-data-space/application';
 
 export enum LEGEND_QUERY_USER_DATA_KEY {
   RECENTLY_VIEWED_QUERIES = 'query-editor.recent-queries',
-  RECENTLY_VIEWED_DATASPACES = 'query-editor.recent-dataSpaces',
+  RECENTLY_VIEWED_LEGACY_DATAPRODUCTS = 'query-editor.recent-dataSpaces',
+  RECENTLY_VIEWED_DATAPRODUCTS = 'query-editor.recent-dataProducts',
+  USER_LAKEHOUSE_INFO = 'query-editor.lakehouse-info',
+}
+
+export interface LakehouseUserInfo {
+  env: string | undefined;
+  snowflakeWarehouse: string | undefined;
 }
 
 export const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
 export const USER_DATA_QUERY_DATASPACE_LIMIT = 10;
+export const USER_DATA_QUERY_DATAPRODUCT_LIMIT = 50;
 
 type SavedData = string[];
 
@@ -132,9 +142,9 @@ export class LegendQueryUserDataHelper {
   // DataSpaces
   static getRecentlyVisitedDataSpaces(
     service: UserDataService,
-  ): VisitedDataProduct[] {
+  ): VisitedLegacyDataProduct[] {
     const data = service.getObjectValue(
-      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_LEGACY_DATAPRODUCTS,
     );
     return (
       // TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
@@ -149,7 +159,7 @@ export class LegendQueryUserDataHelper {
               {
                 data,
               },
-            ) as { data: VisitedDataProduct[] }
+            ) as { data: VisitedLegacyDataProduct[] }
           ).data,
       ) ?? []
     );
@@ -158,7 +168,7 @@ export class LegendQueryUserDataHelper {
   static findRecentlyVisitedDataSpace(
     service: UserDataService,
     id: string,
-  ): VisitedDataProduct | undefined {
+  ): VisitedLegacyDataProduct | undefined {
     return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service).find(
       (v) => v.id === id,
     );
@@ -166,17 +176,18 @@ export class LegendQueryUserDataHelper {
 
   static getRecentlyVisitedDataSpace(
     service: UserDataService,
-  ): VisitedDataProduct | undefined {
+  ): VisitedLegacyDataProduct | undefined {
     return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service)[0];
   }
 
   static persistVisitedDataspace(
     service: UserDataService,
-    value: VisitedDataProduct,
-    persistedData: VisitedDataProduct[],
+    value: VisitedLegacyDataProduct,
+    persistedData: VisitedLegacyDataProduct[],
     limit = USER_DATA_QUERY_DATASPACE_LIMIT,
   ): void {
-    const key = LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES;
+    const key = LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_LEGACY_DATAPRODUCTS;
+    value.lastViewedAt = Date.now();
     const idx = persistedData.findIndex((data) => data.id === value.id);
     if (idx === -1) {
       if (persistedData.length >= limit) {
@@ -192,7 +203,7 @@ export class LegendQueryUserDataHelper {
 
   static removeRecentlyViewedDataSpaces(service: UserDataService): void {
     service.persistValue(
-      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_LEGACY_DATAPRODUCTS,
       [],
     );
   }
@@ -211,7 +222,7 @@ export class LegendQueryUserDataHelper {
     }
     dataSpaces.splice(idx, 1);
     service.persistValue(
-      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_LEGACY_DATAPRODUCTS,
       dataSpaces,
     );
   }
@@ -244,7 +255,7 @@ export class LegendQueryUserDataHelper {
   }
   static addVisitedDatspace(
     service: UserDataService,
-    visited: VisitedDataProduct,
+    visited: VisitedLegacyDataProduct,
   ): void {
     const dataspaces =
       LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
@@ -273,4 +284,158 @@ export class LegendQueryUserDataHelper {
     }
     return false;
   }
+
+  // DataProducts
+  static getRecentlyVisitedDataProducts(
+    service: UserDataService,
+  ): VisitedDataProduct[] {
+    const data = service.getObjectValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATAPRODUCTS,
+    );
+    return (
+      returnUndefOnError(
+        () =>
+          (
+            deserialize(
+              createSimpleSchema({
+                data: raw(),
+              }),
+              {
+                data,
+              },
+            ) as { data: VisitedDataProduct[] }
+          ).data,
+      ) ?? []
+    );
+  }
+
+  static findRecentlyVisitedDataProduct(
+    service: UserDataService,
+    id: string,
+  ): VisitedDataProduct | undefined {
+    return LegendQueryUserDataHelper.getRecentlyVisitedDataProducts(
+      service,
+    ).find((v) => v.id === id);
+  }
+
+  static getRecentlyVisitedDataProduct(
+    service: UserDataService,
+  ): VisitedDataProduct | undefined {
+    return LegendQueryUserDataHelper.getRecentlyVisitedDataProducts(service)[0];
+  }
+
+  static persistVisitedDataProduct(
+    service: UserDataService,
+    value: VisitedDataProduct,
+    persistedData: VisitedDataProduct[],
+    limit = USER_DATA_QUERY_DATAPRODUCT_LIMIT,
+  ): void {
+    const key = LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATAPRODUCTS;
+    value.lastViewedAt = Date.now();
+    const idx = persistedData.findIndex((data) => data.id === value.id);
+    if (idx === -1) {
+      if (persistedData.length >= limit) {
+        persistedData.pop();
+      }
+      persistedData.unshift(value);
+    } else {
+      persistedData.splice(idx, 1);
+      persistedData.unshift(value);
+    }
+    service.persistValue(key, persistedData);
+  }
+
+  static removeRecentlyViewedDataProducts(service: UserDataService): void {
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATAPRODUCTS,
+      [],
+    );
+  }
+
+  static removeRecentlyViewedDataProduct(
+    service: UserDataService,
+    id: string,
+  ): void {
+    const dataProducts =
+      LegendQueryUserDataHelper.getRecentlyVisitedDataProducts(service);
+    const idx = dataProducts.findIndex(
+      (visitedDataProduct) => visitedDataProduct.id === id,
+    );
+    if (idx === -1) {
+      return;
+    }
+    dataProducts.splice(idx, 1);
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATAPRODUCTS,
+      dataProducts,
+    );
+  }
+
+  static addVisitedDataProduct(
+    service: UserDataService,
+    visited: VisitedDataProduct,
+  ): void {
+    const dataProducts =
+      LegendQueryUserDataHelper.getRecentlyVisitedDataProducts(service);
+    LegendQueryUserDataHelper.persistVisitedDataProduct(
+      service,
+      visited,
+      dataProducts,
+    );
+  }
+
+  static updateVisitedDataProductExecContext(
+    service: UserDataService,
+    groupId: string,
+    artifactId: string,
+    dataProductPath: string,
+    exec: string,
+  ): boolean {
+    const visited = LegendQueryUserDataHelper.findRecentlyVisitedDataProduct(
+      service,
+      createVisitedDataProductId(groupId, artifactId, dataProductPath),
+    );
+    if (visited) {
+      visited.accessId = exec;
+      LegendQueryUserDataHelper.addVisitedDataProduct(service, visited);
+      return true;
+    }
+    return false;
+  }
+
+  // Lakehouse User Info
+  static getLakehouseUserInfo(
+    service: UserDataService,
+  ): LakehouseUserInfo | undefined {
+    const data = service.getObjectValue(
+      LEGEND_QUERY_USER_DATA_KEY.USER_LAKEHOUSE_INFO,
+    );
+    return returnUndefOnError(
+      () =>
+        (
+          deserialize(
+            createSimpleSchema({
+              data: raw(),
+            }),
+            {
+              data,
+            },
+          ) as { data: LakehouseUserInfo }
+        ).data,
+    );
+  }
+
+  static persistLakehouseUserInfo(
+    service: UserDataService,
+    info: LakehouseUserInfo,
+  ): void {
+    service.persistValue(LEGEND_QUERY_USER_DATA_KEY.USER_LAKEHOUSE_INFO, info);
+  }
+
+  static removeLakehouseUserInfo(service: UserDataService): void {
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.USER_LAKEHOUSE_INFO,
+      undefined,
+    );
+  }
 }