@finos/legend-application-studio 18.1.0 → 19.0.0

package/src/stores/sidebar-state/WorkspaceUpdaterState.ts

@@ -158,7 +158,7 @@ export class WorkspaceUpdaterState {
         this.sdlcState.checkIfCurrentWorkspaceIsInConflictResolutionMode(),
       )) as boolean;
       if (isInConflictResolutionMode) {
-        this.editorStore.setBlockingAlert({
+        this.editorStore.applicationStore.setBlockingAlert({
           message: 'Workspace is in conflict resolution mode',
           prompt: 'Please refresh the application',
         });
@@ -170,7 +170,7 @@ export class WorkspaceUpdaterState {
         error instanceof NetworkClientError &&
         error.response.status === HttpStatus.NOT_FOUND
       ) {
-        this.editorStore.setBlockingAlert({
+        this.editorStore.applicationStore.setBlockingAlert({
           message: 'Current project or workspace no longer exists',
           prompt: 'Please refresh the application',
         });
@@ -248,7 +248,7 @@ export class WorkspaceUpdaterState {
         this.sdlcState.checkIfCurrentWorkspaceIsInConflictResolutionMode(),
       )) as boolean;
       if (isInConflictResolutionMode) {
-        this.editorStore.setBlockingAlert({
+        this.editorStore.applicationStore.setBlockingAlert({
           message: 'Workspace is in conflict resolution mode',
           prompt: 'Please refresh the application',
         });
@@ -264,7 +264,7 @@ export class WorkspaceUpdaterState {
 
     this.isUpdatingWorkspace = true;
     try {
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: 'Updating workspace...',
         prompt: 'Please do not close the application',
         showLoading: true,
@@ -284,8 +284,9 @@ export class WorkspaceUpdaterState {
         // TODO: we might want to handle the situation more gracefully rather than just reloading the page
         case WorkspaceUpdateReportStatus.CONFLICT:
         case WorkspaceUpdateReportStatus.UPDATED:
-          this.editorStore.setIgnoreNavigationBlocking(true);
-          this.editorStore.applicationStore.navigator.reload();
+          this.editorStore.applicationStore.navigator.reload({
+            ignoreBlocking: true,
+          });
           break;
         case WorkspaceUpdateReportStatus.NO_OP:
         default:
@@ -299,7 +300,7 @@ export class WorkspaceUpdaterState {
       );
       this.editorStore.applicationStore.notifyError(error);
     } finally {
-      this.editorStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.setBlockingAlert(undefined);
       this.isUpdatingWorkspace = false;
     }
   }

package/src/stores/workspace-setup/WorkspaceSetupStore.ts

@@ -111,7 +111,7 @@ export class WorkspaceSetupStore {
     this.currentProject = undefined;
     this.workspaces = [];
     this.currentWorkspace = undefined;
-    this.applicationStore.navigator.goToLocation(
+    this.applicationStore.navigator.updateCurrentLocation(
       generateSetupRoute(undefined, undefined, undefined),
     );
   }
@@ -119,7 +119,7 @@ export class WorkspaceSetupStore {
   resetWorkspace(): void {
     this.currentWorkspace = undefined;
     if (this.currentProject) {
-      this.applicationStore.navigator.goToLocation(
+      this.applicationStore.navigator.updateCurrentLocation(
         generateSetupRoute(this.currentProject.projectId, undefined, undefined),
       );
     }
@@ -145,7 +145,7 @@ export class WorkspaceSetupStore {
             )) as PlainObject<Project>,
           );
         } catch {
-          this.applicationStore.navigator.goToLocation(
+          this.applicationStore.navigator.updateCurrentLocation(
             generateSetupRoute(undefined),
           );
           this.initState.pass();
@@ -241,13 +241,13 @@ export class WorkspaceSetupStore {
         if (matchingWorkspace) {
           this.changeWorkspace(matchingWorkspace);
         } else {
-          this.applicationStore.navigator.goToLocation(
+          this.applicationStore.navigator.updateCurrentLocation(
             generateSetupRoute(project.projectId),
           );
         }
       } else {
         this.currentWorkspace = undefined;
-        this.applicationStore.navigator.goToLocation(
+        this.applicationStore.navigator.updateCurrentLocation(
           generateSetupRoute(project.projectId),
         );
       }
@@ -271,7 +271,7 @@ export class WorkspaceSetupStore {
       );
     }
     this.currentWorkspace = workspace;
-    this.applicationStore.navigator.goToLocation(
+    this.applicationStore.navigator.updateCurrentLocation(
       generateSetupRoute(
         this.currentProject.projectId,
         workspace.workspaceId,

package/tsconfig.json

@@ -58,6 +58,7 @@
     "./src/stores/LegendStudioApplicationPlugin.ts",
     "./src/stores/LegendStudioBaseStore.ts",
     "./src/stores/LegendStudioCodeSnippets.ts",
+    "./src/stores/LegendStudioCommand.ts",
     "./src/stores/LegendStudioDocumentation.ts",
     "./src/stores/LegendStudioEventService.ts",
     "./src/stores/LegendStudioRouter.ts",
@@ -240,8 +241,6 @@
     "./src/components/shared/ElementIconUtils.tsx",
     "./src/components/shared/MultiplicityBadge.tsx",
     "./src/components/shared/ProjectSelectorUtils.tsx",
-    "./src/components/shared/StudioLambdaEditor.tsx",
-    "./src/components/shared/StudioTextInputEditor.tsx",
     "./src/components/shared/TypeTree.tsx",
     "./src/components/shared/WorkspaceSelectorUtils.tsx",
     "./src/components/workspace-review/WorkspaceReview.tsx",

package/lib/components/shared/StudioLambdaEditor.d.ts

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/// <reference types="react" resolution-mode="require"/>
-import type { Type } from '@finos/legend-graph';
-import { type LambdaEditorState } from '@finos/legend-query-builder';
-export declare const StudioLambdaEditor: ((props: {
-    className?: string | undefined;
-    disabled: boolean;
-    lambdaEditorState: LambdaEditorState;
-    /**
-     * TODO: when we pass in these expected type we should match a type as expected type if it's covariance, i.e. it is a subtype of
-     * the expected type. Note that we also have to handle that relationship for Primitive type
-     * See https://dzone.com/articles/covariance-and-contravariance
-     */
-    expectedType?: Type | undefined;
-    matchedExpectedType?: (() => boolean) | undefined;
-    onExpectedTypeLabelSelect?: (() => void) | undefined;
-    forceBackdrop: boolean;
-    disableExpansion?: boolean | undefined;
-    forceExpansion?: boolean | undefined;
-    disablePopUp?: boolean | undefined;
-    useBaseTextEditorSettings?: boolean | undefined;
-    hideErrorBar?: boolean | undefined;
-    onEditorFocusEventHandler?: (() => void) | undefined;
-}) => JSX.Element) & {
-    displayName: string;
-};
-//# sourceMappingURL=StudioLambdaEditor.d.ts.map

package/lib/components/shared/StudioLambdaEditor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StudioLambdaEditor.d.ts","sourceRoot":"","sources":["../../../src/components/shared/StudioLambdaEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAOH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EACL,KAAK,iBAAiB,EAGvB,MAAM,6BAA6B,CAAC;AAErC,eAAO,MAAM,kBAAkB,WACrB;IACN,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,mBAAmB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS,CAAC;IAClD,yBAAyB,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IACrD,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChD,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,yBAAyB,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;CACtD;;CAgGF,CAAC"}

package/lib/components/shared/StudioLambdaEditor.js

@@ -1,53 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { useMemo, useCallback } from 'react';
-import { KeyCode } from 'monaco-editor';
-import { observer } from 'mobx-react-lite';
-import { useApplicationStore } from '@finos/legend-application';
-import { flowResult } from 'mobx';
-import { useEditorStore } from '../editor/EditorStoreProvider.js';
-import { LambdaEditor, } from '@finos/legend-query-builder';
-export const StudioLambdaEditor = observer((props) => {
-    const { className, lambdaEditorState, disabled, forceBackdrop, expectedType, onExpectedTypeLabelSelect, matchedExpectedType, disableExpansion, forceExpansion, disablePopUp, useBaseTextEditorSettings, hideErrorBar, onEditorFocusEventHandler, } = props;
-    const applicationStore = useApplicationStore();
-    const editorStore = useEditorStore();
-    const backdropSetter = useCallback((val) => applicationStore.setShowBackdrop(val), [applicationStore]);
-    const onKeyDownEventHandlers = useMemo(() => [
-        {
-            matcher: (event) => event.keyCode === KeyCode.F8,
-            action: (event) => {
-                flowResult(editorStore.graphState.checkLambdaParsingError(lambdaEditorState, !disabled, () => flowResult(editorStore.toggleTextMode()))).catch(applicationStore.alertUnhandledError);
-            },
-        },
-        {
-            matcher: (event) => event.keyCode === KeyCode.F9,
-            action: (event) => {
-                flowResult(editorStore.graphState.checkLambdaParsingError(lambdaEditorState, !disabled, async () => {
-                    await flowResult(editorStore.graphState.globalCompileInFormMode());
-                })).catch(applicationStore.alertUnhandledError);
-            },
-        },
-        {
-            matcher: (event) => event.keyCode === KeyCode.F10,
-            action: (event) => {
-                flowResult(editorStore.graphState.checkLambdaParsingError(lambdaEditorState, !disabled, () => flowResult(editorStore.graphState.graphGenerationState.globalGenerate()))).catch(applicationStore.alertUnhandledError);
-            },
-        },
-    ], [disabled, lambdaEditorState, applicationStore, editorStore]);
-    return (_jsx(LambdaEditor, { className: className, disabled: disabled, lambdaEditorState: lambdaEditorState, expectedType: expectedType, matchedExpectedType: matchedExpectedType, onExpectedTypeLabelSelect: onExpectedTypeLabelSelect, forceBackdrop: forceBackdrop, backdropSetter: backdropSetter, disableExpansion: disableExpansion, forceExpansion: forceExpansion, disablePopUp: disablePopUp, useBaseTextEditorSettings: useBaseTextEditorSettings, hideErrorBar: hideErrorBar, onKeyDownEventHandlers: onKeyDownEventHandlers, onEditorFocusEventHandler: onEditorFocusEventHandler }, lambdaEditorState.uuid));
-});
-//# sourceMappingURL=StudioLambdaEditor.js.map

package/lib/components/shared/StudioLambdaEditor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StudioLambdaEditor.js","sourceRoot":"","sources":["../../../src/components/shared/StudioLambdaEditor.tsx"],"names":[],"mappings":"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"}

package/lib/components/shared/StudioTextInputEditor.d.ts

@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/// <reference types="react" resolution-mode="require"/>
-import { type editor as monacoEditorAPI } from 'monaco-editor';
-import { type EDITOR_LANGUAGE } from '@finos/legend-application';
-export declare const StudioTextInputEditor: React.FC<{
-    inputValue: string;
-    isReadOnly?: boolean | undefined;
-    language: EDITOR_LANGUAGE;
-    showMiniMap?: boolean | undefined;
-    hideGutter?: boolean | undefined;
-    extraEditorOptions?: monacoEditorAPI.IEditorOptions & monacoEditorAPI.IGlobalEditorOptions;
-    updateInput?: ((val: string) => void) | undefined;
-}>;
-//# sourceMappingURL=StudioTextInputEditor.d.ts.map

package/lib/components/shared/StudioTextInputEditor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StudioTextInputEditor.d.ts","sourceRoot":"","sources":["../../../src/components/shared/StudioTextInputEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAGH,OAAO,EACL,KAAK,MAAM,IAAI,eAAe,EAG/B,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,KAAK,eAAe,EAGrB,MAAM,2BAA2B,CAAC;AAInC,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,kBAAkB,CAAC,EAAE,eAAe,CAAC,cAAc,GACjD,eAAe,CAAC,oBAAoB,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACnD,CA0CA,CAAC"}

package/lib/components/shared/StudioTextInputEditor.js

@@ -1,36 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { useMemo } from 'react';
-import { KeyCode, } from 'monaco-editor';
-import { TextInputEditor, useApplicationStore, } from '@finos/legend-application';
-import { flowResult } from 'mobx';
-import { useEditorStore } from '../editor/EditorStoreProvider.js';
-export const StudioTextInputEditor = (props) => {
-    const { inputValue, isReadOnly, updateInput, language, showMiniMap, hideGutter, extraEditorOptions, } = props;
-    const applicationStore = useApplicationStore();
-    const editorStore = useEditorStore();
-    const onKeyDownEventHandlers = useMemo(() => [
-        {
-            matcher: (event) => event.keyCode === KeyCode.F8,
-            action: (event) => {
-                flowResult(editorStore.toggleTextMode()).catch(applicationStore.alertUnhandledError);
-            },
-        },
-    ], [applicationStore, editorStore]);
-    return (_jsx(TextInputEditor, { inputValue: inputValue, updateInput: updateInput, isReadOnly: isReadOnly, language: language, showMiniMap: showMiniMap, hideGutter: hideGutter, extraEditorOptions: extraEditorOptions, onKeyDownEventHandlers: onKeyDownEventHandlers }));
-};
-//# sourceMappingURL=StudioTextInputEditor.js.map

package/lib/components/shared/StudioTextInputEditor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StudioTextInputEditor.js","sourceRoot":"","sources":["../../../src/components/shared/StudioTextInputEditor.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAGL,OAAO,GACR,MAAM,eAAe,CAAC;AACvB,OAAO,EAGL,eAAe,EACf,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,MAAM,CAAC,MAAM,qBAAqB,GAS7B,CAAC,KAAK,EAAE,EAAE;IACb,MAAM,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,EACX,UAAU,EACV,kBAAkB,GACnB,GAAG,KAAK,CAAC;IAEV,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,sBAAsB,GAC1B,OAAO,CACL,GAAG,EAAE,CAAC;QACJ;YACE,OAAO,EAAE,CAAC,KAAqB,EAAW,EAAE,CAC1C,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE;YAC9B,MAAM,EAAE,CAAC,KAAqB,EAAQ,EAAE;gBACtC,UAAU,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,KAAK,CAC5C,gBAAgB,CAAC,mBAAmB,CACrC,CAAC;YACJ,CAAC;SACF;KACF,EACD,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAChC,CAAC;IAEJ,OAAO,CACL,KAAC,eAAe,IACd,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,GAC9C,CACH,CAAC;AACJ,CAAC,CAAC"}

package/src/components/shared/StudioLambdaEditor.tsx

@@ -1,146 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { useMemo, useCallback } from 'react';
-import { type IKeyboardEvent, KeyCode } from 'monaco-editor';
-import { observer } from 'mobx-react-lite';
-import { useApplicationStore } from '@finos/legend-application';
-import { flowResult } from 'mobx';
-import type { Type } from '@finos/legend-graph';
-import { useEditorStore } from '../editor/EditorStoreProvider.js';
-import {
-  type LambdaEditorState,
-  type LambdaEditorOnKeyDownEventHandler,
-  LambdaEditor,
-} from '@finos/legend-query-builder';
-
-export const StudioLambdaEditor = observer(
-  (props: {
-    className?: string | undefined;
-    disabled: boolean;
-    lambdaEditorState: LambdaEditorState;
-    /**
-     * TODO: when we pass in these expected type we should match a type as expected type if it's covariance, i.e. it is a subtype of
-     * the expected type. Note that we also have to handle that relationship for Primitive type
-     * See https://dzone.com/articles/covariance-and-contravariance
-     */
-    expectedType?: Type | undefined;
-    matchedExpectedType?: (() => boolean) | undefined;
-    onExpectedTypeLabelSelect?: (() => void) | undefined;
-    forceBackdrop: boolean;
-    disableExpansion?: boolean | undefined;
-    forceExpansion?: boolean | undefined;
-    disablePopUp?: boolean | undefined;
-    useBaseTextEditorSettings?: boolean | undefined;
-    hideErrorBar?: boolean | undefined;
-    onEditorFocusEventHandler?: (() => void) | undefined;
-  }) => {
-    const {
-      className,
-      lambdaEditorState,
-      disabled,
-      forceBackdrop,
-      expectedType,
-      onExpectedTypeLabelSelect,
-      matchedExpectedType,
-      disableExpansion,
-      forceExpansion,
-      disablePopUp,
-      useBaseTextEditorSettings,
-      hideErrorBar,
-      onEditorFocusEventHandler,
-    } = props;
-    const applicationStore = useApplicationStore();
-    const editorStore = useEditorStore();
-
-    const backdropSetter = useCallback(
-      (val: boolean) => applicationStore.setShowBackdrop(val),
-      [applicationStore],
-    );
-    const onKeyDownEventHandlers: LambdaEditorOnKeyDownEventHandler[] = useMemo(
-      () => [
-        {
-          matcher: (event: IKeyboardEvent): boolean =>
-            event.keyCode === KeyCode.F8,
-          action: (event: IKeyboardEvent): void => {
-            flowResult(
-              editorStore.graphState.checkLambdaParsingError(
-                lambdaEditorState,
-                !disabled,
-                () => flowResult(editorStore.toggleTextMode()),
-              ),
-            ).catch(applicationStore.alertUnhandledError);
-          },
-        },
-        {
-          matcher: (event: IKeyboardEvent): boolean =>
-            event.keyCode === KeyCode.F9,
-          action: (event: IKeyboardEvent): void => {
-            flowResult(
-              editorStore.graphState.checkLambdaParsingError(
-                lambdaEditorState,
-                !disabled,
-                async () => {
-                  await flowResult(
-                    editorStore.graphState.globalCompileInFormMode(),
-                  );
-                },
-              ),
-            ).catch(applicationStore.alertUnhandledError);
-          },
-        },
-        {
-          matcher: (event: IKeyboardEvent): boolean =>
-            event.keyCode === KeyCode.F10,
-          action: (event: IKeyboardEvent): void => {
-            flowResult(
-              editorStore.graphState.checkLambdaParsingError(
-                lambdaEditorState,
-                !disabled,
-                () =>
-                  flowResult(
-                    editorStore.graphState.graphGenerationState.globalGenerate(),
-                  ),
-              ),
-            ).catch(applicationStore.alertUnhandledError);
-          },
-        },
-      ],
-      [disabled, lambdaEditorState, applicationStore, editorStore],
-    );
-
-    return (
-      <LambdaEditor
-        key={lambdaEditorState.uuid}
-        className={className}
-        disabled={disabled}
-        lambdaEditorState={lambdaEditorState}
-        expectedType={expectedType}
-        matchedExpectedType={matchedExpectedType}
-        onExpectedTypeLabelSelect={onExpectedTypeLabelSelect}
-        forceBackdrop={forceBackdrop}
-        backdropSetter={backdropSetter}
-        disableExpansion={disableExpansion}
-        forceExpansion={forceExpansion}
-        disablePopUp={disablePopUp}
-        useBaseTextEditorSettings={useBaseTextEditorSettings}
-        hideErrorBar={hideErrorBar}
-        onKeyDownEventHandlers={onKeyDownEventHandlers}
-        onEditorFocusEventHandler={onEditorFocusEventHandler}
-      />
-    );
-  },
-);

package/src/components/shared/StudioTextInputEditor.tsx

@@ -1,83 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { useMemo } from 'react';
-import {
-  type editor as monacoEditorAPI,
-  type IKeyboardEvent,
-  KeyCode,
-} from 'monaco-editor';
-import {
-  type TextInputEditorOnKeyDownEventHandler,
-  type EDITOR_LANGUAGE,
-  TextInputEditor,
-  useApplicationStore,
-} from '@finos/legend-application';
-import { flowResult } from 'mobx';
-import { useEditorStore } from '../editor/EditorStoreProvider.js';
-
-export const StudioTextInputEditor: React.FC<{
-  inputValue: string;
-  isReadOnly?: boolean | undefined;
-  language: EDITOR_LANGUAGE;
-  showMiniMap?: boolean | undefined;
-  hideGutter?: boolean | undefined;
-  extraEditorOptions?: monacoEditorAPI.IEditorOptions &
-    monacoEditorAPI.IGlobalEditorOptions;
-  updateInput?: ((val: string) => void) | undefined;
-}> = (props) => {
-  const {
-    inputValue,
-    isReadOnly,
-    updateInput,
-    language,
-    showMiniMap,
-    hideGutter,
-    extraEditorOptions,
-  } = props;
-
-  const applicationStore = useApplicationStore();
-  const editorStore = useEditorStore();
-
-  const onKeyDownEventHandlers: TextInputEditorOnKeyDownEventHandler[] =
-    useMemo(
-      () => [
-        {
-          matcher: (event: IKeyboardEvent): boolean =>
-            event.keyCode === KeyCode.F8,
-          action: (event: IKeyboardEvent): void => {
-            flowResult(editorStore.toggleTextMode()).catch(
-              applicationStore.alertUnhandledError,
-            );
-          },
-        },
-      ],
-      [applicationStore, editorStore],
-    );
-
-  return (
-    <TextInputEditor
-      inputValue={inputValue}
-      updateInput={updateInput}
-      isReadOnly={isReadOnly}
-      language={language}
-      showMiniMap={showMiniMap}
-      hideGutter={hideGutter}
-      extraEditorOptions={extraEditorOptions}
-      onKeyDownEventHandlers={onKeyDownEventHandlers}
-    />
-  );
-};