@finos/legend-application-studio 18.0.0 → 18.0.2

package/src/components/workspace-review/WorkspaceReview.tsx

@@ -20,11 +20,9 @@ import {
   useWorkspaceReviewStore,
   withWorkspaceReviewStore,
 } from './WorkspaceReviewStoreProvider.js';
-import { useParams } from 'react-router';
 import { WorkspaceReviewSideBar } from './WorkspaceReviewSideBar.js';
 import { WorkspaceReviewPanel } from './WorkspaceReviewPanel.js';
 import { ACTIVITY_MODE } from '../../stores/EditorConfig.js';
-import { Link } from 'react-router-dom';
 import {
   type ResizablePanelHandlerProps,
   getControlledResizablePanelProps,
@@ -41,15 +39,14 @@ import {
 } from '@finos/legend-art';
 import {
   type ReviewPathParams,
-  generateViewProjectRoute,
-  generateEditorRoute,
+  generateSetupRoute,
 } from '../../stores/LegendStudioRouter.js';
 import { flowResult } from 'mobx';
 import {
   useEditorStore,
   withEditorStore,
 } from '../editor/EditorStoreProvider.js';
-import { useApplicationStore } from '@finos/legend-application';
+import { useApplicationStore, useParams } from '@finos/legend-application';
 
 const WorkspaceReviewStatusBar = observer(() => {
   const reviewStore = useWorkspaceReviewStore();
@@ -82,23 +79,35 @@ const WorkspaceReviewStatusBar = observer(() => {
           <div className="workspace-review__status-bar__workspace__icon">
             <CodeBranchIcon />
           </div>
-          <div className="workspace-review__status-bar__workspace__project">
-            <Link to={generateViewProjectRoute(reviewStore.projectId)}>
-              {currentProject}
-            </Link>
-          </div>
+          <button
+            className="workspace-review__status-bar__workspace__project"
+            title="Go back to workspace setup using the specified project"
+            tabIndex={-1}
+            onClick={(): void =>
+              applicationStore.navigator.goToLocation(
+                generateSetupRoute(reviewStore.projectId),
+              )
+            }
+          >
+            {currentProject}
+          </button>
           /
-          <div className="workspace-review__status-bar__workspace__workspace">
-            <Link
-              to={generateEditorRoute(
-                reviewStore.projectId,
-                review.workspaceId,
-                review.workspaceType,
-              )}
-            >
-              {review.workspaceId}
-            </Link>
-          </div>
+          <button
+            className="workspace-review__status-bar__workspace__workspace"
+            title="Go back to workspace setup using the specified workspace"
+            tabIndex={-1}
+            onClick={(): void =>
+              applicationStore.navigator.goToLocation(
+                generateSetupRoute(
+                  reviewStore.projectId,
+                  review.workspaceId,
+                  review.workspaceType,
+                ),
+              )
+            }
+          >
+            {review.workspaceId}
+          </button>
           <div className="workspace-review__status-bar__review">
             <a target="_blank" rel="noopener noreferrer" href={review.webURL}>
               {review.title}
@@ -214,7 +223,7 @@ export const WorkspaceReview = withEditorStore(
                         key={ACTIVITY_MODE.REVIEW}
                         className="activity-bar__item activity-bar__item--active workspace-review__activity-bar__review-icon"
                         tabIndex={-1}
-                        title={'Review'}
+                        title="Review"
                         onClick={changeActivity(ACTIVITY_MODE.REVIEW)}
                       >
                         <CheckListIcon />
@@ -224,7 +233,7 @@ export const WorkspaceReview = withEditorStore(
                       <button
                         className="activity-bar__item"
                         tabIndex={-1}
-                        title={'Settings...'}
+                        title="Settings..."
                       >
                         <CogIcon />
                       </button>

package/src/components/workspace-review/WorkspaceReviewSideBar.tsx

@@ -163,7 +163,7 @@ export const WorkspaceReviewSideBar = observer(() => {
                 onClick={reOpenReview}
                 disabled={isDispatchingAction}
                 tabIndex={-1}
-                title={'Re-open review'}
+                title="Reopen review"
               >
                 <ArrowUpIcon />
               </button>
@@ -179,7 +179,7 @@ export const WorkspaceReviewSideBar = observer(() => {
                     currentUser?.userId === review.author.name
                   }
                   tabIndex={-1}
-                  title={'Approve review'}
+                  title="Approve review"
                 >
                   <CheckIcon />
                 </button>

package/src/components/workspace-setup/CreateProjectModal.tsx

@@ -442,7 +442,7 @@ const ImportProjectTab = observer(() => {
   ): void => {
     event.preventDefault();
     if (importProjectSuccessReport) {
-      applicationStore.navigator.openNewWindow(
+      applicationStore.navigator.visitAddress(
         importProjectSuccessReport.reviewUrl,
       );
     } else {

package/src/components/workspace-setup/WorkspaceSetup.tsx

@@ -26,7 +26,6 @@ import {
   CustomSelectorInput,
   RepoIcon,
 } from '@finos/legend-art';
-import { useParams } from 'react-router';
 import { LEGEND_STUDIO_TEST_ID } from '../LegendStudioTestID.js';
 import {
   type SetupPathParams,
@@ -37,6 +36,7 @@ import { flowResult } from 'mobx';
 import {
   DocumentationLink,
   useApplicationNavigationContext,
+  useParams,
 } from '@finos/legend-application';
 import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../stores/LegendStudioDocumentation.js';
 import { CreateProjectModal } from './CreateProjectModal.js';
@@ -167,7 +167,7 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
 
     const handleProceed = (): void => {
       if (setupStore.currentProject && setupStore.currentWorkspace) {
-        applicationStore.navigator.goTo(
+        applicationStore.navigator.goToLocation(
           generateEditorRoute(
             setupStore.currentProject.projectId,
             setupStore.currentWorkspace.workspaceId,

package/src/index.ts

@@ -44,13 +44,13 @@ export {
   type TransformDropTarget,
 } from './stores/shared/DnDUtils.js';
 export { ExplorerTreeRootPackageLabel } from './stores/ExplorerTreeState.js';
-export * from './stores/graphModifier/GraphModifierHelper.js';
-export * from './stores/graphModifier/DomainGraphModifierHelper.js';
+export * from './stores/shared/modifier/GraphModifierHelper.js';
+export * from './stores/shared/modifier/DomainGraphModifierHelper.js';
 export * from './stores/DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 export * from './stores/DSL_Service_LegendStudioApplicationPlugin_Extension.js';
 export * from './stores/DSL_Data_LegendStudioApplicationPlugin_Extension.js';
-export * from './stores/graphModifier/DSL_Generation_GraphModifierHelper.js';
-export * from './stores/graphModifier/DSL_Service_GraphModifierHelper.js';
+export * from './stores/shared/modifier/DSL_Generation_GraphModifierHelper.js';
+export * from './stores/shared/modifier/DSL_Service_GraphModifierHelper.js';
 
 // components
 export * from './components/editor/EditorStoreProvider.js';
@@ -103,7 +103,7 @@ export { DSL_ExternalFormat_LegendStudioApplicationPlugin } from './components/D
 export {
   externalFormatData_setData,
   externalFormatData_setContentType,
-} from './stores/graphModifier/DSL_Data_GraphModifierHelper.js';
+} from './stores/shared/modifier/DSL_Data_GraphModifierHelper.js';
 export { ExternalFormatDataEditor } from './components/editor/edit-panel/data-editor/DataElementEditor.js';
 export {
   ExternalFormatDataState,

package/src/stores/DSL_Mapping_LegendStudioApplicationPlugin_Extension.ts

@@ -61,10 +61,6 @@ export type MappingElementSourceExtractor = (
   mappingElement: MappingElement,
 ) => MappingElementSource | undefined;
 
-export type SetImplemtationClassifier = (
-  setImplementation: SetImplementation,
-) => string | undefined;
-
 export type MappingElementStateCreator = (
   mappingElement: MappingElement | undefined,
   editorStore: EditorStore,
@@ -135,11 +131,6 @@ export interface DSL_Mapping_LegendStudioApplicationPlugin_Extension
    */
   getExtraSetImplementationMappingElementLabelInfoBuilders?(): SetImplementationMappingElementLabelInfoBuilder[];
 
-  /**
-   * Get the list of set implementation classifiers.
-   */
-  getExtraSetImplementationClassifiers?(): SetImplemtationClassifier[];
-
   /**
    * Get the list of the mapping element state creators for the given class mapping.
    */

package/src/stores/EditorGraphState.ts

@@ -52,16 +52,13 @@ import {
   ProjectDependencyInfo,
 } from '@finos/legend-server-depot';
 import {
-  type SetImplementation,
   type PackageableElement,
   GRAPH_MANAGER_EVENT,
   CompilationError,
   EngineError,
   extractSourceInformationCoordinates,
   Package,
-  PureInstanceSetImplementation,
   Profile,
-  OperationSetImplementation,
   PrimitiveType,
   Enumeration,
   Class,
@@ -70,8 +67,6 @@ import {
   ConcreteFunctionDefinition,
   Service,
   FlatData,
-  FlatDataInstanceSetImplementation,
-  EmbeddedFlatDataPropertyMapping,
   PackageableConnection,
   PackageableRuntime,
   FileGenerationSpecification,
@@ -80,9 +75,6 @@ import {
   Unit,
   Database,
   SectionIndex,
-  RootRelationalInstanceSetImplementation,
-  EmbeddedRelationalInstanceSetImplementation,
-  AggregationAwareSetImplementation,
   DependencyGraphBuilderError,
   GraphDataDeserializationError,
   GraphBuilderError,
@@ -91,7 +83,6 @@ import {
   DataElement,
 } from '@finos/legend-graph';
 import {
-  type LambdaEditorState,
   ActionAlertActionType,
   ActionAlertType,
 } from '@finos/legend-application';
@@ -99,14 +90,11 @@ import {
   CONFIGURATION_EDITOR_TAB,
   getConflictsString,
 } from './editor-state/ProjectConfigurationEditorState.js';
-import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from './DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
-import { graph_dispose } from './graphModifier/GraphModifierHelper.js';
-import {
-  PACKAGEABLE_ELEMENT_TYPE,
-  SET_IMPLEMENTATION_TYPE,
-} from './shared/ModelClassifierUtils.js';
+import { graph_dispose } from './shared/modifier/GraphModifierHelper.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelClassifierUtils.js';
 import { GlobalTestRunnerState } from './sidebar-state/testable/GlobalTestRunnerState.js';
 import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
+import type { LambdaEditorState } from '@finos/legend-query-builder';
 
 export enum GraphBuilderStatus {
   SUCCEEDED = 'SUCCEEDED',
@@ -142,7 +130,6 @@ export class EditorGraphState {
       editorStore: false,
       graphGenerationState: false,
       getPackageableElementType: false,
-      getSetImplementationType: false,
       hasCompilationError: computed,
       clearCompilationError: action,
     });
@@ -1194,17 +1181,6 @@ export class EditorGraphState {
   }
 
   // -------------------------------------------------- UTILITIES -----------------------------------------------------
-  /**
-   * NOTE: Notice how this utility draws resources from all of metamodels and uses `instanceof` to classify behavior/response.
-   * As such, methods in this utility cannot be placed in place they should belong to.
-   *
-   * For example: `getSetImplemetnationType` cannot be placed in `SetImplementation` because of circular module dependency
-   * So this utility is born for such purpose, to avoid circular module dependency, and it should just be used for only that
-   * Other utilities that really should reside in the domain-specific meta model should be placed in the meta model module.
-   *
-   * NOTE: We expect the need for these methods will eventually go away as we complete modularization. But we need these
-   * methods here so that we can load plugins.
-   */
 
   getPackageableElementType(element: PackageableElement): string {
     if (element instanceof PrimitiveType) {
@@ -1264,44 +1240,4 @@ export class EditorGraphState {
       `Can't get type label for element '${element.path}': no compatible label getter available from plugins`,
     );
   }
-
-  getSetImplementationType(setImplementation: SetImplementation): string {
-    if (setImplementation instanceof PureInstanceSetImplementation) {
-      return SET_IMPLEMENTATION_TYPE.PUREINSTANCE;
-    } else if (setImplementation instanceof OperationSetImplementation) {
-      return SET_IMPLEMENTATION_TYPE.OPERATION;
-    } else if (setImplementation instanceof FlatDataInstanceSetImplementation) {
-      return SET_IMPLEMENTATION_TYPE.FLAT_DATA;
-    } else if (setImplementation instanceof EmbeddedFlatDataPropertyMapping) {
-      return SET_IMPLEMENTATION_TYPE.EMBEDDED_FLAT_DATA;
-    } else if (
-      setImplementation instanceof RootRelationalInstanceSetImplementation
-    ) {
-      return SET_IMPLEMENTATION_TYPE.RELATIONAL;
-    } else if (
-      setImplementation instanceof EmbeddedRelationalInstanceSetImplementation
-    ) {
-      return SET_IMPLEMENTATION_TYPE.EMBEDDED_RELATIONAL;
-    } else if (setImplementation instanceof AggregationAwareSetImplementation) {
-      return SET_IMPLEMENTATION_TYPE.AGGREGATION_AWARE;
-    }
-    const extraSetImplementationClassifiers = this.editorStore.pluginManager
-      .getApplicationPlugins()
-      .flatMap(
-        (plugin) =>
-          (
-            plugin as DSL_Mapping_LegendStudioApplicationPlugin_Extension
-          ).getExtraSetImplementationClassifiers?.() ?? [],
-      );
-    for (const Classifier of extraSetImplementationClassifiers) {
-      const setImplementationClassifier = Classifier(setImplementation);
-      if (setImplementationClassifier) {
-        return setImplementationClassifier;
-      }
-    }
-    throw new UnsupportedOperationError(
-      `Can't classify set implementation: no compatible classifer available from plugins`,
-      setImplementation,
-    );
-  }
 }

package/src/stores/EditorStore.ts

@@ -142,7 +142,7 @@ import {
   graph_deleteElement,
   graph_deleteOwnElement,
   graph_renameElement,
-} from './graphModifier/GraphModifierHelper.js';
+} from './shared/modifier/GraphModifierHelper.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelClassifierUtils.js';
 import { GlobalTestRunnerState } from './sidebar-state/testable/GlobalTestRunnerState.js';
 import type { LegendStudioApplicationStore } from './LegendStudioBaseStore.js';
@@ -235,7 +235,6 @@ export class EditorStore {
    */
   elementGenerationStates: ElementFileGenerationState[] = [];
   searchElementCommandState = new NonBlockingDialogState();
-  backdrop = false;
   ignoreNavigationBlocking = false;
   isDevToolEnabled = true;
 
@@ -259,7 +258,6 @@ export class EditorStore {
       hotkeys: observable,
       currentEditorState: observable,
       openedEditorStates: observable,
-      backdrop: observable,
       ignoreNavigationBlocking: observable,
       isDevToolEnabled: observable,
 
@@ -268,7 +266,6 @@ export class EditorStore {
       isInitialized: computed,
       isInGrammarTextMode: computed,
       isInFormMode: computed,
-      hasUnpushedChanges: computed,
 
       applicationStore: false,
       sdlcServerClient: false,
@@ -283,7 +280,6 @@ export class EditorStore {
       resetHotkeys: action,
       setBlockGlobalHotkeys: action,
       setCurrentEditorState: action,
-      setBackdrop: action,
       setActiveAuxPanelMode: action,
       setIgnoreNavigationBlocking: action,
       refreshCurrentEntityDiffEditorState: action,
@@ -473,22 +469,14 @@ export class EditorStore {
       ) && this.graphManagerState.systemBuildState.hasSucceeded
     );
   }
+
   get isInGrammarTextMode(): boolean {
     return this.graphEditMode === GRAPH_EDITOR_MODE.GRAMMAR_TEXT;
   }
+
   get isInFormMode(): boolean {
     return this.graphEditMode === GRAPH_EDITOR_MODE.FORM;
   }
-  get hasUnpushedChanges(): boolean {
-    return Boolean(
-      this.changeDetectionState.workspaceLocalLatestRevisionState.changes
-        .length,
-    );
-  }
-
-  setDevTool(val: boolean): void {
-    this.isDevToolEnabled = val;
-  }
 
   setHotkeys(val: HotkeyConfiguration[]): void {
     this.hotkeys = val;
@@ -506,12 +494,12 @@ export class EditorStore {
     this.blockGlobalHotkeys = val;
   }
 
-  setCurrentEditorState(val: EditorState | undefined): void {
-    this.currentEditorState = val;
+  setDevTool(val: boolean): void {
+    this.isDevToolEnabled = val;
   }
 
-  setBackdrop(val: boolean): void {
-    this.backdrop = val;
+  setCurrentEditorState(val: EditorState | undefined): void {
+    this.currentEditorState = val;
   }
 
   setActiveAuxPanelMode(val: AUX_PANEL_MODE): void {
@@ -630,10 +618,10 @@ export class EditorStore {
             },
           },
           {
-            label: 'Back to setup page',
+            label: 'Back to workspace setup',
             type: ActionAlertActionType.STANDARD,
             handler: (): void => {
-              this.applicationStore.navigator.goTo(
+              this.applicationStore.navigator.goToLocation(
                 generateSetupRoute(undefined),
               );
             },
@@ -697,7 +685,7 @@ export class EditorStore {
             default: true,
             type: ActionAlertActionType.STANDARD,
             handler: (): void => {
-              this.applicationStore.navigator.goTo(
+              this.applicationStore.navigator.goToLocation(
                 generateViewProjectRoute(projectId),
               );
             },
@@ -712,10 +700,10 @@ export class EditorStore {
             },
           },
           {
-            label: 'Back to setup page',
+            label: 'Back to workspace setup',
             type: ActionAlertActionType.STANDARD,
             handler: (): void => {
-              this.applicationStore.navigator.goTo(
+              this.applicationStore.navigator.goToLocation(
                 generateSetupRoute(projectId, workspaceId, workspaceType),
               );
             },

package/src/stores/LegendStudioBaseStore.ts

@@ -149,11 +149,14 @@ export class LegendStudioBaseStore {
       this.isSDLCAuthorized =
         (yield this.sdlcServerClient.isAuthorized()) as boolean;
       if (!this.isSDLCAuthorized) {
-        this.applicationStore.navigator.jumpTo(
+        this.applicationStore.navigator.visitAddress(
           SDLCServerClient.authorizeCallbackUrl(
             this.applicationStore.config.sdlcServerUrl,
-            this.applicationStore.navigator.getCurrentLocation(),
+            this.applicationStore.navigator.getCurrentAddress(),
           ),
+          {
+            useSameWindow: true,
+          },
         );
       } else {
         // Only proceed intialization after passing authorization check
@@ -172,7 +175,7 @@ export class LegendStudioBaseStore {
                 default: true,
                 handler: (): void =>
                   this.SDLCServerTermsOfServicesUrlsToView.forEach((url) =>
-                    this.applicationStore.navigator.openNewWindow(url),
+                    this.applicationStore.navigator.visitAddress(url),
                   ),
                 type: ActionAlertActionType.PROCEED,
               },
@@ -209,7 +212,7 @@ export class LegendStudioBaseStore {
               type: ActionAlertActionType.PROCEED,
               default: true,
               handler: (): void => {
-                this.applicationStore.navigator.openNewWindow(
+                this.applicationStore.navigator.visitAddress(
                   this.sdlcServerClient.currentUserUrl,
                 );
                 this.applicationStore.setBlockingAlert({

package/src/stores/LegendStudioRouter.ts

@@ -17,7 +17,7 @@
 import { generateGAVCoordinates } from '@finos/legend-storage';
 import { WorkspaceType } from '@finos/legend-server-sdlc';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { generatePath } from 'react-router';
+import { generatePath } from '@finos/legend-application';
 
 export enum LEGEND_STUDIO_PATH_PARAM_TOKEN {
   PROJECT_ID = 'projectId',

package/src/stores/editor/NewElementState.ts

@@ -80,18 +80,18 @@ import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../DSL
 import {
   packageableConnection_setConnectionValue,
   runtime_addMapping,
-} from '../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   fileGeneration_setScopeElements,
   fileGeneration_setType,
   generationSpecification_addGenerationElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 import {
   service_initNewService,
   service_setExecution,
-} from '../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import type { EmbeddedDataTypeOption } from '../editor-state/element-editor-state/data/DataEditorState.js';
-import { dataElement_setEmbeddedData } from '../graphModifier/DSL_Data_GraphModifierHelper.js';
+import { dataElement_setEmbeddedData } from '../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from '../shared/ModelClassifierUtils.js';
 import {
   buildElementOption,

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

@@ -54,7 +54,7 @@ import {
   fileGeneration_addConfigurationProperty,
   fileGeneration_addScopeElement,
   fileGeneration_deleteScopeElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export class FileGenerationState {
   editorStore: EditorStore;

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

@@ -32,7 +32,7 @@ import {
 import {
   generationSpecification_addNode,
   generationSpecification_deleteGenerationNode,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export interface GenerationSpecNodeDragSource {
   nodeState: GenerationTreeNodeState;

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

@@ -66,7 +66,7 @@ import { ExternalFormatState } from './ExternalFormatState.js';
 import {
   generationSpecification_addFileGeneration,
   generationSpecification_addGenerationElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export const DEFAULT_GENERATION_SPECIFICATION_NAME =
   'MyGenerationSpecification';

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

@@ -49,7 +49,7 @@ import {
 import {
   externalFormat_schemaSet_setFormat,
   externalFormat_schemaSet_setSchemas,
-} from '../graphModifier/DSL_ExternalFormat_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_ExternalFormat_GraphModifierHelper.js';
 import { InnerSchemaSetEditorState } from './element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.js';
 
 export enum MODEL_IMPORT_NATIVE_INPUT_TYPE {
@@ -67,7 +67,7 @@ export enum MODEL_IMPORT_TYPE {
 export abstract class ModelImporterEditorState {
   readonly editorStore: EditorStore;
   readonly modelImporterState: ModelImporterState;
-  loadModelActionState = ActionState.create();
+  readonly loadModelActionState = ActionState.create();
 
   constructor(modelImporterState: ModelImporterState) {
     this.editorStore = modelImporterState.editorStore;
@@ -80,7 +80,7 @@ export abstract class ModelImporterEditorState {
 
   abstract get isLoadingDisabled(): boolean;
 
-  abstract loadModel(): GeneratorFn<void>;
+  abstract loadModel(): Promise<void>;
 }
 
 export class NativeModelImporterEditorState extends ModelImporterEditorState {
@@ -235,7 +235,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
     return `###Pure\n Class model::A\n {\n\n}`;
   }
 
-  *loadModel(): GeneratorFn<void> {
+  async loadModel(): Promise<void> {
     try {
       this.loadModelActionState.inProgress();
       this.editorStore.setBlockingAlert({
@@ -243,17 +243,18 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
         prompt: 'Please do not close the application',
         showLoading: true,
       });
-      const entities = (yield this.loadEntites()) as Entity[];
+      const entities = await this.loadEntites();
       const message = `loading entities from ${
         this.editorStore.applicationStore.config.appName
       } [${this.modelImporterState.replace ? `potentially affected ` : ''} ${
         entities.length
       } entities]`;
-      yield this.editorStore.sdlcServerClient.updateEntities(
+      await this.editorStore.sdlcServerClient.updateEntities(
         this.editorStore.sdlcState.activeProject.projectId,
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
+      this.editorStore.setIgnoreNavigationBlocking(true);
       this.editorStore.applicationStore.navigator.reload();
     } catch (error) {
       assertErrorThrown(error);
@@ -317,8 +318,8 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
     this.config = extensionConfiguration;
   }
 
-  *loadModel(): GeneratorFn<void> {
-    flowResult(this.config.loadModel(this.rendererState));
+  async loadModel(): Promise<void> {
+    await this.config.loadModel(this.rendererState);
   }
 }
 
@@ -393,7 +394,7 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
     }
   }
 
-  *loadModel(): GeneratorFn<void> {
+  async loadModel(): Promise<void> {
     this.loadModelActionState.inProgress();
     try {
       this.loadModelActionState.inProgress();
@@ -404,15 +405,14 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
       });
       const modelgenerationstate =
         this.schemaSetEditorState.schemaSetModelGenerationState;
-      const entities = (yield flowResult(
+      const entities = await flowResult(
         modelgenerationstate.getImportEntities(),
-      )) as Entity[];
+      );
       if (modelgenerationstate.targetBinding) {
-        const schemaEntity = (yield flowResult(
+        const schemaEntity =
           this.editorStore.graphManagerState.graphManager.elementToEntity(
             this.schemaSet,
-          ),
-        )) as Entity;
+          );
         entities.push(schemaEntity);
       }
       assertTrue(Boolean(entities.length), 'No entities to load');
@@ -421,11 +421,12 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
       } [${this.modelImporterState.replace ? `potentially affected ` : ''} ${
         entities.length
       } entities]`;
-      yield this.editorStore.sdlcServerClient.updateEntities(
+      await this.editorStore.sdlcServerClient.updateEntities(
         this.editorStore.sdlcState.activeProject.projectId,
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
+      this.editorStore.setIgnoreNavigationBlocking(true);
       this.editorStore.applicationStore.navigator.reload();
     } catch (error) {
       assertErrorThrown(error);

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

@@ -54,7 +54,7 @@ export enum CONFIGURATION_EDITOR_TAB {
 }
 
 export enum DEPENDENCY_INFO_TYPE {
-  TREE = 'tree',
+  DEPENDENCY_TREE = 'dependency tree',
   CONFLICTS = 'conflicts',
 }