@finos/legend-application-studio 28.13.14 → 28.14.0

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

@@ -443,7 +443,7 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                     <div className="workspace-setup__selectors__container">
                       <div className="workspace-setup__selector">
                         <div className="workspace-setup__selector__header">
-                          Search for project
+                          Search for an existing project
                         </div>
                         <div className="workspace-setup__selector__content">
                           <div
@@ -478,7 +478,7 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                       </div>
                       <div className="workspace-setup__selector">
                         <div className="workspace-setup__selector__header">
-                          Choose a workspace
+                          Choose an existing workspace
                         </div>
                         <div className="workspace-setup__selector__content">
                           <div
@@ -534,6 +534,19 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                   </div>
                   <div className="workspace-setup__actions-combo">
                     <div className="workspace-setup__actions">
+                      <button
+                        className="workspace-setup__new-workspace-btn"
+                        onClick={showCreateWorkspaceModal}
+                        title="Create a Workspace after choosing one project"
+                        disabled={
+                          !setupStore.currentProject ||
+                          !setupStore.currentProjectConfigurationStatus ||
+                          !setupStore.currentProjectConfigurationStatus
+                            .isConfigured
+                        }
+                      >
+                        {`Need to create a new workspace?`}
+                      </button>
                       <div className="workspace-setup__actions__button">
                         <button
                           className="workspace-setup__go-btn btn--dark"
@@ -566,19 +579,6 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                         >
                           Create New Project
                         </button>
-                        <button
-                          className="workspace-setup__new-btn btn--dark"
-                          onClick={showCreateWorkspaceModal}
-                          title="Create a Workspace after choosing one project"
-                          disabled={
-                            !setupStore.currentProject ||
-                            !setupStore.currentProjectConfigurationStatus ||
-                            !setupStore.currentProjectConfigurationStatus
-                              .isConfigured
-                          }
-                        >
-                          Create New Workspace
-                        </button>
                       </div>
                     </div>
                   </div>

package/src/stores/editor/EditorGraphState.ts

@@ -88,6 +88,7 @@ import {
   createGraphBuilderReport,
   ExecutionEnvironmentInstance,
   SnowflakeApp,
+  GraphEntities,
 } from '@finos/legend-graph';
 import { CONFIGURATION_EDITOR_TAB } from './editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from './utils/ModelClassifierUtils.js';
@@ -169,6 +170,7 @@ export class EditorGraphState {
       loadEntityChangesToGraph: flow,
       updateGenerationGraphAndApplication: flow,
       rebuildDependencies: flow,
+      buildGraphForLazyText: flow,
     });
 
     this.editorStore = editorStore;
@@ -510,6 +512,16 @@ export class EditorGraphState {
     )) as Map<string, EntitiesWithOrigin>;
     stopWatch.record(GRAPH_MANAGER_EVENT.FETCH_GRAPH_DEPENDENCIES__SUCCESS);
     dependencyManager.initialize(dependencyEntitiesIndex);
+    // set dependency manager graph origin to entities
+    if (dependencyManager.origin === undefined) {
+      dependencyManager.setOrigin(
+        new GraphEntities(
+          Array.from(dependencyEntitiesIndex.values())
+            .map((e) => e.entities)
+            .flat(),
+        ),
+      );
+    }
     this.isInitializingGraph = false;
     this.editorStore.graphManagerState.dependenciesBuildState.sync(
       ActionState.create().pass(),

package/src/stores/editor/EditorStore.ts

@@ -811,7 +811,14 @@ export class EditorStore implements CommandRegistrar {
         Date.now() - startTime,
         'ms',
       );
-    } catch {
+    } catch (error) {
+      assertErrorThrown(error);
+      this.applicationStore.logService.error(
+        LogEvent.create(GRAPH_MANAGER_EVENT.FETCH_GRAPH_ENTITIES_ERROR),
+        Date.now() - startTime,
+        'ms',
+      );
+      this.applicationStore.notificationService.notifyError(error);
       return;
     } finally {
       this.initState.setMessage(undefined);
@@ -928,7 +935,14 @@ export class EditorStore implements CommandRegistrar {
         Date.now() - startTime,
         'ms',
       );
-    } catch {
+    } catch (error) {
+      assertErrorThrown(error);
+      this.applicationStore.logService.error(
+        LogEvent.create(GRAPH_MANAGER_EVENT.FETCH_GRAPH_ENTITIES_ERROR),
+        Date.now() - startTime,
+        'ms',
+      );
+      this.applicationStore.notificationService.notifyError(error);
       return;
     } finally {
       this.initState.setMessage(undefined);

package/src/stores/editor/GraphEditFormModeState.ts

@@ -475,7 +475,7 @@ export class GraphEditFormModeState extends GraphEditorMode {
       if (!options?.disableNotificationOnSuccess) {
         if (this.editorStore.graphState.warnings.length) {
           this.editorStore.applicationStore.notificationService.notifyWarning(
-            `Compilation suceeded with warnings`,
+            `Compilation succeeded with warnings`,
           );
         } else {
           if (!options?.disableNotificationOnSuccess) {

package/src/stores/editor/GraphEditGrammarModeState.ts

@@ -34,6 +34,7 @@ import {
   LogEvent,
   ActionState,
   StopWatch,
+  assertNonNullable,
 } from '@finos/legend-shared';
 import type { Entity } from '@finos/legend-storage';
 import { makeObservable, flow, flowResult, observable } from 'mobx';
@@ -48,6 +49,11 @@ import { graph_dispose } from '../graph-modifier/GraphModifierHelper.js';
 import { LegendStudioTelemetryHelper } from '../../__lib__/LegendStudioTelemetryHelper.js';
 import { GraphEditorMode } from './GraphEditorMode.js';
 import { ElementEditorState } from './editor-state/element-editor-state/ElementEditorState.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../__lib__/LegendStudioEvent.js';
+
+export enum GRAMMAR_MODE_EDITOR_ACTION {
+  GO_TO_ELEMENT_DEFINITION = 'go-to-element-definition',
+}
 
 export class GraphEditGrammarModeState extends GraphEditorMode {
   grammarTextEditorState: GrammarTextEditorState;
@@ -57,6 +63,7 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
     makeObservable(this, {
       grammarTextEditorState: observable,
       compileText: flow,
+      goToElement: flow,
     });
     this.grammarTextEditorState = new GrammarTextEditorState(this.editorStore);
   }
@@ -130,6 +137,47 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
     }
   }
 
+  *goToElement(elementPath: string): GeneratorFn<void> {
+    try {
+      const sourceInformationIndex = new Map<string, SourceInformation>();
+      (yield this.editorStore.graphManagerState.graphManager.pureCodeToEntities(
+        this.grammarTextEditorState.graphGrammarText,
+        {
+          sourceInformationIndex,
+        },
+      )) as Entity[];
+      this.grammarTextEditorState.setSourceInformationIndex(
+        sourceInformationIndex,
+      );
+      const sourceInformation =
+        this.grammarTextEditorState.sourceInformationIndex.get(elementPath);
+      assertNonNullable(
+        sourceInformation,
+        `No definition found for current element in current grammar. Element may not exist of be defined in dependencies`,
+      );
+      this.grammarTextEditorState.setForcedCursorPosition({
+        lineNumber: sourceInformation.startLine,
+        column: 0,
+      });
+      this.editorStore.applicationStore.logService.info(
+        LogEvent.create(
+          LEGEND_STUDIO_APP_EVENT.TEXT_MODE_ACTION_KEYBOARD_SHORTCUT_GO_TO_DEFINITION__SUCCESS,
+        ),
+      );
+    } catch (error) {
+      assertErrorThrown(error);
+      this.editorStore.applicationStore.notificationService.notifyError(
+        `Unable to go to element ${elementPath}: ${error.message}`,
+      );
+      this.editorStore.applicationStore.logService.error(
+        LogEvent.create(
+          LEGEND_STUDIO_APP_EVENT.TEXT_MODE_ACTION_KEYBOARD_SHORTCUT_GO_TO_DEFINITION__ERROR,
+        ),
+        error,
+      );
+    }
+  }
+
   *compileText(
     options?: {
       onError?: () => void;
@@ -318,7 +366,7 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
       if (!options?.disableNotificationOnSuccess) {
         if (this.editorStore.graphState.warnings.length) {
           this.editorStore.applicationStore.notificationService.notifyWarning(
-            `Compilation suceeded with warnings`,
+            `Compilation succeeded with warnings`,
           );
         } else {
           if (!options?.disableNotificationOnSuccess) {

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

@@ -15,9 +15,9 @@
  */
 
 import type { EditorStore } from '../EditorStore.js';
-import { action, makeObservable, observable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 import { hashValue } from '@finos/legend-shared';
-import { type SourceInformation } from '@finos/legend-graph';
+import type { SourceInformation } from '@finos/legend-graph';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../../__lib__/LegendStudioSetting.js';
 import type { CodeEditorPosition } from '@finos/legend-lego/code-editor';
 
@@ -38,6 +38,7 @@ export class GrammarTextEditorState {
       setGraphGrammarText: action,
       setWrapText: action,
       setForcedCursorPosition: action,
+      wordWrapOtion: computed,
     });
 
     this.editorStore = editorStore;
@@ -51,6 +52,10 @@ export class GrammarTextEditorState {
     return hashValue(this.graphGrammarText);
   }
 
+  get wordWrapOtion(): 'on' | 'off' {
+    return this.wrapText ? 'on' : 'off';
+  }
+
   setGraphGrammarText(code: string): void {
     this.graphGrammarText = code;
   }