@finos/legend-application-marketplace 0.2.13 → 0.2.15

package/src/stores/lakehouse/LegendMarketplaceProductViewerStore.ts

@@ -77,6 +77,7 @@ import {
   EXTERNAL_APPLICATION_NAVIGATION__generateStudioSDLCProjectViewUrl,
   generateLakehouseDataProductPath,
   generateContractPagePath,
+  generatePermitDataAccessRequestPagePath,
 } from '../../__lib__/LegendMarketplaceNavigation.js';
 import {
   DataSpaceViewerState,
@@ -443,7 +444,12 @@ export class LegendMarketplaceProductViewerStore {
             this.marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
               generateLakehouseDataProductPath(_dataProductId, _deploymentId),
             ),
+          getTaskPageUrl: (id: string) =>
+            this.marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
+              generatePermitDataAccessRequestPagePath(id),
+            ),
         },
+        this.marketplaceBaseStore.permitWorkflowServerClient,
       );
       this.setDataProductViewer(dataProductViewerState);
       this.setDataProductDataAccess(dataProductDataAccessState);

package/src/stores/lakehouse/dataProducts/ProductCardState.ts

@@ -67,7 +67,7 @@ export class ProductCardState {
     searchResult: DataProductSearchResult,
     graphManager: V1_PureGraphManager,
     vendorImageMap: ReadonlyMap<string, string>,
-    usedImages?: Set<string> | undefined,
+    usedImages?: Set<string>,
   ) {
     makeObservable(this, {
       dataProductElement: observable,
@@ -87,8 +87,7 @@ export class ProductCardState {
   }
 
   get title(): string {
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    return this.searchResult.dataProductTitle || this.dataProductId;
+    return this.searchResult.dataProductTitle ?? this.dataProductId;
   }
 
   get description(): string {
@@ -232,7 +231,7 @@ export class ProductCardState {
 
   private resolveDisplayImage(
     vendorImageMap: ReadonlyMap<string, string>,
-    usedImages?: Set<string> | undefined,
+    usedImages?: Set<string>,
   ): string {
     const GENERIC_IMAGE_COUNT = 20;
     const guidUpper = this.guid.toUpperCase();

package/src/stores/lakehouse/entitlements/EntitlementsDashboardState.ts

@@ -19,7 +19,9 @@ import {
   assertErrorThrown,
   guaranteeNonNullable,
   guaranteeType,
+  HttpStatus,
   isNonNullable,
+  NetworkClientError,
   type GeneratorFn,
   type PlainObject,
 } from '@finos/legend-shared';
@@ -28,7 +30,6 @@ import {
   type PureProtocolProcessorPlugin,
   type V1_DataProduct,
   type V1_EnrichedUserApprovalStatus,
-  type V1_EntitlementsDataProductDetails,
   type V1_LiteDataContract,
   type V1_LiteDataContractWithUserStatus,
   type V1_PendingTasksResponse,
@@ -38,6 +39,7 @@ import {
   RawLambda,
   V1_DataProductAccessor,
   V1_deserializeDataContractResponse,
+  type V1_DataRequestWithWorkflow,
   V1_entitlementsDataProductDetailsResponseToDataProductDetails,
   V1_IngestDefinitionAccessor,
   V1_LakehouseAccessPoint,
@@ -49,9 +51,11 @@ import {
   V1_SdlcDeploymentDataProductOrigin,
   V1_TaskStatusChangeResponseModelSchema,
   V1_transformDataContractToLiteDatacontract,
+  V1_deserializeDataRequestsWithWorkflowResponse,
+  type V1_DataRequestsWithWorkflowResponse,
 } from '@finos/legend-graph';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
-import { type IngestDeploymentServerConfig } from '@finos/legend-server-lakehouse';
+import type { ContractErrorLayer } from '@finos/legend-extension-dsl-data-product';
 import {
   makeObservable,
   flow,
@@ -66,6 +70,18 @@ import {
 } from './LakehouseEntitlementsStore.js';
 import { getDataProductFromDetails } from '../../../utils/LakehouseUtils.js';
 
+export enum ContractSyncStatus {
+  NEVER_SYNCED = 'NEVER_SYNCED',
+  NOT_FULLY_SYNCED = 'NOT_FULLY_SYNCED',
+}
+
+export type LakehouseContractSyncStatusResponse = {
+  status: string;
+  unsyncedUsers?: { username: string }[];
+  unsyncedAccessPoints?: { accessPointName: string }[];
+  unsyncedTargetAccounts?: string[];
+};
+
 const collectIngestSpecPathsFromOriginDp = (
   rootDataProduct: V1_DataProduct,
   accessPointGroupId: string,
@@ -186,12 +202,14 @@ export class EntitlementsDashboardState {
   // consolidated user information from the tasks.
   allContractsCreatedByUserMap: Map<string, ContractCreatedByUserDetails> =
     new Map();
+  dataRequestsCreatedByUser: V1_DataRequestWithWorkflow[] | undefined;
   selectedTaskIds: Set<string> = new Set();
 
   readonly initializationState = ActionState.create();
   readonly fetchingPendingTasksState = ActionState.create();
   readonly fetchingContractsForUserState = ActionState.create();
   readonly fetchingContractsByUserState = ActionState.create();
+  readonly fetchingDataRequestsCreatedByUserState = ActionState.create();
   readonly changingState = ActionState.create();
 
   constructor(state: LakehouseEntitlementsStore) {
@@ -203,6 +221,7 @@ export class EntitlementsDashboardState {
       allContractsCreatedByUserMap: observable,
       pendingTaskContractMap: observable,
       selectedTaskIds: observable,
+      dataRequestsCreatedByUser: observable,
       pendingTaskContracts: computed,
       allContractsCreatedByUser: computed,
       setSelectedTaskIds: action,
@@ -214,8 +233,8 @@ export class EntitlementsDashboardState {
       fetchContractsForUser: flow,
       fetchContractsCreatedByUser: flow,
       fetchContractDeploymentEnvironments: flow,
-      getUnverifiedIngestDefinitions: flow,
       updateContract: flow,
+      fetchDataRequestsCreatedByUser: flow,
     });
   }
 
@@ -238,37 +257,44 @@ export class EntitlementsDashboardState {
       this.fetchingPendingTasksState.inProgress();
       this.fetchingContractsForUserState.inProgress();
       this.fetchingContractsByUserState.inProgress();
+      this.fetchingDataRequestsCreatedByUserState.inProgress();
 
-      const [pendingTasksData, contractsForUser, contractsCreatedByUserMap] =
-        (yield Promise.all([
-          (async () => {
-            try {
-              const tasks = await flowResult(this.fetchPendingTasks(token));
-              const taskContractMap = await flowResult(
-                this.fetchPendingTaskContracts(token, tasks),
-              );
-              return { tasks, taskContractMap };
-            } catch (error) {
-              assertErrorThrown(error);
-              this.lakehouseEntitlementsStore.applicationStore.alertUnhandledError(
-                error,
-              );
-              return {
-                tasks: [] as V1_ContractUserEventRecord[],
-                taskContractMap: new Map<string, V1_LiteDataContract>(),
-              };
-            }
-          })(),
-          flowResult(this.fetchContractsForUser(token)),
-          flowResult(this.fetchContractsCreatedByUser(token)),
-        ])) as [
-          {
-            tasks: V1_ContractUserEventRecord[];
-            taskContractMap: Map<string, V1_LiteDataContract>;
-          },
-          V1_LiteDataContractWithUserStatus[],
-          Map<string, ContractCreatedByUserDetails>,
-        ];
+      const [
+        pendingTasksData,
+        contractsForUser,
+        contractsCreatedByUserMap,
+        dataRequestsCreatedByUser,
+      ] = (yield Promise.all([
+        (async () => {
+          try {
+            const tasks = await flowResult(this.fetchPendingTasks(token));
+            const taskContractMap = await flowResult(
+              this.fetchPendingTaskContracts(token, tasks),
+            );
+            return { tasks, taskContractMap };
+          } catch (error) {
+            assertErrorThrown(error);
+            this.lakehouseEntitlementsStore.applicationStore.alertUnhandledError(
+              error,
+            );
+            return {
+              tasks: [] as V1_ContractUserEventRecord[],
+              taskContractMap: new Map<string, V1_LiteDataContract>(),
+            };
+          }
+        })(),
+        flowResult(this.fetchContractsForUser(token)),
+        flowResult(this.fetchContractsCreatedByUser(token)),
+        flowResult(this.fetchDataRequestsCreatedByUser(token)),
+      ])) as [
+        {
+          tasks: V1_ContractUserEventRecord[];
+          taskContractMap: Map<string, V1_LiteDataContract>;
+        },
+        V1_LiteDataContractWithUserStatus[],
+        Map<string, ContractCreatedByUserDetails>,
+        V1_DataRequestWithWorkflow[],
+      ];
 
       const allContracts: V1_LiteDataContract[] = [
         ...Array.from(pendingTasksData.taskContractMap.values()),
@@ -295,10 +321,12 @@ export class EntitlementsDashboardState {
       this.pendingTasks = filteredTasks;
       this.allContractsForUser = filteredContractsForUser;
       this.allContractsCreatedByUserMap = filteredCreatedByUserMap;
+      this.dataRequestsCreatedByUser = dataRequestsCreatedByUser;
 
       this.fetchingPendingTasksState.complete();
       this.fetchingContractsForUserState.complete();
       this.fetchingContractsByUserState.complete();
+      this.fetchingDataRequestsCreatedByUserState.complete();
     } catch (error) {
       assertErrorThrown(error);
       this.lakehouseEntitlementsStore.applicationStore.alertUnhandledError(
@@ -441,6 +469,29 @@ export class EntitlementsDashboardState {
     }
   }
 
+  *fetchDataRequestsCreatedByUser(
+    token: string | undefined,
+  ): GeneratorFn<V1_DataRequestWithWorkflow[]> {
+    try {
+      const raw =
+        (yield this.lakehouseEntitlementsStore.lakehouseContractServerClient.getDataAccessRequestsCreatedBy(
+          this.lakehouseEntitlementsStore.applicationStore.identityService
+            .currentUser,
+          token,
+        )) as PlainObject<V1_DataRequestsWithWorkflowResponse>;
+      return V1_deserializeDataRequestsWithWorkflowResponse(
+        raw,
+        this.lakehouseEntitlementsStore.applicationStore.pluginManager.getPureProtocolProcessorPlugins(),
+      );
+    } catch (error) {
+      assertErrorThrown(error);
+      this.lakehouseEntitlementsStore.applicationStore.notificationService.notifyError(
+        `Error fetching data requests created by user: ${error.message}`,
+      );
+      return [];
+    }
+  }
+
   *fetchContractDeploymentEnvironments(
     allContracts: V1_LiteDataContract[],
     token: string | undefined,
@@ -478,10 +529,10 @@ export class EntitlementsDashboardState {
     return didToEnvType;
   }
 
-  *getUnverifiedIngestDefinitions(
+  async getUnverifiedIngestDefinitions(
     contractId: string,
     token: string | undefined,
-  ): GeneratorFn<string[] | undefined> {
+  ): Promise<string[]> {
     const entitlementsStore = this.lakehouseEntitlementsStore;
     const baseStore = entitlementsStore.marketplaceBaseStore;
     const applicationStore = entitlementsStore.applicationStore;
@@ -493,7 +544,7 @@ export class EntitlementsDashboardState {
     const SDLC_DEPLOYMENT = 'alloy-git';
 
     try {
-      const liteContract = (yield (async () => {
+      const liteContract = await (async () => {
         try {
           const rawContractResponse = await contractClient.getDataContract(
             contractId,
@@ -512,7 +563,7 @@ export class EntitlementsDashboardState {
           assertErrorThrown(error);
           return undefined;
         }
-      })()) as V1_LiteDataContract | undefined;
+      })();
       if (!liteContract) {
         return [];
       }
@@ -525,7 +576,7 @@ export class EntitlementsDashboardState {
         return [];
       }
 
-      const dpDetails = (yield (async () => {
+      const dpDetails = await (async () => {
         try {
           const raw = await contractClient.getDataProductByIdAndDID(
             liteContract.resourceId,
@@ -539,7 +590,7 @@ export class EntitlementsDashboardState {
           assertErrorThrown(error);
           return undefined;
         }
-      })()) as V1_EntitlementsDataProductDetails | undefined;
+      })();
       if (!dpDetails) {
         return [];
       }
@@ -553,7 +604,7 @@ export class EntitlementsDashboardState {
         applicationStore.logService,
         baseStore.remoteEngine,
       );
-      yield graphManager.initialize(
+      await graphManager.initialize(
         {
           env: applicationStore.config.env,
           tabSize: DEFAULT_TAB_SIZE,
@@ -564,11 +615,11 @@ export class EntitlementsDashboardState {
         { engine: baseStore.remoteEngine },
       );
 
-      const v1DataProduct = (yield getDataProductFromDetails(
+      const v1DataProduct = await getDataProductFromDetails(
         dpDetails,
         graphManager,
         baseStore,
-      )) as V1_DataProduct | undefined;
+      );
       if (!v1DataProduct) {
         return [];
       }
@@ -584,10 +635,10 @@ export class EntitlementsDashboardState {
       }
 
       const ingestEnvironment =
-        (yield baseStore.lakehouseDataProductService.getOrFetchEnvironmentForDID(
+        await baseStore.lakehouseDataProductService.getOrFetchEnvironmentForDID(
           liteContract.deploymentId,
           token,
-        )) as IngestDeploymentServerConfig | undefined;
+        );
       const ingestServerUrl = ingestEnvironment?.ingestServerUrl;
       if (ingestServerUrl === undefined) {
         return [];
@@ -604,7 +655,7 @@ export class EntitlementsDashboardState {
       }));
 
       const ingestClient = baseStore.lakehouseIngestServerClient;
-      const settled = (yield Promise.all(
+      const settled = await Promise.all(
         specsToVerify.map(async (entry) => {
           try {
             await ingestClient.getIngestDefinitionDetail(
@@ -615,18 +666,100 @@ export class EntitlementsDashboardState {
             return undefined;
           } catch (error) {
             assertErrorThrown(error);
-            return entry.specPath;
+            if (
+              error instanceof NetworkClientError &&
+              error.response.status === HttpStatus.NOT_FOUND
+            ) {
+              return entry.specPath;
+            }
+            return undefined;
           }
         }),
-      )) as (string | undefined)[];
+      );
       return settled.filter(isNonNullable);
+    } catch (error) {
+      assertErrorThrown(error);
+      return [];
+    }
+  }
+
+  async getContractSyncErrors(
+    contractId: string,
+    token: string | undefined,
+  ): Promise<ContractErrorLayer | undefined> {
+    try {
+      const response =
+        (await this.lakehouseEntitlementsStore.lakehouseContractServerClient.getContractSyncStatus(
+          contractId,
+          token,
+        )) as LakehouseContractSyncStatusResponse;
+
+      const status = response.status.toUpperCase();
+
+      if (status === ContractSyncStatus.NEVER_SYNCED) {
+        return { title: 'Sync Error: Contract Never Synced' };
+      }
+
+      if (status === ContractSyncStatus.NOT_FULLY_SYNCED) {
+        const unsyncedUsers =
+          response.unsyncedUsers?.map((user) => user.username) ?? [];
+        const unsyncedAccessPoints =
+          response.unsyncedAccessPoints?.map(
+            (accessPoint) => accessPoint.accessPointName,
+          ) ?? [];
+        const unsyncedTargetAccounts = response.unsyncedTargetAccounts ?? [];
+
+        const syncGroupingLayers: ContractErrorLayer[] = [
+          { title: 'Users', errorItems: unsyncedUsers },
+          { title: 'Target Accounts', errorItems: unsyncedTargetAccounts },
+          { title: 'Access Points', errorItems: unsyncedAccessPoints },
+        ].filter((layer) => layer.errorItems.length > 0);
+
+        if (syncGroupingLayers.length === 0) {
+          return undefined;
+        }
+
+        return {
+          title: 'Unsynced Entities',
+          childLayers: syncGroupingLayers,
+        };
+      }
+
+      return undefined;
     } catch (error) {
       assertErrorThrown(error);
       return undefined;
     }
   }
 
-  private filterByUserEnvironment(
+  async getContractErrors(
+    contractId: string,
+    token: string | undefined,
+    checkSyncStatus = false,
+  ): Promise<ContractErrorLayer | undefined> {
+    const [unverifiedIngestDefinitions, syncErrorsLayer] = await Promise.all([
+      this.getUnverifiedIngestDefinitions(contractId, token),
+      checkSyncStatus
+        ? this.getContractSyncErrors(contractId, token)
+        : Promise.resolve(undefined),
+    ]);
+
+    const childLayers: ContractErrorLayer[] = [
+      unverifiedIngestDefinitions.length > 0
+        ? {
+            title: `Ingest${unverifiedIngestDefinitions.length === 1 ? '' : 's'} Not Found`,
+            errorItems: unverifiedIngestDefinitions,
+          }
+        : undefined,
+      syncErrorsLayer,
+    ].filter(isNonNullable);
+
+    return childLayers.length > 0
+      ? { title: 'Contract Errors', childLayers }
+      : undefined;
+  }
+
+  filterByUserEnvironment(
     pendingData: {
       tasks: V1_ContractUserEventRecord[];
       taskContractMap: Map<string, V1_LiteDataContract>;