@finos/legend-application-studio 28.4.3 → 28.5.0

package/src/stores/workspace-review/WorkspaceReviewStore.ts

@@ -32,7 +32,7 @@ import {
 import type { EditorStore } from '../editor/EditorStore.js';
 import { ACTIVITY_MODE } from '../editor/EditorConfig.js';
 import type { Entity } from '@finos/legend-storage';
-import { Project, Review } from '@finos/legend-server-sdlc';
+import { Project, Review, type Patch } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../__lib__/LegendStudioEvent.js';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 
@@ -41,6 +41,7 @@ export class WorkspaceReviewStore {
 
   currentProjectId?: string | undefined;
   currentProject?: Project | undefined;
+  currentPatch?: Patch | undefined;
   currentReviewId?: string | undefined;
   currentReview?: Review | undefined;
   isFetchingCurrentReview = false;
@@ -54,6 +55,7 @@ export class WorkspaceReviewStore {
     makeObservable(this, {
       currentProjectId: observable,
       currentProject: observable,
+      currentPatch: observable,
       currentReviewId: observable,
       currentReview: observable,
       isFetchingCurrentReview: observable,
@@ -63,6 +65,7 @@ export class WorkspaceReviewStore {
       isCommittingReview: observable,
       isReopeningReview: observable,
       projectId: computed,
+      patchReleaseVersionId: computed,
       reviewId: computed,
       review: computed,
       setProjectIdAndReviewId: action,
@@ -84,6 +87,10 @@ export class WorkspaceReviewStore {
     return guaranteeNonNullable(this.currentProjectId, 'Project ID must exist');
   }
 
+  get patchReleaseVersionId(): string | undefined {
+    return this.currentPatch?.patchReleaseVersionId.id;
+  }
+
   get reviewId(): string {
     return guaranteeNonNullable(this.currentReviewId, 'Review ID must exist');
   }
@@ -131,10 +138,12 @@ export class WorkspaceReviewStore {
       const [fromEntities, toEntities] = (yield Promise.all([
         this.editorStore.sdlcServerClient.getReviewFromEntities(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
         ),
         this.editorStore.sdlcServerClient.getReviewToEntities(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
         ),
       ])) as [Entity[], Entity[]];
@@ -196,6 +205,7 @@ export class WorkspaceReviewStore {
       this.currentReview = Review.serialization.fromJson(
         (yield this.editorStore.sdlcServerClient.getReview(
           this.projectId,
+          this.patchReleaseVersionId,
           this.reviewId,
         )) as PlainObject<Review>,
       );
@@ -217,6 +227,7 @@ export class WorkspaceReviewStore {
       this.currentReview = Review.serialization.fromJson(
         (yield this.editorStore.sdlcServerClient.approveReview(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
         )) as PlainObject<Review>,
       );
@@ -238,6 +249,7 @@ export class WorkspaceReviewStore {
       this.currentReview = Review.serialization.fromJson(
         (yield this.editorStore.sdlcServerClient.commitReview(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
           { message: `${this.review.title} [review]` },
         )) as PlainObject<Review>,
@@ -260,6 +272,7 @@ export class WorkspaceReviewStore {
       this.currentReview = Review.serialization.fromJson(
         (yield this.editorStore.sdlcServerClient.reopenReview(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
         )) as PlainObject<Review>,
       );
@@ -281,6 +294,7 @@ export class WorkspaceReviewStore {
       this.currentReview = Review.serialization.fromJson(
         (yield this.editorStore.sdlcServerClient.closeReview(
           this.projectId,
+          this.patchReleaseVersionId,
           this.review.id,
         )) as PlainObject<Review>,
       );

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

@@ -31,6 +31,7 @@ export class ProjectConfigurationStatus {
 
 export const fetchProjectConfigurationStatus = async (
   projectId: string,
+  patchReleaseVersionId: string | undefined,
   applicationStore: GenericLegendApplicationStore,
   sdlcServerClient: SDLCServerClient,
 ): Promise<ProjectConfigurationStatus> => {
@@ -45,6 +46,7 @@ export const fetchProjectConfigurationStatus = async (
       const review = Review.serialization.fromJson(
         await sdlcServerClient.getReview(
           projectId,
+          patchReleaseVersionId,
           guaranteeNonNullable(status.reviewIds[0]),
         ),
       );

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

@@ -32,6 +32,7 @@ import {
   Project,
   Review,
   Workspace,
+  Patch,
 } from '@finos/legend-server-sdlc';
 import type { LegendStudioApplicationStore } from '../LegendStudioBaseStore.js';
 import {
@@ -63,11 +64,15 @@ export class WorkspaceSetupStore {
   importProjectSuccessReport?: ImportProjectSuccessReport | undefined;
   showCreateProjectModal = false;
 
+  patches: Patch[] = [];
+  loadPatchesState = ActionState.create();
+
   workspaces: Workspace[] = [];
   currentWorkspace?: Workspace | undefined;
   loadWorkspacesState = ActionState.create();
   createWorkspaceState = ActionState.create();
   showCreateWorkspaceModal = false;
+  showAdvancedWorkspaceFilterOptions = false;
 
   constructor(
     applicationStore: LegendStudioApplicationStore,
@@ -81,9 +86,11 @@ export class WorkspaceSetupStore {
       showCreateProjectModal: observable,
       workspaces: observable,
       currentWorkspace: observable,
+      showAdvancedWorkspaceFilterOptions: observable,
       showCreateWorkspaceModal: observable,
       setShowCreateProjectModal: action,
       setShowCreateWorkspaceModal: action,
+      setShowAdvancedWorkspaceFilterOptions: action,
       setImportProjectSuccessReport: action,
       changeWorkspace: action,
       resetProject: action,
@@ -108,6 +115,10 @@ export class WorkspaceSetupStore {
     this.showCreateWorkspaceModal = val;
   }
 
+  setShowAdvancedWorkspaceFilterOptions(val: boolean): void {
+    this.showAdvancedWorkspaceFilterOptions = val;
+  }
+
   setImportProjectSuccessReport(
     importProjectSuccessReport: ImportProjectSuccessReport | undefined,
   ): void {
@@ -116,10 +127,11 @@ export class WorkspaceSetupStore {
 
   resetProject(): void {
     this.currentProject = undefined;
+    this.patches = [];
     this.workspaces = [];
     this.currentWorkspace = undefined;
     this.applicationStore.navigationService.navigator.updateCurrentLocation(
-      generateSetupRoute(undefined, undefined, undefined),
+      generateSetupRoute(undefined, undefined, undefined, undefined),
     );
     this.currentProjectConfigurationStatus = undefined;
   }
@@ -128,7 +140,12 @@ export class WorkspaceSetupStore {
     this.currentWorkspace = undefined;
     if (this.currentProject) {
       this.applicationStore.navigationService.navigator.updateCurrentLocation(
-        generateSetupRoute(this.currentProject.projectId, undefined, undefined),
+        generateSetupRoute(
+          this.currentProject.projectId,
+          undefined,
+          undefined,
+          undefined,
+        ),
       );
     }
   }
@@ -157,7 +174,7 @@ export class WorkspaceSetupStore {
           );
         } catch {
           this.applicationStore.navigationService.navigator.updateCurrentLocation(
-            generateSetupRoute(undefined),
+            generateSetupRoute(undefined, undefined),
           );
           this.initState.pass();
           return;
@@ -221,12 +238,30 @@ export class WorkspaceSetupStore {
   ): GeneratorFn<void> {
     this.currentProject = project;
     this.currentProjectConfigurationStatus = undefined;
-    this.loadWorkspacesState.inProgress();
+    this.loadPatchesState.inProgress();
+    try {
+      this.patches = (
+        (yield this.sdlcServerClient.getPatches(
+          project.projectId,
+        )) as PlainObject<Patch>[]
+      ).map((v) => Patch.serialization.fromJson(v));
+      this.loadPatchesState.pass();
+    } catch (error) {
+      assertErrorThrown(error);
+      this.applicationStore.logService.error(
+        LogEvent.create(LEGEND_STUDIO_APP_EVENT.DEPOT_MANAGER_FAILURE),
+        error,
+      );
+      this.applicationStore.notificationService.notifyError(error);
+      this.loadPatchesState.fail();
+    }
 
+    this.loadWorkspacesState.inProgress();
     try {
       this.currentProjectConfigurationStatus =
         (yield fetchProjectConfigurationStatus(
           project.projectId,
+          undefined,
           this.applicationStore,
           this.sdlcServerClient,
         )) as ProjectConfigurationStatus;
@@ -234,6 +269,7 @@ export class WorkspaceSetupStore {
       const workspacesInConflictResolutionIds = (
         (yield this.sdlcServerClient.getWorkspacesInConflictResolutionMode(
           project.projectId,
+          undefined,
         )) as Workspace[]
       ).map((workspace) => workspace.workspaceId);
 
@@ -250,6 +286,30 @@ export class WorkspaceSetupStore {
             !workspacesInConflictResolutionIds.includes(workspace.workspaceId),
         );
 
+      for (const patch of this.patches) {
+        this.workspaces = this.workspaces.concat(
+          (
+            (yield this.sdlcServerClient.getWorkspaces(
+              project.projectId,
+              patch.patchReleaseVersionId.id,
+            )) as PlainObject<Workspace>[]
+          )
+            .map((v) => {
+              const w = Workspace.serialization.fromJson(v);
+              w.source = patch.patchReleaseVersionId.id;
+              return w;
+            })
+            .filter(
+              // NOTE we don't handle workspaces that only have conflict resolution but no standard workspace
+              // since that indicates bad state of the SDLC server
+              (workspace) =>
+                !workspacesInConflictResolutionIds.includes(
+                  workspace.workspaceId,
+                ),
+            ),
+        );
+      }
+
       if (workspaceInfo) {
         const matchingWorkspace = this.workspaces.find(
           (workspace) =>
@@ -260,16 +320,15 @@ export class WorkspaceSetupStore {
           this.changeWorkspace(matchingWorkspace);
         } else {
           this.applicationStore.navigationService.navigator.updateCurrentLocation(
-            generateSetupRoute(project.projectId),
+            generateSetupRoute(project.projectId, undefined),
           );
         }
       } else {
         this.currentWorkspace = undefined;
         this.applicationStore.navigationService.navigator.updateCurrentLocation(
-          generateSetupRoute(project.projectId),
+          generateSetupRoute(project.projectId, undefined),
         );
       }
-
       this.loadWorkspacesState.pass();
     } catch (error) {
       assertErrorThrown(error);
@@ -292,6 +351,7 @@ export class WorkspaceSetupStore {
     this.applicationStore.navigationService.navigator.updateCurrentLocation(
       generateSetupRoute(
         this.currentProject.projectId,
+        workspace.source,
         workspace.workspaceId,
         workspace.workspaceType,
       ),
@@ -348,6 +408,7 @@ export class WorkspaceSetupStore {
       const importReview = Review.serialization.fromJson(
         (yield this.sdlcServerClient.getReview(
           report.project.projectId,
+          undefined,
           report.reviewId,
         )) as PlainObject<Review>,
       );
@@ -368,6 +429,7 @@ export class WorkspaceSetupStore {
 
   *createWorkspace(
     projectId: string,
+    patchReleaseVersionId: string | undefined,
     workspaceId: string,
     workspaceType: WorkspaceType,
   ): GeneratorFn<void> {
@@ -376,10 +438,12 @@ export class WorkspaceSetupStore {
       const newWorkspace = Workspace.serialization.fromJson(
         (yield this.sdlcServerClient.createWorkspace(
           projectId,
+          patchReleaseVersionId,
           workspaceId,
           workspaceType,
         )) as PlainObject<Workspace>,
       );
+      newWorkspace.source = patchReleaseVersionId;
 
       this.applicationStore.notificationService.notifySuccess(
         `Workspace '${newWorkspace.workspaceId}' is succesfully created`,