@finos/legend-application-studio 16.0.2 → 17.0.0

package/src/index.ts

@@ -42,7 +42,7 @@ export {
   TypeDragSource,
   type UMLEditorElementDropTarget,
   type TransformDropTarget,
-} from './stores/shared/DnDUtil.js';
+} from './stores/shared/DnDUtils.js';
 export { ExplorerTreeRootPackageLabel } from './stores/ExplorerTreeState.js';
 export * from './stores/graphModifier/GraphModifierHelper.js';
 export * from './stores/graphModifier/DomainGraphModifierHelper.js';
@@ -54,6 +54,10 @@ export * from './stores/graphModifier/DSLService_GraphModifierHelper.js';
 
 // components
 export * from './components/editor/EditorStoreProvider.js';
+export * from './stores/LegendStudioRouter.js';
+export { ActivityBarMenu } from './components/editor/ActivityBar.js';
+export * from './components/shared/ProjectSelectorUtils.js';
+export * from './components/shared/WorkspaceSelectorUtils.js';
 export { ClassFormEditor } from './components/editor/edit-panel/uml-editor/ClassEditor.js';
 export { TypeTree } from './components/shared/TypeTree.js';
 export { StudioTextInputEditor } from './components/shared/StudioTextInputEditor.js';
@@ -80,12 +84,6 @@ export { MappingElementState } from './stores/editor-state/element-editor-state/
 export { UnsupportedInstanceSetImplementationState } from './stores/editor-state/element-editor-state/mapping/UnsupportedInstanceSetImplementationState.js';
 export { getElementIcon } from './components/shared/ElementIconUtils.js';
 
-export { ProjectSelector } from './components/workspace-setup/ProjectSelector.js';
-
-// TO BE REMOVED: these setup are currently needed for project dependency dashboard, until we open source, we can remove them
-export * from './components/workspace-setup/WorkspaceSetupStoreProvider.js';
-export { WorkspaceSetupStore } from './stores/workspace-setup/WorkspaceSetupStore.js';
-
 // --------------------------------------------- DSL --------------------------------------------------
 /**
  * @modularize
@@ -97,13 +95,15 @@ export {
   ConnectionEditor_BooleanEditor,
   ConnectionEditor_ArrayEditor,
 } from './components/editor/edit-panel/connection-editor/RelationalDatabaseConnectionEditor.js';
-export * from './stores/DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension.js';
+export * from './stores/DSLGeneration_LegendStudioApplicationPlugin_Extension.js';
 
 export * from './stores/StoreRelational_LegendStudioApplicationPlugin_Extension.js';
 
+export { MINIMUM_SERVICE_OWNERS } from './stores/editor-state/element-editor-state/service/ServiceEditorState.js';
+export { generateServiceManagementUrl } from './stores/editor-state/element-editor-state/service/ServiceRegistrationState.js';
 export { ServicePureExecutionState } from './stores/editor-state/element-editor-state/service/ServiceExecutionState.js';
 export { NewServiceModal } from './components/editor/edit-panel/service-editor/NewServiceModal.js';
-export { GenerationFile } from './stores/shared/FileGenerationTreeUtil.js';
+export { GenerationFile } from './stores/shared/FileGenerationTreeUtils.js';
 export { FileGenerationState } from './stores/editor-state/FileGenerationState.js';
 export { DSLExternalFormat_LegendStudioApplicationPlugin } from './components/DSLExternalFormat_LegendStudioApplicationPlugin.js';
 export {

package/src/stores/{DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension.ts → DSLGeneration_LegendStudioApplicationPlugin_Extension.ts}

@@ -30,7 +30,7 @@ export type FileGenerationScopeFilterConfiguration = {
   filter: (element: PackageableElement) => boolean;
 };
 
-export interface DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension
+export interface DSLGeneration_LegendStudioApplicationPlugin_Extension
   extends DSL_LegendStudioApplicationPlugin_Extension {
   /**
    * Get drag-and-drop type specifier for model generation specification elements.
@@ -44,6 +44,9 @@ export interface DSLGenerationSpecification_LegendStudioApplicationPlugin_Extens
 
   /**
    * Get the list of filters that check if an element is in scope for certain file generation.
+   *
+   * TODO?: ideally, we should consider having the backend returns this information instead,
+   * maybe the classifier path
    */
   getExtraFileGenerationScopeFilterConfigurations?(): FileGenerationScopeFilterConfiguration[];
 }

package/src/stores/EditorGraphState.ts

@@ -37,7 +37,7 @@ import { ElementEditorState } from './editor-state/element-editor-state/ElementE
 import { GraphGenerationState } from './editor-state/GraphGenerationState.js';
 import { MODEL_IMPORT_NATIVE_INPUT_TYPE } from './editor-state/ModelImporterState.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from './LegendStudioApplicationPlugin.js';
-import type { Entity } from '@finos/legend-storage';
+import { type Entity, generateGAVCoordinates } from '@finos/legend-storage';
 import {
   type EntityChange,
   type ProjectDependency,
@@ -49,7 +49,6 @@ import {
   ProjectVersionEntities,
   ProjectData,
   ProjectDependencyCoordinates,
-  generateGAVCoordinates,
   ProjectDependencyInfo,
 } from '@finos/legend-server-depot';
 import {
@@ -105,7 +104,7 @@ import { graph_dispose } from './graphModifier/GraphModifierHelper.js';
 import {
   PACKAGEABLE_ELEMENT_TYPE,
   SET_IMPLEMENTATION_TYPE,
-} from './shared/ModelUtil.js';
+} from './shared/ModelClassifierUtils.js';
 import { GlobalTestRunnerState } from './sidebar-state/testable/GlobalTestRunnerState.js';
 import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
 

package/src/stores/EditorStore.ts

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { action, flowResult, makeAutoObservable } from 'mobx';
+import {
+  action,
+  computed,
+  flow,
+  flowResult,
+  makeObservable,
+  observable,
+} from 'mobx';
 import { ClassEditorState } from './editor-state/element-editor-state/ClassEditorState.js';
 import { ExplorerTreeState } from './ExplorerTreeState.js';
 import {
@@ -74,7 +81,7 @@ import { CHANGE_DETECTION_EVENT } from './ChangeDetectionEvent.js';
 import { GenerationSpecificationEditorState } from './editor-state/GenerationSpecificationEditorState.js';
 import { UnsupportedElementEditorState } from './editor-state/UnsupportedElementEditorState.js';
 import { FileGenerationViewerState } from './editor-state/FileGenerationViewerState.js';
-import type { GenerationFile } from './shared/FileGenerationTreeUtil.js';
+import type { GenerationFile } from './shared/FileGenerationTreeUtils.js';
 import type { ElementFileGenerationState } from './editor-state/element-editor-state/ElementFileGenerationState.js';
 import { DevToolState } from './aux-panel-state/DevToolState.js';
 import {
@@ -95,7 +102,6 @@ import {
 } from '@finos/legend-server-sdlc';
 import {
   type PackageableElement,
-  type Store,
   type GraphManagerState,
   GRAPH_MANAGER_EVENT,
   PrimitiveType,
@@ -126,8 +132,6 @@ import {
   ActionAlertType,
   APPLICATION_EVENT,
   TAB_SIZE,
-  buildElementOption,
-  type PackageableElementOption,
 } from '@finos/legend-application';
 import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
 import type { EditorMode } from './editor/EditorMode.js';
@@ -139,7 +143,7 @@ import {
   graph_deleteOwnElement,
   graph_renameElement,
 } from './graphModifier/GraphModifierHelper.js';
-import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelUtil.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelClassifierUtils.js';
 import { GlobalTestRunnerState } from './sidebar-state/testable/GlobalTestRunnerState.js';
 import type { LegendStudioApplicationStore } from './LegendStudioBaseStore.js';
 import { EmbeddedQueryBuilderState } from './EmbeddedQueryBuilderState.js';
@@ -196,6 +200,7 @@ export class EditorStore {
   conflictResolutionState: WorkspaceUpdateConflictResolutionState;
   devToolState: DevToolState;
   embeddedQueryBuilderState: EmbeddedQueryBuilderState;
+  newElementState: NewElementState;
 
   private _isDisposed = false;
   initState = ActionState.create();
@@ -218,13 +223,12 @@ export class EditorStore {
 
   // Hot keys
   blockGlobalHotkeys = false;
-  defaultHotkeys: HotkeyConfiguration[] = [];
+  readonly defaultHotkeys: HotkeyConfiguration[] = [];
   hotkeys: HotkeyConfiguration[] = [];
 
   // Tabs
   currentEditorState?: EditorState | undefined;
   openedEditorStates: EditorState[] = [];
-  newElementState: NewElementState;
   /**
    * Since we want to share element generation state across all element in the editor, we will create 1 element generate state
    * per file generation configuration type.
@@ -240,9 +244,32 @@ export class EditorStore {
     sdlcServerClient: SDLCServerClient,
     depotServerClient: DepotServerClient,
     graphManagerState: GraphManagerState,
-    pluginManager: LegendStudioPluginManager,
   ) {
-    makeAutoObservable(this, {
+    makeObservable<
+      EditorStore,
+      '_isDisposed' | 'initStandardMode' | 'initConflictResolutionMode'
+    >(this, {
+      editorMode: observable,
+      mode: observable,
+      _isDisposed: observable,
+      graphEditMode: observable,
+      activeAuxPanelMode: observable,
+      activeActivity: observable,
+      blockGlobalHotkeys: observable,
+      hotkeys: observable,
+      currentEditorState: observable,
+      openedEditorStates: observable,
+      backdrop: observable,
+      ignoreNavigationBlocking: observable,
+      isDevToolEnabled: observable,
+
+      isInViewerMode: computed,
+      isInConflictResolutionMode: computed,
+      isInitialized: computed,
+      isInGrammarTextMode: computed,
+      isInFormMode: computed,
+      hasUnpushedChanges: computed,
+
       applicationStore: false,
       sdlcServerClient: false,
       depotServerClient: false,
@@ -277,12 +304,22 @@ export class EditorStore {
       reprocessElementEditorState: action,
       openGeneratedFile: action,
       closeAllEditorTabs: action,
+
+      initialize: flow,
+      initMode: flow,
+      initStandardMode: flow,
+      initConflictResolutionMode: flow,
+      buildGraph: flow,
+      addElement: flow,
+      deleteElement: flow,
+      renameElement: flow,
+      toggleTextMode: flow,
     });
 
     this.applicationStore = applicationStore;
     this.sdlcServerClient = sdlcServerClient;
     this.depotServerClient = depotServerClient;
-    this.pluginManager = pluginManager;
+    this.pluginManager = applicationStore.pluginManager;
 
     this.editorMode = new StandardEditorMode(this);
 
@@ -838,6 +875,8 @@ export class EditorStore {
         return;
       }
 
+      this.initState.setMessage(`Starting change detection engine...`);
+
       // build explorer tree
       this.explorerTreeState.buildImmutableModelTrees();
       this.explorerTreeState.build();
@@ -875,6 +914,8 @@ export class EditorStore {
       );
       // since errors have been handled accordingly, we don't need to do anything here
       return;
+    } finally {
+      this.initState.setMessage(undefined);
     }
   }
 
@@ -1345,14 +1386,6 @@ export class EditorStore {
     }
   }
 
-  get storeOptions(): PackageableElementOption<Store>[] {
-    return this.graphManagerState.usableStores.map(buildElementOption);
-  }
-
-  get dataOptions(): PackageableElementOption<DataElement>[] {
-    return this.graphManagerState.usableDataElements.map(buildElementOption);
-  }
-
   getSupportedElementTypes(): string[] {
     return (
       [

package/src/stores/EditorStoreTestUtils.ts

@@ -68,6 +68,5 @@ export const TEST__getTestEditorStore = (
     TEST__getTestSDLCServerClient(),
     TEST__getTestDepotServerClient(),
     TEST__getTestGraphManagerState(pluginManager),
-    pluginManager,
   );
 };

package/src/stores/ExplorerTreeState.ts

@@ -30,14 +30,14 @@ import {
   openNodeById,
   openNodes,
   populatePackageTreeNodeChildren,
-} from './shared/PackageTreeUtil.js';
+} from './shared/PackageTreeUtils.js';
 import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
-import type { PackageTreeNodeData } from './shared/TreeUtil.js';
+import type { PackageTreeNodeData } from './shared/TreeUtils.js';
 import type { TreeData } from '@finos/legend-art';
 import {
   type GenerationTreeNodeData,
   getGenerationTreeData,
-} from './shared/FileGenerationTreeUtil.js';
+} from './shared/FileGenerationTreeUtils.js';
 import {
   type PackageableElement,
   ROOT_PACKAGE_NAME,

package/src/stores/LegendStudioAppEvent.ts

@@ -32,5 +32,8 @@ export enum LEGEND_STUDIO_APP_EVENT {
 
   WORKSPACE_UPDATED = 'sdlc.workspace-update.success',
   WORKSPACE_LOCAL_CHANGES_PUSHED = 'sdlc.local-changes-push.success',
+
+  // Depot
+  // TODO: consider to split this generic errors into more specific events
   DEPOT_MANAGER_FAILURE = 'depot.manager.failure',
 }

package/src/stores/LegendStudioBaseStore.ts

@@ -43,13 +43,12 @@ import type { DepotServerClient } from '@finos/legend-server-depot';
 import type { LegendStudioPluginManager } from '../application/LegendStudioPluginManager.js';
 import type { LegendStudioApplicationConfig } from '../application/LegendStudioApplicationConfig.js';
 import { LegendStudioEventService } from './LegendStudioEventService.js';
-import type { LegendStudioApplicationPlugin } from './LegendStudioApplicationPlugin.js';
 
 const UNKNOWN_USER_ID = '(unknown)';
 
 export type LegendStudioApplicationStore = ApplicationStore<
   LegendStudioApplicationConfig,
-  LegendStudioApplicationPlugin
+  LegendStudioPluginManager
 >;
 
 export class LegendStudioBaseStore {
@@ -67,7 +66,6 @@ export class LegendStudioBaseStore {
     applicationStore: LegendStudioApplicationStore,
     sdlcServerClient: SDLCServerClient,
     depotServerClient: DepotServerClient,
-    pluginManager: LegendStudioPluginManager,
   ) {
     makeObservable<LegendStudioBaseStore, 'initializeSDLCServerClient'>(this, {
       isSDLCAuthorized: observable,
@@ -82,7 +80,7 @@ export class LegendStudioBaseStore {
     this.sdlcServerClient = sdlcServerClient;
     this.depotServerClient = depotServerClient;
 
-    this.pluginManager = pluginManager;
+    this.pluginManager = applicationStore.pluginManager;
 
     // Register plugins
     this.sdlcServerClient.setTracerService(this.applicationStore.tracerService);
@@ -125,6 +123,11 @@ export class LegendStudioBaseStore {
     ApplicationTelemetry.logEvent_ApplicationInitialized(
       this.applicationStore.telemetryService,
       {
+        application: {
+          name: this.applicationStore.config.appName,
+          version: this.applicationStore.config.appVersion,
+          env: this.applicationStore.config.env,
+        },
         browser: {
           userAgent: navigator.userAgent,
         },

package/src/stores/LegendStudioRouter.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { generateGAVCoordinates } from '@finos/legend-server-depot';
+import { generateGAVCoordinates } from '@finos/legend-storage';
 import { WorkspaceType } from '@finos/legend-server-sdlc';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { generatePath } from 'react-router';

package/src/stores/editor/NewElementState.ts

@@ -74,6 +74,7 @@ import {
   DataElement,
   stub_RawLambda,
   stub_Database,
+  Measure,
 } from '@finos/legend-graph';
 import type { DSLMapping_LegendStudioApplicationPlugin_Extension } from '../DSLMapping_LegendStudioApplicationPlugin_Extension.js';
 import {
@@ -91,7 +92,7 @@ import {
 } from '../graphModifier/DSLService_GraphModifierHelper.js';
 import type { EmbeddedDataTypeOption } from '../editor-state/element-editor-state/data/DataEditorState.js';
 import { dataElement_setEmbeddedData } from '../graphModifier/DSLData_GraphModifierHelper.js';
-import { PACKAGEABLE_ELEMENT_TYPE } from '../shared/ModelUtil.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from '../shared/ModelClassifierUtils.js';
 import {
   buildElementOption,
   type PackageableElementOption,
@@ -756,6 +757,9 @@ export class NewElementState {
       case PACKAGEABLE_ELEMENT_TYPE.ENUMERATION:
         element = new Enumeration(name);
         break;
+      case PACKAGEABLE_ELEMENT_TYPE.MEASURE:
+        element = new Measure(name);
+        break;
       case PACKAGEABLE_ELEMENT_TYPE.PROFILE:
         element = new Profile(name);
         break;

package/src/stores/editor-state/FileGenerationState.ts

@@ -29,7 +29,7 @@ import {
   populateDirectoryTreeNodeChildren,
   buildGenerationDirectory,
   reprocessOpenNodes,
-} from '../shared/FileGenerationTreeUtil.js';
+} from '../shared/FileGenerationTreeUtils.js';
 import {
   type GeneratorFn,
   assertErrorThrown,

package/src/stores/editor-state/FileGenerationViewerState.ts

@@ -17,7 +17,7 @@
 import type { EditorStore } from '../EditorStore.js';
 import { EditorState } from './EditorState.js';
 import { observable, makeObservable, computed } from 'mobx';
-import type { GenerationFile } from '../shared/FileGenerationTreeUtil.js';
+import type { GenerationFile } from '../shared/FileGenerationTreeUtils.js';
 import { EDITOR_LANGUAGE, TAB_SIZE } from '@finos/legend-application';
 import { returnUndefOnError } from '@finos/legend-shared';
 

package/src/stores/editor-state/GraphGenerationState.ts

@@ -42,7 +42,7 @@ import {
   populateDirectoryTreeNodeChildren,
   buildGenerationDirectory,
   reprocessOpenNodes,
-} from '../shared/FileGenerationTreeUtil.js';
+} from '../shared/FileGenerationTreeUtils.js';
 import type { TreeData } from '@finos/legend-art';
 import type { EditorStore } from '../EditorStore.js';
 import { ExplorerTreeRootPackageLabel } from '../ExplorerTreeState.js';
@@ -54,14 +54,14 @@ import type { Entity } from '@finos/legend-storage';
 import {
   type GenerationConfigurationDescription,
   type GenerationOutput,
-  type DSLGenerationSpecification_PureGraphManagerPlugin_Extension,
+  type DSLGeneration_PureGraphManagerPlugin_Extension,
   type GenerationTreeNode,
   Class,
   Enumeration,
   GenerationSpecification,
   ELEMENT_PATH_DELIMITER,
 } from '@finos/legend-graph';
-import type { DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension } from '../DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension.js';
+import type { DSLGeneration_LegendStudioApplicationPlugin_Extension } from '../DSLGeneration_LegendStudioApplicationPlugin_Extension.js';
 import { ExternalFormatState } from './ExternalFormatState.js';
 import {
   generationSpecification_addFileGeneration,
@@ -135,14 +135,14 @@ export class GraphGenerationState {
   get supportedFileGenerationConfigurationsForCurrentElement(): GenerationConfigurationDescription[] {
     if (this.editorStore.currentEditorState instanceof ElementEditorState) {
       const currentElement = this.editorStore.currentEditorState.element;
-      // Note: For now we only allow classes and enumerations for all types of generations.
+      // NOTE: For now we only allow classes and enumerations for all types of generations.
       const extraFileGenerationScopeFilterConfigurations =
         this.editorStore.pluginManager
           .getApplicationPlugins()
           .flatMap(
             (plugin) =>
               (
-                plugin as DSLGenerationSpecification_LegendStudioApplicationPlugin_Extension
+                plugin as DSLGeneration_LegendStudioApplicationPlugin_Extension
               ).getExtraFileGenerationScopeFilterConfigurations?.() ?? [],
           );
       return this.fileGenerationConfigurations.filter((generationType) => {
@@ -370,7 +370,7 @@ export class GraphGenerationState {
         .flatMap(
           (plugin) =>
             (
-              plugin as DSLGenerationSpecification_PureGraphManagerPlugin_Extension
+              plugin as DSLGeneration_PureGraphManagerPlugin_Extension
             ).getExtraModelGenerationElementGetters?.() ?? [],
         )
         .flatMap((getter) => getter(this.editorStore.graphManagerState.graph));

package/src/stores/editor-state/ProjectConfigurationEditorState.ts

@@ -40,13 +40,13 @@ import {
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
 import {
   type ProjectVersionDependencies,
-  generateGAVCoordinates,
   MASTER_SNAPSHOT_ALIAS,
   ProjectData,
   ProjectDependencyInfo,
   ProjectDependencyCoordinates,
 } from '@finos/legend-server-depot';
 import { TAB_SIZE } from '@finos/legend-application';
+import { generateGAVCoordinates } from '@finos/legend-storage';
 
 export enum CONFIGURATION_EDITOR_TAB {
   PROJECT_STRUCTURE = 'PROJECT_STRUCTURE',

package/src/stores/editor-state/element-editor-state/RuntimeEditorState.ts

@@ -27,7 +27,7 @@ import {
   filterByType,
 } from '@finos/legend-shared';
 import { ElementEditorState } from './ElementEditorState.js';
-import type { RuntimeExplorerTreeNodeData } from '../../shared/TreeUtil.js';
+import type { RuntimeExplorerTreeNodeData } from '../../shared/TreeUtils.js';
 import type { TreeData } from '@finos/legend-art';
 import { ConnectionEditorState } from './connection/ConnectionEditorState.js';
 import { getMappingElementSource } from './mapping/MappingEditorState.js';

package/src/stores/editor-state/element-editor-state/mapping/MappingEditorState.ts

@@ -34,7 +34,7 @@ import {
   MappingTestState,
   TEST_RESULT,
 } from './MappingTestState.js';
-import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtil.js';
+import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
 import {
   type GeneratorFn,
   assertErrorThrown,
@@ -118,7 +118,7 @@ import {
   setImpl_updateRootOnCreate,
   setImpl_updateRootOnDelete,
 } from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
-import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../shared/ModelUtil.js';
+import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../shared/ModelClassifierUtils.js';
 import { rootRelationalSetImp_setMainTableAlias } from '../../../graphModifier/StoreRelational_GraphModifierHelper.js';
 
 export interface MappingExplorerTreeNodeData extends TreeNodeData {

package/src/stores/editor-state/element-editor-state/mapping/MappingExecutionState.ts

@@ -49,7 +49,7 @@ import {
   generateEnumerableNameFromToken,
   tryToFormatLosslessJSONString,
 } from '@finos/legend-shared';
-import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtil.js';
+import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
 import {
   type InputData,
   type Mapping,

package/src/stores/editor-state/element-editor-state/mapping/MappingTestState.ts

@@ -47,7 +47,7 @@ import {
   makeAutoObservable,
   flowResult,
 } from 'mobx';
-import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtil.js';
+import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
 import {
   type MappingTest,
   type RawLambda,

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

@@ -66,8 +66,7 @@ import {
   stub_PackageableRuntime,
   stub_Mapping,
 } from '@finos/legend-graph';
-import type { Entity } from '@finos/legend-storage';
-import { parseGACoordinates } from '@finos/legend-server-depot';
+import { type Entity, parseGACoordinates } from '@finos/legend-storage';
 import { runtime_addMapping } from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {