@finos/legend-application-repl 1.0.35 → 1.0.36

package/lib/stores/LegendREPLDataCubeEngine.js

@@ -16,70 +16,66 @@
 import {} from './LegendREPLServerClient.js';
 import { _elementPtr, _function, _lambda, DataCubeEngine, DataCubeFunction, _deserializeValueSpecification, _serializeValueSpecification, } from '@finos/legend-data-cube';
 import { TDSExecutionResult, V1_buildExecutionResult, V1_deserializeExecutionResult, V1_buildEngineError, V1_EngineError, V1_getGenericTypeFullPath, V1_relationTypeModelSchema, } from '@finos/legend-graph';
-import { assertErrorThrown, guaranteeType, HttpStatus, isNonNullable, LogEvent, NetworkClientError, } from '@finos/legend-shared';
+import { assertErrorThrown, guaranteeType, HttpStatus, isNonNullable, LogEvent, NetworkClientError, UnsupportedOperationError, } from '@finos/legend-shared';
 import { LegendREPLDataCubeSource, RawLegendREPLDataCubeSource, REPL_DATA_CUBE_SOURCE_TYPE, } from './LegendREPLDataCubeSource.js';
-import { APPLICATION_EVENT, shouldDisplayVirtualAssistantDocumentationEntry, } from '@finos/legend-application';
+import { APPLICATION_EVENT } from '@finos/legend-application';
 import { deserialize } from 'serializr';
 export class LegendREPLDataCubeEngine extends DataCubeEngine {
-    application;
-    baseStore;
-    client;
-    constructor(baseStore) {
+    _application;
+    _client;
+    constructor(application, client) {
         super();
-        this.application = baseStore.application;
-        this.baseStore = baseStore;
-        this.client = baseStore.client;
+        this._application = application;
+        this._client = client;
     }
     // ---------------------------------- IMPLEMENTATION ----------------------------------
     async processQuerySource(value) {
-        if (value._type !== REPL_DATA_CUBE_SOURCE_TYPE) {
-            throw new Error(`Can't deserialize query source of type '${value._type}'. Only type(s) '${REPL_DATA_CUBE_SOURCE_TYPE}' are supported.`);
+        switch (value._type) {
+            case REPL_DATA_CUBE_SOURCE_TYPE: {
+                const rawSource = RawLegendREPLDataCubeSource.serialization.fromJson(value);
+                const source = new LegendREPLDataCubeSource();
+                source.query = await this.parseValueSpecification(rawSource.query, false);
+                try {
+                    source.columns = (await this._getQueryRelationType(_lambda([], [source.query]))).columns;
+                }
+                catch (error) {
+                    assertErrorThrown(error);
+                    throw new Error(`Can't get query result columns. Make sure the source query return a relation (i.e. typed TDS). Error: ${error.message}`);
+                }
+                source.runtime = rawSource.runtime;
+                source.mapping = rawSource.mapping;
+                source.timestamp = rawSource.timestamp;
+                source.model = rawSource.model;
+                source.isLocal = rawSource.isLocal;
+                source.isPersistenceSupported = rawSource.isPersistenceSupported;
+                return source;
+            }
+            default: {
+                throw new UnsupportedOperationError(`Can't process query source of type '${value._type}'.`);
+            }
         }
-        const rawSource = RawLegendREPLDataCubeSource.serialization.fromJson(value);
-        this.baseStore.sourceQuery = rawSource.query;
-        const source = new LegendREPLDataCubeSource();
-        source.query = await this.parseValueSpecification(rawSource.query, false);
-        source.columns = (await this.getQueryRelationType(_lambda([], [source.query]), source)).columns;
-        source.runtime = rawSource.runtime;
-        source.mapping = rawSource.mapping;
-        source.timestamp = rawSource.timestamp;
-        source.model = rawSource.model;
-        source.isLocal = rawSource.isLocal;
-        source.isPersistenceSupported = rawSource.isPersistenceSupported;
-        return source;
     }
     async parseValueSpecification(code, returnSourceInformation) {
-        return _deserializeValueSpecification(await this.client.parseValueSpecification({
+        return _deserializeValueSpecification(await this._client.parseValueSpecification({
             code,
             returnSourceInformation,
         }));
     }
     async getValueSpecificationCode(value, pretty) {
-        return this.client.getValueSpecificationCode({
+        return this._client.getValueSpecificationCode({
             value: _serializeValueSpecification(value),
             pretty,
         });
     }
     async getQueryTypeahead(code, baseQuery, source) {
-        return this.client.getQueryTypeahead({
+        return this._client.getQueryTypeahead({
             code,
             baseQuery: _serializeValueSpecification(baseQuery),
         });
     }
-    async getQueryRelationType(query, source) {
-        const relationType = deserialize(V1_relationTypeModelSchema, await this.client.getQueryRelationReturnType({
-            query: _serializeValueSpecification(query),
-        }));
-        return {
-            columns: relationType.columns.map((column) => ({
-                name: column.name,
-                type: V1_getGenericTypeFullPath(column.genericType),
-            })),
-        };
-    }
     async getQueryCodeRelationReturnType(code, baseQuery, source) {
         try {
-            const relationType = deserialize(V1_relationTypeModelSchema, await this.client.getQueryCodeRelationReturnType({
+            const relationType = deserialize(V1_relationTypeModelSchema, await this._client.getQueryCodeRelationReturnType({
                 code,
                 baseQuery: _serializeValueSpecification(baseQuery),
             }));
@@ -100,7 +96,7 @@ export class LegendREPLDataCubeEngine extends DataCubeEngine {
         }
     }
     async executeQuery(query, source, options) {
-        const result = await this.client.executeQuery({
+        const result = await this._client.executeQuery({
             query: _serializeValueSpecification(query),
             debug: options?.debug,
         });
@@ -119,48 +115,54 @@ export class LegendREPLDataCubeEngine extends DataCubeEngine {
         }
         return undefined;
     }
-    // ---------------------------------- APPLICATION ----------------------------------
-    getDocumentationURL() {
-        return this.application.documentationService.url;
-    }
-    getDocumentationEntry(key) {
-        return this.application.documentationService.getDocEntry(key);
-    }
-    shouldDisplayDocumentationEntry(entry) {
-        return shouldDisplayVirtualAssistantDocumentationEntry(entry);
-    }
-    openLink(url) {
-        this.application.navigationService.navigator.visitAddress(url);
-    }
-    sendTelemetry(event, data) {
-        this.application.telemetryService.logEvent(event, data);
+    // ---------------------------------- UTILITIES ----------------------------------
+    async _getQueryRelationType(query) {
+        const relationType = deserialize(V1_relationTypeModelSchema, await this._client.getQueryRelationReturnType({
+            query: _serializeValueSpecification(query),
+        }));
+        return {
+            columns: relationType.columns.map((column) => ({
+                name: column.name,
+                type: V1_getGenericTypeFullPath(column.genericType),
+            })),
+        };
     }
+    // ---------------------------------- APPLICATION ----------------------------------
     logDebug(message, ...data) {
-        this.application.logService.debug(LogEvent.create(APPLICATION_EVENT.DEBUG), message, ...data);
+        this._application.logService.debug(LogEvent.create(APPLICATION_EVENT.DEBUG), message, ...data);
     }
     debugProcess(processName, ...data) {
         // eslint-disable-next-line no-process-env
         if (process.env.NODE_ENV === 'development') {
-            this.application.logService.info(LogEvent.create(APPLICATION_EVENT.DEBUG), `\n------ START DEBUG PROCESS: ${processName} ------`, ...data.flatMap(([key, value]) => [`\n[${key.toUpperCase()}]:`, value]), `\n------- END DEBUG PROCESS: ${processName} -------\n\n`);
+            this._application.logService.info(LogEvent.create(APPLICATION_EVENT.DEBUG), `\n------ START DEBUG PROCESS: ${processName} ------`, ...data.flatMap(([key, value]) => [`\n[${key.toUpperCase()}]:`, value]), `\n------- END DEBUG PROCESS: ${processName} -------\n\n`);
         }
         else {
-            this.application.logService.debug(LogEvent.create(APPLICATION_EVENT.DEBUG), `\n------ START DEBUG PROCESS: ${processName} ------`, ...data.flatMap(([key, value]) => [`\n[${key.toUpperCase()}]:`, value]), `\n------- END DEBUG PROCESS: ${processName} -------\n\n`);
+            this._application.logService.debug(LogEvent.create(APPLICATION_EVENT.DEBUG), `\n------ START DEBUG PROCESS: ${processName} ------`, ...data.flatMap(([key, value]) => [`\n[${key.toUpperCase()}]:`, value]), `\n------- END DEBUG PROCESS: ${processName} -------\n\n`);
         }
     }
     logInfo(event, ...data) {
-        this.application.logService.info(event, ...data);
+        this._application.logService.info(event, ...data);
     }
     logWarning(event, ...data) {
-        this.application.logService.warn(event, ...data);
+        this._application.logService.warn(event, ...data);
     }
     logError(event, ...data) {
-        this.application.logService.error(event, ...data);
+        this._application.logService.error(event, ...data);
     }
     logUnhandledError(error) {
-        this.application.logUnhandledError(error);
+        this._application.logUnhandledError(error);
     }
     logIllegalStateError(message, error) {
         this.logError(LogEvent.create(APPLICATION_EVENT.ILLEGAL_APPLICATION_STATE_OCCURRED), message, error);
     }
+    getDocumentationEntry(key) {
+        return this._application.documentationService.getDocEntry(key);
+    }
+    openLink(url) {
+        this._application.navigationService.navigator.visitAddress(url);
+    }
+    sendTelemetry(event, data) {
+        this._application.telemetryService.logEvent(event, data);
+    }
 }
 //# sourceMappingURL=LegendREPLDataCubeEngine.js.map

package/lib/stores/LegendREPLDataCubeEngine.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-repl",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "Legend REPL Grid client application core",
   "keywords": [
     "legend",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@finos/legend-application": "16.0.16",
     "@finos/legend-art": "7.1.73",
-    "@finos/legend-data-cube": "0.0.37",
+    "@finos/legend-data-cube": "0.0.38",
     "@finos/legend-graph": "32.0.0",
     "@finos/legend-shared": "10.0.65",
     "@types/react": "19.0.2",

package/src/components/LegendREPLDataCubeHeader.tsx

@@ -14,25 +14,28 @@
  * limitations under the License.
  */
 
-import { FormButton, type DataCubeState } from '@finos/legend-data-cube';
+import {
+  FormButton,
+  type DataCubeInnerHeaderComponentParams,
+} from '@finos/legend-data-cube';
 import { observer } from 'mobx-react-lite';
 import { LegendREPLDataCubeSource } from '../stores/LegendREPLDataCubeSource.js';
 import { useLegendREPLBaseStore } from './LegendREPLFramworkProvider.js';
 
 export const LegendREPLDataCubeHeader = observer(
-  (props: { dataCube: DataCubeState }) => {
-    const { dataCube } = props;
+  (props: DataCubeInnerHeaderComponentParams) => {
+    const { api } = props;
     const store = useLegendREPLBaseStore();
 
-    if (!dataCube.view.isSourceProcessed || !store.queryServerBaseUrl) {
+    if (!store.source || !store.queryServerBaseUrl) {
       return null;
     }
 
     const isPublishAllowed =
-      dataCube.view.source instanceof LegendREPLDataCubeSource &&
-      dataCube.view.source.isPersistenceSupported &&
+      store.source instanceof LegendREPLDataCubeSource &&
+      store.source.isPersistenceSupported &&
       // eslint-disable-next-line no-process-env
-      (process.env.NODE_ENV === 'development' || !dataCube.view.source.isLocal);
+      (process.env.NODE_ENV === 'development' || !store.source.isLocal);
 
     return (
       <div className="flex h-full items-center">
@@ -41,8 +44,8 @@ export const LegendREPLDataCubeHeader = observer(
           disabled={!isPublishAllowed || store.publishState.isInProgress}
           onClick={() => {
             store
-              .publishDataCube(dataCube)
-              .catch((error) => dataCube.engine.logUnhandledError(error));
+              .publishDataCube(api)
+              .catch((error) => store.alertService.alertUnhandledError(error));
           }}
         >
           Publish

package/src/components/LegendREPLWebApplication.tsx

@@ -24,6 +24,9 @@ import { useEffect } from 'react';
 import { formatDate, LogEvent } from '@finos/legend-shared';
 import {
   DataCube,
+  DataCubePlaceholder,
+  DataCubePlaceholderErrorDisplay,
+  DEFAULT_REPORT_NAME,
   type DataCubeQuery,
   type DataCubeSettingValues,
 } from '@finos/legend-data-cube';
@@ -64,29 +67,36 @@ const LegendREPLDataCube = observer((props: { query: DataCubeQuery }) => {
       query={query}
       engine={store.engine}
       options={{
-        onNameChanged(name, source) {
+        gridClientLicense: store.gridClientLicense,
+        layoutManager: store.layoutService.manager,
+        taskManager: store.taskService.manager,
+        onNameChanged(event) {
           const timestamp =
-            source instanceof LegendREPLDataCubeSource
-              ? source.timestamp
+            event.source instanceof LegendREPLDataCubeSource
+              ? event.source.timestamp
               : undefined;
           application.layoutService.setWindowTitle(
             `\u229E ${name}${timestamp ? ` - ${formatDate(new Date(timestamp), 'HH:mm:ss EEE MMM dd yyyy')}` : ''}`,
           );
         },
-        innerHeaderComponent: (dataCube) => (
-          <LegendREPLDataCubeHeader dataCube={dataCube} />
+        onViewInitialized(event) {
+          store.setSource(event.source);
+        },
+        innerHeaderRenderer: (params) => (
+          <LegendREPLDataCubeHeader api={params.api} />
         ),
-        getSettingValues() {
-          return application.settingService.getObjectValue(
+        settingsData: {
+          values: application.settingService.getObjectValue(
             LegendREPLSettingStorageKey.DATA_CUBE,
-          ) as DataCubeSettingValues | undefined;
+          ) as DataCubeSettingValues | undefined,
         },
-        onSettingValuesChanged(values) {
+        onSettingsChanged(values) {
           application.settingService.persistValue(
             LegendREPLSettingStorageKey.DATA_CUBE,
             values,
           );
         },
+        documentationUrl: application.documentationService.url,
       }}
     />
   );
@@ -105,9 +115,24 @@ export const LegendREPLRouter = observer(() => {
       .catch((error) => store.application.alertUnhandledError(error));
   }, [store]);
 
+  if (!store.initializeState.hasSucceeded) {
+    return (
+      <DataCubePlaceholder
+        title={DEFAULT_REPORT_NAME}
+        layoutManager={store.layoutService.manager}
+      >
+        {store.initializeState.hasFailed && (
+          <DataCubePlaceholderErrorDisplay
+            message="Initialization Failure"
+            prompt="Resolve the issue and reload."
+          />
+        )}
+      </DataCubePlaceholder>
+    );
+  }
   return (
     <div className="h-full">
-      {store.initializeState.hasSucceeded && store.query && (
+      {store.query && (
         <Routes>
           <Route
             path={LEGEND_REPL_GRID_CLIENT_ROUTE_PATTERN.DATA_CUBE}

package/src/stores/LegendREPLBaseStore.tsx

@@ -25,14 +25,22 @@ import {
 import type { LegendREPLApplicationStore } from '../application/LegendREPLApplicationStore.js';
 import { LegendREPLServerClient } from './LegendREPLServerClient.js';
 import {
-  DataCubeConfiguration,
   DataCubeQuery,
+  type DataCubeSource,
   LayoutConfiguration,
   RawAdhocQueryDataCubeSource,
   WindowState,
-  type DataCubeState,
+  type DataCubeAPI,
+  DEFAULT_REPORT_NAME,
+  DataCubeLayoutService,
+  DataCubeAlertService,
+  DataCubeLogService,
+  DataCubeTaskService,
 } from '@finos/legend-data-cube';
-import { LegendREPLDataCubeSource } from './LegendREPLDataCubeSource.js';
+import {
+  LegendREPLDataCubeSource,
+  RawLegendREPLDataCubeSource,
+} from './LegendREPLDataCubeSource.js';
 import { PersistentDataCubeQuery } from '@finos/legend-graph';
 import { LegendREPLPublishDataCubeAlert } from '../components/LegendREPLPublishDataCubeAlert.js';
 import { APPLICATION_EVENT } from '@finos/legend-application';
@@ -40,14 +48,17 @@ import { action, makeObservable, observable } from 'mobx';
 import { LegendREPLDataCubeEngine } from './LegendREPLDataCubeEngine.js';
 
 export class LegendREPLBaseStore {
+  private readonly _client: LegendREPLServerClient;
   readonly application: LegendREPLApplicationStore;
-  readonly client: LegendREPLServerClient;
   readonly engine: LegendREPLDataCubeEngine;
+  readonly taskService: DataCubeTaskService;
+  readonly layoutService: DataCubeLayoutService;
+  readonly alertService: DataCubeAlertService;
+
   readonly initializeState = ActionState.create();
   readonly publishState = ActionState.create();
 
-  sourceQuery?: string | undefined;
-  currentUser?: string | undefined;
+  source?: DataCubeSource | undefined;
   gridClientLicense?: string | undefined;
   queryServerBaseUrl?: string | undefined;
   hostedApplicationBaseUrl?: string | undefined;
@@ -56,11 +67,13 @@ export class LegendREPLBaseStore {
   constructor(application: LegendREPLApplicationStore) {
     makeObservable(this, {
       query: observable,
-
       setQuery: action,
+
+      source: observable,
+      setSource: action,
     });
     this.application = application;
-    this.client = new LegendREPLServerClient(
+    this._client = new LegendREPLServerClient(
       new NetworkClient({
         baseUrl: application.config.useDynamicREPLServer
           ? window.location.origin +
@@ -71,18 +84,27 @@ export class LegendREPLBaseStore {
           : application.config.replUrl,
       }),
     );
-    this.engine = new LegendREPLDataCubeEngine(this);
+    this.engine = new LegendREPLDataCubeEngine(this.application, this._client);
+    this.taskService = new DataCubeTaskService();
+    this.layoutService = new DataCubeLayoutService();
+    this.alertService = new DataCubeAlertService(
+      new DataCubeLogService(this.engine),
+      this.layoutService,
+    );
   }
 
-  setQuery(query: DataCubeQuery | undefined): void {
+  setQuery(query: DataCubeQuery | undefined) {
     this.query = query;
   }
 
+  setSource(source: DataCubeSource | undefined) {
+    this.source = source;
+  }
+
   async initialize() {
     this.initializeState.inProgress();
     try {
-      const info = await this.client.getInfrastructureInfo();
-      this.currentUser = info.currentUser;
+      const info = await this._client.getInfrastructureInfo();
       if (info.currentUser) {
         this.application.identityService.setCurrentUser(info.currentUser);
       }
@@ -92,7 +114,7 @@ export class LegendREPLBaseStore {
       this.hostedApplicationBaseUrl = info.hostedApplicationBaseUrl;
       this.gridClientLicense = info.gridClientLicense;
       this.setQuery(
-        DataCubeQuery.serialization.fromJson(await this.client.getBaseQuery()),
+        DataCubeQuery.serialization.fromJson(await this._client.getBaseQuery()),
       );
 
       this.initializeState.pass();
@@ -103,46 +125,48 @@ export class LegendREPLBaseStore {
         `Can't initialize REPL`,
         error,
       );
+      this.alertService.alertError(error, {
+        message: `Initialization Failure: ${error.message}`,
+        text: `Resolve the issue and reload the engine.`,
+      });
       this.initializeState.fail();
     }
   }
 
-  async publishDataCube(dataCube: DataCubeState) {
+  async publishDataCube(api: DataCubeAPI) {
     if (
-      !this.sourceQuery ||
-      !dataCube.view.isSourceProcessed ||
       !this.queryServerBaseUrl ||
-      !(dataCube.view.source instanceof LegendREPLDataCubeSource) ||
-      !dataCube.view.source.isPersistenceSupported ||
-      !dataCube.view.source.model ||
+      !(this.source instanceof LegendREPLDataCubeSource) ||
+      !this.source.isPersistenceSupported ||
+      !this.source.model ||
       // eslint-disable-next-line no-process-env
-      !(process.env.NODE_ENV === 'development' || !dataCube.view.source.isLocal)
+      !(process.env.NODE_ENV === 'development' || !this.source.isLocal)
     ) {
       return;
     }
 
     this.publishState.inProgress();
-    const task = dataCube.view.newTask('Publish query');
+    const task = this.taskService.newTask('Publish query');
 
     try {
-      const query = new DataCubeQuery();
-      query.query = await dataCube.engine.getPartialQueryCode(
-        dataCube.view.snapshotManager.currentSnapshot,
-      );
+      const query = await api.generateDataCubeQuery();
+
       const source = new RawAdhocQueryDataCubeSource();
-      source.query = this.sourceQuery;
-      source.runtime = dataCube.view.source.runtime;
-      source.model = dataCube.view.source.model;
+      source.query = RawLegendREPLDataCubeSource.serialization.fromJson(
+        query.source,
+      ).query;
+      source.runtime = this.source.runtime;
+      source.model = this.source.model;
       query.source = RawAdhocQueryDataCubeSource.serialization.toJson(source);
+
       const newQuery = new PersistentDataCubeQuery();
       newQuery.id = uuid();
-      newQuery.name = DataCubeConfiguration.serialization.fromJson(
-        dataCube.view.snapshotManager.currentSnapshot.data.configuration,
-      ).name;
+      newQuery.name = query.configuration?.name ?? DEFAULT_REPORT_NAME;
       newQuery.content = DataCubeQuery.serialization.toJson(query);
-      newQuery.owner = this.currentUser;
+      newQuery.owner = this.application.identityService.currentUser;
+
       const publishedQuery = PersistentDataCubeQuery.serialization.fromJson(
-        await this.client.publishQuery(
+        await this._client.publishQuery(
           PersistentDataCubeQuery.serialization.toJson(newQuery),
           this.queryServerBaseUrl,
         ),
@@ -160,15 +184,15 @@ export class LegendREPLBaseStore {
         minHeight: 100,
         center: true,
       };
-      dataCube.engine.layout.newWindow(window);
+      this.layoutService.newWindow(window);
     } catch (error) {
       assertErrorThrown(error);
-      dataCube.view.engine.alertError(error, {
+      this.alertService.alertError(error, {
         message: `Persistence Failure: Can't publish query.`,
         text: `Error: ${error.message}`,
       });
     } finally {
-      dataCube.view.endTask(task);
+      this.taskService.endTask(task);
       this.publishState.complete();
     }
   }