@finos/legend-application-studio 28.18.73 → 28.18.75

package/src/components/editor/editor-group/service-editor/ServiceEditor.tsx

@@ -526,8 +526,7 @@ const ServiceGeneralEditor = observer(() => {
                         >
                           <ErrorIcon />
                           <div className="service-editor__owner__validation-label">
-                            Service requires at least {MINIMUM_SERVICE_OWNERS}{' '}
-                            owners
+                            {`Service requires at least ${MINIMUM_SERVICE_OWNERS} owners`}
                           </div>
                         </div>
                       )}

package/src/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.tsx

@@ -69,7 +69,7 @@ import { EXTERNAL_APPLICATION_NAVIGATION__generateServiceQueryCreatorUrl } from
 import type { EditorStore } from '../../../../stores/editor/EditorStore.js';
 import { pureExecution_setFunction } from '../../../../stores/graph-modifier/DSL_Service_GraphModifierHelper.js';
 import { ServiceEditorState } from '../../../../stores/editor/editor-state/element-editor-state/service/ServiceEditorState.js';
-import { openDataCube } from '../../../../stores/editor/data-cube/DataCubeViewerState.js';
+import { openDataCube } from '../../../../stores/editor/data-cube/LegendStudioDataCubeHelper.js';
 
 const ServiceExecutionResultViewer = observer(
   (props: { executionState: ServicePureExecutionState }) => {

package/src/components/editor/panel-group/DevToolPanel.tsx

@@ -154,7 +154,7 @@ export const DevToolPanel = observer(() => {
         />
         <PanelFormBooleanField
           name="Use Dev client protocol version"
-          prompt="Specifies if development client porotocl (v_X_X_X) version should be used for execution"
+          prompt="Specifies if development client protocol (v_X_X_X) version should be used for execution"
           value={engineConfig.useDevClientProtocol}
           isReadOnly={false}
           update={toggleSetUseDevClientProtocol}

package/src/components/editor/side-bar/Explorer.tsx

@@ -147,7 +147,7 @@ import { QueryDatabaseState } from '../../../stores/editor/editor-state/element-
 import {
   isElementSupportedByDataCube,
   openDataCube,
-} from '../../../stores/editor/data-cube/DataCubeViewerState.js';
+} from '../../../stores/editor/data-cube/LegendStudioDataCubeHelper.js';
 
 const ElementRenamer = observer(() => {
   const editorStore = useEditorStore();

package/src/components/project-reviewer/ProjectReviewStoreProvider.tsx

@@ -25,11 +25,10 @@ const ProjectReviewerStoreContext = createContext<
   ProjectReviewerStore | undefined
 >(undefined);
 
-export const ProjectReviewerStoreProvider = ({
-  children,
-}: {
+export const ProjectReviewerStoreProvider = (props: {
   children: React.ReactNode;
-}): React.ReactElement => {
+}) => {
+  const { children } = props;
   const editorStore = useEditorStore();
   editorStore.setMode(EDITOR_MODE.REVIEW);
   const store = useLocalObservable(() => new ProjectReviewerStore(editorStore));

package/src/components/showcase/ShowcaseViewer.tsx

@@ -410,10 +410,12 @@ export const ShowcaseViewer = withEditorStore(
             )}
             <ShowcaseViewerStatusBar />
             <EmbeddedQueryBuilder />
-            {editorStore.embeddedDataCubeViewerEngine && (
+            {editorStore.embeddedDataCubeViewerState && (
               <QueryDataCubeViewer
-                engine={editorStore.embeddedDataCubeViewerEngine}
-                close={() => editorStore.setDataCubeViewState(undefined)}
+                state={editorStore.embeddedDataCubeViewerState}
+                close={() =>
+                  editorStore.setEmbeddedDataCubeViewerState(undefined)
+                }
                 options={{
                   fullScreen: true,
                 }}

package/src/stores/LegendStudioBaseStore.ts

@@ -22,7 +22,6 @@ import {
   ActionState,
   LogEvent,
   assertErrorThrown,
-  NetworkClient,
 } from '@finos/legend-shared';
 import {
   type ApplicationStore,
@@ -48,6 +47,7 @@ import type { LegendStudioApplicationConfig } from '../application/LegendStudioA
 import { LegendStudioEventHelper } from '../__lib__/LegendStudioEventHelper.js';
 import { LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN } from '../__lib__/LegendStudioNavigation.js';
 import { ShowcaseManagerState } from './ShowcaseManagerState.js';
+import { getCurrentUserIDFromEngineServer } from '@finos/legend-graph';
 
 export type LegendStudioApplicationStore = ApplicationStore<
   LegendStudioApplicationConfig,
@@ -168,8 +168,8 @@ export class LegendStudioBaseStore {
     if (this.applicationStore.identityService.isAnonymous) {
       try {
         this.applicationStore.identityService.setCurrentUser(
-          (yield new NetworkClient().get(
-            `${this.applicationStore.config.engineServerUrl}/server/v1/currentUser`,
+          (yield getCurrentUserIDFromEngineServer(
+            this.applicationStore.config.engineServerUrl,
           )) as string,
         );
       } catch (error) {

package/src/stores/editor/EditorGraphState.ts

@@ -453,6 +453,10 @@ export class EditorGraphState {
         this.editorStore.applicationStore.notificationService.notifyError(
           `Can't build graph. Redirected to text mode for debugging. Error: ${error.message}`,
         );
+        this.editorStore.applicationStore.logService.error(
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+          error,
+        );
         try {
           yield flowResult(
             this.editorStore.switchModes(GRAPH_EDITOR_MODE.GRAMMAR_TEXT, {

package/src/stores/editor/EditorStore.ts

@@ -117,7 +117,7 @@ import {
   GraphEditLazyGrammarModeState,
   LazyTextEditorStore,
 } from '../lazy-text-editor/LazyTextEditorStore.js';
-import type { QueryBuilderDataCubeEngine } from '@finos/legend-query-builder';
+import type { QueryBuilderDataCubeViewerState } from '@finos/legend-query-builder';
 
 export abstract class EditorExtensionState {
   /**
@@ -179,7 +179,7 @@ export class EditorStore implements CommandRegistrar {
   modelImporterState: ModelImporterState;
   projectConfigurationEditorState: ProjectConfigurationEditorState;
   embeddedQueryBuilderState: EmbeddedQueryBuilderState;
-  embeddedDataCubeViewerEngine: QueryBuilderDataCubeEngine | undefined;
+  embeddedDataCubeViewerState: QueryBuilderDataCubeViewerState | undefined;
   newElementState: NewElementState;
   /**
    * Since we want to share element generation state across all element in the editor, we will create 1 element generate state
@@ -225,7 +225,6 @@ export class EditorStore implements CommandRegistrar {
       showSearchElementCommand: observable,
       quickInputState: observable,
       lazyTextEditorStore: observable,
-      embeddedDataCubeViewerEngine: observable,
 
       isInViewerMode: computed,
       disableGraphEditing: computed,
@@ -250,6 +249,9 @@ export class EditorStore implements CommandRegistrar {
       buildGraph: flow,
       toggleTextMode: flow,
       switchModes: flow,
+
+      embeddedDataCubeViewerState: observable,
+      setEmbeddedDataCubeViewerState: action,
     });
 
     this.applicationStore = applicationStore;
@@ -377,8 +379,10 @@ export class EditorStore implements CommandRegistrar {
     this.showSearchElementCommand = val;
   }
 
-  setDataCubeViewState(val: QueryBuilderDataCubeEngine | undefined): void {
-    this.embeddedDataCubeViewerEngine = val;
+  setEmbeddedDataCubeViewerState(
+    val: QueryBuilderDataCubeViewerState | undefined,
+  ): void {
+    this.embeddedDataCubeViewerState = val;
   }
 
   setQuickInputState<T>(val: QuickInputState<T> | undefined): void {

package/src/stores/editor/data-cube/{DataCubeViewerState.ts → LegendStudioDataCubeHelper.ts}

@@ -26,13 +26,17 @@ import {
   Service,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../EditorStore.js';
-import { QueryBuilderDataCubeEngine } from '@finos/legend-query-builder';
+import {
+  QueryBuilderDataCubeEngine,
+  QueryBuilderDataCubeViewerState,
+} from '@finos/legend-query-builder';
 import {
   assertErrorThrown,
   guaranteeNonNullable,
   guaranteeType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
+import { type DataCubeQuery } from '@finos/legend-data-cube';
 
 export const isElementSupportedByDataCube = (
   element: PackageableElement,
@@ -44,7 +48,9 @@ export const openDataCube = async (
   editorStore: EditorStore,
 ): Promise<void> => {
   try {
+    let query: DataCubeQuery;
     let engine: QueryBuilderDataCubeEngine;
+
     if (element instanceof ConcreteFunctionDefinition) {
       const body = element.expressionSequence;
       const rawLambda = new RawLambda([], body);
@@ -55,6 +61,7 @@ export const openDataCube = async (
         undefined,
         editorStore.graphManagerState,
       );
+      query = await engine.generateInitialQuery();
     } else if (element instanceof Service) {
       const exec = guaranteeType(
         element.execution,
@@ -92,20 +99,25 @@ export const openDataCube = async (
         runtime?.packageableRuntime.value.path,
         editorStore.graphManagerState,
       );
+      query = await engine.generateInitialQuery();
     } else {
       throw new UnsupportedOperationError(
         'Element not supported to open Data Cube with',
       );
     }
+
     try {
-      await engine.getRelationalType(engine.selectInitialQuery);
+      await engine.getRelationType(engine.selectInitialQuery);
     } catch (error) {
       assertErrorThrown(error);
       throw new UnsupportedOperationError(
         'Only relation type queries supported in Data Cube',
       );
     }
-    editorStore.setDataCubeViewState(engine);
+
+    editorStore.setEmbeddedDataCubeViewerState(
+      new QueryBuilderDataCubeViewerState(query, engine),
+    );
   } catch (error) {
     assertErrorThrown(error);
     editorStore.applicationStore.notificationService.notifyError(

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

@@ -221,7 +221,7 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
     this.execution = execution;
     this.queryLoaderState = new QueryLoaderState(
       editorStore.applicationStore,
-      editorStore.graphManagerState,
+      editorStore.graphManagerState.graphManager,
       {
         loadQuery: (query: LightQuery): void => {
           flowResult(this.importQuery(query.id)).catch(

package/src/stores/project-view/ProjectViewerStore.ts

@@ -479,6 +479,10 @@ export class ProjectViewerStore {
         this.editorStore.applicationStore.notificationService.notifyError(
           `Can't build graph. Redirected to text mode for debugging. Error: ${error.message}`,
         );
+        this.editorStore.applicationStore.logService.error(
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+          error,
+        );
         yield flowResult(
           this.editorStore.switchModes(GRAPH_EDITOR_MODE.GRAMMAR_TEXT, {
             isGraphBuildFailure: true,

package/src/stores/showcase/ShowcaseViewerStore.ts

@@ -270,6 +270,10 @@ export class ShowcaseViewerStore {
         this.editorStore.applicationStore.notificationService.notifyError(
           `Can't build graph. Redirected to text mode for debugging. Error: ${error.message}`,
         );
+        this.editorStore.applicationStore.logService.error(
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+          error,
+        );
         yield flowResult(
           this.editorStore.switchModes(GRAPH_EDITOR_MODE.GRAMMAR_TEXT, {
             isGraphBuildFailure: true,

package/tsconfig.json

@@ -93,7 +93,7 @@
     "./src/stores/editor/QuickInputState.ts",
     "./src/stores/editor/StandardEditorMode.ts",
     "./src/stores/editor/__test-utils__/EditorStoreTestUtils.ts",
-    "./src/stores/editor/data-cube/DataCubeViewerState.ts",
+    "./src/stores/editor/data-cube/LegendStudioDataCubeHelper.ts",
     "./src/stores/editor/editor-state/ArtifactGenerationViewerState.ts",
     "./src/stores/editor/editor-state/EditorState.ts",
     "./src/stores/editor/editor-state/ExternalFormatState.ts",

package/lib/stores/editor/data-cube/DataCubeViewerState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeViewerState.d.ts","sourceRoot":"","sources":["../../../../src/stores/editor/data-cube/DataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,kBAAkB,EAOxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AASrD,eAAO,MAAM,4BAA4B,YAC9B,kBAAkB,KAC1B,OAC0E,CAAC;AAE9E,eAAO,MAAM,YAAY,YACd,kBAAkB,eACd,WAAW,KACvB,OAAO,CAAC,IAAI,CAsEd,CAAC"}

package/lib/stores/editor/data-cube/DataCubeViewerState.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeViewerState.js","sourceRoot":"","sources":["../../../../src/stores/editor/data-cube/DataCubeViewerState.ts"],"names":[],"mappings":"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"}