@finos/legend-application-studio 23.1.7 → 23.1.8

package/src/components/shared/DiffView.tsx

@@ -18,16 +18,12 @@ import { useEffect, useState, useRef } from 'react';
 import { observer } from 'mobx-react-lite';
 import { editor as monacoEditorAPI } from 'monaco-editor';
 import {
-  EDITOR_THEME,
-  EDITOR_LANGUAGE,
+  CODE_EDITOR_THEME,
+  CODE_EDITOR_LANGUAGE,
   TAB_SIZE,
   useApplicationStore,
 } from '@finos/legend-application';
-import {
-  disposeDiffEditor,
-  getBaseTextEditorOptions,
-  useResizeDetector,
-} from '@finos/legend-art';
+import { useResizeDetector } from '@finos/legend-art';
 import {
   isString,
   stringifyLosslessJSON,
@@ -35,10 +31,14 @@ import {
   tryToFormatLosslessJSONString,
 } from '@finos/legend-shared';
 import { useEditorStore } from '../editor/EditorStoreProvider.js';
+import {
+  disposeDiffCodeEditor,
+  getBaseCodeEditorOptions,
+} from '@finos/legend-lego/code-editor';
 
 export const TextDiffView = observer(
   (props: {
-    language: EDITOR_LANGUAGE;
+    language: CODE_EDITOR_LANGUAGE;
     from?: string | undefined;
     to?: string | undefined;
   }) => {
@@ -63,8 +63,8 @@ export const TextDiffView = observer(
       if (!editor && editorRef.current) {
         const element = editorRef.current;
         const _editor = monacoEditorAPI.createDiffEditor(element, {
-          ...getBaseTextEditorOptions(),
-          theme: EDITOR_THEME.LEGEND,
+          ...getBaseCodeEditorOptions(),
+          theme: CODE_EDITOR_THEME.LEGEND,
           readOnly: true,
         });
         setEditor(_editor);
@@ -83,15 +83,15 @@ export const TextDiffView = observer(
     useEffect(
       () => (): void => {
         if (editor) {
-          disposeDiffEditor(editor);
+          disposeDiffCodeEditor(editor);
         }
       },
       [editor],
     ); // dispose editor
 
     return (
-      <div ref={ref} className="text-editor__container">
-        <div className="text-editor__body" ref={editorRef} />
+      <div ref={ref} className="code-editor__container">
+        <div className="code-editor__body" ref={editorRef} />
       </div>
     );
   },
@@ -121,7 +121,7 @@ export const JsonDiffView = observer(
 
     return (
       <TextDiffView
-        language={EDITOR_LANGUAGE.JSON}
+        language={CODE_EDITOR_LANGUAGE.JSON}
         from={formatJSONLikeValue(from, Boolean(lossless))}
         to={formatJSONLikeValue(to, Boolean(lossless))}
       />

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

@@ -34,14 +34,12 @@ import {
 import { LEGEND_STUDIO_TEST_ID } from '../../application/LegendStudioTesting.js';
 import { isNumber } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
-import {
-  DocumentationLink,
-  useConditionedApplicationNavigationContext,
-} from '@finos/legend-application';
+import { useConditionedApplicationNavigationContext } from '@finos/legend-application';
 import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../application/LegendStudioDocumentation.js';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../application/LegendStudioApplicationNavigationContext.js';
 import { useLegendStudioApplicationStore } from '../LegendStudioBaseStoreProvider.js';
 import { useWorkspaceSetupStore } from './WorkspaceSetup.js';
+import { DocumentationLink } from '@finos/legend-application/components';
 
 enum CREATE_PROJECT_MODAL_TAB {
   CREATE = 'CREATE',

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

@@ -28,12 +28,10 @@ import {
 } from '@finos/legend-art';
 import { flowResult } from 'mobx';
 import { type Project, WorkspaceType } from '@finos/legend-server-sdlc';
-import {
-  useApplicationStore,
-  DocumentationLink,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../application/LegendStudioDocumentation.js';
 import { useWorkspaceSetupStore } from './WorkspaceSetup.js';
+import { DocumentationLink } from '@finos/legend-application/components';
 
 export const CreateWorkspaceModal = observer(
   (props: { selectedProject: Project }) => {

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

@@ -34,7 +34,6 @@ import {
 } from '../../application/LegendStudioNavigation.js';
 import { flowResult } from 'mobx';
 import {
-  DocumentationLink,
   useApplicationNavigationContext,
   useParams,
 } from '@finos/legend-application';
@@ -57,6 +56,7 @@ import {
 import { debounce, guaranteeNonNullable } from '@finos/legend-shared';
 import { WorkspaceSetupStore } from '../../stores/workspace-setup/WorkspaceSetupStore.js';
 import { useSDLCServerClient } from '@finos/legend-server-sdlc';
+import { DocumentationLink } from '@finos/legend-application/components';
 
 const WorkspaceSetupStoreContext = createContext<
   WorkspaceSetupStore | undefined

package/src/index.ts

@@ -80,7 +80,7 @@ export * from './stores/editor/EditorStoreTestUtils.js';
 
 export { PostProcessorEditorState } from './stores/editor/editor-state/element-editor-state/connection/PostProcessorEditorState.js';
 export { MappingExecutionState } from './stores/editor/editor-state/element-editor-state/mapping/MappingExecutionState.js';
-export { DEPRECATED_MappingTestState } from './stores/editor/editor-state/element-editor-state/mapping/MappingTestState.js';
+export { DEPRECATED__MappingTestState } from './stores/editor/editor-state/element-editor-state/mapping/MappingTestState.js';
 export {
   ConnectionValueState,
   RelationalDatabaseConnectionValueState,

package/src/stores/editor/EditorGraphState.ts

@@ -91,14 +91,12 @@ import {
   createGraphBuilderReport,
   ExecutionEnvironmentInstance,
 } from '@finos/legend-graph';
-import {
-  LegendApplicationTelemetryHelper,
-  type TabState,
-} from '@finos/legend-application';
+import { LegendApplicationTelemetryHelper } from '@finos/legend-application';
 import { CONFIGURATION_EDITOR_TAB } from './editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelClassifierUtils.js';
 import { LEGEND_STUDIO_APP_EVENT } from '../../application/LegendStudioEvent.js';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../application/LegendStudioSetting.js';
+import type { TabState } from '@finos/legend-application/components';
 
 export enum GraphBuilderStatus {
   SUCCEEDED = 'SUCCEEDED',

package/src/stores/editor/EditorTabManagerState.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { TabManagerState } from '@finos/legend-application';
 import {
   Association,
   Class,
@@ -57,6 +56,7 @@ import { GenerationSpecificationEditorState } from './editor-state/GenerationSpe
 import { UnsupportedElementEditorState } from './editor-state/UnsupportedElementEditorState.js';
 import type { EditorStore } from './EditorStore.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from '../LegendStudioApplicationPlugin.js';
+import { TabManagerState } from '@finos/legend-application/components';
 
 export class EditorTabManagerState extends TabManagerState {
   readonly editorStore: EditorStore;

package/src/stores/editor/GraphEditFormModeState.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import type { TabState } from '@finos/legend-application';
 import {
   type PackageableElement,
   isElementReadOnly,
@@ -55,6 +54,7 @@ import {
 import { ElementEditorState } from './editor-state/element-editor-state/ElementEditorState.js';
 import { LegendStudioTelemetryHelper } from '../../application/LegendStudioTelemetryHelper.js';
 import { GraphEditorMode } from './GraphEditorMode.js';
+import type { TabState } from '@finos/legend-application/components';
 
 export class GraphEditFormModeState extends GraphEditorMode {
   *initialize(): GeneratorFn<void> {

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

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { TabState } from '@finos/legend-application/components';
 import type { EditorStore } from '../EditorStore.js';
-import { TabState } from '@finos/legend-application';
 
 export abstract class EditorState extends TabState {
   readonly editorStore: EditorStore;

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

@@ -18,7 +18,7 @@ import type { EditorStore } from '../EditorStore.js';
 import { EditorState } from './EditorState.js';
 import { observable, makeObservable, computed } from 'mobx';
 import type { FileSystem_File } from '../shared/FileSystemTreeUtils.js';
-import { EDITOR_LANGUAGE, TAB_SIZE } from '@finos/legend-application';
+import { CODE_EDITOR_LANGUAGE, TAB_SIZE } from '@finos/legend-application';
 import { returnUndefOnError } from '@finos/legend-shared';
 
 export const getTextContent = (
@@ -26,7 +26,7 @@ export const getTextContent = (
   format: string | undefined,
 ): string => {
   switch (format?.toLowerCase()) {
-    case EDITOR_LANGUAGE.JSON:
+    case CODE_EDITOR_LANGUAGE.JSON:
       return (
         returnUndefOnError(() =>
           JSON.stringify(JSON.parse(content), undefined, TAB_SIZE),
@@ -39,14 +39,14 @@ export const getTextContent = (
 
 export const getEditorLanguageForFormat = (
   format?: string,
-): EDITOR_LANGUAGE => {
+): CODE_EDITOR_LANGUAGE => {
   switch (format?.toLowerCase()) {
-    case EDITOR_LANGUAGE.JAVA:
-      return EDITOR_LANGUAGE.JAVA;
-    case EDITOR_LANGUAGE.JSON:
-      return EDITOR_LANGUAGE.JSON;
+    case CODE_EDITOR_LANGUAGE.JAVA:
+      return CODE_EDITOR_LANGUAGE.JAVA;
+    case CODE_EDITOR_LANGUAGE.JSON:
+      return CODE_EDITOR_LANGUAGE.JSON;
     default:
-      return EDITOR_LANGUAGE.TEXT;
+      return CODE_EDITOR_LANGUAGE.TEXT;
   }
 };
 

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

@@ -44,9 +44,9 @@ import {
   PURE_CONNECTION_NAME,
   ExecutionEnvironmentInstance,
 } from '@finos/legend-graph';
-import type { TextEditorPosition } from '@finos/legend-art';
 import { generatePackageableElementTreeNodeDataLabel } from '../shared/PackageTreeUtils.js';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../../application/LegendStudioSetting.js';
+import type { CodeEditorPosition } from '@finos/legend-lego/code-editor';
 
 const getGrammarElementTypeLabelRegexString = (
   typeLabel: string,
@@ -71,7 +71,7 @@ export class GrammarTextEditorState {
   graphGrammarText = '';
   currentElementLabelRegexString?: string | undefined;
   wrapText: boolean;
-  forcedCursorPosition?: TextEditorPosition | undefined;
+  forcedCursorPosition?: CodeEditorPosition | undefined;
 
   constructor(editorStore: EditorStore) {
     makeObservable(this, {
@@ -105,7 +105,7 @@ export class GrammarTextEditorState {
     this.wrapText = val;
   }
 
-  setForcedCursorPosition(position: TextEditorPosition | undefined): void {
+  setForcedCursorPosition(position: CodeEditorPosition | undefined): void {
     this.forcedCursorPosition = position;
   }
 

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

@@ -31,7 +31,7 @@ import { PureInstanceSetImplementationState } from './PureInstanceSetImplementat
 import { ElementEditorState } from '../../../editor-state/element-editor-state/ElementEditorState.js';
 import {
   MAPPING_TEST_EDITOR_TAB_TYPE,
-  DEPRECATED_MappingTestState,
+  DEPRECATED__MappingTestState,
   TEST_RESULT,
 } from './MappingTestState.js';
 import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
@@ -583,7 +583,7 @@ export class MappingEditorState extends ElementEditorState {
   mappingExplorerTreeData: TreeData<MappingExplorerTreeNodeData>;
   newMappingElementSpec?: MappingElementSpec | undefined;
 
-  mappingTestStates: DEPRECATED_MappingTestState[] = [];
+  mappingTestStates: DEPRECATED__MappingTestState[] = [];
   isRunningAllTests = false;
   allTestRunTime = 0;
 
@@ -623,7 +623,7 @@ export class MappingEditorState extends ElementEditorState {
     });
 
     this.mappingTestStates = this.mapping.test.map(
-      (t) => new DEPRECATED_MappingTestState(editorStore, t, this),
+      (t) => new DEPRECATED__MappingTestState(editorStore, t, this),
     );
     this.mappingExplorerTreeData = getMappingElementTreeData(
       this.mapping,
@@ -675,7 +675,7 @@ export class MappingEditorState extends ElementEditorState {
 
   *openTab(tabState: MappingEditorTabState): GeneratorFn<void> {
     if (tabState !== this.currentTabState) {
-      if (tabState instanceof DEPRECATED_MappingTestState) {
+      if (tabState instanceof DEPRECATED__MappingTestState) {
         yield flowResult(this.openTest(tabState.test));
       } else if (tabState instanceof MappingElementState) {
         this.openMappingElement(tabState.mappingElement, false);
@@ -1185,7 +1185,7 @@ export class MappingEditorState extends ElementEditorState {
             tabState.mappingElement.id.value,
           );
           return this.createMappingElementState(mappingElement);
-        } else if (tabState instanceof DEPRECATED_MappingTestState) {
+        } else if (tabState instanceof DEPRECATED__MappingTestState) {
           return mappingEditorState.mappingTestStates.find(
             (testState) => testState.test.name === tabState.test.name,
           );
@@ -1210,16 +1210,16 @@ export class MappingEditorState extends ElementEditorState {
           tabState instanceof MappingElementState &&
           tabState.mappingElement === currentlyOpenedMappingElement,
       );
-    } else if (this.currentTabState instanceof DEPRECATED_MappingTestState) {
+    } else if (this.currentTabState instanceof DEPRECATED__MappingTestState) {
       const currentlyOpenedMappingTest =
         mappingEditorState.mappingTestStates.find(
           (testState) =>
-            this.currentTabState instanceof DEPRECATED_MappingTestState &&
+            this.currentTabState instanceof DEPRECATED__MappingTestState &&
             testState.test.name === this.currentTabState.test.name,
         )?.test;
       mappingEditorState.currentTabState = this.openedTabStates.find(
         (tabState) =>
-          tabState instanceof DEPRECATED_MappingTestState &&
+          tabState instanceof DEPRECATED__MappingTestState &&
           tabState.test === currentlyOpenedMappingTest,
       );
     } else {
@@ -1351,7 +1351,7 @@ export class MappingEditorState extends ElementEditorState {
     const isOpened = Boolean(
       this.openedTabStates.find(
         (tabState) =>
-          tabState instanceof DEPRECATED_MappingTestState &&
+          tabState instanceof DEPRECATED__MappingTestState &&
           tabState.test === test,
       ),
     );
@@ -1365,7 +1365,7 @@ export class MappingEditorState extends ElementEditorState {
     if (
       !this.openedTabStates.find(
         (tabState) =>
-          tabState instanceof DEPRECATED_MappingTestState &&
+          tabState instanceof DEPRECATED__MappingTestState &&
           tabState.test === test,
       )
     ) {
@@ -1373,7 +1373,7 @@ export class MappingEditorState extends ElementEditorState {
     }
     this.currentTabState = this.openedTabStates.find(
       (tabState) =>
-        tabState instanceof DEPRECATED_MappingTestState &&
+        tabState instanceof DEPRECATED__MappingTestState &&
         tabState.test === test,
     );
     yield flowResult(
@@ -1413,7 +1413,7 @@ export class MappingEditorState extends ElementEditorState {
         testState.resetTestRunStatus(),
       );
       const input = this.mappingTestStates
-        .map((testState: DEPRECATED_MappingTestState) => {
+        .map((testState: DEPRECATED__MappingTestState) => {
           // run non-skip tests, and reset all skipped tests
           if (!testState.isSkipped) {
             testState.setIsRunningTest(true);
@@ -1454,7 +1454,7 @@ export class MappingEditorState extends ElementEditorState {
 
   *addTest(test: DEPRECATED__MappingTest): GeneratorFn<void> {
     this.mappingTestStates.push(
-      new DEPRECATED_MappingTestState(this.editorStore, test, this),
+      new DEPRECATED__MappingTestState(this.editorStore, test, this),
     );
     mapping_addTest(
       this.mapping,
@@ -1468,7 +1468,8 @@ export class MappingEditorState extends ElementEditorState {
     const matchMappingTestState = (
       tabState: MappingEditorTabState | undefined,
     ): boolean =>
-      tabState instanceof DEPRECATED_MappingTestState && tabState.test === test;
+      tabState instanceof DEPRECATED__MappingTestState &&
+      tabState.test === test;
     mapping_deleteTest(this.mapping, test);
     if (this.currentTabState && matchMappingTestState(this.currentTabState)) {
       yield flowResult(this.closeTab(this.currentTabState));
@@ -1536,7 +1537,7 @@ export class MappingEditorState extends ElementEditorState {
     );
     // open the test
     this.mappingTestStates.push(
-      new DEPRECATED_MappingTestState(this.editorStore, newTest, this),
+      new DEPRECATED__MappingTestState(this.editorStore, newTest, this),
     );
     yield flowResult(this.openTest(newTest));
   }

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

@@ -105,7 +105,6 @@ import {
 import {
   ActionAlertActionType,
   ActionAlertType,
-  ExecutionPlanState,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
@@ -133,6 +132,7 @@ import {
   LambdaEditorState,
   QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
+  ExecutionPlanState,
 } from '@finos/legend-query-builder';
 import { MappingEditorTabState } from './MappingTabManagerState.js';
 

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

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-import { TabState } from '@finos/legend-application';
+import { TabState } from '@finos/legend-application/components';
 
 export abstract class MappingEditorTabState extends TabState {}

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

@@ -80,7 +80,7 @@ import {
   ModelStore,
   reportGraphAnalytics,
 } from '@finos/legend-graph';
-import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
+import { TAB_SIZE } from '@finos/legend-application';
 import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   expectedOutputMappingTestAssert_setExpectedOutput,
@@ -99,6 +99,7 @@ import {
   LambdaEditorState,
   QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
+  ExecutionPlanState,
 } from '@finos/legend-query-builder';
 import { MappingEditorTabState } from './MappingTabManagerState.js';
 
@@ -397,7 +398,7 @@ export enum MAPPING_TEST_EDITOR_TAB_TYPE {
  * TODO: Remove once migration from `MappingTest_Legacy` to `MappingTest` is complete
  * @deprecated
  */
-export class DEPRECATED_MappingTestState extends MappingEditorTabState {
+export class DEPRECATED__MappingTestState extends MappingEditorTabState {
   readonly editorStore: EditorStore;
   readonly mappingEditorState: MappingEditorState;
 

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

@@ -34,7 +34,6 @@ import {
 import {
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
-  ExecutionPlanState,
   generateExtensionUrlPattern,
   generatePath,
   TAB_SIZE,
@@ -94,6 +93,7 @@ import {
   PARAMETER_SUBMIT_ACTION,
   QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
+  ExecutionPlanState,
 } from '@finos/legend-query-builder';
 
 enum DSL_SERVICE_PATH_PARAM_TOKEN {