@finos/legend-application-studio 27.1.5 → 27.1.7

package/src/stores/editor/editor-state/element-editor-state/mapping/testable/MappingTestingHelper.ts

@@ -62,6 +62,7 @@ import {
   assertTrue,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
+import type { DSL_Data_LegendStudioApplicationPlugin_Extension } from '../../../../../extensions/DSL_Data_LegendStudioApplicationPlugin_Extension.js';
 
 export const createGraphFetchRawLambda = (
   mainClass: Class,
@@ -116,7 +117,7 @@ export const generateStoreTestDataFromSetImpl = (
     );
     if (_table instanceof TableAlias) {
       const relation = _table.relation.value;
-      const owner = relation.schema._OWNER;
+      const owner = _table.relation.ownerReference.value;
       const val = new RelationalCSVData();
       if (tryAndMockTable && relation instanceof Table) {
         const mockTable = new RelationalCSVDataTable();
@@ -137,6 +138,20 @@ export const generateStoreTestDataFromSetImpl = (
       return createStoreBareModelStoreData(srcClass.value, editorStore);
     }
   }
+  const extraStoreDataCreators = editorStore.pluginManager
+    .getApplicationPlugins()
+    .flatMap(
+      (plugin) =>
+        (
+          plugin as DSL_Data_LegendStudioApplicationPlugin_Extension
+        ).getExtraStoreTestDataCreators?.() ?? [],
+    );
+  for (const creator of extraStoreDataCreators) {
+    const embeddedData = creator(setImpl);
+    if (embeddedData) {
+      return embeddedData;
+    }
+  }
   return undefined;
 };
 

package/src/stores/editor/utils/TestableUtils.ts

@@ -59,6 +59,7 @@ import {
 import { EmbeddedDataType } from '../editor-state/ExternalFormatState.js';
 import type { EditorStore } from '../EditorStore.js';
 import { createMockDataForMappingElementSource } from './MockDataUtils.js';
+import type { DSL_Data_LegendStudioApplicationPlugin_Extension } from '../../extensions/DSL_Data_LegendStudioApplicationPlugin_Extension.js';
 
 export const DEFAULT_TEST_ASSERTION_ID = 'assertion_1';
 export const DEFAULT_TEST_ID = 'test_1';
@@ -127,8 +128,28 @@ export const createBareModelStoreData = (
 export class EmbeddedDataCreatorFromEmbeddedData
   implements EmbeddedDataVisitor<EmbeddedData>
 {
+  editorStore: EditorStore;
+  constructor(editorStore: EditorStore) {
+    this.editorStore = editorStore;
+  }
   visit_EmbeddedData(data: EmbeddedData): EmbeddedData {
-    throw new Error('Method not implemented.');
+    const extraEmbeddedDataCloners = this.editorStore.pluginManager
+      .getApplicationPlugins()
+      .flatMap(
+        (plugin) =>
+          (
+            plugin as DSL_Data_LegendStudioApplicationPlugin_Extension
+          ).getExtraEmbeddedDataCloners?.() ?? [],
+      );
+    for (const creator of extraEmbeddedDataCloners) {
+      const embeddedData = creator(data);
+      if (embeddedData) {
+        return embeddedData;
+      }
+    }
+    throw new UnsupportedOperationError(
+      `Unsupported embedded data${data.toString()}`,
+    );
   }
   visit_INTERNAL__UnknownEmbeddedData(
     data: INTERNAL__UnknownEmbeddedData,
@@ -149,7 +170,7 @@ export class EmbeddedDataCreatorFromEmbeddedData
           const v = new ModelEmbeddedData();
           v.model = PackageableElementExplicitReference.create(e.model.value);
           v.data = e.data.accept_EmbeddedDataVisitor(
-            new EmbeddedDataCreatorFromEmbeddedData(),
+            new EmbeddedDataCreatorFromEmbeddedData(this.editorStore),
           );
           return v;
         }
@@ -160,7 +181,7 @@ export class EmbeddedDataCreatorFromEmbeddedData
   }
   visit_DataElementReference(data: DataElementReference): EmbeddedData {
     return data.dataElement.value.data.accept_EmbeddedDataVisitor(
-      new EmbeddedDataCreatorFromEmbeddedData(),
+      new EmbeddedDataCreatorFromEmbeddedData(this.editorStore),
     );
   }
   visit_RelationalCSVData(data: RelationalCSVData): EmbeddedData {
@@ -224,6 +245,20 @@ export class EmbeddedDataConnectionTypeVisitor
   }
 
   visit_Connection(connection: Connection): string {
+    const extraEmbeddedDataCreator = this.editorStore.pluginManager
+      .getApplicationPlugins()
+      .flatMap(
+        (plugin) =>
+          (
+            plugin as DSL_Data_LegendStudioApplicationPlugin_Extension
+          ).getExtraEmbeddedDataTypeFromConnectionMatchers?.() ?? [],
+      );
+    for (const creator of extraEmbeddedDataCreator) {
+      const embeddedData = creator(connection);
+      if (embeddedData) {
+        return embeddedData;
+      }
+    }
     return EmbeddedDataType.EXTERNAL_FORMAT_DATA;
   }
   visit_INTERNAL__UnknownConnection(

package/src/stores/extensions/DSL_Data_LegendStudioApplicationPlugin_Extension.ts

@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import type { EmbeddedData } from '@finos/legend-graph';
+import type {
+  Connection,
+  EmbeddedData,
+  SetImplementation,
+  StoreTestData,
+} from '@finos/legend-graph';
 import type { EmbeddedDataTypeOption } from '../editor/editor-state/element-editor-state/data/DataEditorState.js';
 import type { EmbeddedDataState } from '../editor/editor-state/element-editor-state/data/EmbeddedDataState.js';
 import type { EditorStore } from '../editor/EditorStore.js';
@@ -35,6 +40,18 @@ export type EmbeddedDataCreator = (
   embeddedDataType: string,
 ) => EmbeddedData | undefined;
 
+export type EmbeddedDataCloner = (
+  embeddedData: EmbeddedData,
+) => EmbeddedData | undefined;
+
+export type StoreTestDataCreators = (
+  setImp: SetImplementation,
+) => StoreTestData | undefined;
+
+export type EmbeddedDataTypeFromConnectionMatcher = (
+  connection: Connection,
+) => string | undefined;
+
 /**
  * NOTE: The tab-stop index of the snippet must start from 2
  */
@@ -67,4 +84,19 @@ export interface DSL_Data_LegendStudioApplicationPlugin_Extension
    * Get the list of embedded data creators
    */
   getExtraEmbeddedDataCreators?(): EmbeddedDataCreator[];
+
+  /**
+   * Get the list of embedded data type from connection matchers
+   */
+  getExtraEmbeddedDataTypeFromConnectionMatchers?(): EmbeddedDataTypeFromConnectionMatcher[];
+
+  /**
+   * Get the list of store test data creators
+   */
+  getExtraStoreTestDataCreators?(): StoreTestDataCreators[];
+
+  /**
+   * Get the list of embedded data cloners
+   */
+  getExtraEmbeddedDataCloners?(): EmbeddedDataCloner[];
 }

package/tsconfig.json

@@ -210,7 +210,6 @@
     "./src/components/editor/editor-group/element-generation-editor/FileGenerationEditor.tsx",
     "./src/components/editor/editor-group/element-generation-editor/FileSystemViewer.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_BindingElementEditor.tsx",
-    "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_NewSchemaSetDriver.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetModelGenerationEditor.tsx",

package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.d.ts

@@ -1,22 +0,0 @@
-import { ExternalFormatConnection, type Binding } from '@finos/legend-graph';
-import { ConnectionValueState } from '../../../../stores/editor/editor-state/element-editor-state/connection/ConnectionEditorState.js';
-import type { EditorStore } from '../../../../stores/editor/EditorStore.js';
-import { NewConnectionValueDriver } from '../../../../stores/editor/NewElementState.js';
-export declare class ExternalFormatConnectionValueState extends ConnectionValueState {
-    connection: ExternalFormatConnection;
-    constructor(editorStore: EditorStore, connection: ExternalFormatConnection);
-    label(): string;
-}
-export declare const ExternalFormatConnectionEditor: ((props: {
-    connectionValueState: ExternalFormatConnectionValueState;
-    isReadOnly: boolean;
-}) => import("react/jsx-runtime").JSX.Element) & {
-    displayName: string;
-};
-export declare class NewExternalFormatConnectionDriver extends NewConnectionValueDriver<ExternalFormatConnection> {
-    constructor(editorStore: EditorStore);
-    get isValid(): boolean;
-    getConnectionType(): string;
-    createConnection(store: Binding): ExternalFormatConnection;
-}
-//# sourceMappingURL=DSL_ExternalFormat_ExternalFormatConnectionEditor.d.ts.map

package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSL_ExternalFormat_ExternalFormatConnectionEditor.d.ts","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.tsx"],"names":[],"mappings":"AAgBA,OAAO,EACL,wBAAwB,EAGxB,KAAK,OAAO,EACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,iGAAiG,CAAC;AACvI,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AAIxF,qBAAa,kCAAmC,SAAQ,oBAAoB;IACjE,UAAU,EAAE,wBAAwB,CAAC;gBAElC,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,wBAAwB;IAK1E,KAAK,IAAI,MAAM;CAGhB;AAED,eAAO,MAAM,8BAA8B,WACjC;IACN,oBAAoB,EAAE,kCAAkC,CAAC;IACzD,UAAU,EAAE,OAAO,CAAC;CACrB;;CA4BF,CAAC;AAEF,qBAAa,iCAAkC,SAAQ,wBAAwB,CAAC,wBAAwB,CAAC;gBAC3F,WAAW,EAAE,WAAW;IAQpC,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,iBAAiB,IAAI,MAAM;IAI3B,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB;CAS3D"}

package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.js

@@ -1,61 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { observer } from 'mobx-react-lite';
-import { ExternalFormatConnection, PackageableElementExplicitReference, UrlStream, } from '@finos/legend-graph';
-import { computed, makeObservable } from 'mobx';
-import { ConnectionValueState } from '../../../../stores/editor/editor-state/element-editor-state/connection/ConnectionEditorState.js';
-import { NewConnectionValueDriver } from '../../../../stores/editor/NewElementState.js';
-import { externalFormat_urlStream_setUrl } from '../../../../stores/graph-modifier/DSL_ExternalFormat_GraphModifierHelper.js';
-import { EXTERNAL_FORMAT_CONNECTION } from '../../../extensions/DSL_ExternalFormat_LegendStudioApplicationPlugin.js';
-export class ExternalFormatConnectionValueState extends ConnectionValueState {
-    connection;
-    constructor(editorStore, connection) {
-        super(editorStore, connection);
-        this.connection = connection;
-    }
-    label() {
-        return 'external format connection';
-    }
-}
-export const ExternalFormatConnectionEditor = observer((props) => {
-    const { connectionValueState, isReadOnly } = props;
-    const connection = connectionValueState.connection;
-    const changeUrl = (event) => externalFormat_urlStream_setUrl(connection.externalSource, event.target.value);
-    return (_jsx("div", { className: "external-format-connection-editor", children: _jsxs("div", { className: "external-format-connection-editor__section", children: [_jsx("div", { className: "external-format-connection-editor__section__header__label", children: "URL" }), _jsx("div", { className: "external-format-connection-editor__section__header__prompt", children: "Specifies the connection URL" }), _jsx("textarea", { className: "external-format-connection-editor__section__textarea", spellCheck: false, value: connection.externalSource.url, onChange: changeUrl, disabled: isReadOnly })] }) }));
-});
-export class NewExternalFormatConnectionDriver extends NewConnectionValueDriver {
-    constructor(editorStore) {
-        super(editorStore);
-        makeObservable(this, {
-            isValid: computed,
-        });
-    }
-    get isValid() {
-        return true;
-    }
-    getConnectionType() {
-        return EXTERNAL_FORMAT_CONNECTION;
-    }
-    createConnection(store) {
-        const externalFormatConnection = new ExternalFormatConnection(PackageableElementExplicitReference.create(store));
-        const urlStream = new UrlStream();
-        externalFormat_urlStream_setUrl(urlStream, '');
-        externalFormatConnection.externalSource = urlStream;
-        return externalFormatConnection;
-    }
-}
-//# sourceMappingURL=DSL_ExternalFormat_ExternalFormatConnectionEditor.js.map

package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSL_ExternalFormat_ExternalFormatConnectionEditor.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,mCAAmC,EACnC,SAAS,GAEV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iGAAiG,CAAC;AAEvI,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,+BAA+B,EAAE,MAAM,6EAA6E,CAAC;AAC9H,OAAO,EAAE,0BAA0B,EAAE,MAAM,yEAAyE,CAAC;AAErH,MAAM,OAAO,kCAAmC,SAAQ,oBAAoB;IACjE,UAAU,CAA2B;IAE9C,YAAY,WAAwB,EAAE,UAAoC;QACxE,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,OAAO,4BAA4B,CAAC;IACtC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,QAAQ,CACpD,CAAC,KAGA,EAAE,EAAE;IACH,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,UAAU,GAAG,oBAAoB,CAAC,UAAU,CAAC;IACnD,MAAM,SAAS,GAAkD,CAAC,KAAK,EAAE,EAAE,CACzE,+BAA+B,CAC7B,UAAU,CAAC,cAAc,EACzB,KAAK,CAAC,MAAM,CAAC,KAAK,CACnB,CAAC;IACJ,OAAO,CACL,cAAK,SAAS,EAAC,mCAAmC,YAChD,eAAK,SAAS,EAAC,4CAA4C,aACzD,cAAK,SAAS,EAAC,2DAA2D,oBAEpE,EACN,cAAK,SAAS,EAAC,4DAA4D,6CAErE,EACN,mBACE,SAAS,EAAC,sDAAsD,EAChE,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,EACpC,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,UAAU,GACpB,IACE,GACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,OAAO,iCAAkC,SAAQ,wBAAkD;IACvG,YAAY,WAAwB;QAClC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEnB,cAAc,CAAC,IAAI,EAAE;YACnB,OAAO,EAAE,QAAQ;SAClB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB;QACf,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,gBAAgB,CAAC,KAAc;QAC7B,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,CAC3D,mCAAmC,CAAC,MAAM,CAAC,KAAK,CAAC,CAClD,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,+BAA+B,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC/C,wBAAwB,CAAC,cAAc,GAAG,SAAS,CAAC;QACpD,OAAO,wBAAwB,CAAC;IAClC,CAAC;CACF"}

package/src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_ExternalFormatConnectionEditor.tsx

@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { observer } from 'mobx-react-lite';
-import {
-  ExternalFormatConnection,
-  PackageableElementExplicitReference,
-  UrlStream,
-  type Binding,
-} from '@finos/legend-graph';
-import { computed, makeObservable } from 'mobx';
-import { ConnectionValueState } from '../../../../stores/editor/editor-state/element-editor-state/connection/ConnectionEditorState.js';
-import type { EditorStore } from '../../../../stores/editor/EditorStore.js';
-import { NewConnectionValueDriver } from '../../../../stores/editor/NewElementState.js';
-import { externalFormat_urlStream_setUrl } from '../../../../stores/graph-modifier/DSL_ExternalFormat_GraphModifierHelper.js';
-import { EXTERNAL_FORMAT_CONNECTION } from '../../../extensions/DSL_ExternalFormat_LegendStudioApplicationPlugin.js';
-
-export class ExternalFormatConnectionValueState extends ConnectionValueState {
-  override connection: ExternalFormatConnection;
-
-  constructor(editorStore: EditorStore, connection: ExternalFormatConnection) {
-    super(editorStore, connection);
-    this.connection = connection;
-  }
-
-  label(): string {
-    return 'external format connection';
-  }
-}
-
-export const ExternalFormatConnectionEditor = observer(
-  (props: {
-    connectionValueState: ExternalFormatConnectionValueState;
-    isReadOnly: boolean;
-  }) => {
-    const { connectionValueState, isReadOnly } = props;
-    const connection = connectionValueState.connection;
-    const changeUrl: React.ChangeEventHandler<HTMLTextAreaElement> = (event) =>
-      externalFormat_urlStream_setUrl(
-        connection.externalSource,
-        event.target.value,
-      );
-    return (
-      <div className="external-format-connection-editor">
-        <div className="external-format-connection-editor__section">
-          <div className="external-format-connection-editor__section__header__label">
-            URL
-          </div>
-          <div className="external-format-connection-editor__section__header__prompt">
-            Specifies the connection URL
-          </div>
-          <textarea
-            className="external-format-connection-editor__section__textarea"
-            spellCheck={false}
-            value={connection.externalSource.url}
-            onChange={changeUrl}
-            disabled={isReadOnly}
-          />
-        </div>
-      </div>
-    );
-  },
-);
-
-export class NewExternalFormatConnectionDriver extends NewConnectionValueDriver<ExternalFormatConnection> {
-  constructor(editorStore: EditorStore) {
-    super(editorStore);
-
-    makeObservable(this, {
-      isValid: computed,
-    });
-  }
-
-  get isValid(): boolean {
-    return true;
-  }
-
-  getConnectionType(): string {
-    return EXTERNAL_FORMAT_CONNECTION;
-  }
-
-  createConnection(store: Binding): ExternalFormatConnection {
-    const externalFormatConnection = new ExternalFormatConnection(
-      PackageableElementExplicitReference.create(store),
-    );
-    const urlStream = new UrlStream();
-    externalFormat_urlStream_setUrl(urlStream, '');
-    externalFormatConnection.externalSource = urlStream;
-    return externalFormatConnection;
-  }
-}