@finos/legend-application-studio 28.21.5 → 28.21.6

package/src/stores/editor/editor-state/element-editor-state/function-activator/testable/FunctionTestableState.ts

@@ -63,7 +63,9 @@ import {
   EqualTo,
   EqualToRelation,
   RelationElement,
+  RelationRowTestData,
   observe_RelationElement,
+  observe_RelationRowTestData,
   ModelStore,
   RelationElementsData,
   CORE_PURE_PATH,
@@ -723,7 +725,6 @@ export const createFunctionTest = async (
     assertion.id = DEFAULT_TEST_ASSERTION_ID;
     const expectedRelElement = new RelationElement();
     expectedRelElement.paths = [];
-    expectedRelElement.rows = [];
     let inferredColumns: string[] = [];
     if (type.path === CORE_PURE_PATH.RELATION) {
       try {
@@ -746,6 +747,9 @@ export const createFunctionTest = async (
       }
     }
     expectedRelElement.columns = inferredColumns;
+    const emptyRow = observe_RelationRowTestData(new RelationRowTestData());
+    emptyRow.values = inferredColumns.map(() => '');
+    expectedRelElement.rows = [emptyRow];
     observe_RelationElement(expectedRelElement);
     assertion.expected = expectedRelElement;
     _assertion = assertion;

package/src/stores/editor/sidebar-state/ProjectOverviewState.ts

@@ -42,6 +42,7 @@ import {
   type WorkspaceType,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../__lib__/LegendStudioEvent.js';
+import { LegendStudioUserDataHelper } from '../../../__lib__/LegendStudioUserDataHelper.js';
 
 export enum PROJECT_OVERVIEW_ACTIVITY_MODE {
   RELEASE = 'RELEASE',
@@ -155,6 +156,19 @@ export class ProjectOverviewState {
       this.projectWorkspaces = this.projectWorkspaces.filter(
         (w) => !areWorkspacesEquivalent(workspace, w),
       );
+      // Drop the deleted workspace from the recents cache so the workspace
+      // setup screen doesn't keep offering a dead link. Patch workspaces are
+      // never cached, so this is a no-op for them.
+      if (workspace.source === undefined) {
+        LegendStudioUserDataHelper.workspaceSetup_removeRecentWorkspace(
+          this.editorStore.applicationStore.userDataService,
+          {
+            projectId: this.sdlcState.activeProject.projectId,
+            workspaceId: workspace.workspaceId,
+            workspaceType: workspace.workspaceType,
+          },
+        );
+      }
       // redirect to home page if current workspace is deleted
       if (
         areWorkspacesEquivalent(

package/src/stores/editor/sidebar-state/WorkspaceReviewState.ts

@@ -25,6 +25,7 @@ import {
 import type { EditorStore } from '../EditorStore.js';
 import type { EditorSDLCState } from '../EditorSDLCState.js';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../__lib__/LegendStudioEvent.js';
+import { LegendStudioUserDataHelper } from '../../../__lib__/LegendStudioUserDataHelper.js';
 import {
   type GeneratorFn,
   type PlainObject,
@@ -402,6 +403,19 @@ export class WorkspaceReviewState {
         review.id,
         { message: `${review.title} [review]` },
       );
+      // Committing a review deletes the workspace on SDLC. Drop it from
+      // the recents cache so the workspace setup screen doesn't keep
+      // offering a dead link. Patch workspaces are never cached.
+      if (this.sdlcState.activePatch === undefined) {
+        LegendStudioUserDataHelper.workspaceSetup_removeRecentWorkspace(
+          this.editorStore.applicationStore.userDataService,
+          {
+            projectId: this.sdlcState.activeProject.projectId,
+            workspaceId: this.sdlcState.activeWorkspace.workspaceId,
+            workspaceType: this.sdlcState.activeWorkspace.workspaceType,
+          },
+        );
+      }
       this.editorStore.applicationStore.alertService.setActionAlertInfo({
         message: 'Committed review successfully',
         prompt:

package/src/stores/editor/sidebar-state/dev-metadata/DevMetadataState.ts

@@ -156,6 +156,13 @@ export class DevMetadataState {
         'Project Name required to push to dev mode',
       );
       this.pushState.inProgress();
+      LegendStudioTelemetryHelper.logEvent_DevMetadataPushLaunched(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        currentProjectConfiguration.groupId,
+        currentProjectConfiguration.artifactId,
+        undefined,
+      );
       const result =
         (yield this.editorStore.graphManagerState.graphManager.pushToDevMetadata(
           currentProjectConfiguration.groupId,
@@ -165,7 +172,7 @@ export class DevMetadataState {
           this.editorStore.graphManagerState.graph,
         )) as DeployProjectResponse;
       this.result = result;
-      LegendStudioTelemetryHelper.logEvent_DevMetadataPushLaunched(
+      LegendStudioTelemetryHelper.logEvent_DevMetadataPushSucceeded(
         this.editorStore.applicationStore.telemetryService,
         this.editorStore.editorMode.getSourceInfo(),
         currentProjectConfiguration.groupId,

package/src/stores/project-reviewer/ProjectReviewerStore.ts

@@ -45,6 +45,7 @@ import {
   ReviewApproval,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../__lib__/LegendStudioEvent.js';
+import { LegendStudioUserDataHelper } from '../../__lib__/LegendStudioUserDataHelper.js';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import type { Entity } from '@finos/legend-storage';
 import { EntityDiffViewState } from '../editor/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
@@ -457,6 +458,20 @@ export class ProjectReviewerStore {
           { message: `${this.review.title} [review]` },
         )) as PlainObject<Review>,
       );
+      // Committing a review deletes its workspace on SDLC. Drop the
+      // matching entry from the local recents cache (no-op if it wasn't
+      // there, e.g., the reviewer isn't the workspace author). Patch
+      // workspaces are never cached.
+      if (this.patchReleaseVersionId === undefined) {
+        LegendStudioUserDataHelper.workspaceSetup_removeRecentWorkspace(
+          this.editorStore.applicationStore.userDataService,
+          {
+            projectId: this.projectId,
+            workspaceId: this.review.workspaceId,
+            workspaceType: this.review.workspaceType,
+          },
+        );
+      }
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.logService.error(

package/src/stores/workspace-setup/WorkspaceSetupStore.ts

@@ -51,6 +51,11 @@ import {
   ProjectConfigurationStatus,
 } from './ProjectConfigurationStatus.js';
 import { GraphManagerState } from '@finos/legend-graph';
+import {
+  LegendStudioUserDataHelper,
+  type RecentProjectEntry,
+  type RecentWorkspaceEntry,
+} from '../../__lib__/LegendStudioUserDataHelper.js';
 
 interface ImportProjectSuccessReport {
   projectId: string;
@@ -92,6 +97,12 @@ export class WorkspaceSetupStore {
 
   graphManagerState: GraphManagerState;
 
+  // Cached recents to make re-opening a project/workspace instantaneous.
+  // NOTE: patch-based workspaces are intentionally excluded from this cache.
+  recentProjects: RecentProjectEntry[] = [];
+  recentWorkspaces: RecentWorkspaceEntry[] = [];
+  selectRecentProjectState = ActionState.create();
+
   constructor(
     applicationStore: LegendStudioApplicationStore,
     sdlcServerClient: SDLCServerClient,
@@ -113,6 +124,8 @@ export class WorkspaceSetupStore {
       enginePromise: observable,
       sandboxModal: observable,
       hasSandboxAccess: observable,
+      recentProjects: observable,
+      recentWorkspaces: observable,
       setShowCreateProjectModal: action,
       setShowCreateWorkspaceModal: action,
       setShowAdvancedWorkspaceFilterOptions: action,
@@ -121,6 +134,9 @@ export class WorkspaceSetupStore {
       changeWorkspace: action,
       resetProject: action,
       resetWorkspace: action,
+      removeRecentProject: action,
+      removeRecentWorkspace: action,
+      clearRecents: action,
       initialize: flow,
       loadProjects: flow,
       loadSandboxProject: flow,
@@ -130,6 +146,7 @@ export class WorkspaceSetupStore {
       createSandboxProject: flow,
       createWorkspace: flow,
       initializeEngine: flow,
+      selectRecentProject: flow,
     });
 
     this.applicationStore = applicationStore;
@@ -138,6 +155,14 @@ export class WorkspaceSetupStore {
       applicationStore.pluginManager,
       applicationStore.logService,
     );
+    this.recentProjects =
+      LegendStudioUserDataHelper.workspaceSetup_getRecentProjects(
+        applicationStore.userDataService,
+      );
+    this.recentWorkspaces =
+      LegendStudioUserDataHelper.workspaceSetup_getRecentWorkspaces(
+        applicationStore.userDataService,
+      );
     if (this.supportsCreatingSandboxProject) {
       flowResult(this.initializeEngine()).catch(
         applicationStore.alertUnhandledError,
@@ -197,6 +222,67 @@ export class WorkspaceSetupStore {
     this.sandboxModal = val;
   }
 
+  // --- Recents -------------------------------------------------------------
+  // NOTE: writes to the recents cache happen from the editor (see
+  // `EditorStore.initialize`) at the moment a workspace is actually opened.
+  // This store only reads the cache (to seed dropdowns) and prunes entries
+  // that are discovered to be stale.
+
+  removeRecentProject(projectId: string): void {
+    const updated =
+      LegendStudioUserDataHelper.workspaceSetup_removeRecentProject(
+        this.applicationStore.userDataService,
+        projectId,
+      );
+    this.recentProjects = updated.projects;
+    this.recentWorkspaces = updated.workspaces;
+  }
+
+  removeRecentWorkspace(entry: {
+    projectId: string;
+    workspaceId: string;
+    workspaceType: WorkspaceType;
+  }): void {
+    this.recentWorkspaces =
+      LegendStudioUserDataHelper.workspaceSetup_removeRecentWorkspace(
+        this.applicationStore.userDataService,
+        entry,
+      );
+  }
+
+  clearRecents(): void {
+    LegendStudioUserDataHelper.workspaceSetup_clearRecents(
+      this.applicationStore.userDataService,
+    );
+    this.recentProjects = [];
+    this.recentWorkspaces = [];
+  }
+
+  /**
+   * Fetches a project by id (used when the user picks a cached "recent"
+   * project that may not be in the current search results) and switches to
+   * it. If the project no longer exists, the entry is pruned from recents.
+   */
+  *selectRecentProject(projectId: string): GeneratorFn<void> {
+    this.selectRecentProjectState.inProgress();
+    try {
+      const project = Project.serialization.fromJson(
+        (yield this.sdlcServerClient.getProject(
+          projectId,
+        )) as PlainObject<Project>,
+      );
+      yield flowResult(this.changeProject(project));
+      this.selectRecentProjectState.pass();
+    } catch (error) {
+      assertErrorThrown(error);
+      this.removeRecentProject(projectId);
+      this.applicationStore.notificationService.notifyWarning(
+        `Recent project could not be opened and was removed from recents`,
+      );
+      this.selectRecentProjectState.fail();
+    }
+  }
+
   *createSandboxProject(): GeneratorFn<void> {
     try {
       if (!this.hasSandboxAccess) {
@@ -277,6 +363,7 @@ export class WorkspaceSetupStore {
             )) as PlainObject<Project>,
           );
         } catch {
+          this.removeRecentProject(projectId);
           this.applicationStore.navigationService.navigator.updateCurrentLocation(
             generateSetupRoute(undefined, undefined),
           );
@@ -513,6 +600,12 @@ export class WorkspaceSetupStore {
         if (matchingWorkspace) {
           this.changeWorkspace(matchingWorkspace);
         } else {
+          // Workspace no longer exists — prune from recents.
+          this.removeRecentWorkspace({
+            projectId: project.projectId,
+            workspaceId: workspaceInfo.workspaceId,
+            workspaceType: workspaceInfo.workspaceType,
+          });
           this.applicationStore.navigationService.navigator.updateCurrentLocation(
             generateSetupRoute(project.projectId, undefined),
           );

package/tsconfig.json

@@ -374,6 +374,7 @@
     "./src/components/workspace-setup/CreateProjectModal.tsx",
     "./src/components/workspace-setup/CreateWorkspaceModal.tsx",
     "./src/components/workspace-setup/ProjectSelectorUtils.tsx",
+    "./src/components/workspace-setup/RecentWorkspacesPanel.tsx",
     "./src/components/workspace-setup/WorkspaceSelectorUtils.tsx",
     "./src/components/workspace-setup/WorkspaceSetup.tsx"
   ],