@finos/legend-application-studio 25.0.2 → 25.0.4

package/src/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.ts

@@ -32,26 +32,30 @@ import {
   filterByType,
 } from '@finos/legend-shared';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../../../__lib__/LegendStudioEvent.js';
-import { Version } from '@finos/legend-server-sdlc';
 import {
   type Service,
   type PureExecution,
+  type ServiceRegistrationSuccess,
   ServiceExecutionMode,
   buildLambdaVariableExpressions,
   VariableExpression,
   generateMultiplicityString,
   areMultiplicitiesEqual,
   Multiplicity,
-  type ServiceRegistrationSuccess,
 } from '@finos/legend-graph';
 import { ServiceRegistrationEnvironmentConfig } from '../../../../../application/LegendStudioApplicationConfig.js';
 import {
   ActionAlertActionType,
   ActionAlertType,
 } from '@finos/legend-application';
+import { compareSemVerVersions } from '@finos/legend-storage';
 
 export const LATEST_PROJECT_REVISION = 'Latest Project Revision';
 
+const PROD_SERVICE_EXECUTION_SERVER = 'PROD';
+
+export const PROJECT_SEMANTIC_VERSION_PATTERN = /^[0-9]*.[0-9]*.[0-9]*$/;
+
 export const generateServiceManagementUrl = (
   baseUrl: string,
   serviceUrlPattern: string,
@@ -82,7 +86,7 @@ const getServiceExecutionMode = (mode: string): ServiceExecutionMode => {
 
 interface ServiceVersionOption {
   label: string;
-  value: Version | string;
+  value: string;
 }
 
 export class ServiceConfigState {
@@ -92,7 +96,7 @@ export class ServiceConfigState {
 
   serviceEnv?: string | undefined;
   serviceExecutionMode?: ServiceExecutionMode | undefined;
-  projectVersion?: Version | string | undefined;
+  projectVersion?: string | undefined;
   enableModesWithVersioning: boolean;
   TEMPORARY__useStoreModel = false;
   TEMPORARY__useGenerateLineage = true;
@@ -159,19 +163,36 @@ export class ServiceConfigState {
       this.enableModesWithVersioning &&
       this.serviceExecutionMode !== ServiceExecutionMode.FULL_INTERACTIVE
     ) {
-      const options: ServiceVersionOption[] =
-        this.editorStore.sdlcState.projectVersions.map((version) => ({
-          label: version.id.id,
+      const semVerVersions = this.editorStore.depotState.projectVersions
+        .filter((v) => v.match(PROJECT_SEMANTIC_VERSION_PATTERN))
+        .sort((v1, v2) => compareSemVerVersions(v2, v1));
+      const snapshotVersions = this.editorStore.depotState.projectVersions
+        .filter((v) => !v.match(PROJECT_SEMANTIC_VERSION_PATTERN))
+        .sort((v1, v2) => v1.localeCompare(v2));
+      const options: ServiceVersionOption[] = snapshotVersions
+        .concat(semVerVersions)
+        .map((version) => ({
+          label: version,
           value: version,
         }));
-      if (this.serviceExecutionMode !== ServiceExecutionMode.PROD) {
-        return [
-          {
-            label: prettyCONSTName(LATEST_PROJECT_REVISION),
-            value: LATEST_PROJECT_REVISION,
-          },
-          ...options,
-        ];
+      if (
+        this.serviceEnv &&
+        this.serviceEnv.toUpperCase() === PROD_SERVICE_EXECUTION_SERVER
+      ) {
+        return semVerVersions.map((version) => ({
+          label: version,
+          value: version,
+        }));
+      } else {
+        if (this.serviceExecutionMode !== ServiceExecutionMode.PROD) {
+          return [
+            {
+              label: prettyCONSTName(LATEST_PROJECT_REVISION),
+              value: LATEST_PROJECT_REVISION,
+            },
+            ...options,
+          ];
+        }
       }
       return options;
     }
@@ -186,7 +207,7 @@ export class ServiceConfigState {
     this.serviceExecutionMode = val;
   }
 
-  setProjectVersion(val: Version | string | undefined): void {
+  setProjectVersion(val: string | undefined): void {
     this.projectVersion = val;
   }
 
@@ -208,7 +229,7 @@ export class ServiceConfigState {
     if (this.serviceExecutionMode === ServiceExecutionMode.SEMI_INTERACTIVE) {
       this.projectVersion = LATEST_PROJECT_REVISION;
     } else if (this.serviceExecutionMode === ServiceExecutionMode.PROD) {
-      this.projectVersion = this.editorStore.sdlcState.projectVersions[0];
+      this.projectVersion = this.editorStore.depotState.projectVersions[0];
     } else {
       this.projectVersion = undefined;
     }
@@ -256,10 +277,6 @@ export class ServiceRegistrationState extends ServiceConfigState {
         this.options.find((info) => info.env === this.serviceEnv),
       );
       const serverUrl = config.executionUrl;
-      const versionInput =
-        this.projectVersion instanceof Version
-          ? this.projectVersion.id.id
-          : undefined;
       const projectConfig = guaranteeNonNullable(
         this.editorStore.projectConfigurationEditorState.projectConfiguration,
       );
@@ -270,7 +287,7 @@ export class ServiceRegistrationState extends ServiceConfigState {
           this.editorStore.graphManagerState.graph,
           projectConfig.groupId,
           projectConfig.artifactId,
-          versionInput,
+          this.projectVersion,
           serverUrl,
           guaranteeNonNullable(this.serviceExecutionMode),
           {

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

@@ -30,7 +30,6 @@ import {
   ActionState,
   assertTrue,
 } from '@finos/legend-shared';
-import { Version } from '@finos/legend-server-sdlc';
 import {
   ServiceConfigState,
   ServiceRegistrationState,
@@ -193,23 +192,19 @@ export class GlobalBulkServiceRegistrationState {
         this.editorStore.projectConfigurationEditorState.projectConfiguration,
       );
 
-      const versionInput =
-        this.serviceConfigState.projectVersion instanceof Version
-          ? this.serviceConfigState.projectVersion.id.id
-          : undefined;
-
       const config = guaranteeNonNullable(
         this.serviceConfigState.options.find(
           (info) => info.env === this.serviceConfigState.serviceEnv,
         ),
       );
+
       const registrationResults =
         (yield this.editorStore.graphManagerState.graphManager.bulkServiceRegistration(
           selectedServices,
           this.editorStore.graphManagerState.graph,
           projectConfig.groupId,
           projectConfig.artifactId,
-          versionInput,
+          this.serviceConfigState.projectVersion,
           config.executionUrl,
           guaranteeNonNullable(this.serviceConfigState.serviceExecutionMode),
           {

package/src/stores/project-view/ProjectViewerStore.ts

@@ -181,6 +181,7 @@ export class ProjectViewerStore {
 
     // fetch project versions
     yield flowResult(this.editorStore.sdlcState.fetchProjectVersions());
+    yield flowResult(this.editorStore.depotState.fetchProjectVersions());
 
     // ensure only either version or revision is specified
     if (versionId && revisionId) {

package/tsconfig.json

@@ -56,6 +56,7 @@
     "./src/stores/editor/ChangeDetectionState.ts",
     "./src/stores/editor/DependencyProjectViewerHelper.ts",
     "./src/stores/editor/EditorConfig.ts",
+    "./src/stores/editor/EditorDepotState.ts",
     "./src/stores/editor/EditorGraphState.ts",
     "./src/stores/editor/EditorMode.ts",
     "./src/stores/editor/EditorSDLCState.ts",