@finos/legend-application-query 13.6.0 → 13.6.2

package/src/components/QueryEditor.tsx

@@ -89,7 +89,11 @@ import {
 import { LATEST_VERSION_ALIAS } from '@finos/legend-server-depot';
 import { buildVersionOption, type VersionOption } from './QuerySetup.js';
 import { QueryEditorExistingQueryVersionRevertModal } from './QueryEdtiorExistingQueryVersionRevertModal.js';
-import { debounce, compareSemVerVersions } from '@finos/legend-shared';
+import {
+  debounce,
+  compareSemVerVersions,
+  guaranteeNonNullable,
+} from '@finos/legend-shared';
 import { LegendQueryInfo } from './LegendQueryAppInfo.js';
 import { QueryEditorDataspaceInfoModal } from './data-space/DataSpaceInfo.js';
 import { DataSpaceQueryBuilderState } from '@finos/legend-extension-dsl-data-space/application';
@@ -422,9 +426,7 @@ const QueryEditorExistingQueryInfoModal = observer(
     const selectedVersionOption = updateState.queryVersionId
       ? buildVersionOption(updateState.queryVersionId)
       : buildVersionOption(query.versionId);
-    const onVersionOptionChange = async (
-      option: VersionOption | null,
-    ): Promise<void> => {
+    const onVersionOptionChange = (option: VersionOption | null) => {
       if (option?.value && option.value !== updateState.queryVersionId) {
         updateState.setQueryVersionId(option.value);
       }
@@ -816,7 +818,9 @@ const processQueryParams = (
 export const ExistingQueryEditor = observer(() => {
   const applicationStore = useApplicationStore();
   const params = useParams<ExistingQueryEditorPathParams>();
-  const queryId = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID];
+  const queryId = guaranteeNonNullable(
+    params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID],
+  );
   const queryParams =
     applicationStore.navigationService.navigator.getCurrentLocationParameters();
   const processed = processQueryParams(queryParams);
@@ -839,8 +843,12 @@ export const ExistingQueryEditor = observer(() => {
 export const ServiceQueryCreator = observer(() => {
   const applicationStore = useApplicationStore();
   const parameters = useParams<ServiceQueryCreatorPathParams>();
-  const gav = parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV];
-  const servicePath = parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH];
+  const gav = guaranteeNonNullable(
+    parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV],
+  );
+  const servicePath = guaranteeNonNullable(
+    parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH],
+  );
   const executionKey =
     applicationStore.navigationService.navigator.getCurrentLocationParameterValue(
       LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY,
@@ -859,9 +867,15 @@ export const ServiceQueryCreator = observer(() => {
 
 export const MappingQueryCreator = observer(() => {
   const params = useParams<MappingQueryCreatorPathParams>();
-  const gav = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV];
-  const mappingPath = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH];
-  const runtimePath = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH];
+  const gav = guaranteeNonNullable(
+    params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV],
+  );
+  const mappingPath = guaranteeNonNullable(
+    params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH],
+  );
+  const runtimePath = guaranteeNonNullable(
+    params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH],
+  );
 
   return (
     <MappingQueryCreatorStoreProvider

package/src/components/QueryEdtiorExistingQueryVersionRevertModal.tsx

@@ -49,9 +49,7 @@ export const QueryEditorExistingQueryVersionRevertModal = observer(
     const selectedVersionOption = queryVersion
       ? buildVersionOption(queryVersion)
       : null;
-    const onVersionOptionChange = async (
-      option: VersionOption | null,
-    ): Promise<void> => {
+    const onVersionOptionChange = (option: VersionOption | null) => {
       if (option?.value && option.value !== queryVersion) {
         setQueryVersion(option.value);
       }

package/src/components/UpdateExistingServiceQuerySetup.tsx

@@ -131,7 +131,7 @@ const UpdateExistingServiceQuerySetupContent = observer(() => {
             <SearchIcon />
           </div>
           <CustomSelectorInput
-            ref={serviceSearchRef}
+            inputRef={serviceSearchRef}
             className="query-setup__wizard__selector"
             options={serviceOptions}
             isLoading={setupStore.loadServicesState.isInProgress}

package/src/components/__test-utils__/QueryEditorComponentTestUtils.tsx

@@ -44,6 +44,11 @@ import {
 import { LegendQueryFrameworkProvider } from '../LegendQueryFrameworkProvider.js';
 import { TEST__BrowserEnvironmentProvider } from '@finos/legend-application/test';
 import { Core_LegendQueryApplicationPlugin } from '../Core_LegendQueryApplicationPlugin.js';
+import { Route, Routes } from '@finos/legend-application/browser';
+import {
+  generateExistingQueryEditorRoute,
+  LEGEND_QUERY_ROUTE_PATTERN,
+} from '../../__lib__/LegendQueryNavigation.js';
 
 const TEST_QUERY_ID = 'test-query-id';
 export const TEST_QUERY_NAME = 'MyTestQuery';
@@ -170,9 +175,16 @@ export const TEST__setUpQueryEditor = async (
 
   const renderResult = render(
     <ApplicationStoreProvider store={MOCK__editorStore.applicationStore}>
-      <TEST__BrowserEnvironmentProvider>
+      <TEST__BrowserEnvironmentProvider
+        initialEntries={[generateExistingQueryEditorRoute(lightQuery.id)]}
+      >
         <LegendQueryFrameworkProvider>
-          <ExistingQueryEditor />
+          <Routes>
+            <Route
+              path={LEGEND_QUERY_ROUTE_PATTERN.EDIT_EXISTING_QUERY}
+              element={<ExistingQueryEditor />}
+            />
+          </Routes>
         </LegendQueryFrameworkProvider>
       </TEST__BrowserEnvironmentProvider>
     </ApplicationStoreProvider>,

package/src/components/data-cube/ExistingQueryDataCubeViewer.tsx

@@ -29,6 +29,7 @@ import { useEffect } from 'react';
 import { flowResult } from 'mobx';
 import { DataCube, DataCubeProvider } from '@finos/legend-data-cube';
 import { QueryBuilderDataCubeApplicationEngine } from '@finos/legend-query-builder';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 
 export const DataCubeWrapper = observer(() => {
   const applicationStore = useApplicationStore();
@@ -44,6 +45,7 @@ export const DataCubeWrapper = observer(() => {
   const _appEngine = new QueryBuilderDataCubeApplicationEngine(
     applicationStore,
   );
+
   return (
     <DataCubeProvider application={_appEngine} engine={store.engine}>
       <DataCube />
@@ -53,7 +55,10 @@ export const DataCubeWrapper = observer(() => {
 
 export const ExistingQueryDataCubeViewer = observer(() => {
   const params = useParams<ExistingQueryEditorPathParams>();
-  const queryId = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID];
+  const queryId = guaranteeNonNullable(
+    params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID],
+  );
+
   return (
     <ExistingQueryDataCubeEditorStoreProvider queryId={queryId}>
       <DataCubeWrapper />

package/src/components/data-space/DataSpaceQueryCreator.tsx

@@ -88,14 +88,12 @@ const DataSpaceQueryCreatorStoreProvider: React.FC<{
 
 export const DataSpaceQueryCreator = observer(() => {
   const applicationStore = useApplicationStore();
-  const parameters = useParams<DataSpaceQueryCreatorPathParams | undefined>();
-  const gav = parameters?.[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV];
+  const parameters = useParams<DataSpaceQueryCreatorPathParams>();
+  const gav = parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV];
   const dataSpacePath =
-    parameters?.[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH];
+    parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH];
   const executionContext =
-    parameters?.[
-      DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT
-    ];
+    parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT];
   const runtimePath =
     applicationStore.navigationService.navigator.getCurrentLocationParameterValue(
       DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN.RUNTIME_PATH,

package/src/components/data-space/DataSpaceQuerySetup.tsx

@@ -82,7 +82,7 @@ const DataSpaceQuerySetupSetupPanelContent = observer(
             </label>
             <CustomSelectorInput
               inputId="query-builder__setup__data-space-selector"
-              ref={dataSpaceSearchRef}
+              inputRef={dataSpaceSearchRef}
               className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
               options={dataSpaceOptions}
               isLoading={queryBuilderState.loadDataSpacesState.isInProgress}

package/src/components/data-space/DataSpaceTemplateQueryCreator.tsx

@@ -28,6 +28,7 @@ import {
   type DataSpaceTemplateQueryCreatorPathParams,
 } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { QueryEditor } from '../QueryEditor.js';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 
 const DataSpaceTemplateQueryCreatorStoreProvider: React.FC<{
   children: React.ReactNode;
@@ -59,16 +60,19 @@ const DataSpaceTemplateQueryCreatorStoreProvider: React.FC<{
 
 export const DataSpaceTemplateQueryCreator = observer(() => {
   const parameters = useParams<DataSpaceTemplateQueryCreatorPathParams>();
-  const gav =
-    parameters[DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV];
-  const dataSpacePath =
+  const gav = guaranteeNonNullable(
+    parameters[DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV],
+  );
+  const dataSpacePath = guaranteeNonNullable(
     parameters[
       DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH
-    ];
-  const templateQueryId =
+    ],
+  );
+  const templateQueryId = guaranteeNonNullable(
     parameters[
       DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE_QUERY_ID
-    ];
+    ],
+  );
 
   return (
     <DataSpaceTemplateQueryCreatorStoreProvider

package/src/stores/data-cube/ExistingQueryDataCubeViewer.ts

@@ -24,6 +24,7 @@ import {
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import { assertErrorThrown, type GeneratorFn } from '@finos/legend-shared';
 import { QueryBuilderDataCubeEngine } from '@finos/legend-query-builder';
+import { flow, makeObservable, observable } from 'mobx';
 
 export class ExistingQueryDataCubeEditorStore {
   readonly applicationStore: LegendQueryApplicationStore;
@@ -37,6 +38,10 @@ export class ExistingQueryDataCubeEditorStore {
     depotServerClient: DepotServerClient,
     queryId: string,
   ) {
+    makeObservable(this, {
+      initialize: flow,
+      engine: observable,
+    });
     this.applicationStore = applicationStore;
     this.depotServerClient = depotServerClient;
     this.graphManagerState = new GraphManagerState(
@@ -81,8 +86,10 @@ export class ExistingQueryDataCubeEditorStore {
         (yield this.graphManagerState.graphManager.pureCodeToLambda(
           content,
         )) as unknown as RawLambda;
+      // TODO: we should be able to call engine and convert lambda to relation if not one.
       const engine = new QueryBuilderDataCubeEngine(
         lambda,
+        undefined,
         execConext.mapping,
         execConext.runtime,
         this.graphManagerState,