@finos/legend-application-data-cube 0.7.34 → 0.7.36

package/src/components/builder/source/LakehouseConsumerDataCubeSourceBuilder.tsx

@@ -18,52 +18,58 @@ import { DataCubeCodeEditor, FormTextInput } from '@finos/legend-data-cube';
 import { CustomSelectorInput } from '@finos/legend-art';
 import { useAuth } from 'react-oidc-context';
 import { assertErrorThrown, guaranteeNonNullable } from '@finos/legend-shared';
-import { useEffect } from 'react';
+import { useEffect, type ReactNode } from 'react';
 import type { LakehouseConsumerDataCubeSourceBuilderState } from '../../../stores/builder/source/LakehouseConsumerDataCubeSourceBuilderState.js';
 import { useLegendDataCubeBuilderStore } from '../LegendDataCubeBuilderStoreProvider.js';
 import {
-  buildIngestDeploymentServerConfigOption,
-  type IngestDeploymentServerConfigOption,
-} from '@finos/legend-server-lakehouse';
-import { V1_IngestEnvironmentClassification } from '@finos/legend-graph';
+  V1_EntitlementsLakehouseEnvironmentType,
+  type V1_EntitlementsDataProductLite,
+} from '@finos/legend-graph';
 
 export const LakehouseConsumerDataCubeSourceBuilder: React.FC<{
   sourceBuilder: LakehouseConsumerDataCubeSourceBuilderState;
 }> = observer(({ sourceBuilder }) => {
   const auth = useAuth();
   const store = useLegendDataCubeBuilderStore();
-  const envOptions = sourceBuilder.environments
-    .map(buildIngestDeploymentServerConfigOption)
-    // not include dev
-    .filter(
-      (config) =>
-        config.value.environmentClassification !==
-        V1_IngestEnvironmentClassification.DEV,
-    )
-    .sort(
-      (a, b) =>
-        a.value.environmentName.localeCompare(b.value.environmentName) ||
-        a.value.environmentClassification.localeCompare(
-          b.value.environmentClassification,
-        ),
-    );
 
-  const selectedEnvOption = sourceBuilder.selectedEnvironment
-    ? buildIngestDeploymentServerConfigOption(sourceBuilder.selectedEnvironment)
-    : null;
-  const onEnvChange = (newValue: IngestDeploymentServerConfigOption | null) => {
-    sourceBuilder.setSelectedEnvironment(newValue?.value ?? undefined);
-    sourceBuilder
-      .fetchAccessPoints()
-      .catch((error) => store.alertService.alertUnhandledError(error));
+  const renderDataProductLabel = (
+    dataProduct: V1_EntitlementsDataProductLite,
+  ): ReactNode => {
+    const title = dataProduct.title;
+    const id = guaranteeNonNullable(dataProduct.id);
+    // If title is empty, show id only. Otherwise show title (prominent) and id (muted)
+    // Main text: slightly larger and normal weight. Subtext: grey and slightly smaller.
+    return (
+      <div className="flex w-full flex-col items-start">
+        <div className="w-full whitespace-normal break-words text-base font-normal text-black">
+          {title ?? id}
+        </div>
+        {title ? (
+          <div className="mt-1 w-full truncate text-sm text-neutral-500">
+            {id}
+          </div>
+        ) : null}
+      </div>
+    );
+  };
+  const renderDataProductMainText = (
+    dataProduct: V1_EntitlementsDataProductLite,
+  ): ReactNode => {
+    const title = dataProduct.title;
+    const id = guaranteeNonNullable(dataProduct.id);
+    // Ensure selected value is vertically centered inside the control by
+    // making the label container full-height and centering its content.
+    return (
+      <div className="flex h-full w-full items-center whitespace-normal break-words text-base font-normal text-black">
+        {title ?? id}
+      </div>
+    );
   };
 
   useEffect(() => {
     sourceBuilder.reset();
     try {
       sourceBuilder.loadDataProducts(auth.user?.access_token);
-      sourceBuilder.fetchEnvironment(auth.user?.access_token);
-      sourceBuilder.fetchUserEntitlementEnvs(auth.user?.access_token);
     } catch (error) {
       assertErrorThrown(error);
       store.alertService.alertUnhandledError(error);
@@ -73,23 +79,93 @@ export const LakehouseConsumerDataCubeSourceBuilder: React.FC<{
   return (
     <div className="flex h-full w-full">
       <div className="m-3 flex w-full flex-col items-stretch gap-2 text-neutral-500">
+        <div className="query-setup__wizard__group mt-3">
+          <div className="query-setup__wizard__group__title">Mode</div>
+          <CustomSelectorInput
+            className="query-setup__wizard__selector"
+            options={[
+              {
+                label: 'Production',
+                value: V1_EntitlementsLakehouseEnvironmentType.PRODUCTION,
+              },
+              {
+                label: 'Production (parallel)',
+                value:
+                  V1_EntitlementsLakehouseEnvironmentType.PRODUCTION_PARALLEL,
+              },
+            ]}
+            onChange={(newVal: {
+              label: string;
+              value: V1_EntitlementsLakehouseEnvironmentType;
+            }) => {
+              sourceBuilder.setEnvMode(newVal.value);
+              sourceBuilder.resetDataProduct();
+            }}
+            value={{
+              label:
+                sourceBuilder.envMode ===
+                V1_EntitlementsLakehouseEnvironmentType.PRODUCTION
+                  ? 'Production'
+                  : sourceBuilder.envMode ===
+                      V1_EntitlementsLakehouseEnvironmentType.PRODUCTION_PARALLEL
+                    ? 'Production (parallel)'
+                    : 'Development',
+              value: sourceBuilder.envMode,
+            }}
+            placeholder="Choose mode"
+            isClearable={true}
+            escapeClearsValue={true}
+          />
+        </div>
         <div className="query-setup__wizard__group mt-3">
           <div className="query-setup__wizard__group__title">Data Product</div>
           <CustomSelectorInput
             className="query-setup__wizard__selector text-nowrap"
-            options={sourceBuilder.dataProducts.map((dataProduct) => ({
-              label: guaranteeNonNullable(dataProduct.id),
-              value: guaranteeNonNullable(dataProduct.fullPath),
-            }))}
+            // give the option rows more height to accommodate wrapped titles
+            optionCustomization={{ rowHeight: 56 }}
+            options={sourceBuilder.filteredDataProducts.map((dataProduct) => {
+              const title = dataProduct.title;
+              const id = guaranteeNonNullable(dataProduct.id);
+              return {
+                label: renderDataProductLabel(dataProduct),
+                // include a searchable text so react-select filter can match id/title
+                searchText: `${title} ${id}`.trim(),
+                value: guaranteeNonNullable(dataProduct),
+              };
+            })}
+            filterOption={(option, rawInput) => {
+              const input = rawInput.toLowerCase();
+              // option.data may contain our custom searchText
+              const data = option.data as { searchText?: string } | undefined;
+
+              // Prefer a non-empty searchText from data when available
+              const searchTextSource =
+                data?.searchText && data.searchText.trim() !== ''
+                  ? data.searchText.toLowerCase().trim()
+                  : ''.trim();
+
+              // If user hasn't typed anything, show all options
+              if (input === '') {
+                return true;
+              }
+
+              return searchTextSource.includes(input);
+            }}
             disabled={
               sourceBuilder.dataProductLoadingState.isInProgress ||
               sourceBuilder.dataProductLoadingState.hasFailed
             }
             isLoading={sourceBuilder.dataProductLoadingState.isInProgress}
-            onChange={(newValue: { label: string; value: string } | null) => {
-              sourceBuilder.setSelectedDataProduct(newValue?.value ?? '');
+            onChange={(
+              newValue: {
+                label: ReactNode;
+                searchText?: string;
+                value: V1_EntitlementsDataProductLite;
+              } | null,
+            ) => {
+              sourceBuilder.setSelectedDataProduct(newValue?.value);
               sourceBuilder
-                .fetchDataProduct(auth.user?.access_token)
+                .fetchAccessPoints()
                 .catch((error) =>
                   store.alertService.alertUnhandledError(error),
                 );
@@ -97,7 +173,11 @@ export const LakehouseConsumerDataCubeSourceBuilder: React.FC<{
             value={
               sourceBuilder.selectedDataProduct
                 ? {
-                    label: sourceBuilder.selectedDataProduct,
+                    label: renderDataProductMainText(
+                      sourceBuilder.selectedDataProduct,
+                    ),
+                    searchText:
+                      `${sourceBuilder.selectedDataProduct.title ?? ''} ${sourceBuilder.selectedDataProduct.id}`.trim(),
                     value: sourceBuilder.selectedDataProduct,
                   }
                 : null
@@ -107,71 +187,47 @@ export const LakehouseConsumerDataCubeSourceBuilder: React.FC<{
             escapeClearsValue={true}
           />
         </div>
-        {sourceBuilder.environments.length > 0 && (
-          <div className="query-setup__wizard__group mt-3">
-            <div className="query-setup__wizard__group__title">Environment</div>
+        {sourceBuilder.accessPoints.size > 0 && (
+          <div className="query-setup__wizard__group mt-2">
+            <div className="query-setup__wizard__group__title">
+              Access Point
+            </div>
             <CustomSelectorInput
-              className="query-setup__wizard__selector text-nowrap"
-              options={envOptions}
-              disabled={
-                sourceBuilder.ingestEnvLoadingState.isInProgress ||
-                sourceBuilder.ingestEnvLoadingState.hasFailed ||
-                !sourceBuilder.selectedDataProduct
-              }
-              isLoading={sourceBuilder.ingestEnvLoadingState.isInProgress}
-              onChange={(
-                newValue: IngestDeploymentServerConfigOption | null,
-              ) => {
-                onEnvChange(newValue);
+              className="query-setup__wizard__selector"
+              options={Array.from(sourceBuilder.accessPoints.entries()).map(
+                ([id, title]) => ({
+                  label: title?.trim() ? title : id,
+                  value: id,
+                }),
+              )}
+              disabled={false}
+              isLoading={false}
+              onChange={(newValue: { label: string; value: string } | null) => {
+                const value = newValue?.value ?? '';
+                const label = newValue?.label ?? '';
+                sourceBuilder.setSelectedAccessPoint([value, label]);
+                sourceBuilder.setWarehouse(
+                  sourceBuilder.DEFAULT_CONSUMER_WAREHOUSE,
+                );
+                sourceBuilder
+                  .initializeQuery()
+                  .catch((error) =>
+                    store.alertService.alertUnhandledError(error),
+                  );
               }}
-              value={selectedEnvOption}
-              placeholder={`Choose an Environment`}
+              value={
+                sourceBuilder.selectedAccessPoint
+                  ? {
+                      label: sourceBuilder.selectedAccessPoint[1],
+                      value: sourceBuilder.selectedAccessPoint[0],
+                    }
+                  : null
+              }
               isClearable={false}
               escapeClearsValue={true}
             />
           </div>
         )}
-        {sourceBuilder.accessPoints.length > 0 &&
-          sourceBuilder.selectedEnvironment && (
-            <div className="query-setup__wizard__group mt-2">
-              <div className="query-setup__wizard__group__title">
-                Access Point
-              </div>
-              <CustomSelectorInput
-                className="query-setup__wizard__selector"
-                options={sourceBuilder.accessPoints.map((accessPoint) => ({
-                  label: accessPoint,
-                  value: accessPoint,
-                }))}
-                disabled={false}
-                isLoading={false}
-                onChange={(
-                  newValue: { label: string; value: string } | null,
-                ) => {
-                  const accessPoint = newValue?.value ?? '';
-                  sourceBuilder.setSelectedAccessPoint(accessPoint);
-                  sourceBuilder.setWarehouse(
-                    sourceBuilder.DEFAULT_CONSUMER_WAREHOUSE,
-                  );
-                  sourceBuilder
-                    .initializeQuery()
-                    .catch((error) =>
-                      store.alertService.alertUnhandledError(error),
-                    );
-                }}
-                value={
-                  sourceBuilder.selectedAccessPoint
-                    ? {
-                        label: sourceBuilder.selectedAccessPoint,
-                        value: sourceBuilder.selectedAccessPoint,
-                      }
-                    : null
-                }
-                isClearable={false}
-                escapeClearsValue={true}
-              />
-            </div>
-          )}
         {sourceBuilder.selectedAccessPoint && (
           <div className="query-setup__wizard__group mt-2">
             <div className="query-setup__wizard__group__title">Warehouse</div>

package/src/stores/LegendDataCubeDataCubeEngine.ts

@@ -171,7 +171,9 @@ import {
   RawLakehouseSdlcOrigin,
 } from './model/LakehouseConsumerDataCubeSource.js';
 import {
-  isEnvNameCompatibleWithEntitlementsLakehouseEnvironmentType,
+  buildEnvNameCompatibleWithLakehouseEnvironmentType,
+  getEntitlementsLakehouseEnvironmentTypeCompatibleWithEnvName,
+  isLakehouseEnvironmentType,
   type LakehouseContractServerClient,
   type LakehouseIngestServerClient,
 } from '@finos/legend-server-lakehouse';
@@ -347,7 +349,7 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
       }
     } else if (source instanceof LakehouseConsumerDataCubeSource) {
       return {
-        environment: source.environment,
+        environment: source.userEnvironment,
         warehouse: source.warehouse,
         deploymentId: source.deploymentId,
         project: source.dpCoordinates
@@ -849,7 +851,6 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
           rawSource,
           source,
         );
-        source.environment = rawSource.environment;
         source.paths = rawSource.paths;
         source.warehouse = rawSource.warehouse;
         source.deploymentId = rawSource.deploymentId;
@@ -1953,9 +1954,49 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
   ) {
     let pmcd: V1_PureModelContext | undefined;
 
+    // find user entitled environment
+    const env =
+      await this._lakehouseContractServerClient.getUserEntitlementEnvs(
+        this._application.identityService.currentUser,
+        authStore.getAccessToken(),
+      );
+    const userEnv = guaranteeNonNullable(
+      env.users.map((e) => e.lakehouseEnvironment).at(0),
+    );
+
+    // Backwards-compatible environment handling
+    //
+    // The incoming `rawSource.environment` may be in one of two forms:
+    // 1. An entitlement environment type (the canonical enum used by the entitlements
+    //    service, e.g. PRODUCTION / PRODUCTION_PARALLEL / DEVELOPMENT).
+    // 2. A legacy, user-specific environment name string (used by older queries).
+    //
+    // To make the consumer view robust across both representations, we normalize
+    // the raw environment into a runtime-compatible environment name that is
+    // compatible with the current user's entitled environment (`userEnv`). This
+    // preserves the ability for any user to open the view regardless of how the
+    // environment was stored.
+
+    if (isLakehouseEnvironmentType(rawSource.environment)) {
+      const lakehouseEnv =
+        getEntitlementsLakehouseEnvironmentTypeCompatibleWithEnvName(
+          rawSource.environment,
+        );
+      source.userEnvironment =
+        buildEnvNameCompatibleWithLakehouseEnvironmentType(
+          userEnv,
+          lakehouseEnv,
+        );
+    } else {
+      source.userEnvironment =
+        buildEnvNameCompatibleWithLakehouseEnvironmentType(
+          userEnv,
+          rawSource.environment,
+        );
+    }
     const runtime = new V1_LakehouseRuntime();
     runtime.warehouse = rawSource.warehouse;
-    runtime.environment = rawSource.environment;
+    runtime.environment = source.userEnvironment;
 
     const packageableRuntime = new V1_PackageableRuntime();
     packageableRuntime.runtimeValue = runtime;
@@ -1985,15 +2026,17 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
             ),
           )
         : [];
-      const selectedEnv = rawSource.environment;
+      const selectedEnv = source.userEnvironment;
       const dataProduct = dataProducts.find((dp) => {
         const envType = dp.lakehouseEnvironment?.type;
         if (!envType) {
           return false;
         }
-        return isEnvNameCompatibleWithEntitlementsLakehouseEnvironmentType(
-          selectedEnv,
-          envType,
+        return (
+          envType ===
+          getEntitlementsLakehouseEnvironmentTypeCompatibleWithEnvName(
+            selectedEnv,
+          )
         );
       });
       const fullGraphGrammar = guaranteeType(

package/src/stores/builder/LegendDataCubeCreatorState.tsx

@@ -138,7 +138,7 @@ export class LegendDataCubeCreatorState {
         return new LakehouseConsumerDataCubeSourceBuilderState(
           this._application,
           this._engine,
-          this._store.platformServerClient,
+          this._store.depotServerClient,
           this._store.contractServerClient,
           this._alertService,
         );