@finos/legend-application-query 13.8.42 → 13.8.43

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

@@ -101,14 +101,15 @@ export const QueryEditorDataspaceInfoModal = observer(
     const dataSpaceMedata = dataSpaceAnalysisResult?.executionContextsIndex.get(
       executionContext.name,
     )?.runtimeMetadata;
-    const connection =
-      executionContext.defaultRuntime.value.runtimeValue.connections.length > 0
-        ? executionContext.defaultRuntime.value.runtimeValue.connections[0]
-            ?.storeConnections?.[0]?.connection instanceof ConnectionPointer
-          ? executionContext.defaultRuntime.value.runtimeValue.connections[0]
-              ?.storeConnections?.[0]?.connection
-          : undefined
-        : undefined;
+    const defaultRuntimeValue = executionContext.defaultRuntime?.value;
+    const executionContextMappingValue = executionContext.mapping?.value;
+    const connection = defaultRuntimeValue?.runtimeValue.connections.length
+      ? defaultRuntimeValue.runtimeValue.connections[0]?.storeConnections?.[0]
+          ?.connection instanceof ConnectionPointer
+        ? defaultRuntimeValue.runtimeValue.connections[0]?.storeConnections?.[0]
+            ?.connection
+        : undefined
+      : undefined;
     const connectionPath = connection
       ? connection.packageableConnection.value.path
       : dataSpaceMedata
@@ -210,31 +211,41 @@ export const QueryEditorDataspaceInfoModal = observer(
                 <div className="dataspace-info-modal__field__label">
                   Mapping
                 </div>
-                <div
-                  className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
-                  onClick={() =>
-                    flowResult(
-                      visitElement(executionContext.mapping.value.path),
-                    )
-                  }
-                >
-                  {executionContext.mapping.value.name}
-                </div>
+                {executionContextMappingValue ? (
+                  <div
+                    className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
+                    onClick={() =>
+                      flowResult(
+                        visitElement(executionContextMappingValue.path),
+                      )
+                    }
+                  >
+                    {executionContextMappingValue.name}
+                  </div>
+                ) : (
+                  <div className="dataspace-info-modal__field__value">
+                    (none)
+                  </div>
+                )}
               </div>
               <div className="dataspace-info-modal__field">
                 <div className="dataspace-info-modal__field__label">
                   Runtime
                 </div>
-                <div
-                  className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
-                  onClick={() =>
-                    flowResult(
-                      visitElement(executionContext.defaultRuntime.value.path),
-                    )
-                  }
-                >
-                  {executionContext.defaultRuntime.value.name}
-                </div>
+                {defaultRuntimeValue ? (
+                  <div
+                    className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
+                    onClick={() =>
+                      flowResult(visitElement(defaultRuntimeValue.path))
+                    }
+                  >
+                    {defaultRuntimeValue.name}
+                  </div>
+                ) : (
+                  <div className="dataspace-info-modal__field__value">
+                    (none)
+                  </div>
+                )}
               </div>
               {(connection || dataSpaceMedata) && (
                 <>

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

@@ -65,18 +65,18 @@ import type { LegendQueryDataSpaceQueryBuilderState } from '../../stores/data-sp
 const resolveExecutionContextRuntimes = (
   queryBuilderState: LegendQueryDataSpaceQueryBuilderState,
 ): PackageableRuntime[] => {
+  const currentMapping = guaranteeNonNullable(
+    queryBuilderState.executionContext.mapping,
+    `Execution context '${queryBuilderState.executionContext.name}' does not have a mapping`,
+  ).value;
   if (queryBuilderState.dataSpaceAnalysisResult) {
     const executionContext = Array.from(
       queryBuilderState.dataSpaceAnalysisResult.executionContextsIndex.values(),
-    ).find(
-      (e) =>
-        e.mapping.path ===
-        queryBuilderState.executionContext.mapping.value.path,
-    );
+    ).find((e) => e.mapping.path === currentMapping.path);
     return guaranteeNonNullable(executionContext).compatibleRuntimes;
   }
   return getMappingCompatibleRuntimes(
-    queryBuilderState.executionContext.mapping.value,
+    currentMapping,
     queryBuilderState.graphManagerState.usableRuntimes,
   );
 };
@@ -127,10 +127,12 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
     };
 
     // execution context
-    const executionContextOptions =
-      queryBuilderState.dataSpace.executionContexts
-        .map(buildExecutionContextOption)
-        .sort(compareLabelFn);
+    const executionContextOptions = guaranteeNonNullable(
+      queryBuilderState.dataSpace.executionContexts,
+      `Data product '${queryBuilderState.dataSpace.path}' does not have any execution contexts`,
+    )
+      .map(buildExecutionContextOption)
+      .sort(compareLabelFn);
     const showExecutionContextOptions = executionContextOptions.length > 1;
     const selectedExecutionContextOption = buildExecutionContextOption(
       queryBuilderState.executionContext,
@@ -142,11 +144,17 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
       if (option.value === queryBuilderState.executionContext) {
         return;
       }
-      const currentMapping =
-        queryBuilderState.executionContext.mapping.value.path;
+      const currentMappingPath = guaranteeNonNullable(
+        queryBuilderState.executionContext.mapping,
+        `Execution context '${queryBuilderState.executionContext.name}' does not have a mapping`,
+      ).value.path;
+      const nextMappingPath = guaranteeNonNullable(
+        option.value.mapping,
+        `Execution context '${option.value.name}' does not have a mapping`,
+      ).value.path;
       queryBuilderState.setExecutionContext(option.value);
       await queryBuilderState.propagateExecutionContextChange(
-        currentMapping === option.value.mapping.value.path,
+        currentMappingPath === nextMappingPath,
       );
       queryBuilderState.onExecutionContextChange?.(option.value);
     };
@@ -191,7 +199,10 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
     // class
     const classes = resolveUsableDataSpaceClasses(
       queryBuilderState.dataSpace,
-      queryBuilderState.executionContext.mapping.value,
+      guaranteeNonNullable(
+        queryBuilderState.executionContext.mapping,
+        `Execution context '${queryBuilderState.executionContext.name}' does not have a mapping`,
+      ).value,
       queryBuilderState.graphManagerState,
       queryBuilderState,
     );

package/src/stores/QueryEditorStore.ts

@@ -1836,33 +1836,37 @@ const resolveExecutionContext = (
   queryMapping: Mapping | undefined,
   queryRuntime: PackageableRuntime | undefined,
 ): DataSpaceExecutionContext | undefined => {
-  if (!ex) {
-    if (queryMapping && queryRuntime) {
-      if (
-        dataSpace.defaultExecutionContext.mapping.value !== queryMapping &&
-        dataSpace.defaultExecutionContext.defaultRuntime.value.path !==
-          queryRuntime.path
-      ) {
-        const matchingExecContexts = dataSpace.executionContexts.filter(
-          (ec) => ec.mapping.value === queryMapping,
+  const executionContexts = dataSpace.executionContexts ?? [];
+  if (ex) {
+    return executionContexts.find((ec) => ec.name === ex);
+  }
+  const defaultExecutionContext = dataSpace.defaultExecutionContext;
+  if (!defaultExecutionContext) {
+    return undefined;
+  }
+  if (queryMapping && queryRuntime) {
+    const defaultExecutionContextMapping = defaultExecutionContext.mapping;
+    const defaultExecutionContextRuntime =
+      defaultExecutionContext.defaultRuntime;
+    if (
+      defaultExecutionContextMapping &&
+      defaultExecutionContextRuntime &&
+      defaultExecutionContextMapping.value !== queryMapping &&
+      defaultExecutionContextRuntime.value.path !== queryRuntime.path
+    ) {
+      const matchingExecContexts = executionContexts.filter(
+        (ec) => ec.mapping?.value === queryMapping,
+      );
+      if (matchingExecContexts.length > 1) {
+        const matchRuntime = matchingExecContexts.find(
+          (exec) => exec.defaultRuntime?.value.path === queryRuntime.path,
         );
-        if (matchingExecContexts.length > 1) {
-          const matchRuntime = matchingExecContexts.find(
-            (exec) => exec.defaultRuntime.value.path === queryRuntime.path,
-          );
-          // TODO: we will safely do this for now. Long term we should save exec context key into query store
-          // we should make runtime/mapping optional
-          return matchRuntime ?? matchingExecContexts[0];
-        }
-        return matchingExecContexts[0];
+        return matchRuntime ?? matchingExecContexts[0];
       }
+      return matchingExecContexts[0];
     }
-    return dataSpace.defaultExecutionContext;
   }
-  const matchingExecContexts = dataSpace.executionContexts.filter(
-    (ec) => ec.name === ex,
-  );
-  return matchingExecContexts[0];
+  return defaultExecutionContext;
 };
 
 export class ExistingQueryEditorStore extends QueryEditorStore {
@@ -2219,21 +2223,29 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
             this.applicationStore.config.options.queryBuilderConfig,
             sourceInfo,
           );
+        const matchingExecutionContextMapping = guaranteeNonNullable(
+          matchingExecutionContext.mapping,
+          `Execution context '${matchingExecutionContext.name}' does not have a mapping`,
+        );
+        const matchingExecutionContextRuntime = guaranteeNonNullable(
+          matchingExecutionContext.defaultRuntime,
+          `Execution context '${matchingExecutionContext.name}' does not have a default runtime`,
+        );
         const mappingModelCoverageAnalysisResult =
           dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
-            matchingExecutionContext.mapping.value.path,
+            matchingExecutionContextMapping.value.path,
           );
         if (mappingModelCoverageAnalysisResult) {
           dataSpaceQueryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
             mappingModelCoverageAnalysisResult;
         }
         dataSpaceQueryBuilderState.executionContextState.setMapping(
-          matchingExecutionContext.mapping.value,
+          matchingExecutionContextMapping.value,
         );
         dataSpaceQueryBuilderState.executionContextState.setRuntimeValue(
           new RuntimePointer(
             PackageableElementExplicitReference.create(
-              matchingExecutionContext.defaultRuntime.value,
+              matchingExecutionContextRuntime.value,
             ),
           ),
         );

package/src/stores/data-space/DataProductQueryCreatorStore.ts

@@ -432,7 +432,7 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
       this.graphManagerState.graph,
     );
     const executionContext = guaranteeNonNullable(
-      dataSpace.executionContexts.find(
+      dataSpace.executionContexts?.find(
         (context) => context.name === queryableDataSpace.executionContext,
       ),
       `Can't find execution context '${queryableDataSpace.executionContext}'`,

package/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts

@@ -145,7 +145,7 @@ export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreator
       executionContext =
         template.info?.executionContextKey === undefined
           ? dataSpace.defaultExecutionContext
-          : dataSpace.executionContexts.find(
+          : dataSpace.executionContexts?.find(
               (ex) => ex.name === template.info?.executionContextKey,
             );
       if (template.info) {

package/src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts

@@ -59,7 +59,7 @@ import {
   createViewProjectHandler,
   createViewSDLCProjectHandler,
 } from '../DataSpaceQueryBuilderHelper.js';
-import type { GeneratorFn } from '@finos/legend-shared';
+import { guaranteeNonNullable, type GeneratorFn } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import type {
   DepotEntityWithOrigin,
@@ -220,7 +220,10 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
         this.dataSpace.title,
         this.dataSpace.name,
         this.dataSpace.path,
-        this.dataSpace.defaultExecutionContext.name,
+        guaranteeNonNullable(
+          this.dataSpace.defaultExecutionContext,
+          `Data space '${this.dataSpace.path}' does not have a default execution context`,
+        ).name,
       ),
     };
   }
@@ -293,7 +296,10 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
         dataSpace.title,
         dataSpace.name,
         dataSpace.path,
-        dataSpace.defaultExecutionContext.name,
+        guaranteeNonNullable(
+          dataSpace.defaultExecutionContext,
+          `Data space '${dataSpace.path}' does not have a default execution context`,
+        ).name,
       ),
       this.project.versionId === SNAPSHOT_VERSION_ALIAS,
     );