@finos/legend-application-marketplace 0.2.13 → 0.2.15

package/src/pages/Lakehouse/entitlements/EntitlementsPendingContractsDashboard.tsx

@@ -14,15 +14,9 @@
  * limitations under the License.
  */
 
-import {
-  GraphManagerState,
-  V1_ContractState,
-  type V1_LiteDataContract,
-  V1_LiteDataContractWithUserStatus,
-} from '@finos/legend-graph';
+import { V1_LiteDataContractWithUserStatus } from '@finos/legend-graph';
 import {
   DataGrid,
-  type DataGridCellClickedEvent,
   type DataGridCellRendererParams,
   type DataGridColumnDefinition,
 } from '@finos/legend-lego/data-grid';
@@ -33,63 +27,84 @@ import {
   FormGroup,
   Switch,
 } from '@mui/material';
-import { useMemo, useState } from 'react';
-import type {
-  ContractCreatedByUserDetails,
-  EntitlementsDashboardState,
-} from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
+import { useEffect, useMemo, useState } from 'react';
+import type { EntitlementsDashboardState } from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
 import { useLegendMarketplaceBaseStore } from '../../../application/providers/LegendMarketplaceFrameworkProvider.js';
 import { observer } from 'mobx-react-lite';
 import { startCase } from '@finos/legend-shared';
 import { useAuth } from 'react-oidc-context';
 import {
+  type ContractErrorLayer,
   MultiUserRenderer,
   isContractInTerminalState,
   DataAccessRequestViewer,
   isApprovalStatusTerminal,
-  DataContractViewerState,
 } from '@finos/legend-extension-dsl-data-product';
-import {
-  generateContractPagePath,
-  generateLakehouseDataProductPath,
-} from '../../../__lib__/LegendMarketplaceNavigation.js';
 import type { LakehouseEntitlementsStore } from '../../../stores/lakehouse/entitlements/LakehouseEntitlementsStore.js';
 import { flowResult } from 'mobx';
-import { getCommonEntitlementsColDefs } from '../../../utils/EntitlementsUtils.js';
+import {
+  getCommonEntitlementsColDefs,
+  type EntitlementsRow,
+  getContractData,
+  getSelectedRowId,
+  getSelectedContractGuid,
+  getOpenTaskAssignees,
+  EntitlementsColumnHeader,
+  CONTRACT_STATE_DISPLAY_LABELS,
+  ENTITLEMENTS_DEFAULT_COL_DEF,
+  ROW_KIND_CONTRACT,
+  ROW_KIND_REQUEST,
+  TERMINAL_DATA_REQUEST_STATES,
+  UNKNOWN,
+  useSelectedViewerState,
+  useGetDataProductUrl,
+} from '../../../utils/EntitlementsUtils.js';
 
-const AssigneesCellRenderer = (props: {
-  dataContract:
-    | V1_LiteDataContractWithUserStatus
-    | ContractCreatedByUserDetails
-    | undefined;
-  entitlementsStore: LakehouseEntitlementsStore;
-}): React.ReactNode => {
-  const { dataContract, entitlementsStore } = props;
+const AssigneesCellRenderer = observer(
+  (props: {
+    row: EntitlementsRow | undefined;
+    entitlementsStore: LakehouseEntitlementsStore;
+  }): React.ReactNode => {
+    const { row, entitlementsStore } = props;
+    if (!row) {
+      return null;
+    }
 
-  const assignees =
-    (dataContract instanceof V1_LiteDataContractWithUserStatus
-      ? dataContract.pendingTaskWithAssignees?.assignees.toSorted()
-      : dataContract?.sortedAssigneeIds) ?? [];
+    let assignees: string[];
+    if (row.kind === ROW_KIND_CONTRACT) {
+      assignees =
+        (row.data instanceof V1_LiteDataContractWithUserStatus
+          ? row.data.pendingTaskWithAssignees?.assignees.toSorted()
+          : row.data.sortedAssigneeIds) ?? [];
+    } else {
+      assignees = getOpenTaskAssignees(row.data);
+    }
 
-  return (
-    <MultiUserRenderer
-      userIds={assignees}
-      applicationStore={entitlementsStore.applicationStore}
-      userSearchService={
-        entitlementsStore.marketplaceBaseStore.userSearchService
-      }
-      disableOnClick={true}
-      singleUserClassName="marketplace-lakehouse-entitlements__grid__user-display"
-    />
-  );
-};
+    return (
+      <MultiUserRenderer
+        userIds={assignees}
+        applicationStore={entitlementsStore.applicationStore}
+        userSearchService={
+          entitlementsStore.marketplaceBaseStore.userSearchService
+        }
+        disableOnClick={true}
+        singleUserClassName="marketplace-lakehouse-entitlements__grid__user-display"
+      />
+    );
+  },
+);
 
 export const EntitlementsPendingContractsDashboard = observer(
   (props: { dashboardState: EntitlementsDashboardState }): React.ReactNode => {
     const { dashboardState } = props;
-    const { allContractsForUser, allContractsCreatedByUser } = dashboardState;
+    const {
+      allContractsForUser,
+      allContractsCreatedByUser,
+      dataRequestsCreatedByUser,
+    } = dashboardState;
     const marketplaceBaseStore = useLegendMarketplaceBaseStore();
     const auth = useAuth();
+    const getDataProductUrl = useGetDataProductUrl();
 
     const myPendingContracts = useMemo(
       () =>
@@ -112,110 +127,110 @@ export const EntitlementsPendingContractsDashboard = observer(
       [allContractsCreatedByUser, myPendingContractIds],
     );
 
-    const [selectedContract, setSelectedContract] = useState<
-      V1_LiteDataContract | undefined
+    const pendingDataRequests = useMemo(
+      () =>
+        (dataRequestsCreatedByUser ?? []).filter(
+          (dr) => !TERMINAL_DATA_REQUEST_STATES.has(dr.dataRequest.state),
+        ),
+      [dataRequestsCreatedByUser],
+    );
+
+    const [selectedRow, setSelectedRow] = useState<
+      EntitlementsRow | undefined
     >();
-    const [unverifiedIngestDefinitions, setUnverifiedIngestDefinitions] =
-      useState<string[] | undefined>(undefined);
-    const [ingestVerificationInProgress, setIngestVerificationInProgress] =
-      useState(false);
+    const [contractErrors, setContractErrors] = useState<
+      ContractErrorLayer | undefined
+    >(undefined);
+
+    const selectedRowId = getSelectedRowId(selectedRow);
+    const selectedViewerState = useSelectedViewerState(
+      selectedRow,
+      selectedRowId,
+    );
+
     const [showForOthers, setShowForOthers] = useState<boolean>(
       myPendingContracts.length === 0 && pendingContractsForOthers.length > 0,
     );
 
-    const handleCellClicked = async (
-      event: DataGridCellClickedEvent<
-        V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
-      >,
-    ) => {
-      const contract = event.data?.contractResultLite;
-      setSelectedContract(contract);
-      setUnverifiedIngestDefinitions(undefined);
-      if (contract !== undefined) {
-        setIngestVerificationInProgress(true);
-        const result = await flowResult(
-          dashboardState.getUnverifiedIngestDefinitions(
-            contract.guid,
-            auth.user?.access_token,
-          ),
-        );
-        setUnverifiedIngestDefinitions(result);
-        setIngestVerificationInProgress(false);
+    useEffect(() => {
+      setContractErrors(undefined);
+      if (selectedRow?.kind === ROW_KIND_CONTRACT) {
+        const contract = selectedRow.data.contractResultLite;
+        dashboardState
+          .getContractErrors(contract.guid, auth.user?.access_token)
+          .then((result) => setContractErrors(result))
+          .catch(() => setContractErrors(undefined));
       }
-    };
+    }, [selectedRow, auth.user?.access_token, dashboardState]);
 
-    const defaultColDef: DataGridColumnDefinition<
-      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
-    > = useMemo(
-      () => ({
-        minWidth: 50,
-        sortable: true,
-        resizable: true,
-        flex: 1,
-      }),
-      [],
-    );
+    const selectedContractGuid = getSelectedContractGuid(selectedRow);
 
-    const colDefs: DataGridColumnDefinition<
-      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
-    >[] = useMemo(
+    const colDefs: DataGridColumnDefinition<EntitlementsRow>[] = useMemo(
       () => [
         ...getCommonEntitlementsColDefs(dashboardState),
         {
-          headerName: 'State',
+          headerName: EntitlementsColumnHeader.STATE,
           valueGetter: (params) => {
-            const state = params.data?.contractResultLite.state;
-            switch (state) {
-              case V1_ContractState.PENDING_DATA_OWNER_APPROVAL:
-                return 'Data Owner Approval';
-              case V1_ContractState.OPEN_FOR_PRIVILEGE_MANAGER_APPROVAL:
-                return 'Privilege Manager Approval';
-              default:
-                return state ? startCase(state) : 'Unknown';
+            if (!params.data) {
+              return UNKNOWN;
+            }
+            if (params.data.kind === ROW_KIND_CONTRACT) {
+              const state = getContractData(params.data)?.state;
+              return state
+                ? (CONTRACT_STATE_DISPLAY_LABELS[state] ?? startCase(state))
+                : UNKNOWN;
             }
+            return startCase(params.data.data.dataRequest.state);
           },
         },
         {
-          headerName: 'Business Justification',
-          valueGetter: (p) => p.data?.contractResultLite.description,
-        },
-        {
-          headerName: 'Assignees',
+          headerName: EntitlementsColumnHeader.ASSIGNEES,
           colId: 'assignees',
           valueGetter: (params) => {
-            const assignees =
-              (params.data instanceof V1_LiteDataContractWithUserStatus
-                ? params.data.pendingTaskWithAssignees?.assignees.toSorted()
-                : params.data?.sortedAssigneeIds) ?? [];
-            return assignees.length > 0 ? assignees.join(', ') : 'Unknown';
+            if (!params.data) {
+              return UNKNOWN;
+            }
+            if (params.data.kind === ROW_KIND_CONTRACT) {
+              const assignees =
+                (params.data.data instanceof V1_LiteDataContractWithUserStatus
+                  ? params.data.data.pendingTaskWithAssignees?.assignees.toSorted()
+                  : params.data.data.sortedAssigneeIds) ?? [];
+              return assignees.length > 0 ? assignees.join(', ') : UNKNOWN;
+            }
+            const openAssignees = getOpenTaskAssignees(params.data.data);
+            return openAssignees.length > 0 ? openAssignees.join(', ') : 'None';
           },
           cellRenderer: (
-            params: DataGridCellRendererParams<
-              V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
-            >,
+            params: DataGridCellRendererParams<EntitlementsRow>,
           ) => (
             <AssigneesCellRenderer
-              dataContract={params.data}
+              row={params.data}
               entitlementsStore={dashboardState.lakehouseEntitlementsStore}
             />
           ),
         },
-        {
-          hide: true,
-          headerName: 'Contract ID',
-          valueGetter: (p) => p.data?.contractResultLite.guid,
-        },
       ],
       [dashboardState],
     );
 
-    const gridRowData = useMemo(
-      () =>
-        showForOthers
-          ? [...myPendingContracts, ...pendingContractsForOthers]
-          : myPendingContracts,
-      [showForOthers, myPendingContracts, pendingContractsForOthers],
-    );
+    const gridRowData: EntitlementsRow[] = useMemo(() => {
+      const contracts = showForOthers
+        ? [...myPendingContracts, ...pendingContractsForOthers]
+        : myPendingContracts;
+      return [
+        ...contracts.map(
+          (c): EntitlementsRow => ({ kind: ROW_KIND_CONTRACT, data: c }),
+        ),
+        ...pendingDataRequests.map(
+          (r): EntitlementsRow => ({ kind: ROW_KIND_REQUEST, data: r }),
+        ),
+      ];
+    }, [
+      showForOthers,
+      myPendingContracts,
+      pendingContractsForOthers,
+      pendingDataRequests,
+    ]);
 
     return (
       <Box className="marketplace-lakehouse-entitlements__pending-contracts">
@@ -252,61 +267,39 @@ export const EntitlementsPendingContractsDashboard = observer(
             suppressFieldDotNotation={true}
             suppressContextMenu={false}
             columnDefs={colDefs}
-            onCellClicked={(
-              event: DataGridCellClickedEvent<
-                V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
-              >,
-            ) =>
-              // eslint-disable-next-line no-void
-              void handleCellClicked(event)
-            }
-            defaultColDef={defaultColDef}
+            onCellClicked={(event) => event.data && setSelectedRow(event.data)}
+            defaultColDef={ENTITLEMENTS_DEFAULT_COL_DEF}
             rowHeight={45}
-            overlayNoRowsTemplate="You have no pending contracts"
-            loading={dashboardState.fetchingContractsForUserState.isInProgress}
-            overlayLoadingTemplate="Loading contracts"
+            overlayNoRowsTemplate="You have no pending contracts or data requests"
+            loading={
+              dashboardState.fetchingContractsForUserState.isInProgress ||
+              dashboardState.fetchingDataRequestsCreatedByUserState.isInProgress
+            }
+            overlayLoadingTemplate="Loading"
           />
         </Box>
-        {selectedContract !== undefined && !ingestVerificationInProgress && (
+        {selectedRow !== undefined && selectedViewerState !== undefined && (
           <DataAccessRequestViewer
             open={true}
             onClose={() => {
-              setSelectedContract(undefined);
-              setUnverifiedIngestDefinitions(undefined);
-              setIngestVerificationInProgress(false);
-            }}
-            unverifiedIngestDefinitions={unverifiedIngestDefinitions}
-            viewerState={
-              new DataContractViewerState(
-                selectedContract,
-                (contractId: string, taskId: string) =>
-                  marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
-                    generateContractPagePath(contractId, taskId),
-                  ),
-                undefined,
-                marketplaceBaseStore.applicationStore,
-                marketplaceBaseStore.lakehouseContractServerClient,
-                new GraphManagerState(
-                  marketplaceBaseStore.applicationStore.pluginManager,
-                  marketplaceBaseStore.applicationStore.logService,
-                ),
-                marketplaceBaseStore.userSearchService,
-              )
-            }
-            onRefresh={async () => {
-              await flowResult(
-                dashboardState.updateContract(
-                  selectedContract.guid,
-                  auth.user?.access_token,
-                ),
-              );
+              setSelectedRow(undefined);
+              setContractErrors(undefined);
             }}
-            getDataProductUrl={(dataProductId: string, deploymentId: number) =>
-              marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
-                generateLakehouseDataProductPath(dataProductId, deploymentId),
-              )
-            }
-            //Derives environment from the fact that other environments are filtered out
+            contractErrors={contractErrors}
+            viewerState={selectedViewerState}
+            {...(selectedContractGuid
+              ? {
+                  onRefresh: async () => {
+                    await flowResult(
+                      dashboardState.updateContract(
+                        selectedContractGuid,
+                        auth.user?.access_token,
+                      ),
+                    );
+                  },
+                }
+              : {})}
+            getDataProductUrl={getDataProductUrl}
             dataProductEnvironment={
               marketplaceBaseStore.envState.lakehouseEnvironment
             }

package/src/pages/Lakehouse/entitlements/EntitlementsPendingTasksDashboard.tsx

@@ -55,6 +55,7 @@ import { observer } from 'mobx-react-lite';
 import type { LegendMarketplaceBaseStore } from '../../../stores/LegendMarketplaceBaseStore.js';
 import { startCase } from '@finos/legend-shared';
 import {
+  type ContractErrorLayer,
   UserRenderer,
   getOrganizationalScopeTypeName,
   getOrganizationalScopeTypeDetails,
@@ -289,10 +290,9 @@ export const EntitlementsPendingTasksDashboard = observer(
     >();
     const [selectedContractTargetUser, setSelectedContractTargetUser] =
       useState<string | undefined>();
-    const [unverifiedIngestDefinitions, setUnverifiedIngestDefinitions] =
-      useState<string[] | undefined>(undefined);
-    const [ingestVerificationInProgress, setIngestVerificationInProgress] =
-      useState(false);
+    const [contractErrors, setContractErrors] = useState<
+      ContractErrorLayer | undefined
+    >(undefined);
 
     const auth = useAuth();
 
@@ -322,17 +322,13 @@ export const EntitlementsPendingTasksDashboard = observer(
         );
         setSelectedContract(contract);
         setSelectedContractTargetUser(event.data?.consumer);
-        setUnverifiedIngestDefinitions(undefined);
+        setContractErrors(undefined);
         if (contract !== undefined) {
-          setIngestVerificationInProgress(true);
-          const result = await flowResult(
-            dashboardState.getUnverifiedIngestDefinitions(
-              contract.guid,
-              auth.user?.access_token,
-            ),
+          const result = await dashboardState.getContractErrors(
+            contract.guid,
+            auth.user?.access_token,
           );
-          setUnverifiedIngestDefinitions(result);
-          setIngestVerificationInProgress(false);
+          setContractErrors(result);
         }
       }
     };
@@ -859,15 +855,14 @@ export const EntitlementsPendingTasksDashboard = observer(
           pendingTaskContracts={pendingTaskContracts}
           marketplaceBaseStore={marketplaceBaseStore}
         />
-        {selectedContract !== undefined && !ingestVerificationInProgress && (
+        {selectedContract !== undefined && (
           <DataAccessRequestViewer
             open={true}
             onClose={() => {
               setSelectedContract(undefined);
-              setUnverifiedIngestDefinitions(undefined);
-              setIngestVerificationInProgress(false);
+              setContractErrors(undefined);
             }}
-            unverifiedIngestDefinitions={unverifiedIngestDefinitions}
+            contractErrors={contractErrors}
             viewerState={
               new DataContractViewerState(
                 selectedContract,