@finos/legend-application-studio 18.0.2 → 19.0.0

package/src/stores/EmbeddedQueryBuilderState.ts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import type { QueryBuilderState } from '@finos/legend-query-builder';
+import {
+  type QueryBuilderState,
+  QUERY_BUILDER_BACKDROP_CONTAINER_ID,
+} from '@finos/legend-query-builder';
 import type { GeneratorFn } from '@finos/legend-shared';
 import { flow, flowResult, makeObservable, observable } from 'mobx';
 import { FormModeCompilationOutcome } from './EditorGraphState.js';
@@ -57,7 +60,7 @@ export class EmbeddedQueryBuilderState {
         return;
       }
       if (!config.disableCompile) {
-        this.editorStore.setBlockingAlert({
+        this.editorStore.applicationStore.setBlockingAlert({
           message: 'Compiling graph before building query...',
           showLoading: true,
         });
@@ -70,21 +73,21 @@ export class EmbeddedQueryBuilderState {
         )) as FormModeCompilationOutcome;
         switch (compilationOutcome) {
           case FormModeCompilationOutcome.SKIPPED: {
-            this.editorStore.setBlockingAlert(undefined);
+            this.editorStore.applicationStore.setBlockingAlert(undefined);
             this.editorStore.applicationStore.notifyWarning(
               `Can't open query builder: Can't compile at this time, please try again later`,
             );
             return;
           }
           case FormModeCompilationOutcome.SUCCEEDED: {
-            this.editorStore.setBlockingAlert(undefined);
+            this.editorStore.applicationStore.setBlockingAlert(undefined);
             break;
           }
           default: {
             this.editorStore.applicationStore.notifyWarning(
               `Can't open query builder: Compilation failed! Please fix the compilation issue and try again`,
             );
-            this.editorStore.setBlockingAlert(undefined);
+            this.editorStore.applicationStore.setBlockingAlert(undefined);
             return;
           }
         }
@@ -92,14 +95,16 @@ export class EmbeddedQueryBuilderState {
       if (!this.editorStore.graphState.hasCompilationError) {
         this.queryBuilderState = config.setupQueryBuilderState();
         this.actionConfigs = config.actionConfigs;
+        this.editorStore.applicationStore.setBackdropContainerElementID(
+          QUERY_BUILDER_BACKDROP_CONTAINER_ID,
+        );
       }
-      this.editorStore.setBlockGlobalHotkeys(true);
-      this.editorStore.setHotkeys([]);
     } else {
+      this.editorStore.applicationStore.setBackdropContainerElementID(
+        undefined,
+      );
       this.queryBuilderState = undefined;
       this.actionConfigs = [];
-      this.editorStore.setBlockGlobalHotkeys(false);
-      this.editorStore.resetHotkeys();
     }
   }
 }

package/src/stores/LegendStudioBaseStore.ts

@@ -28,6 +28,7 @@ import {
   ActionAlertActionType,
   ActionAlertType,
   ApplicationTelemetry,
+  matchPath,
 } from '@finos/legend-application';
 import {
   action,
@@ -43,6 +44,7 @@ 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 { LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN } from './LegendStudioRouter.js';
 
 const UNKNOWN_USER_ID = '(unknown)';
 
@@ -59,7 +61,7 @@ export class LegendStudioBaseStore {
 
   initState = ActionState.create();
 
-  isSDLCAuthorized = false;
+  isSDLCAuthorized: boolean | undefined = false;
   SDLCServerTermsOfServicesUrlsToView: string[] = [];
 
   constructor(
@@ -98,28 +100,38 @@ export class LegendStudioBaseStore {
     }
     this.initState.inProgress();
 
-    // setup SDLC server client
-    yield flowResult(this.initializeSDLCServerClient());
+    // authorize SDLC, unless navigation location match SDLC-bypassed patterns
+    if (
+      !matchPath(this.applicationStore.navigator.getCurrentLocation(), [
+        LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV,
+        LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV_ENTITY,
+      ])
+    ) {
+      // setup SDLC server client
+      yield flowResult(this.initializeSDLCServerClient());
+
+      let currentUserID = UNKNOWN_USER_ID;
+      try {
+        const currentUser = User.serialization.fromJson(
+          (yield this.sdlcServerClient.getCurrentUser()) as PlainObject<User>,
+        );
+        this.sdlcServerClient.setCurrentUser(currentUser);
+        currentUserID = currentUser.userId;
+      } catch (error) {
+        assertErrorThrown(error);
+        this.applicationStore.log.error(
+          LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
+          error,
+        );
+        this.applicationStore.notifyWarning(error.message);
+      }
 
-    let currentUserID = UNKNOWN_USER_ID;
-    try {
-      const currentUser = User.serialization.fromJson(
-        (yield this.sdlcServerClient.getCurrentUser()) as PlainObject<User>,
-      );
-      this.sdlcServerClient.setCurrentUser(currentUser);
-      currentUserID = currentUser.userId;
-    } catch (error) {
-      assertErrorThrown(error);
-      this.applicationStore.log.error(
-        LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
-        error,
-      );
-      this.applicationStore.notifyWarning(error.message);
+      // setup telemetry service
+      this.applicationStore.telemetryService.setUserId(currentUserID);
+    } else {
+      this.isSDLCAuthorized = undefined;
     }
 
-    // setup telemetry service
-    this.applicationStore.telemetryService.setUserId(currentUserID);
-
     ApplicationTelemetry.logEvent_ApplicationInitialized(
       this.applicationStore.telemetryService,
       {
@@ -149,14 +161,11 @@ export class LegendStudioBaseStore {
       this.isSDLCAuthorized =
         (yield this.sdlcServerClient.isAuthorized()) as boolean;
       if (!this.isSDLCAuthorized) {
-        this.applicationStore.navigator.visitAddress(
+        this.applicationStore.navigator.goToAddress(
           SDLCServerClient.authorizeCallbackUrl(
             this.applicationStore.config.sdlcServerUrl,
             this.applicationStore.navigator.getCurrentAddress(),
           ),
-          {
-            useSameWindow: true,
-          },
         );
       } else {
         // Only proceed intialization after passing authorization check
@@ -191,7 +200,8 @@ export class LegendStudioBaseStore {
           });
         }
 
-        // fetch server features config
+        // fetch server features config and platforms
+        yield this.sdlcServerClient.fetchServerPlatforms();
         yield this.sdlcServerClient.fetchServerFeaturesConfiguration();
       }
     } catch (error) {

package/src/stores/LegendStudioCommand.ts

@@ -0,0 +1,83 @@
+/**
+ * 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 type { CommandConfigData } from '@finos/legend-application';
+
+export enum LEGEND_STUDIO_COMMAND_KEY {
+  SYNC_WITH_WORKSPACE = 'editor.sync-workspace',
+  CREATE_ELEMENT = 'editor.create-new-element',
+  SEARCH_ELEMENT = 'editor.search-element',
+  TOGGLE_TEXT_MODE = 'editor.toggle-text-mode',
+  GENERATE = 'editor.generate',
+  COMPILE = 'editor.compile',
+  TOGGLE_AUX_PANEL = 'editor.toggle-auxiliary-panel',
+  TOGGLE_MODEL_LOADER = 'editor.toggle-model-loader',
+  TOGGLE_SIDEBAR_EXPLORER = 'editor.sidebar.toggle-explorer',
+  TOGGLE_SIDEBAR_LOCAL_CHANGES = 'editor.sidebar.toggle-local-changes',
+  TOGGLE_SIDEBAR_WORKSPACE_REVIEW = 'editor.sidebar.toggle-workspace-review',
+  TOGGLE_SIDEBAR_WORKSPACE_UPDATER = 'editor.sidebar.toggle-workspace-updater',
+}
+
+export const LEGEND_STUDIO_COMMAND_CONFIG: CommandConfigData = {
+  [LEGEND_STUDIO_COMMAND_KEY.SYNC_WITH_WORKSPACE]: {
+    title: 'Sync with workspace',
+    defaultKeyboardShortcut: 'Control+s',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.CREATE_ELEMENT]: {
+    title: 'Create new element',
+    defaultKeyboardShortcut: 'Control+Shift+n',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.SEARCH_ELEMENT]: {
+    title: 'Search for element',
+    defaultKeyboardShortcut: 'Control+p',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_MODEL_LOADER]: {
+    title: 'Toggle model loader',
+    defaultKeyboardShortcut: 'F2',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_TEXT_MODE]: {
+    title: 'Toggle text mode',
+    defaultKeyboardShortcut: 'F8',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.COMPILE]: {
+    title: 'Compile',
+    defaultKeyboardShortcut: 'F9',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.GENERATE]: {
+    title: 'Generate',
+    defaultKeyboardShortcut: 'F10',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_AUX_PANEL]: {
+    title: 'Toggle auxiliary panel',
+    defaultKeyboardShortcut: 'Control+`',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_SIDEBAR_EXPLORER]: {
+    title: 'Toggle explorer sidebar',
+    defaultKeyboardShortcut: 'Control+Shift+x',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_SIDEBAR_LOCAL_CHANGES]: {
+    title: 'Toggle local changes sidebar',
+    defaultKeyboardShortcut: 'Control+Shift+g',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_SIDEBAR_WORKSPACE_REVIEW]: {
+    title: 'Toggle workspace review sidebar',
+    defaultKeyboardShortcut: 'Control+Shift+m',
+  },
+  [LEGEND_STUDIO_COMMAND_KEY.TOGGLE_SIDEBAR_WORKSPACE_UPDATER]: {
+    title: 'Toggle workspace updater sidebar',
+    defaultKeyboardShortcut: 'Control+Shift+u',
+  },
+};

package/src/stores/LegendStudioRouter.ts

@@ -32,18 +32,23 @@ export enum LEGEND_STUDIO_PATH_PARAM_TOKEN {
 
 export const LEGEND_STUDIO_ROUTE_PATTERN = Object.freeze({
   VIEW: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}`,
-  VIEW_BY_GAV: `/view/archive/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GAV}`,
-  VIEW_BY_GAV_ENTITY: `/view/archive/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GAV}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
   VIEW_BY_ENTITY: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
   VIEW_BY_REVISION: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/revision/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.REVISION_ID}`,
   VIEW_BY_VERSION: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/version/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.VERSION_ID}`,
   VIEW_BY_REVISION_ENTITY: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/revision/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.REVISION_ID}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
   VIEW_BY_VERSION_ENTITY: `/view/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/version/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.VERSION_ID}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
   REVIEW: `/review/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.REVIEW_ID}`,
-  EDIT: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID}/`,
-  EDIT_GROUP: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/groupWorkspace/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/`,
-  SETUP: `/setup/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}?/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID}?`,
-  SETUP_GROUP: `/setup/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/groupWorkspace/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/`,
+  EDIT_WORKSPACE: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID}/`,
+  EDIT_WORKSPACE_ENTITY: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
+  EDIT_GROUP_WORKSPACE: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/groupWorkspace/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/`,
+  EDIT_GROUP_WORKSPACE_ENTITY: `/edit/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/groupWorkspace/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
+  SETUP_WORKSPACE: `/setup/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}?/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID}?`,
+  SETUP_GROUP_WORKSPACE: `/setup/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID}/groupWorkspace/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/`,
+});
+
+export const LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN = Object.freeze({
+  VIEW_BY_GAV: `/view/archive/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GAV}`,
+  VIEW_BY_GAV_ENTITY: `/view/archive/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.GAV}/entity/:${LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH}`,
 });
 
 export interface ReviewPathParams {
@@ -59,16 +64,11 @@ export interface ViewerPathParams {
   [LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH]?: string;
 }
 
-export interface CoreEditorPathParams {
+export interface WorkspaceEditorPathParams {
   [LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID]: string;
-}
-
-export interface EditorPathParams extends CoreEditorPathParams {
-  [LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID]: string;
-}
-
-export interface GroupEditorPathParams extends CoreEditorPathParams {
-  [LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID]: string;
+  [LEGEND_STUDIO_PATH_PARAM_TOKEN.WORKSPACE_ID]?: string;
+  [LEGEND_STUDIO_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID]?: string;
+  [LEGEND_STUDIO_PATH_PARAM_TOKEN.ENTITY_PATH]?: string;
 }
 export interface SetupPathParams {
   [LEGEND_STUDIO_PATH_PARAM_TOKEN.PROJECT_ID]?: string;
@@ -80,7 +80,7 @@ const generateGroupWorkspaceSetupRoute = (
   projectId: string | undefined,
   groupWorkspaceId: string,
 ): string =>
-  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.SETUP_GROUP, {
+  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.SETUP_GROUP_WORKSPACE, {
     // FIXME: due to some problem with typings, we will need to cast like this
     // we will fix this when upgrading react-router
     // See https://github.com/finos/legend-studio/issues/688
@@ -92,7 +92,7 @@ const generateWorkspaceSetupRoute = (
   projectId: string | undefined,
   workspaceId?: string,
 ): string =>
-  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.SETUP, {
+  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.SETUP_WORKSPACE, {
     // FIXME: due to some problem with typings, we will need to cast like this
     // we will fix this when upgrading react-router
     // See https://github.com/finos/legend-studio/issues/688
@@ -118,29 +118,44 @@ export const generateSetupRoute = (
 const generateGroupWorkspaceEditorRoute = (
   projectId: string,
   groupWorkspaceId: string,
+  entityPath?: string | undefined,
 ): string =>
-  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT_GROUP, {
-    projectId,
-    groupWorkspaceId,
-  });
+  !entityPath
+    ? generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT_GROUP_WORKSPACE, {
+        projectId,
+        groupWorkspaceId,
+      })
+    : generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT_GROUP_WORKSPACE_ENTITY, {
+        projectId,
+        groupWorkspaceId,
+        entityPath,
+      });
 
 const generateWorkspaceEditorRoute = (
   projectId: string,
   workspaceId: string,
+  entityPath?: string | undefined,
 ): string =>
-  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT, {
-    projectId,
-    workspaceId,
-  });
+  !entityPath
+    ? generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT_WORKSPACE, {
+        projectId,
+        workspaceId,
+      })
+    : generatePath(LEGEND_STUDIO_ROUTE_PATTERN.EDIT_WORKSPACE_ENTITY, {
+        projectId,
+        workspaceId,
+        entityPath,
+      });
 
 export const generateEditorRoute = (
   projectId: string,
   workspaceId: string,
   workspaceType: WorkspaceType,
+  entityPath?: string | undefined,
 ): string =>
   workspaceType === WorkspaceType.GROUP
-    ? generateGroupWorkspaceEditorRoute(projectId, workspaceId)
-    : generateWorkspaceEditorRoute(projectId, workspaceId);
+    ? generateGroupWorkspaceEditorRoute(projectId, workspaceId, entityPath)
+    : generateWorkspaceEditorRoute(projectId, workspaceId, entityPath);
 
 export const generateReviewRoute = (
   projectId: string,
@@ -172,22 +187,16 @@ export const generateViewProjectByGAVRoute = (
   entityPath?: string | undefined,
 ): string =>
   !entityPath
-    ? generatePath(LEGEND_STUDIO_ROUTE_PATTERN.VIEW_BY_GAV, {
+    ? generatePath(LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV, {
         gav: generateGAVCoordinates(groupId, artifactId, versionId),
       })
-    : generatePath(LEGEND_STUDIO_ROUTE_PATTERN.VIEW_BY_GAV_ENTITY, {
-        gav: generateGAVCoordinates(groupId, artifactId, versionId),
-        entityPath,
-      });
-
-export const generateViewProjectEntityByGAVRoute = (
-  groupId: string,
-  artifactId: string,
-  versionId: string,
-): string =>
-  generatePath(LEGEND_STUDIO_ROUTE_PATTERN.VIEW_BY_GAV, {
-    gav: generateGAVCoordinates(groupId, artifactId, versionId),
-  });
+    : generatePath(
+        LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV_ENTITY,
+        {
+          gav: generateGAVCoordinates(groupId, artifactId, versionId),
+          entityPath,
+        },
+      );
 
 export const generateViewVersionRoute = (
   projectId: string,

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

@@ -461,12 +461,13 @@ export class GraphGenerationState {
       .filter(isNonNullable);
     const currentEditorState = this.editorStore.currentEditorState;
     if (currentEditorState instanceof FileGenerationViewerState) {
-      this.editorStore.currentEditorState =
+      this.editorStore.setCurrentEditorState(
         this.editorStore.openedEditorStates.find(
           (e) =>
             e instanceof FileGenerationViewerState &&
             e.generatedFile.path === currentEditorState.generatedFile.path,
-        );
+        ),
+      );
     }
   }
 

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

@@ -90,7 +90,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
 
   constructor(modelImporterState: ModelImporterState) {
     super(modelImporterState);
-    this.modelText = this.getExampleEntitiesInputText();
+
     makeObservable(this, {
       nativeType: observable,
       modelText: observable,
@@ -98,9 +98,10 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
       setModelText: action,
       setNativeImportType: action,
       isLoadingDisabled: computed,
-      loadModel: flow,
       loadCurrentProjectEntities: flow,
     });
+
+    this.modelText = this.getExampleEntitiesInputText();
   }
 
   get label(): string {
@@ -238,7 +239,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
   async loadModel(): Promise<void> {
     try {
       this.loadModelActionState.inProgress();
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: 'Loading model...',
         prompt: 'Please do not close the application',
         showLoading: true,
@@ -254,8 +255,9 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
-      this.editorStore.setIgnoreNavigationBlocking(true);
-      this.editorStore.applicationStore.navigator.reload();
+      this.editorStore.applicationStore.navigator.reload({
+        ignoreBlocking: true,
+      });
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.log.error(
@@ -265,7 +267,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
       this.editorStore.applicationStore.notifyError(error);
     } finally {
       this.loadModelActionState.complete();
-      this.editorStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.setBlockingAlert(undefined);
     }
   }
 }
@@ -287,8 +289,7 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
     modelImporterState: ModelImporterState,
   ) {
     super(modelImporterState);
-    this.config = config;
-    this.rendererState = rendererState;
+
     makeObservable(this, {
       config: observable,
       modelImporterState: observable,
@@ -298,6 +299,9 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
       setExtension: action,
       loadModel: flow,
     });
+
+    this.config = config;
+    this.rendererState = rendererState;
   }
 
   get label(): string {
@@ -337,6 +341,18 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
     modelImporterState: ModelImporterState,
   ) {
     super(modelImporterState);
+
+    makeObservable(this, {
+      schemaSet: observable,
+      schemaSetEditorState: observable,
+      loadModelActionState: observable,
+      description: observable,
+      isolatedSchemaGraph: observable,
+      setExternalFormat: action,
+      setDescription: action,
+      isLoadingDisabled: computed,
+    });
+
     this.description = description;
     this.schemaSet = new SchemaSet(DEFAULT_SCHEMA_NAME);
     this.schemaSet.format = description.name;
@@ -351,17 +367,6 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
       this.editorStore,
       this.isolatedSchemaGraph,
     );
-    makeObservable(this, {
-      schemaSet: observable,
-      schemaSetEditorState: observable,
-      loadModelActionState: observable,
-      description: observable,
-      isolatedSchemaGraph: observable,
-      setExternalFormat: action,
-      setDescription: action,
-      isLoadingDisabled: computed,
-      loadModel: flow,
-    });
   }
 
   get allowHardReplace(): boolean {
@@ -398,7 +403,7 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
     this.loadModelActionState.inProgress();
     try {
       this.loadModelActionState.inProgress();
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: 'Loading model...',
         prompt: 'Please do not close the application',
         showLoading: true,
@@ -426,14 +431,15 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
-      this.editorStore.setIgnoreNavigationBlocking(true);
-      this.editorStore.applicationStore.navigator.reload();
+      this.editorStore.applicationStore.navigator.reload({
+        ignoreBlocking: true,
+      });
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.notifyError(error);
     } finally {
       this.loadModelActionState.complete();
-      this.editorStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.setBlockingAlert(undefined);
     }
   }
 }
@@ -456,6 +462,7 @@ export class ModelImporterState extends EditorState {
       setExternalFormatImportFormat: action,
       setImportEditorState: action,
     });
+
     this.modelImportEditorState = new NativeModelImporterEditorState(this);
     this.extensionConfigs = this.editorStore.pluginManager
       .getApplicationPlugins()
@@ -469,12 +476,15 @@ export class ModelImporterState extends EditorState {
   get headerName(): string {
     return 'Model Importer';
   }
+
   setReplaceFlag(val: boolean): void {
     this.replace = val;
   }
+
   setImportEditorState(val: ModelImporterEditorState): void {
     this.modelImportEditorState = val;
   }
+
   setNativeImportType(
     nativeImportType: MODEL_IMPORT_NATIVE_INPUT_TYPE,
   ): NativeModelImporterEditorState {
@@ -486,6 +496,7 @@ export class ModelImporterState extends EditorState {
     this.setImportEditorState(nativeEditorState);
     return nativeEditorState;
   }
+
   setExternalFormatImportFormat(
     externalFormat: ExternalFormatDescription,
   ): ExternalFormatModelImporterState {
@@ -497,6 +508,7 @@ export class ModelImporterState extends EditorState {
     this.setImportEditorState(extensionEditorState);
     return extensionEditorState;
   }
+
   setModelImporterExtension(
     extension: ModelImporterExtensionConfiguration,
   ): ExtensionModelImporterEditorState {

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

@@ -30,12 +30,14 @@ import {
   LogEvent,
   assertErrorThrown,
   guaranteeNonNullable,
+  hashArray,
 } from '@finos/legend-shared';
 import type { EditorSDLCState } from '../EditorSDLCState.js';
 import {
   type ProjectConfiguration,
   ProjectStructureVersion,
   UpdateProjectConfigurationCommand,
+  UpdatePlatformConfigurationsCommand,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
 import {
@@ -51,6 +53,7 @@ import { generateGAVCoordinates } from '@finos/legend-storage';
 export enum CONFIGURATION_EDITOR_TAB {
   PROJECT_STRUCTURE = 'PROJECT_STRUCTURE',
   PROJECT_DEPENDENCIES = 'PROJECT_DEPENDENCIES',
+  PLATFORM_CONFIGURATIONS = 'PLATFORM_CONFIGURATIONS',
 }
 
 export enum DEPENDENCY_INFO_TYPE {
@@ -343,7 +346,7 @@ export class ProjectConfigurationEditorState extends EditorState {
   // See https://github.com/finos/legend-studio/issues/952
   *updateConfigs(): GeneratorFn<void> {
     this.isUpdatingConfiguration = true;
-    this.editorStore.setBlockingAlert({
+    this.editorStore.applicationStore.setBlockingAlert({
       message: `Updating project configuration...`,
       prompt: `Please do not reload the application`,
       showLoading: true,
@@ -356,6 +359,17 @@ export class ProjectConfigurationEditorState extends EditorState {
           this.currentProjectConfiguration.projectStructureVersion,
           `update project configuration from ${this.editorStore.applicationStore.config.appName}`,
         );
+
+      if (
+        hashArray(this.originalConfig.platformConfigurations ?? []) !==
+        hashArray(this.currentProjectConfiguration.platformConfigurations ?? [])
+      ) {
+        updateProjectConfigurationCommand.platformConfigurations =
+          new UpdatePlatformConfigurationsCommand(
+            this.currentProjectConfiguration.platformConfigurations,
+          );
+      }
+
       updateProjectConfigurationCommand.projectDependenciesToAdd =
         this.currentProjectConfiguration.projectDependencies.filter(
           (dep) =>
@@ -382,7 +396,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       this.editorStore.applicationStore.notifyError(error);
     } finally {
       this.isUpdatingConfiguration = false;
-      this.editorStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.setBlockingAlert(undefined);
     }
   }
 

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

@@ -863,12 +863,10 @@ export class MappingExecutionState {
           );
         }
       } else {
-        this.editorStore.setActionAlertInfo({
+        this.editorStore.applicationStore.setActionAlertInfo({
           message: 'Mapping execution input data is already set',
           prompt: 'Do you want to regenerate the input data?',
           type: ActionAlertType.CAUTION,
-          onEnter: (): void => this.editorStore.setBlockGlobalHotkeys(true),
-          onClose: (): void => this.editorStore.setBlockGlobalHotkeys(false),
           actions: [
             {
               label: 'Regenerate',