@finos/legend-application-query 13.4.16 → 13.4.18

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

@@ -15,12 +15,15 @@
  */
 import { extractElementNameFromPath, RuntimePointer, PackageableElementExplicitReference, } from '@finos/legend-graph';
 import { StoreProjectData, LATEST_VERSION_ALIAS, } from '@finos/legend-server-depot';
-import { guaranteeNonNullable, guaranteeType, uuid, } from '@finos/legend-shared';
+import { LogEvent, assertErrorThrown, guaranteeNonNullable, guaranteeType, returnUndefOnError, uuid, } from '@finos/legend-shared';
 import { QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
 import { DSL_DataSpace_getGraphManagerExtension, getDataSpace, retrieveAnalyticsResultCache, } from '@finos/legend-extension-dsl-data-space/graph';
 import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, createViewProjectHandler, createViewSDLCProjectHandler, } from '../QueryEditorStore.js';
 import { DataSpaceProjectInfo, DataSpaceQueryBuilderState, createQueryClassTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
 import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
+import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
+import { createVisitedDataSpaceId, hasDataSpaceInfoBeenVisited, createSimpleVisitedDataspace, } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
+import { LEGEND_QUERY_APP_EVENT } from '../../__lib__/LegendQueryEvent.js';
 export class DataSpaceQueryCreatorStore extends QueryEditorStore {
     groupId;
     artifactId;
@@ -64,6 +67,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
             versionId: projectInfo.versionId,
             dataSpace: dataSpace.path,
         };
+        const visitedDataSpaces = LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(this.applicationStore.userDataService);
         const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, this.depotServerClient, QueryBuilderDataBrowserWorkflow.INSTANCE, new QueryBuilderActionConfig_QueryApplication(this), dataSpace, executionContext, (dataSpaceInfo) => {
             if (dataSpaceInfo.defaultExecutionContext) {
                 this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(dataSpaceInfo.groupId), guaranteeNonNullable(dataSpaceInfo.artifactId), LATEST_VERSION_ALIAS, //always default to latest
@@ -79,6 +83,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
                 queryBuilderState.executionContext.defaultRuntime.value
                 ? undefined
                 : runtimePointer.packageableRuntime.value.path, queryBuilderState.class?.path));
+            returnUndefOnError(() => LegendQueryUserDataHelper.updateVisitedDataSpaceExecContext(this.applicationStore.userDataService, this.groupId, this.artifactId, dataSpace.path, ec.name));
         }, (runtimeValue) => {
             const runtimePointer = guaranteeType(runtimeValue, RuntimePointer);
             queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(queryBuilderState.projectInfo).groupId, guaranteeNonNullable(queryBuilderState.projectInfo).artifactId, guaranteeNonNullable(queryBuilderState.projectInfo).versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
@@ -92,7 +97,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
                 queryBuilderState.executionContext.defaultRuntime.value
                 ? undefined
                 : runtimePointer.packageableRuntime.value.path, _class.path));
-        }, projectInfo, this.applicationStore.config.options.queryBuilderConfig, sourceInfo);
+        }, projectInfo, this.applicationStore.config.options.queryBuilderConfig, sourceInfo, (dataSpaceInfo) => hasDataSpaceInfoBeenVisited(dataSpaceInfo, visitedDataSpaces));
         queryBuilderState.setExecutionContext(executionContext);
         queryBuilderState.propagateExecutionContextChange(executionContext);
         // set runtime if already chosen
@@ -103,8 +108,19 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
         if (this.classPath) {
             queryBuilderState.changeClass(this.graphManagerState.graph.getClass(this.classPath));
         }
+        // add to visited dataspaces
+        this.addVisitedDataSpace(executionContext.name);
         return queryBuilderState;
     }
+    addVisitedDataSpace(execName) {
+        try {
+            LegendQueryUserDataHelper.addVisitedDatspace(this.applicationStore.userDataService, createSimpleVisitedDataspace(this.groupId, this.artifactId, this.versionId, this.dataSpacePath, execName));
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.applicationStore.logService.warn(LogEvent.create(LEGEND_QUERY_APP_EVENT.LOCAL_STORAGE_PERSIST_ERROR), error.message);
+        }
+    }
     getPersistConfiguration(lambda, options) {
         return {
             defaultName: options?.update
@@ -123,5 +139,8 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
             },
         };
     }
+    onInitializeFailure() {
+        LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(this.applicationStore.userDataService, createVisitedDataSpaceId(this.groupId, this.artifactId, this.dataSpacePath));
+    }
 }
 //# sourceMappingURL=DataSpaceQueryCreatorStore.js.map

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

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

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

@@ -17,11 +17,16 @@ import { type DepotServerClient } from '@finos/legend-server-depot';
 import type { GraphManagerState, RawLambda } from '@finos/legend-graph';
 import { type GenericLegendApplicationStore } from '@finos/legend-application';
 import { type QueryBuilderConfig, QueryBuilderState } from '@finos/legend-query-builder';
-import type { ProjectGAVCoordinates } from '@finos/legend-storage';
+import type { Entity, ProjectGAVCoordinates } from '@finos/legend-storage';
 import { ActionState, type GeneratorFn } from '@finos/legend-shared';
 import { type DataSpaceInfo } from '@finos/legend-extension-dsl-data-space/application';
 import { QueryEditorStore, type QueryPersistConfiguration } from '../QueryEditorStore.js';
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
+import type { VisitedDataspace } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
+type DataSpaceVisitedEntity = {
+    visited: VisitedDataspace;
+    entity: Entity;
+};
 export declare class DataSpaceQuerySetupState extends QueryBuilderState {
     editorStore: QueryEditorStore;
     readonly depotServerClient: DepotServerClient;
@@ -38,7 +43,9 @@ export declare class DataSpaceQuerySetupState extends QueryBuilderState {
     get sideBarClassName(): string | undefined;
     showAdvancedSearchPanel(): void;
     hideAdvancedSearchPanel(): void;
-    loadDataSpaces(): GeneratorFn<void>;
+    initializeDataSpaceSetup(): GeneratorFn<void>;
+    redirectIfPossible(): GeneratorFn<DataSpaceVisitedEntity | undefined>;
+    hyrdateVisitedDataSpace(visited: VisitedDataspace): GeneratorFn<DataSpaceVisitedEntity | undefined>;
 }
 export declare class DataSpaceQuerySetupStore extends QueryEditorStore {
     get isViewProjectActionDisabled(): boolean;
@@ -49,4 +56,5 @@ export declare class DataSpaceQuerySetupStore extends QueryEditorStore {
     initializeQueryBuilderState(): Promise<QueryBuilderState>;
     buildGraph(): GeneratorFn<void>;
 }
+export {};
 //# sourceMappingURL=DataSpaceQuerySetupState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EACL,KAAK,kBAAkB,EACvB,iBAAiB,EAElB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EACL,WAAW,EAIX,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EAEL,gBAAgB,EAGhB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAExG,qBAAa,wBAAyB,SAAQ,iBAAiB;IAC7D,WAAW,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,cAAwB;IACpD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IACzD,QAAQ,CAAC,WAAW,EAAE,CACpB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC;IACV,QAAQ,CAAC,eAAe,EAAE,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEV,oCAAoC,QAAO,MAAM,SAAS,CAChB;IAEnD,UAAU,EAAE,aAAa,EAAE,CAAM;IACjC,mBAAmB,UAAS;IAC5B,mBAAmB,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;gBAG7D,WAAW,EAAE,gBAAgB,EAC7B,gBAAgB,EAAE,6BAA6B,EAC/C,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,EAC/C,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,EACT,eAAe,EAAE,CACf,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,OAAO,CAAC,IAAI,CAAC,EAClB,MAAM,EAAE,kBAAkB,GAAG,SAAS;IA2BxC,IAAa,mBAAmB,IAAI,OAAO,CAE1C;IAED,IAAa,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,uBAAuB,IAAI,IAAI;IAY/B,uBAAuB,IAAI,IAAI;IAI9B,cAAc,IAAI,WAAW,CAAC,IAAI,CAAC;CAkBrC;AAED,qBAAa,wBAAyB,SAAQ,gBAAgB;IAC5D,IAAa,2BAA2B,IAAI,OAAO,CAElD;IAED,cAAc,IAAI,qBAAqB;IAIvC,uBAAuB,CACrB,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,GACzC,yBAAyB;IAItB,2BAA2B,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAoCrD,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAG1C"}
+{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"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"}

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

@@ -15,7 +15,7 @@
  */
 import { DepotScope, LATEST_VERSION_ALIAS, } from '@finos/legend-server-depot';
 import {} from '@finos/legend-application';
-import { action, flow, makeObservable, observable } from 'mobx';
+import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 import { QueryBuilderState, QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
 import { ActionState, assertErrorThrown, guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
 import { extractDataSpaceInfo, } from '@finos/legend-extension-dsl-data-space/application';
@@ -24,6 +24,7 @@ import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, createView
 import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/data-space/DataSpaceQuerySetup.js';
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
+import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 export class DataSpaceQuerySetupState extends QueryBuilderState {
     editorStore;
     depotServerClient;
@@ -42,7 +43,9 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
             advancedSearchState: observable,
             showAdvancedSearchPanel: action,
             hideAdvancedSearchPanel: action,
-            loadDataSpaces: flow,
+            initializeDataSpaceSetup: flow,
+            redirectIfPossible: flow,
+            hyrdateVisitedDataSpace: flow,
         });
         this.editorStore = editorStore;
         this.workflowState.updateActionConfig(new QueryBuilderActionConfig_QueryApplication(editorStore));
@@ -66,9 +69,16 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
     hideAdvancedSearchPanel() {
         this.advancedSearchState = undefined;
     }
-    *loadDataSpaces() {
+    *initializeDataSpaceSetup() {
         this.loadDataSpacesState.inProgress();
         try {
+            const hydrated = (yield flowResult(this.redirectIfPossible()));
+            if (hydrated) {
+                this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(hydrated.visited.groupId), guaranteeNonNullable(hydrated.visited.artifactId), hydrated.visited.versionId ?? LATEST_VERSION_ALIAS, hydrated.visited.path, hydrated.visited.execContext ??
+                    hydrated.entity.content.defaultExecutionContext, undefined, undefined));
+                this.loadDataSpacesState.complete();
+                return;
+            }
             this.dataSpaces = (yield this.depotServerClient.getEntitiesByClassifier(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
                 scope: DepotScope.RELEASES,
             })).map((storedEntity) => extractDataSpaceInfo(storedEntity, false));
@@ -80,6 +90,46 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
             this.applicationStore.notificationService.notifyError(error);
         }
     }
+    *redirectIfPossible() {
+        const visitedQueries = LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(this.applicationStore.userDataService);
+        let redirect = undefined;
+        for (let i = 0; i < visitedQueries.length; i++) {
+            const visited = visitedQueries[i];
+            if (visited) {
+                const hydrated = (yield flowResult(this.hyrdateVisitedDataSpace(visited)));
+                if (hydrated) {
+                    redirect = hydrated;
+                    break;
+                }
+            }
+        }
+        return redirect;
+    }
+    *hyrdateVisitedDataSpace(visited) {
+        try {
+            const entity = (yield this.depotServerClient.getVersionEntity(visited.groupId, visited.artifactId, visited.versionId ?? LATEST_VERSION_ALIAS, visited.path));
+            const content = entity.content;
+            if (visited.execContext) {
+                const found = content.executionContexts.find((e) => e.name === visited.execContext);
+                if (!found) {
+                    visited.execContext = undefined;
+                    return {
+                        visited,
+                        entity,
+                    };
+                }
+            }
+            return {
+                visited,
+                entity,
+            };
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(this.applicationStore.userDataService, visited.id);
+        }
+        return undefined;
+    }
 }
 export class DataSpaceQuerySetupStore extends QueryEditorStore {
     get isViewProjectActionDisabled() {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.4.16",
+  "version": "13.4.18",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -43,17 +43,17 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.1.3",
-    "@finos/legend-art": "7.1.32",
-    "@finos/legend-extension-dsl-data-space": "10.3.15",
-    "@finos/legend-graph": "31.10.0",
-    "@finos/legend-lego": "1.2.33",
-    "@finos/legend-query-builder": "4.14.39",
-    "@finos/legend-server-depot": "6.0.41",
-    "@finos/legend-shared": "10.0.36",
-    "@finos/legend-storage": "3.0.86",
+    "@finos/legend-application": "15.1.5",
+    "@finos/legend-art": "7.1.34",
+    "@finos/legend-extension-dsl-data-space": "10.3.17",
+    "@finos/legend-graph": "31.10.2",
+    "@finos/legend-lego": "1.2.35",
+    "@finos/legend-query-builder": "4.14.41",
+    "@finos/legend-server-depot": "6.0.43",
+    "@finos/legend-shared": "10.0.38",
+    "@finos/legend-storage": "3.0.88",
     "@testing-library/react": "15.0.7",
-    "@types/react": "18.3.2",
+    "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "mobx": "6.12.3",
     "mobx-react-lite": "4.0.7",
@@ -62,14 +62,14 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.1.5",
+    "@finos/legend-dev-utils": "2.1.6",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "8.57.0",
     "jest": "29.7.0",
     "npm-run-all": "4.1.5",
     "rimraf": "5.0.7",
-    "sass": "1.77.1",
+    "sass": "1.77.3",
     "typescript": "5.4.5"
   },
   "peerDependencies": {

package/src/__lib__/LegendQueryEvent.ts

@@ -26,4 +26,6 @@ export enum LEGEND_QUERY_APP_EVENT {
 
   VIEW_PROJECT__LAUNCH = 'query-editor.view-project.launch',
   VIEW_SDLC_PROJECT__LAUNCH = 'query-editor.view-sdlc-project.launch',
+
+  LOCAL_STORAGE_PERSIST_ERROR = 'LOCAL_STORAGE_PERSIST_ERROR',
 }

package/src/__lib__/LegendQueryUserDataHelper.ts

@@ -16,22 +16,38 @@
 
 import type { UserDataService } from '@finos/legend-application';
 import { returnUndefOnError } from '@finos/legend-shared';
-import { createSimpleSchema, deserialize, list, primitive } from 'serializr';
+import {
+  createSimpleSchema,
+  deserialize,
+  list,
+  primitive,
+  raw,
+} from 'serializr';
+import {
+  createVisitedDataspaceFromInfo,
+  createIdFromDataSpaceInfo,
+  createVisitedDataSpaceId,
+  type SavedVisitedDataSpaces,
+  type VisitedDataspace,
+} from './LegendQueryUserDataSpaceHelper.js';
+import type { DataSpaceInfo } 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',
 }
 
-const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
-type RecentlyViewedQueriesData = string[];
+export const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
+export const USER_DATA_QUERY_DATASPACE_LIMIT = 10;
+
+type SavedData = string[];
 
 export class LegendQueryUserDataHelper {
-  static getRecentlyViewedQueries(
+  static getPersistedData(
     service: UserDataService,
-  ): RecentlyViewedQueriesData {
-    const data = service.getObjectValue(
-      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
-    );
+    key: LEGEND_QUERY_USER_DATA_KEY,
+  ): SavedData {
+    const data = service.getObjectValue(key);
     return (
       // TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
       // See https://github.com/finos/legend-studio/issues/407
@@ -45,12 +61,41 @@ export class LegendQueryUserDataHelper {
               {
                 data,
               },
-            ) as { data: RecentlyViewedQueriesData }
+            ) as { data: SavedData }
           ).data,
       ) ?? []
     );
   }
 
+  static persistValue(
+    service: UserDataService,
+    value: string,
+    persistedData: SavedData,
+    opts: {
+      key: LEGEND_QUERY_USER_DATA_KEY;
+      limit: number;
+    },
+  ): void {
+    const idx = persistedData.findIndex((data) => data === value);
+    if (idx === -1) {
+      if (persistedData.length >= opts.limit) {
+        persistedData.pop();
+      }
+      persistedData.unshift(value);
+    } else {
+      persistedData.splice(idx, 1);
+      persistedData.unshift(value);
+    }
+    service.persistValue(opts.key, persistedData);
+  }
+
+  static getRecentlyViewedQueries(service: UserDataService): SavedData {
+    return LegendQueryUserDataHelper.getPersistedData(
+      service,
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+    );
+  }
+
   static removeRecentlyViewedQueries(service: UserDataService): void {
     service.persistValue(
       LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
@@ -79,21 +124,150 @@ export class LegendQueryUserDataHelper {
     queryId: string,
   ): void {
     const queries = LegendQueryUserDataHelper.getRecentlyViewedQueries(service);
-    const idx = queries.findIndex((query) => query === queryId);
+    LegendQueryUserDataHelper.persistValue(service, queryId, queries, {
+      limit: USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT,
+      key: LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+    });
+  }
+  // DataSpaces
+  static getRecentlyVisitedDataSpaces(
+    service: UserDataService,
+  ): SavedVisitedDataSpaces {
+    const data = service.getObjectValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
+    );
+    return (
+      // TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
+      // See https://github.com/finos/legend-studio/issues/407
+      returnUndefOnError(
+        () =>
+          (
+            deserialize(
+              createSimpleSchema({
+                data: raw(),
+              }),
+              {
+                data,
+              },
+            ) as { data: SavedVisitedDataSpaces }
+          ).data,
+      ) ?? []
+    );
+  }
+
+  static findRecentlyVisitedDataSpace(
+    service: UserDataService,
+    id: string,
+  ): VisitedDataspace | undefined {
+    return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service).find(
+      (v) => v.id === id,
+    );
+  }
+
+  static getRecentlyVisitedDataSpace(
+    service: UserDataService,
+  ): VisitedDataspace | undefined {
+    return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service)[0];
+  }
+
+  static persistVisitedDataspace(
+    service: UserDataService,
+    value: VisitedDataspace,
+    persistedData: SavedVisitedDataSpaces,
+    limit = USER_DATA_QUERY_DATASPACE_LIMIT,
+  ): void {
+    const key = LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES;
+    const idx = persistedData.findIndex((data) => data.id === value.id);
     if (idx === -1) {
-      if (queries.length < USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT) {
-        queries.unshift(queryId);
-      } else {
-        queries.pop();
-        queries.unshift(queryId);
+      if (persistedData.length >= limit) {
+        persistedData.pop();
       }
+      persistedData.unshift(value);
     } else {
-      queries.splice(idx, 1);
-      queries.unshift(queryId);
+      persistedData.splice(idx, 1);
+      persistedData.unshift(value);
     }
+    service.persistValue(key, persistedData);
+  }
+
+  static removeRecentlyViewedDataSpaces(service: UserDataService): void {
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
+      [],
+    );
+  }
+
+  static removeRecentlyViewedDataSpace(
+    service: UserDataService,
+    id: string,
+  ): void {
+    const dataSpaces =
+      LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
+    const idx = dataSpaces.findIndex(
+      (visitedDataspace) => visitedDataspace.id === id,
+    );
+    if (idx === -1) {
+      return;
+    }
+    dataSpaces.splice(idx, 1);
     service.persistValue(
       LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
-      queries,
+      dataSpaces,
     );
   }
+
+  static removeDataSpace(service: UserDataService, info: DataSpaceInfo): void {
+    const id = createIdFromDataSpaceInfo(info);
+    if (id) {
+      LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(service, id);
+    }
+  }
+
+  static addRecentlyVistedDatspace(
+    service: UserDataService,
+    info: DataSpaceInfo,
+    execContext: string | undefined,
+  ): void {
+    const visited = createVisitedDataspaceFromInfo(info, execContext);
+    if (visited) {
+      const dataspaces =
+        LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
+      LegendQueryUserDataHelper.persistVisitedDataspace(
+        service,
+        visited,
+        dataspaces,
+      );
+    }
+  }
+  static addVisitedDatspace(
+    service: UserDataService,
+    visited: VisitedDataspace,
+  ): void {
+    const dataspaces =
+      LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
+    LegendQueryUserDataHelper.persistVisitedDataspace(
+      service,
+      visited,
+      dataspaces,
+    );
+  }
+
+  static updateVisitedDataSpaceExecContext(
+    service: UserDataService,
+    groupId: string,
+    artifactId: string,
+    dataspace: string,
+    exec: string,
+  ): boolean {
+    const visited = LegendQueryUserDataHelper.findRecentlyVisitedDataSpace(
+      service,
+      createVisitedDataSpaceId(groupId, artifactId, dataspace),
+    );
+    if (visited) {
+      visited.execContext = exec;
+      LegendQueryUserDataHelper.addVisitedDatspace(service, visited);
+      return true;
+    }
+    return false;
+  }
 }