@finos/legend-application-studio 22.6.0 → 23.0.1

package/src/components/editor/edit-panel/mapping-editor/InstanceSetImplementationSourceSelectorModal.tsx

@@ -26,7 +26,7 @@ import {
   getMappingElementSource,
   type MappingElementSource,
   type MappingEditorState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import {
   type InstanceSetImplementation,
   type View,

package/src/components/editor/edit-panel/mapping-editor/MappingEditor.tsx

@@ -46,14 +46,14 @@ import {
   getMappingElementType,
   MAPPING_ELEMENT_TYPE,
   getMappingElementLabel,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
-import { MappingElementState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
+import { MappingElementState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingElementState.js';
 import { MappingExplorer } from './MappingExplorer.js';
 import { MappingTestEditor } from './MappingTestEditor.js';
-import { MappingTestState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingTestState.js';
+import { MappingTestState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingTestState.js';
 import { MappingTestsExplorer } from './MappingTestsExplorer.js';
-import { LEGEND_STUDIO_TEST_ID } from '../../../LegendStudioTestID.js';
-import { MappingExecutionState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingExecutionState.js';
+import { LEGEND_STUDIO_TEST_ID } from '../../../../application/LegendStudioTesting.js';
+import { MappingExecutionState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingExecutionState.js';
 import { MappingExecutionBuilder } from './MappingExecutionBuilder.js';
 import { flowResult } from 'mobx';
 import { useEditorStore } from '../../EditorStoreProvider.js';
@@ -68,8 +68,8 @@ import {
   useApplicationNavigationContext,
   useApplicationStore,
 } from '@finos/legend-application';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../stores/LegendStudioApplicationNavigationContext.js';
-import type { MappingEditorTabState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingTabManagerState.js';
+import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../application/LegendStudioApplicationNavigationContext.js';
+import type { MappingEditorTabState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingTabManagerState.js';
 
 export const MappingEditorSplashScreen: React.FC = () => {
   const logoWidth = 280;

package/src/components/editor/edit-panel/mapping-editor/MappingExecutionBuilder.tsx

@@ -49,13 +49,13 @@ import {
   getMappingElementSource,
   getMappingElementTarget,
   getMappingElementLabel,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import { useDrop } from 'react-dnd';
 import { NewServiceModal } from '../service-editor/NewServiceModal.js';
 import {
   type MappingElementDragSource,
   CORE_DND_TYPE,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import { assertErrorThrown, guaranteeType, uniq } from '@finos/legend-shared';
 import {
   type MappingExecutionState,
@@ -63,7 +63,7 @@ import {
   MappingExecutionObjectInputDataState,
   MappingExecutionFlatDataInputDataState,
   MappingExecutionRelationalInputDataState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingExecutionState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingExecutionState.js';
 import {
   EDITOR_LANGUAGE,
   ActionAlertActionType,
@@ -82,15 +82,14 @@ import {
   stub_RawLambda,
   isStubbed_RawLambda,
 } from '@finos/legend-graph';
-import { objectInputData_setData } from '../../../../stores/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
-import { flatData_setData } from '../../../../stores/shared/modifier/STO_FlatData_GraphModifierHelper.js';
+import { objectInputData_setData } from '../../../../stores/editor/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { flatData_setData } from '../../../../stores/editor/shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   relationalInputData_setData,
   relationalInputData_setInputType,
-} from '../../../../stores/shared/modifier/STO_Relational_GraphModifierHelper.js';
-import { MappingExecutionQueryBuilderState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
+} from '../../../../stores/editor/shared/modifier/STO_Relational_GraphModifierHelper.js';
+import { MappingExecutionQueryBuilderState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
 import type { QueryBuilderState } from '@finos/legend-query-builder';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../stores/LegendStudioApplicationNavigationContext.js';
 
 interface ClassMappingSelectOption {
   label: string;
@@ -193,9 +192,9 @@ const MappingExecutionQueryEditor = observer(
           embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
             setupQueryBuilderState: (): QueryBuilderState => {
               const queryBuilderState = new MappingExecutionQueryBuilderState(
-                executionState.mappingEditorState.mapping,
                 embeddedQueryBuilderState.editorStore.applicationStore,
                 embeddedQueryBuilderState.editorStore.graphManagerState,
+                executionState.mappingEditorState.mapping,
               );
               queryBuilderState.initializeWithQuery(
                 executionState.queryState.query,
@@ -244,8 +243,6 @@ const MappingExecutionQueryEditor = observer(
             disableCompile: isStubbed_RawLambda(
               executionState.queryState.query,
             ),
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_EXECUTION_EDITOR,
           }),
         );
       },

package/src/components/editor/edit-panel/mapping-editor/MappingExecutionQueryBuilder.tsx

@@ -23,7 +23,7 @@ import {
 import { CustomSelectorInput, PURE_MappingIcon } from '@finos/legend-art';
 import { getMappingCompatibleClasses } from '@finos/legend-graph';
 import { QueryBuilderClassSelector } from '@finos/legend-query-builder';
-import type { MappingExecutionQueryBuilderState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
+import type { MappingExecutionQueryBuilderState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 
 /**
@@ -69,12 +69,13 @@ const MappingExecutionQueryBuilderSetupPanelContent = observer(
                 options={[]}
                 value={selectedMappingOption}
                 darkMode={
-                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
                 }
                 formatOptionLabel={getPackageableElementOptionFormatter({
                   darkMode:
                     !applicationStore.layoutService
-                      .TEMPORARY__isLightThemeEnabled,
+                      .TEMPORARY__isLightColorThemeEnabled,
                   graph: editorStore.graphManagerState.graph,
                 })}
               />

package/src/components/editor/edit-panel/mapping-editor/MappingExplorer.tsx

@@ -21,7 +21,7 @@ import {
   type ElementDragSource,
   CORE_DND_TYPE,
   MappingElementDragSource,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import {
   type TreeNodeContainerProps,
   clsx,
@@ -39,7 +39,7 @@ import {
   MenuContent,
   MenuContentItem,
 } from '@finos/legend-art';
-import { MappingElementState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementState.js';
+import { MappingElementState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingElementState.js';
 import { useDrop, useDrag } from 'react-dnd';
 import { toSentenceCase } from '@finos/legend-shared';
 import {
@@ -50,11 +50,11 @@ import {
   getMappingElementType,
   MappingEditorState,
   getMappingElementLabel,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
-import { LEGEND_STUDIO_TEST_ID } from '../../../LegendStudioTestID.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
+import { LEGEND_STUDIO_TEST_ID } from '../../../../application/LegendStudioTesting.js';
 import { getElementIcon } from '../../../shared/ElementIconUtils.js';
 import { NewMappingElementModal } from '../../../editor/edit-panel/mapping-editor/NewMappingElementModal.js';
-import { MappingElementDecorator } from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementDecorator.js';
+import { MappingElementDecorator } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingElementDecorator.js';
 import { flowResult } from 'mobx';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
@@ -69,8 +69,8 @@ import { useApplicationStore } from '@finos/legend-application';
 import {
   PureInstanceSetImplementationFilterState,
   PureInstanceSetImplementationState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
-import { pureInstanceSetImpl_setMappingFilter } from '../../../../stores/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
+import { pureInstanceSetImpl_setMappingFilter } from '../../../../stores/editor/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 export const MappingExplorerContextMenu = observer(
   forwardRef<
@@ -465,7 +465,7 @@ export const MappingExplorer = observer((props: { isReadOnly: boolean }) => {
     : undefined;
   const visitGenerationParentElement = (): void => {
     if (generationParentElement) {
-      editorStore.tabManagerState.openElementEditor(generationParentElement);
+      editorStore.graphEditorMode.openElement(generationParentElement);
     }
   };
   // explorer tree data

package/src/components/editor/edit-panel/mapping-editor/MappingTestEditor.tsx

@@ -24,7 +24,7 @@ import {
   MappingTestFlatDataInputDataState,
   MappingTestExpectedOutputAssertionState,
   MappingTestRelationalInputDataState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingTestState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingTestState.js';
 import { JsonDiffView } from '../../../shared/DiffView.js';
 import {
   clsx,
@@ -51,7 +51,7 @@ import { useDrop } from 'react-dnd';
 import {
   type MappingElementDragSource,
   CORE_DND_TYPE,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import {
   IllegalStateError,
   guaranteeType,
@@ -75,7 +75,7 @@ import { MappingTestStatusIndicator } from './MappingTestsExplorer.js';
 import {
   getMappingElementSource,
   getMappingElementTarget,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
   Class,
@@ -86,17 +86,16 @@ import {
   isStubbed_RawLambda,
   DEPRECATED__validate_MappingTestAssert,
 } from '@finos/legend-graph';
-import { flatData_setData } from '../../../../stores/shared/modifier/STO_FlatData_GraphModifierHelper.js';
+import { flatData_setData } from '../../../../stores/editor/shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   relationalInputData_setData,
   relationalInputData_setInputType,
-} from '../../../../stores/shared/modifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../../stores/editor/shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   type QueryBuilderState,
   QueryBuilderTextEditorMode,
 } from '@finos/legend-query-builder';
-import { MappingExecutionQueryBuilderState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../stores/LegendStudioApplicationNavigationContext.js';
+import { MappingExecutionQueryBuilderState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js';
 
 const MappingTestQueryEditor = observer(
   (props: { testState: MappingTestState; isReadOnly: boolean }) => {
@@ -113,9 +112,9 @@ const MappingTestQueryEditor = observer(
           embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
             setupQueryBuilderState: (): QueryBuilderState => {
               const queryBuilderState = new MappingExecutionQueryBuilderState(
-                testState.mappingEditorState.mapping,
                 embeddedQueryBuilderState.editorStore.applicationStore,
                 embeddedQueryBuilderState.editorStore.graphManagerState,
+                testState.mappingEditorState.mapping,
               );
               queryBuilderState.initializeWithQuery(testState.queryState.query);
               if (openInTextMode) {
@@ -166,8 +165,6 @@ const MappingTestQueryEditor = observer(
               },
             ],
             disableCompile: isStubbed_RawLambda(testState.queryState.query),
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_TEST_EDITOR,
           }),
         );
       });

package/src/components/editor/edit-panel/mapping-editor/MappingTestsExplorer.tsx

@@ -21,7 +21,7 @@ import {
   type MappingTestState,
   MAPPING_TEST_EDITOR_TAB_TYPE,
   TEST_RESULT,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingTestState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingTestState.js';
 import {
   clsx,
   ContextMenu,
@@ -43,14 +43,14 @@ import {
 import {
   type MappingElementDragSource,
   CORE_DND_TYPE,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import { ClassMappingSelectorModal } from './MappingExecutionBuilder.js';
 import { flowResult } from 'mobx';
 import { Randomizer } from '@finos/legend-shared';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import { useApplicationStore } from '@finos/legend-application';
 import { SetImplementation } from '@finos/legend-graph';
-import { MappingEditorState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+import { MappingEditorState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 
 const addTestPromps = [
   `Let's add some test!`,

package/src/components/editor/edit-panel/mapping-editor/NewMappingElementModal.tsx

@@ -29,7 +29,7 @@ import {
   createEnumerationMapping,
   getAllMappingElements,
   MappingEditorState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import {
   guaranteeNonNullable,
   UnsupportedOperationError,
@@ -43,7 +43,7 @@ import {
   Association,
   PrimitiveType,
 } from '@finos/legend-graph';
-import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../../stores/shared/ModelClassifierUtils.js';
+import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../../stores/editor/shared/ModelClassifierUtils.js';
 import {
   buildElementOption,
   getPackageableElementOptionFormatter,

package/src/components/editor/edit-panel/mapping-editor/OperationSetImplementationEditor.tsx

@@ -16,7 +16,7 @@
 
 import { useEffect, useCallback } from 'react';
 import { observer } from 'mobx-react-lite';
-import { MappingEditorState } from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+import { MappingEditorState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import {
   CustomSelectorInput,
   createFilter,
@@ -31,13 +31,13 @@ import {
   CORE_DND_TYPE,
   type OperationSetImplementationDropTarget,
   type MappingElementDragSource,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import { useDrop } from 'react-dnd';
 import { noop } from '@finos/legend-shared';
 import {
   MappingElementDecorator,
   MappingElementDecorationCleaner,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementDecorator.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingElementDecorator.js';
 import {
   OperationSetImplementation,
   OperationType,
@@ -57,7 +57,7 @@ import {
   operationMapping_addParameter,
   operationMapping_changeParameter,
   operationMapping_deleteParameter,
-} from '../../../../stores/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../../stores/editor/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 interface SetImplementationOption {
   value: SetImplementation;
@@ -169,7 +169,7 @@ export const OperationSetImplementationEditor = observer(
         const parent = param.setImplementation.value._PARENT;
         // TODO: think more about this flow. Right now we open the mapping element in the parent mapping
         if (parent !== mappingEditorState.element) {
-          editorStore.tabManagerState.openElementEditor(parent);
+          editorStore.graphEditorMode.openElement(parent);
           editorStore.tabManagerState
             .getCurrentEditorState(MappingEditorState)
             .openMappingElement(param.setImplementation.value, false);

package/src/components/editor/edit-panel/mapping-editor/PropertyMappingsEditor.tsx

@@ -15,38 +15,38 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { MultiplicityBadge } from '../../../shared/MultiplicityBadge.js';
 import { PurePropertyMappingEditor } from './PurePropertyMappingEditor.js';
 import { getElementIcon } from '../../../shared/ElementIconUtils.js';
 import {
   type MappingElement,
   MappingEditorState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import type {
   InstanceSetImplementationState,
   PropertyMappingState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingElementState.js';
 import {
   PurePropertyMappingState,
   PureInstanceSetImplementationState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
 import {
   clsx,
   ArrowCircleRightIcon,
   TimesCircleIcon,
   TimesIcon,
+  AsteriskIcon,
 } from '@finos/legend-art';
 import { guaranteeType } from '@finos/legend-shared';
 import {
   type FlatDataPropertyMappingState,
   FlatDataInstanceSetImplementationState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/FlatDataInstanceSetImplementationState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/FlatDataInstanceSetImplementationState.js';
 import { FlatDataPropertyMappingEditor } from './FlatDataPropertyMappingEditor.js';
 import { RelationalPropertyMappingEditor } from './relational/RelationalPropertyMappingEditor.js';
 import type {
   RelationalPropertyMappingState,
   RootRelationalInstanceSetImplementationState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/relational/RelationalInstanceSetImplementationState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/relational/RelationalInstanceSetImplementationState.js';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
   type Property,
@@ -61,20 +61,43 @@ import {
   OperationSetImplementation,
   FlatDataInstanceSetImplementation,
   RootRelationalInstanceSetImplementation,
+  MULTIPLICITY_INFINITE,
+  type Multiplicity,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import {
   instanceSetImplementation_deletePropertyMapping,
   setImpl_nominateRoot,
   setImplementation_setRoot,
-} from '../../../../stores/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../../stores/editor/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../stores/shared/ModelClassifierUtils.js';
-import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../../stores/DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
+} from '../../../../stores/editor/shared/ModelClassifierUtils.js';
+import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../../stores/extensions/DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 import { Fragment } from 'react';
 
+const MultiplicityBadge: React.FC<{
+  multiplicity: Multiplicity;
+}> = (props) => {
+  const { multiplicity } = props;
+  const isRequired = multiplicity.lowerBound && multiplicity.lowerBound > 0;
+  const tooltipText = `${isRequired ? '[required]' : '[optional]'}${
+    isRequired ? ` minimum: ${multiplicity.lowerBound}` : ''
+  } maximum: ${multiplicity.upperBound ?? MULTIPLICITY_INFINITE}`;
+
+  return (
+    <div
+      className={`multiplicity-badge ${
+        isRequired ? 'multiplicity-badge--required' : ''
+      }`}
+      title={tooltipText}
+    >
+      {multiplicity.upperBound ? null : <AsteriskIcon />}
+    </div>
+  );
+};
+
 export const getExpectedReturnType = (
   targetSetImplementation: SetImplementation | undefined,
 ): Type | undefined => {
@@ -193,7 +216,7 @@ export const PropertyMappingEditor = observer(
             const parent = rootMappingElement._PARENT;
             if (parent !== mappingEditorState.element) {
               // TODO: think more about this flow. Right now we open the mapping element in the parent mapping
-              editorStore.tabManagerState.openElementEditor(parent);
+              editorStore.graphEditorMode.openElement(parent);
               editorStore.tabManagerState
                 .getCurrentEditorState(MappingEditorState)
                 .openMappingElement(rootMappingElement, false);

package/src/components/editor/edit-panel/mapping-editor/PurePropertyMappingEditor.tsx

@@ -20,15 +20,15 @@ import {
   type TransformDropTarget,
   CORE_DND_TYPE,
   TypeDragSource,
-} from '../../../../stores/shared/DnDUtils.js';
+} from '../../../../stores/editor/shared/DnDUtils.js';
 import {
   type MappingElement,
   MappingEditorState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/MappingEditorState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingEditorState.js';
 import type {
   PurePropertyMappingState,
   PureInstanceSetImplementationState,
-} from '../../../../stores/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
+} from '../../../../stores/editor/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.js';
 import {
   clsx,
   CustomSelectorInput,
@@ -44,12 +44,12 @@ import {
   getRawGenericType,
   EnumerationMappingExplicitReference,
 } from '@finos/legend-graph';
-import { purePropertyMapping_setTransformer } from '../../../../stores/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { purePropertyMapping_setTransformer } from '../../../../stores/editor/shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import { getExpectedReturnType } from './PropertyMappingsEditor.js';
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../stores/shared/ModelClassifierUtils.js';
+} from '../../../../stores/editor/shared/ModelClassifierUtils.js';
 import { LambdaEditor } from '@finos/legend-query-builder';
 
 const SimplePropertyMappingEditor = observer(