@finos/legend-application-studio 16.0.2 → 18.0.0

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

@@ -28,6 +28,7 @@ import {
   UnsupportedOperationError,
   getNullableFirstElement,
   assertTrue,
+  URL_SEPARATOR,
 } from '@finos/legend-shared';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
 import { Version } from '@finos/legend-server-sdlc';
@@ -36,7 +37,7 @@ import {
   type ServiceRegistrationResult,
   ServiceExecutionMode,
 } from '@finos/legend-graph';
-import { ServiceRegistrationEnvInfo } from '../../../../application/LegendStudioApplicationConfig.js';
+import { ServiceRegistrationEnvironmentConfig } from '../../../../application/LegendStudioApplicationConfig.js';
 import {
   ActionAlertActionType,
   ActionAlertType,
@@ -44,6 +45,19 @@ import {
 
 export const LATEST_PROJECT_REVISION = 'Latest Project Revision';
 
+export const generateServiceManagementUrl = (
+  baseUrl: string,
+  serviceUrlPattern: string,
+): string =>
+  `${baseUrl}${
+    URL_SEPARATOR +
+    encodeURIComponent(
+      serviceUrlPattern[0] === URL_SEPARATOR
+        ? serviceUrlPattern.substring(1)
+        : serviceUrlPattern,
+    )
+  }`;
+
 const getServiceExecutionMode = (mode: string): ServiceExecutionMode => {
   switch (mode) {
     case ServiceExecutionMode.FULL_INTERACTIVE:
@@ -59,22 +73,15 @@ const getServiceExecutionMode = (mode: string): ServiceExecutionMode => {
   }
 };
 
-const URL_SEPARATOR = '/';
-
 interface ServiceVersionOption {
   label: string;
   value: Version | string;
 }
 
-export enum SERVICE_REGISTRATION_PHASE {
-  REGISTERING_SERVICE = 'REGISTERING_SERVICE',
-  ACTIVATING_SERVICE = 'ACTIVATING_SERVICE',
-}
-
 export class ServiceRegistrationState {
   readonly editorStore: EditorStore;
   readonly service: Service;
-  readonly registrationOptions: ServiceRegistrationEnvInfo[] = [];
+  readonly registrationOptions: ServiceRegistrationEnvironmentConfig[] = [];
   registrationState = ActionState.create();
   serviceEnv?: string | undefined;
   serviceExecutionMode?: ServiceExecutionMode | undefined;
@@ -86,7 +93,7 @@ export class ServiceRegistrationState {
   constructor(
     editorStore: EditorStore,
     service: Service,
-    registrationOptions: ServiceRegistrationEnvInfo[],
+    registrationOptions: ServiceRegistrationEnvironmentConfig[],
     enableModesWithVersioning: boolean,
   ) {
     makeAutoObservable(this, {
@@ -151,13 +158,13 @@ export class ServiceRegistrationState {
     this.setServiceExecutionMode(this.executionModes[0]);
   }
 
-  get options(): ServiceRegistrationEnvInfo[] {
+  get options(): ServiceRegistrationEnvironmentConfig[] {
     if (this.enableModesWithVersioning) {
       return this.registrationOptions;
     }
     return this.registrationOptions
       .map((_envConfig) => {
-        const envConfig = new ServiceRegistrationEnvInfo();
+        const envConfig = new ServiceRegistrationEnvironmentConfig();
         envConfig.env = _envConfig.env;
         envConfig.executionUrl = _envConfig.executionUrl;
         envConfig.managementUrl = _envConfig.managementUrl;
@@ -179,7 +186,7 @@ export class ServiceRegistrationState {
   get versionOptions(): ServiceVersionOption[] | undefined {
     if (
       this.enableModesWithVersioning &&
-      !(this.serviceExecutionMode === ServiceExecutionMode.FULL_INTERACTIVE)
+      this.serviceExecutionMode !== ServiceExecutionMode.FULL_INTERACTIVE
     ) {
       const options: ServiceVersionOption[] =
         this.editorStore.sdlcState.projectVersions.map((version) => ({
@@ -215,9 +222,7 @@ export class ServiceRegistrationState {
       const projectConfig = guaranteeNonNullable(
         this.editorStore.projectConfigurationEditorState.projectConfiguration,
       );
-      this.registrationState.setMessage(
-        SERVICE_REGISTRATION_PHASE.REGISTERING_SERVICE,
-      );
+      this.registrationState.setMessage(`Registering service...`);
       const serviceRegistrationResult =
         (yield this.editorStore.graphManagerState.graphManager.registerService(
           this.service,
@@ -227,12 +232,12 @@ export class ServiceRegistrationState {
           versionInput,
           serverUrl,
           guaranteeNonNullable(this.serviceExecutionMode),
-          this.TEMPORARY__useStoreModel,
+          {
+            TEMPORARY__useStoreModel: this.TEMPORARY__useStoreModel,
+          },
         )) as ServiceRegistrationResult;
       if (this.activatePostRegistration) {
-        this.registrationState.setMessage(
-          SERVICE_REGISTRATION_PHASE.ACTIVATING_SERVICE,
-        );
+        this.registrationState.setMessage(`Activating service...`);
         yield this.editorStore.graphManagerState.graphManager.activateService(
           serverUrl,
           serviceRegistrationResult.serviceInstanceId,
@@ -240,20 +245,13 @@ export class ServiceRegistrationState {
       }
       assertNonEmptyString(
         serviceRegistrationResult.pattern,
-        'Service registration pattern is missing',
+        'Service registration pattern is missing or empty',
       );
-      const message = `Service with pattern ${
-        serviceRegistrationResult.pattern
-      } registered ${this.activatePostRegistration ? 'and activated ' : ''}`;
-      const encodedServicePattern =
-        URL_SEPARATOR +
-        encodeURIComponent(
-          serviceRegistrationResult.pattern[0] === URL_SEPARATOR
-            ? serviceRegistrationResult.pattern.substring(1)
-            : serviceRegistrationResult.pattern,
-        );
+
       this.editorStore.setActionAlertInfo({
-        message,
+        message: `Service with pattern ${
+          serviceRegistrationResult.pattern
+        } registered ${this.activatePostRegistration ? 'and activated ' : ''}`,
         prompt: 'You can now launch and monitor the operation of your service',
         type: ActionAlertType.STANDARD,
         onEnter: (): void => this.editorStore.setBlockGlobalHotkeys(true),
@@ -264,7 +262,10 @@ export class ServiceRegistrationState {
             type: ActionAlertActionType.PROCEED,
             handler: (): void => {
               this.editorStore.applicationStore.navigator.openNewWindow(
-                `${config.managementUrl}${encodedServicePattern}`,
+                generateServiceManagementUrl(
+                  config.managementUrl,
+                  serviceRegistrationResult.pattern,
+                ),
               );
             },
             default: true,

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestDataState.ts

@@ -51,11 +51,11 @@ import type { EditorStore } from '../../../../EditorStore.js';
 import {
   service_addConnectionTestData,
   service_setConnectionTestDataEmbeddedData,
-} from '../../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import {
   createMockEnumerationProperty,
   createMockPrimitiveProperty,
-} from '../../../../shared/MockDataUtil.js';
+} from '../../../../shared/MockDataUtils.js';
 import {
   createRelationalDataFromCSV,
   EmbeddedDataConnectionTypeVisitor,

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -35,7 +35,7 @@ import {
   service_setParameterValues,
   service_setParameterValueSpec,
   service_setSerializationFormat,
-} from '../../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import {
   assertErrorThrown,
   deleteEntry,

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestableState.ts

@@ -46,7 +46,7 @@ import {
   service_addTest,
   service_addTestSuite,
   service_deleteTestSuite,
-} from '../../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import { createEmptyEqualToJsonAssertion } from '../../../../shared/testable/TestableUtils.js';
 import type { ServiceEditorState } from '../ServiceEditorState.js';
 import { ServiceTestDataState } from './ServiceTestDataState.js';

package/src/stores/editor-state/element-editor-state/testable/TestAssertionState.ts

@@ -36,7 +36,7 @@ import {
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
-import { externalFormatData_setData } from '../../../graphModifier/DSLData_GraphModifierHelper.js';
+import { externalFormatData_setData } from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
 import {
   getTestableResultFromAssertionStatus,
   TESTABLE_RESULT,

package/src/stores/graphModifier/{DSLMapping_GraphModifierHelper.ts → DSL_Mapping_GraphModifierHelper.ts}

@@ -250,7 +250,7 @@ export const enumValueMapping_updateSourceValue = action(
       sourceValue_setValue(
         sourceValue,
         sourceType instanceof Type && sourceType.name === PRIMITIVE_TYPE.INTEGER
-          ? parseInt(val as string)
+          ? parseInt(val as string, 10)
           : val,
       );
     }

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

@@ -32,7 +32,11 @@ import {
   generateViewRevisionRoute,
   generateViewProjectRoute,
 } from '../LegendStudioRouter.js';
-import type { Entity } from '@finos/legend-storage';
+import {
+  type Entity,
+  type ProjectGAVCoordinates,
+  parseGAVCoordinates,
+} from '@finos/legend-storage';
 import {
   ProjectConfiguration,
   Revision,
@@ -42,11 +46,7 @@ import {
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
 import { TAB_SIZE } from '@finos/legend-application';
-import {
-  type ProjectGAVCoordinates,
-  parseGAVCoordinates,
-  ProjectData,
-} from '@finos/legend-server-depot';
+import { ProjectData } from '@finos/legend-server-depot';
 import {
   type WorkflowManagerState,
   ProjectVersionWorkflowManagerState,
@@ -202,7 +202,7 @@ export class ProjectViewerStore {
     // fetch entities
     stopWatch.record();
     this.editorStore.initState.setMessage(`Fetching entities...`);
-    if (versionId) {
+    if (versionId && !revisionId) {
       // get version info if a version is specified
       this.version =
         versionId !== this.latestVersion.id.id
@@ -223,7 +223,7 @@ export class ProjectViewerStore {
           versionId,
         ),
       ])) as [Entity[], PlainObject<ProjectConfiguration>];
-    } else if (revisionId) {
+    } else if (revisionId && !versionId) {
       // get revision info if a revision is specified
       this.revision =
         revisionId !== this.currentRevision.id

package/src/stores/shared/{DnDUtil.ts → DnDUtils.ts}

@@ -19,7 +19,7 @@ import type {
   FlatDataRecordTypeTreeNodeData,
   TypeTreeNodeData,
   PackageTreeNodeData,
-} from '../shared/TreeUtil.js';
+} from './TreeUtils.js';
 
 export enum CORE_DND_TYPE {
   NONE = 'NONE',

package/src/stores/shared/{MockDataUtil.ts → MockDataUtils.ts}

@@ -30,7 +30,10 @@ import {
   DATE_FORMAT,
   DATE_TIME_FORMAT,
 } from '@finos/legend-graph';
-import { CLASS_PROPERTY_TYPE, getClassPropertyType } from './ModelUtil.js';
+import {
+  CLASS_PROPERTY_TYPE,
+  getClassPropertyType,
+} from './ModelClassifierUtils.js';
 import type { MappingElementSource } from '../editor-state/element-editor-state/mapping/MappingEditorState.js';
 
 export const createMockPrimitiveProperty = (

package/src/stores/shared/{PackageTreeUtil.ts → PackageTreeUtils.ts}

@@ -15,10 +15,10 @@
  */
 
 import { isNonNullable, addUniqueEntry } from '@finos/legend-shared';
-import type { PackageTreeNodeData } from './TreeUtil.js';
+import type { PackageTreeNodeData } from './TreeUtils.js';
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import type { EditorStore } from '../EditorStore.js';
-import { CORE_DND_TYPE } from './DnDUtil.js';
+import { CORE_DND_TYPE } from './DnDUtils.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from '../LegendStudioApplicationPlugin.js';
 import {
   type PackageableElement,

package/src/stores/shared/{TreeUtil.ts → TreeUtils.ts}

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { CORE_DND_TYPE } from '../shared/DnDUtil.js';
+import type { CORE_DND_TYPE } from '../shared/DnDUtils.js';
 import type { TreeNodeData } from '@finos/legend-art';
 import type {
   Type,

package/src/stores/shared/testable/TestableUtils.ts

@@ -47,7 +47,7 @@ import {
 } from '@finos/legend-shared';
 import { EmbeddedDataType } from '../../editor-state/ExternalFormatState.js';
 import type { EditorStore } from '../../EditorStore.js';
-import { createMockDataForMappingElementSource } from '../MockDataUtil.js';
+import { createMockDataForMappingElementSource } from '../MockDataUtils.js';
 
 export const createBareExternalFormat = (
   contentType?: string | undefined,

package/src/stores/sidebar-state/testable/GlobalTestRunnerState.ts

@@ -19,6 +19,7 @@ import {
   type AssertionStatus,
   type Test,
   type Testable,
+  type TestBatch,
   type TestResult,
   type TestAssertion,
   RunTestsTestableInput,
@@ -134,6 +135,14 @@ export class AtomicTestTreeNodeData extends TestTreeNodeData {
   }
 }
 
+export class TestBatchTreeNodeData extends TestTreeNodeData {
+  testBatch: TestBatch;
+  constructor(id: string, testBatch: TestBatch) {
+    super(id, testBatch.id);
+    this.testBatch = testBatch;
+  }
+}
+
 export class TestSuiteTreeNodeData extends TestTreeNodeData {
   testSuite: TestSuite;
 
@@ -327,6 +336,14 @@ export const getNodeTestableResult = (
     return getTestableResultFromTestResult(
       getAtomicTest_TestResult(node.atomicTest, results),
     );
+  } else if (node instanceof TestBatchTreeNodeData) {
+    node.testBatch.assertions.forEach((assertion) => {
+      getNodeTestableResult(
+        new AssertionTestTreeNodeData(assertion.id, assertion),
+        globalRun,
+        results,
+      );
+    });
   } else if (node instanceof TestSuiteTreeNodeData) {
     return getTestableResultFromTestResults(
       getTestSuite_TestResults(node.testSuite, results),
@@ -346,6 +363,7 @@ export class TestableState {
   testableMetadata: TestableMetadata;
   treeData: TreeData<TestableExplorerTreeNodeData>;
   results: Map<AtomicTest, TestResult> = new Map();
+  batchResults: Map<TestBatch, TestResult> = new Map();
   isRunningTests = ActionState.create();
 
   constructor(