@finos/legend-application-studio 15.0.0 → 15.2.0

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

@@ -61,7 +61,12 @@ export class ServiceEditorState extends ElementEditorState {
     });
 
     this.executionState = this.buildExecutionState();
-    this.registrationState = new ServiceRegistrationState(editorStore, this);
+    this.registrationState = new ServiceRegistrationState(
+      editorStore,
+      this.service,
+      editorStore.applicationStore.config.options.TEMPORARY__serviceRegistrationConfig,
+      editorStore.sdlcServerClient.features.canCreateVersion,
+    );
     this.testableState = new ServiceTestableState(editorStore, this);
   }
 

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

@@ -904,7 +904,7 @@ export class MultiServicePureExecutionState extends ServicePureExecutionState {
 
   addExecutionParameter(value: string): void {
     const _mapping =
-      this.editorStore.mappingOptions[0]?.value ?? stub_Mapping();
+      this.editorStore.graphManagerState.usableMappings[0] ?? stub_Mapping();
     const _key = new KeyedExecutionParameter(
       value,
       PackageableElementExplicitReference.create(_mapping),

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

@@ -15,10 +15,7 @@
  */
 
 import { action, computed, makeAutoObservable } from 'mobx';
-import {
-  type ServiceEditorState,
-  MINIMUM_SERVICE_OWNERS,
-} from '../../../editor-state/element-editor-state/service/ServiceEditorState.js';
+import { MINIMUM_SERVICE_OWNERS } from '../../../editor-state/element-editor-state/service/ServiceEditorState.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   type GeneratorFn,
@@ -35,6 +32,7 @@ import {
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
 import { Version } from '@finos/legend-server-sdlc';
 import {
+  type Service,
   type ServiceRegistrationResult,
   ServiceExecutionMode,
 } from '@finos/legend-graph';
@@ -74,23 +72,29 @@ export enum SERVICE_REGISTRATION_PHASE {
 }
 
 export class ServiceRegistrationState {
-  editorStore: EditorStore;
-  serviceEditorState: ServiceEditorState;
+  readonly editorStore: EditorStore;
+  readonly service: Service;
+  readonly registrationOptions: ServiceRegistrationEnvInfo[] = [];
   registrationState = ActionState.create();
   serviceEnv?: string | undefined;
   serviceExecutionMode?: ServiceExecutionMode | undefined;
   projectVersion?: Version | string | undefined;
   activatePostRegistration = true;
+  enableModesWithVersioning: boolean;
+  TEMPORARY__useStoreModel = false;
 
   constructor(
     editorStore: EditorStore,
-    serviceEditorState: ServiceEditorState,
+    service: Service,
+    registrationOptions: ServiceRegistrationEnvInfo[],
+    enableModesWithVersioning: boolean,
   ) {
     makeAutoObservable(this, {
       editorStore: false,
       executionModes: computed,
       updateVersion: action,
       setProjectVersion: action,
+      setUseStoreModelWithFullInteractive: action,
       initialize: action,
       updateType: action,
       updateEnv: action,
@@ -98,7 +102,9 @@ export class ServiceRegistrationState {
     });
 
     this.editorStore = editorStore;
-    this.serviceEditorState = serviceEditorState;
+    this.service = service;
+    this.registrationOptions = registrationOptions;
+    this.enableModesWithVersioning = enableModesWithVersioning;
     this.initialize();
     this.registrationState.setMessageFormatter(prettyCONSTName);
   }
@@ -112,16 +118,15 @@ export class ServiceRegistrationState {
   setProjectVersion(val: Version | string | undefined): void {
     this.projectVersion = val;
   }
-
   setActivatePostRegistration(val: boolean): void {
     this.activatePostRegistration = val;
   }
+  setUseStoreModelWithFullInteractive(val: boolean): void {
+    this.TEMPORARY__useStoreModel = val;
+  }
 
   initialize(): void {
-    this.serviceEnv = getNullableFirstElement(
-      this.editorStore.applicationStore.config.options
-        .TEMPORARY__serviceRegistrationConfig,
-    )?.env;
+    this.serviceEnv = getNullableFirstElement(this.registrationOptions)?.env;
     this.serviceExecutionMode = this.executionModes[0];
     this.updateVersion();
   }
@@ -147,12 +152,11 @@ export class ServiceRegistrationState {
   }
 
   get options(): ServiceRegistrationEnvInfo[] {
-    if (this.editorStore.sdlcServerClient.features.canCreateVersion) {
-      return this.editorStore.applicationStore.config.options
-        .TEMPORARY__serviceRegistrationConfig;
+    if (this.enableModesWithVersioning) {
+      return this.registrationOptions;
     }
-    return this.editorStore.applicationStore.config.options.TEMPORARY__serviceRegistrationConfig.map(
-      (_envConfig) => {
+    return this.registrationOptions
+      .map((_envConfig) => {
         const envConfig = new ServiceRegistrationEnvInfo();
         envConfig.env = _envConfig.env;
         envConfig.executionUrl = _envConfig.executionUrl;
@@ -162,8 +166,8 @@ export class ServiceRegistrationState {
           (mode) => mode === ServiceExecutionMode.FULL_INTERACTIVE,
         );
         return envConfig;
-      },
-    ).filter((envConfig) => envConfig.modes.length);
+      })
+      .filter((envConfig) => envConfig.modes.length);
   }
 
   get executionModes(): ServiceExecutionMode[] {
@@ -174,8 +178,8 @@ export class ServiceRegistrationState {
 
   get versionOptions(): ServiceVersionOption[] | undefined {
     if (
-      this.editorStore.sdlcServerClient.features.canCreateVersion &&
-      this.serviceExecutionMode !== ServiceExecutionMode.FULL_INTERACTIVE
+      this.enableModesWithVersioning &&
+      !(this.serviceExecutionMode === ServiceExecutionMode.FULL_INTERACTIVE)
     ) {
       const options: ServiceVersionOption[] =
         this.editorStore.sdlcState.projectVersions.map((version) => ({
@@ -216,13 +220,14 @@ export class ServiceRegistrationState {
       );
       const serviceRegistrationResult =
         (yield this.editorStore.graphManagerState.graphManager.registerService(
-          this.serviceEditorState.service,
+          this.service,
           this.editorStore.graphManagerState.graph,
           projectConfig.groupId,
           projectConfig.artifactId,
           versionInput,
           serverUrl,
           guaranteeNonNullable(this.serviceExecutionMode),
+          this.TEMPORARY__useStoreModel,
         )) as ServiceRegistrationResult;
       if (this.activatePostRegistration) {
         this.registrationState.setMessage(
@@ -284,11 +289,11 @@ export class ServiceRegistrationState {
   }
 
   validateServiceForRegistration(): void {
-    this.serviceEditorState.service.owners.forEach((owner) =>
+    this.service.owners.forEach((owner) =>
       assertNonEmptyString(owner, `Service can't have an empty owner name`),
     );
     assertTrue(
-      this.serviceEditorState.service.owners.length >= MINIMUM_SERVICE_OWNERS,
+      this.service.owners.length >= MINIMUM_SERVICE_OWNERS,
       `Service needs to have at least 2 owners in order to be registered`,
     );
     guaranteeNonNullable(

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

@@ -206,13 +206,17 @@ export class ConnectionTestDataState {
 }
 
 export class NewConnectionDataState {
+  readonly editorStore: EditorStore;
   readonly testSuiteState: ServiceTestDataState;
   showModal = false;
   connection: IdentifiedConnection | undefined;
   embeddedDataType: EmbeddedDataTypeOption | undefined;
   dataElement: DataElement | undefined;
 
-  constructor(suite: ServiceTestDataState) {
+  constructor(
+    editorStore: EditorStore,
+    serviceTestDataState: ServiceTestDataState,
+  ) {
     makeObservable(this, {
       showModal: observable,
       connection: observable,
@@ -224,8 +228,10 @@ export class NewConnectionDataState {
       handleConnectionChange: action,
       setDataElement: action,
     });
-    this.testSuiteState = suite;
-    this.dataElement = this.testSuiteState.editorStore.dataOptions[0]?.value;
+
+    this.editorStore = editorStore;
+    this.testSuiteState = serviceTestDataState;
+    this.dataElement = editorStore.graphManagerState.usableDataElements[0];
   }
 
   setModal(val: boolean): void {
@@ -303,6 +309,7 @@ export class ServiceTestDataState {
       newConnectionDataState: observable,
       selectedDataState: observable,
     });
+
     this.testData = testData;
     this.testSuiteState = testSuiteState;
     this.editorStore = testSuiteState.editorStore;
@@ -315,7 +322,10 @@ export class ServiceTestDataState {
         connectionData,
       );
     }
-    this.newConnectionDataState = new NewConnectionDataState(this);
+    this.newConnectionDataState = new NewConnectionDataState(
+      this.editorStore,
+      this,
+    );
   }
 
   createConnectionTestData(): void {

package/src/stores/graphModifier/StoreRelational_GraphModifierHelper.ts

@@ -42,6 +42,8 @@ import {
   type ObserverContext,
   type EnumerationMappingReference,
   type TableAlias,
+  type Mapper,
+  type PostProcessor,
   getRelationalInputType,
   observe_DatasourceSpecification,
   observe_AuthenticationStrategy,
@@ -49,8 +51,14 @@ import {
   observe_PropertyMapping,
   observe_EnumerationMappingReference,
   observe_TableAlias,
+  type SchemaNameMapper,
+  type MapperPostProcessor,
+  observe_PostProcessor,
+  observe_Mapper,
 } from '@finos/legend-graph';
+import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
+import type { RelationalDatabaseConnectionValueState } from '../editor-state/element-editor-state/connection/ConnectionEditorState.js';
 
 // --------------------------------------------- DB Connection -------------------------------------
 
@@ -421,3 +429,59 @@ export const rootRelationalSetImp_setPropertyMappings = action(
     );
   },
 );
+
+// --------------------------------------------- Post-Processor -------------------------------------
+
+export const relationalDatabaseConnection_addPostProcessor = action(
+  (
+    connectionValueState: RelationalDatabaseConnectionValueState,
+    postProcessor: PostProcessor,
+    observerContext: ObserverContext,
+  ): void => {
+    addUniqueEntry(
+      connectionValueState.connection.postProcessors,
+      observe_PostProcessor(postProcessor, observerContext),
+    );
+  },
+);
+
+export const relationalDatabaseConnection_deletePostProcessor = action(
+  (
+    connectionValueState: RelationalDatabaseConnectionValueState,
+    postProcessor: PostProcessor,
+  ): void => {
+    deleteEntry(connectionValueState.connection.postProcessors, postProcessor);
+  },
+);
+
+export const mapperPostProcessor_addMapper = action(
+  (mapperPostProcessor: MapperPostProcessor, mapper: Mapper): void => {
+    addUniqueEntry(mapperPostProcessor.mappers, observe_Mapper(mapper));
+  },
+);
+
+export const mapper_setFrom = action((mapper: Mapper, val: string): void => {
+  mapper.from = val;
+});
+
+export const mapper_setTo = action((mapper: Mapper, val: string): void => {
+  mapper.to = val;
+});
+
+export const schemaNameMapper_setTo = action(
+  (schemaNameMapper: SchemaNameMapper, val: string): void => {
+    schemaNameMapper.to = val;
+  },
+);
+
+export const schemaNameMapper_setFrom = action(
+  (schemaNameMapper: SchemaNameMapper, val: string): void => {
+    schemaNameMapper.from = val;
+  },
+);
+
+export const mapperPostProcessor_deleteMapper = action(
+  (mapperPostProcessor: MapperPostProcessor, val: Mapper): void => {
+    deleteEntry(mapperPostProcessor.mappers, val);
+  },
+);

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

@@ -46,7 +46,6 @@ import {
   filterByType,
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
-import { getElementTypeIcon } from '../../../components/shared/ElementIconUtils.js';
 import type { EditorSDLCState } from '../../EditorSDLCState.js';
 import type { EditorStore } from '../../EditorStore.js';
 import type {
@@ -56,10 +55,9 @@ import type {
 
 // Testable Metadata
 export interface TestableMetadata {
-  testable: Testable;
   id: string;
   name: string;
-  icon: React.ReactNode;
+  testable: Testable;
 }
 
 export const getTestableMetadata = (
@@ -69,7 +67,7 @@ export const getTestableMetadata = (
 ): TestableMetadata => {
   if (testable instanceof PackageableElement) {
     return {
-      testable: testable,
+      testable,
       id:
         getNullableIDFromTestable(
           testable,
@@ -77,10 +75,6 @@ export const getTestableMetadata = (
           editorStore.graphManagerState.pluginManager.getPureGraphManagerPlugins(),
         ) ?? uuid(),
       name: testable.name,
-      icon: getElementTypeIcon(
-        editorStore,
-        editorStore.graphState.getPackageableElementType(testable),
-      ),
     };
   }
   const extraTestables = extraTestableMetadataGetters
@@ -91,7 +85,6 @@ export const getTestableMetadata = (
       testable,
       id: uuid(),
       name: '(unknown)',
-      icon: null,
     }
   );
 };

package/tsconfig.json

@@ -85,6 +85,7 @@
     "./src/stores/editor-state/element-editor-state/UMLEditorState.ts",
     "./src/stores/editor-state/element-editor-state/connection/ConnectionEditorState.ts",
     "./src/stores/editor-state/element-editor-state/connection/DatabaseBuilderState.ts",
+    "./src/stores/editor-state/element-editor-state/connection/PostProcessorEditorState.ts",
     "./src/stores/editor-state/element-editor-state/data/DataEditorState.ts",
     "./src/stores/editor-state/element-editor-state/data/EmbeddedDataState.ts",
     "./src/stores/editor-state/element-editor-state/external-format/BindingEditorState.ts",
@@ -165,8 +166,10 @@
     "./src/components/editor/edit-panel/UnsupportedElementEditor.tsx",
     "./src/components/editor/edit-panel/connection-editor/ConnectionEditor.tsx",
     "./src/components/editor/edit-panel/connection-editor/DatabaseBuilder.tsx",
+    "./src/components/editor/edit-panel/connection-editor/DatabaseEditorHelper.tsx",
     "./src/components/editor/edit-panel/connection-editor/FlatDataConnectionEditor.tsx",
     "./src/components/editor/edit-panel/connection-editor/RelationalDatabaseConnectionEditor.tsx",
+    "./src/components/editor/edit-panel/connection-editor/post-processor-editor/MapperPostProcessorEditor.tsx",
     "./src/components/editor/edit-panel/data-editor/DataElementEditor.tsx",
     "./src/components/editor/edit-panel/data-editor/EmbeddedDataEditor.tsx",
     "./src/components/editor/edit-panel/data-editor/RelationalCSVDataEditor.tsx",
@@ -242,8 +245,7 @@
     "./src/components/workspace-setup/ProjectSelector.tsx",
     "./src/components/workspace-setup/WorkspaceSelector.tsx",
     "./src/components/workspace-setup/WorkspaceSetup.tsx",
-    "./src/components/workspace-setup/WorkspaceSetupStoreProvider.tsx",
-    "./src/stores/editor-state/element-editor-state/mapping/relational/DatabaseEditorHelper.tsx"
+    "./src/components/workspace-setup/WorkspaceSetupStoreProvider.tsx"
   ],
   "include": [
     "src/**/*.ts",

package/tsconfig.package.json

@@ -0,0 +1,38 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext",
+      "webworker",
+      "scripthost"
+    ],
+    "composite": true,
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "target": "esnext",
+    "module": "nodenext",
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "importsNotUsedAsValues": "error",
+    "strict": true,
+    "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "./lib",
+    "tsBuildInfoFile": "./build/package.tsbuildinfo",
+    "rootDir": "./"
+  },
+  "files": [
+    "./package.json"
+  ],
+  "include": [
+    "package.json"
+  ],
+  "exclude": [
+    "lib"
+  ]
+}

package/lib/stores/editor-state/element-editor-state/mapping/relational/DatabaseEditorHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DatabaseEditorHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/editor-state/element-editor-state/mapping/relational/DatabaseEditorHelper.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,EACL,KAAK,kBAAkB,EAmBxB,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,uBAAuB,SAAU,kBAAkB,KAAG,MAuClE,CAAC;AAEF,eAAO,MAAM,oBAAoB,SACzB,kBAAkB,KACvB,MAAM,SA2CR,CAAC"}

package/lib/stores/editor-state/element-editor-state/mapping/relational/DatabaseEditorHelper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DatabaseEditorHelper.js","sourceRoot":"","sources":["../../../../../../src/stores/editor-state/element-editor-state/mapping/relational/DatabaseEditorHelper.tsx"],"names":[],"mappings":"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"}