@finos/legend-application-marketplace 0.2.26 → 0.2.28

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

@@ -15,9 +15,8 @@
  */
 
 import {
-  type V1_ContractUserEventRecord,
-  type V1_LiteDataContract,
-  GraphManagerState,
+  type V1_PendingTaskRecord,
+  type V1_LiteAccessRequest,
   V1_ApprovalType,
   V1_ResourceType,
 } from '@finos/legend-graph';
@@ -42,7 +41,6 @@ import {
   Tooltip,
 } from '@mui/material';
 import { useCallback, useMemo, useState, type ChangeEvent } from 'react';
-import type { EntitlementsDashboardState } from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
 import { useLegendMarketplaceBaseStore } from '../../../application/providers/LegendMarketplaceFrameworkProvider.js';
 import {
   CubesLoadingIndicator,
@@ -59,26 +57,35 @@ import {
   UserRenderer,
   getOrganizationalScopeTypeName,
   getOrganizationalScopeTypeDetails,
+  stringifyOrganizationalScope,
   DataAccessRequestViewer,
-  DataContractViewerState,
 } from '@finos/legend-extension-dsl-data-product';
-import {
-  generateContractPagePath,
-  generateLakehouseDataProductPath,
-} from '../../../__lib__/LegendMarketplaceNavigation.js';
 import {
   CONTRACT_ACTION,
   LegendMarketplaceTelemetryHelper,
 } from '../../../__lib__/LegendMarketplaceTelemetryHelper.js';
 import { formatOrderDate } from '../../../stores/orders/OrderHelpers.js';
+import {
+  ContractCreatedByUserDetails,
+  type EntitlementsDashboardState,
+} from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
+import {
+  type EntitlementsRow,
+  ROW_KIND_CONTRACT,
+  ROW_KIND_REQUEST,
+  getSelectedRowId,
+  getSelectedContractGuid,
+  useSelectedViewerState,
+  useGetDataProductUrl,
+} from '../../../utils/EntitlementsUtils.js';
 
 const EntitlementsDashboardActionModal = (props: {
   open: boolean;
-  selectedTasks: V1_ContractUserEventRecord[];
+  selectedTasks: V1_PendingTaskRecord[];
   dashboardState: EntitlementsDashboardState;
   onClose: () => void;
   action: 'approve' | 'deny' | undefined;
-  pendingTaskContracts: V1_LiteDataContract[];
+  pendingTaskContracts: V1_LiteAccessRequest[];
   marketplaceBaseStore: LegendMarketplaceBaseStore;
 }) => {
   const {
@@ -94,7 +101,7 @@ const EntitlementsDashboardActionModal = (props: {
   const auth = useAuth();
   const [isLoading, setIsLoading] = useState(false);
   const [errorMessages, setErrorMessages] = useState<
-    [V1_ContractUserEventRecord, string][]
+    [V1_PendingTaskRecord, string][]
   >([]);
   const [successCount, setSuccessCount] = useState(0);
 
@@ -188,7 +195,7 @@ const EntitlementsDashboardActionModal = (props: {
               </Box>
             )}
             {errorMessages.map(([task, errorMessage]) => {
-              const contractId = task.dataContractId;
+              const contractId = task.accessRequestId;
               const contract = pendingTaskContracts.find(
                 (c) => c.guid === contractId,
               );
@@ -285,8 +292,8 @@ export const EntitlementsPendingTasksDashboard = observer(
       'approve' | 'deny' | undefined
     >();
     const selectedTaskIdsSet = dashboardState.selectedTaskIds;
-    const [selectedContract, setSelectedContract] = useState<
-      V1_LiteDataContract | undefined
+    const [selectedRow, setSelectedRow] = useState<
+      EntitlementsRow | undefined
     >();
     const [selectedContractTargetUser, setSelectedContractTargetUser] =
       useState<string | undefined>();
@@ -295,16 +302,21 @@ export const EntitlementsPendingTasksDashboard = observer(
     >(undefined);
 
     const auth = useAuth();
+    const getDataProductUrl = useGetDataProductUrl();
+
+    const selectedRowId = getSelectedRowId(selectedRow);
+    const selectedViewerState = useSelectedViewerState(
+      selectedRow,
+      selectedRowId,
+    );
+    const selectedContractGuid = getSelectedContractGuid(selectedRow);
 
     // Callbacks
 
     const handleFirstDataRendered = (
-      event: DataGridFirstDataRenderedEvent<
-        V1_ContractUserEventRecord,
-        unknown
-      >,
+      event: DataGridFirstDataRenderedEvent<V1_PendingTaskRecord, unknown>,
     ) => {
-      const nodesToSelect: DataGridIRowNode<V1_ContractUserEventRecord>[] = [];
+      const nodesToSelect: DataGridIRowNode<V1_PendingTaskRecord>[] = [];
       event.api.forEachNode((node) => {
         if (node.data && selectedTaskIdsSet.has(node.data.taskId)) {
           nodesToSelect.push(node);
@@ -313,22 +325,39 @@ export const EntitlementsPendingTasksDashboard = observer(
       event.api.setNodesSelected({ nodes: nodesToSelect, newValue: true });
     };
 
-    const handleCellClicked = async (
-      event: DataGridCellClickedEvent<V1_ContractUserEventRecord, unknown>,
+    const handleCellClicked = (
+      event: DataGridCellClickedEvent<V1_PendingTaskRecord, unknown>,
     ) => {
       if (event.colDef.colId !== 'selection') {
-        const contract = pendingTaskContracts.find(
-          (c) => c.guid === event.data?.dataContractId,
-        );
-        setSelectedContract(contract);
         setSelectedContractTargetUser(event.data?.consumer);
-        setContractErrors(undefined);
-        if (contract !== undefined) {
-          const result = await dashboardState.getContractErrors(
-            contract.guid,
-            auth.user?.access_token,
+
+        const dataRequestId = event.data?.accessRequestId;
+        const isDataRequest =
+          dataRequestId !== undefined &&
+          dashboardState.pendingDataRequestIds.has(dataRequestId);
+
+        if (isDataRequest && dataRequestId) {
+          const detail =
+            dashboardState.pendingDataRequestDetailsMap.get(dataRequestId);
+          if (detail) {
+            setContractErrors(undefined);
+            setSelectedRow({ kind: ROW_KIND_REQUEST, data: detail });
+          }
+        } else {
+          const contract = pendingTaskContracts.find(
+            (c) => c.guid === event.data?.accessRequestId,
           );
-          setContractErrors(result);
+          if (contract) {
+            setContractErrors(undefined);
+            setSelectedRow({
+              kind: ROW_KIND_CONTRACT,
+              data: new ContractCreatedByUserDetails(contract),
+            });
+            dashboardState
+              .getContractErrors(contract.guid, auth.user?.access_token)
+              .then((result) => setContractErrors(result))
+              .catch(() => setContractErrors(undefined));
+          }
         }
       }
     };
@@ -345,7 +374,7 @@ export const EntitlementsPendingTasksDashboard = observer(
     );
 
     const CustomSelectionRenderer = useCallback(
-      (params: DataGridCellRendererParams<V1_ContractUserEventRecord>) => {
+      (params: DataGridCellRendererParams<V1_PendingTaskRecord>) => {
         const handleChange = (_: ChangeEvent<HTMLInputElement>) => {
           if (params.data) {
             const newSet = new Set<string>(selectedTaskIdsSet);
@@ -372,8 +401,8 @@ export const EntitlementsPendingTasksDashboard = observer(
 
     const CustomSelectionHeaderRenderer = useCallback(
       (_props: {
-        params: DataGridCustomHeaderProps<V1_ContractUserEventRecord>;
-        taskSet: V1_ContractUserEventRecord[];
+        params: DataGridCustomHeaderProps<V1_PendingTaskRecord>;
+        taskSet: V1_PendingTaskRecord[];
       }) => {
         const { taskSet } = _props;
         const checked =
@@ -410,213 +439,231 @@ export const EntitlementsPendingTasksDashboard = observer(
       [selectedTaskIdsSet, dashboardState],
     );
 
-    const colDefs: DataGridColumnDefinition<V1_ContractUserEventRecord>[] =
-      useMemo(
-        () => [
-          {
-            headerName: 'Date Created',
-            colId: 'dateCreated',
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const createdAt = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.createdAt;
-              return formatOrderDate(createdAt) ?? 'Unknown';
-            },
-            sortable: true,
-            sort: 'desc',
-            comparator: (_, __, val1, val2) => {
-              const contractId1 = val1.data?.dataContractId;
-              const contractId2 = val2.data?.dataContractId;
-              const createdAt1 = pendingTaskContracts.find(
-                (c) => c.guid === contractId1,
-              )?.createdAt;
-              const createdAt2 = pendingTaskContracts.find(
-                (c) => c.guid === contractId2,
-              )?.createdAt;
-              const dateA = createdAt1 ? new Date(createdAt1).getTime() : 0;
-              const dateB = createdAt2 ? new Date(createdAt2).getTime() : 0;
-              return dateA - dateB;
-            },
+    const colDefs: DataGridColumnDefinition<V1_PendingTaskRecord>[] = useMemo(
+      () => [
+        {
+          headerName: 'Date Created',
+          colId: 'dateCreated',
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const createdAt = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.createdAt;
+            return formatOrderDate(createdAt) ?? 'Unknown';
           },
-          {
-            minWidth: 25,
-            sortable: true,
-            resizable: true,
-            colId: 'consumerType',
-            headerName: 'Consumer Type',
-            flex: 1,
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const consumer = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.consumer;
-              const typeName = consumer
-                ? getOrganizationalScopeTypeName(
-                    consumer,
-                    dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
-                  )
-                : undefined;
-              return typeName ?? 'Unknown';
-            },
-            cellRenderer: (
-              params: DataGridCellRendererParams<V1_ContractUserEventRecord>,
-            ) => {
-              const contractId = params.data?.dataContractId;
-              const consumer = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.consumer;
-              const typeName = consumer
-                ? getOrganizationalScopeTypeName(
-                    consumer,
-                    dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
-                  )
-                : undefined;
-              const typeDetails = consumer
-                ? getOrganizationalScopeTypeDetails(
-                    consumer,
-                    dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
-                  )
-                : undefined;
-              return (
-                <>
-                  {typeName ?? 'Unknown'}
-                  {typeDetails !== undefined && (
-                    <Tooltip
-                      className="marketplace-lakehouse-entitlements__grid__consumer-type__tooltip__icon"
-                      title={typeDetails}
-                    >
-                      <InfoCircleIcon />
-                    </Tooltip>
-                  )}
-                </>
-              );
-            },
+          sortable: true,
+          sort: 'desc',
+          comparator: (_, __, val1, val2) => {
+            const contractId1 = val1.data?.accessRequestId;
+            const contractId2 = val2.data?.accessRequestId;
+            const createdAt1 = pendingTaskContracts.find(
+              (c) => c.guid === contractId1,
+            )?.createdAt;
+            const createdAt2 = pendingTaskContracts.find(
+              (c) => c.guid === contractId2,
+            )?.createdAt;
+            const dateA = createdAt1 ? new Date(createdAt1).getTime() : 0;
+            const dateB = createdAt2 ? new Date(createdAt2).getTime() : 0;
+            return dateA - dateB;
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            colId: 'targetUser',
-            headerName: 'Target User',
-            flex: 1,
-            valueGetter: (params) => {
-              return params.data?.consumer ?? 'Unknown';
-            },
-            cellRenderer: (
-              params: DataGridCellRendererParams<V1_ContractUserEventRecord>,
-            ) => {
-              return (
-                <UserRenderer
-                  userId={params.data?.consumer}
-                  applicationStore={marketplaceBaseStore.applicationStore}
-                  userSearchService={marketplaceBaseStore.userSearchService}
-                  disableOnClick={true}
-                  className="marketplace-lakehouse-entitlements__grid__user-display"
-                />
-              );
-            },
+        },
+        {
+          minWidth: 25,
+          sortable: true,
+          resizable: true,
+          colId: 'consumerType',
+          headerName: 'Consumer Type',
+          flex: 1,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const consumer = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.consumer;
+            const typeName = consumer
+              ? getOrganizationalScopeTypeName(
+                  consumer,
+                  dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
+                )
+              : undefined;
+            return typeName ?? 'Unknown';
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            colId: 'requester',
-            headerName: 'Requester',
-            flex: 1,
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const requester = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.createdBy;
-              return requester ?? 'Unknown';
-            },
-            cellRenderer: (
-              params: DataGridCellRendererParams<V1_ContractUserEventRecord>,
-            ) => {
-              const contractId = params.data?.dataContractId;
-              const requester = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.createdBy;
-              return requester ? (
-                <UserRenderer
-                  userId={requester}
-                  applicationStore={marketplaceBaseStore.applicationStore}
-                  userSearchService={marketplaceBaseStore.userSearchService}
-                  disableOnClick={true}
-                  className="marketplace-lakehouse-entitlements__grid__user-display"
-                />
-              ) : (
-                <>Unknown</>
-              );
-            },
+          cellRenderer: (
+            params: DataGridCellRendererParams<V1_PendingTaskRecord>,
+          ) => {
+            const contractId = params.data?.accessRequestId;
+            const consumer = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.consumer;
+            const typeName = consumer
+              ? getOrganizationalScopeTypeName(
+                  consumer,
+                  dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
+                )
+              : undefined;
+            const typeDetails = consumer
+              ? getOrganizationalScopeTypeDetails(
+                  consumer,
+                  dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
+                )
+              : undefined;
+            return (
+              <>
+                {typeName ?? 'Unknown'}
+                {typeDetails !== undefined && (
+                  <Tooltip
+                    className="marketplace-lakehouse-entitlements__grid__consumer-type__tooltip__icon"
+                    title={typeDetails}
+                  >
+                    <InfoCircleIcon />
+                  </Tooltip>
+                )}
+              </>
+            );
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            headerName: 'Target Data Product',
-            flex: 1,
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const contract = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              );
-              return contract?.resourceId ?? 'Unknown';
-            },
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          colId: 'targetUser',
+          headerName: 'Target User',
+          flex: 1,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const consumer = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.consumer;
+            return consumer
+              ? stringifyOrganizationalScope(
+                  consumer,
+                  dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
+                )
+              : 'Unknown';
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            headerName: 'Target Access Point Group',
-            flex: 1,
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const contract = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              );
-              const accessPointGroup =
-                contract?.resourceType === V1_ResourceType.ACCESS_POINT_GROUP
-                  ? contract.accessPointGroup
-                  : `${contract?.accessPointGroup ?? 'Unknown'} (${contract?.resourceType ?? 'Unknown Type'})`;
-              return accessPointGroup ?? 'Unknown';
-            },
+          cellRenderer: (
+            params: DataGridCellRendererParams<V1_PendingTaskRecord>,
+          ) => {
+            const contractId = params.data?.accessRequestId;
+            const consumer = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.consumer;
+            const userId = consumer
+              ? stringifyOrganizationalScope(
+                  consumer,
+                  dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins(),
+                )
+              : undefined;
+            return (
+              <UserRenderer
+                userId={userId}
+                applicationStore={marketplaceBaseStore.applicationStore}
+                userSearchService={marketplaceBaseStore.userSearchService}
+                disableOnClick={true}
+                className="marketplace-lakehouse-entitlements__grid__user-display"
+              />
+            );
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            headerName: 'Business Justification',
-            flex: 2,
-            valueGetter: (params) => {
-              const contractId = params.data?.dataContractId;
-              const businessJustification = pendingTaskContracts.find(
-                (c) => c.guid === contractId,
-              )?.description;
-              return businessJustification ?? 'Unknown';
-            },
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          colId: 'requester',
+          headerName: 'Requester',
+          flex: 1,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const requester = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.createdBy;
+            return requester ?? 'Unknown';
           },
-          {
-            minWidth: 50,
-            sortable: true,
-            resizable: true,
-            hide: true,
-            headerName: 'Contract ID',
-            flex: 2,
-            valueGetter: (params) => params.data?.dataContractId ?? 'Unknown',
+          cellRenderer: (
+            params: DataGridCellRendererParams<V1_PendingTaskRecord>,
+          ) => {
+            const contractId = params.data?.accessRequestId;
+            const requester = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.createdBy;
+            return requester ? (
+              <UserRenderer
+                userId={requester}
+                applicationStore={marketplaceBaseStore.applicationStore}
+                userSearchService={marketplaceBaseStore.userSearchService}
+                disableOnClick={true}
+                className="marketplace-lakehouse-entitlements__grid__user-display"
+              />
+            ) : (
+              <>Unknown</>
+            );
           },
-        ],
-        [
-          dashboardState.lakehouseEntitlementsStore.applicationStore
-            .pluginManager,
-          marketplaceBaseStore.applicationStore,
-          marketplaceBaseStore.userSearchService,
-          pendingTaskContracts,
-        ],
-      );
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          headerName: 'Target Data Product',
+          flex: 1,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const contract = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            );
+            return contract?.resourceId ?? 'Unknown';
+          },
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          headerName: 'Target Access Point Group',
+          flex: 1,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const contract = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            );
+            const accessPointGroup =
+              contract?.resourceType === V1_ResourceType.ACCESS_POINT_GROUP
+                ? contract.accessPointGroup
+                : `${contract?.accessPointGroup ?? 'Unknown'} (${contract?.resourceType ?? 'Unknown Type'})`;
+            return accessPointGroup ?? 'Unknown';
+          },
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          headerName: 'Business Justification',
+          flex: 2,
+          valueGetter: (params) => {
+            const contractId = params.data?.accessRequestId;
+            const businessJustification = pendingTaskContracts.find(
+              (c) => c.guid === contractId,
+            )?.description;
+            return businessJustification ?? 'Unknown';
+          },
+        },
+        {
+          minWidth: 50,
+          sortable: true,
+          resizable: true,
+          hide: true,
+          headerName: 'Contract ID',
+          flex: 2,
+          valueGetter: (params) => params.data?.accessRequestId ?? 'Unknown',
+        },
+      ],
+      [
+        dashboardState.lakehouseEntitlementsStore.applicationStore
+          .pluginManager,
+        marketplaceBaseStore.applicationStore,
+        marketplaceBaseStore.userSearchService,
+        pendingTaskContracts,
+      ],
+    );
 
-    const privilegeManagerColDefs: DataGridColumnDefinition<V1_ContractUserEventRecord>[] =
+    const privilegeManagerColDefs: DataGridColumnDefinition<V1_PendingTaskRecord>[] =
       useMemo(
         () => [
           {
@@ -625,7 +672,7 @@ export const EntitlementsPendingTasksDashboard = observer(
             width: 50,
             cellRenderer: CustomSelectionRenderer,
             headerComponent: (
-              params: DataGridCustomHeaderProps<V1_ContractUserEventRecord>,
+              params: DataGridCustomHeaderProps<V1_PendingTaskRecord>,
             ) => (
               <CustomSelectionHeaderRenderer
                 params={params}
@@ -644,7 +691,7 @@ export const EntitlementsPendingTasksDashboard = observer(
         ],
       );
 
-    const dataOwnerColDefs: DataGridColumnDefinition<V1_ContractUserEventRecord>[] =
+    const dataOwnerColDefs: DataGridColumnDefinition<V1_PendingTaskRecord>[] =
       useMemo(
         () => [
           {
@@ -653,7 +700,7 @@ export const EntitlementsPendingTasksDashboard = observer(
             width: 50,
             cellRenderer: CustomSelectionRenderer,
             headerComponent: (
-              params: DataGridCustomHeaderProps<V1_ContractUserEventRecord>,
+              params: DataGridCustomHeaderProps<V1_PendingTaskRecord>,
             ) => (
               <CustomSelectionHeaderRenderer
                 params={params}
@@ -672,7 +719,7 @@ export const EntitlementsPendingTasksDashboard = observer(
         ],
       );
 
-    const otherTasksColDefs: DataGridColumnDefinition<V1_ContractUserEventRecord>[] =
+    const otherTasksColDefs: DataGridColumnDefinition<V1_PendingTaskRecord>[] =
       useMemo(
         () => [
           {
@@ -681,7 +728,7 @@ export const EntitlementsPendingTasksDashboard = observer(
             width: 50,
             cellRenderer: CustomSelectionRenderer,
             headerComponent: (
-              params: DataGridCustomHeaderProps<V1_ContractUserEventRecord>,
+              params: DataGridCustomHeaderProps<V1_PendingTaskRecord>,
             ) => (
               <CustomSelectionHeaderRenderer
                 params={params}
@@ -749,17 +796,9 @@ export const EntitlementsPendingTasksDashboard = observer(
                   rowHeight={45}
                   rowSelection={rowSelection}
                   onFirstDataRendered={handleFirstDataRendered}
-                  onCellClicked={(
-                    event: DataGridCellClickedEvent<
-                      V1_ContractUserEventRecord,
-                      unknown
-                    >,
-                  ) =>
-                    // eslint-disable-next-line no-void
-                    void handleCellClicked(event)
-                  }
+                  onCellClicked={handleCellClicked}
                   columnDefs={privilegeManagerColDefs}
-                  overlayNoRowsTemplate="You have no contracts to approve as a Privilege Manager"
+                  overlayNoRowsTemplate="You have no contracts or data requests to approve as a Privilege Manager"
                   loading={loading}
                   overlayLoadingTemplate="Loading contracts"
                 />
@@ -792,17 +831,9 @@ export const EntitlementsPendingTasksDashboard = observer(
                   rowHeight={45}
                   rowSelection={rowSelection}
                   onFirstDataRendered={handleFirstDataRendered}
-                  onCellClicked={(
-                    event: DataGridCellClickedEvent<
-                      V1_ContractUserEventRecord,
-                      unknown
-                    >,
-                  ) =>
-                    // eslint-disable-next-line no-void
-                    void handleCellClicked(event)
-                  }
+                  onCellClicked={handleCellClicked}
                   columnDefs={dataOwnerColDefs}
-                  overlayNoRowsTemplate="You have no contracts to approve as a Data Owner"
+                  overlayNoRowsTemplate="You have no contracts or data requests to approve as a Data Owner"
                   loading={loading}
                   overlayLoadingTemplate="Loading contracts"
                 />
@@ -824,15 +855,7 @@ export const EntitlementsPendingTasksDashboard = observer(
                     rowHeight={45}
                     rowSelection={rowSelection}
                     onFirstDataRendered={handleFirstDataRendered}
-                    onCellClicked={(
-                      event: DataGridCellClickedEvent<
-                        V1_ContractUserEventRecord,
-                        unknown
-                      >,
-                    ) =>
-                      // eslint-disable-next-line no-void
-                      void handleCellClicked(event)
-                    }
+                    onCellClicked={handleCellClicked}
                     columnDefs={otherTasksColDefs}
                     loading={loading}
                     overlayLoadingTemplate="Loading contracts"
@@ -855,44 +878,28 @@ export const EntitlementsPendingTasksDashboard = observer(
           pendingTaskContracts={pendingTaskContracts}
           marketplaceBaseStore={marketplaceBaseStore}
         />
-        {selectedContract !== undefined && (
+        {selectedRow !== undefined && selectedViewerState !== undefined && (
           <DataAccessRequestViewer
             open={true}
             onClose={() => {
-              setSelectedContract(undefined);
+              setSelectedRow(undefined);
               setContractErrors(undefined);
             }}
             contractErrors={contractErrors}
-            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,
-                ),
-              );
-            }}
-            getDataProductUrl={(dataProductId: string, deploymentId: number) =>
-              marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
-                generateLakehouseDataProductPath(dataProductId, deploymentId),
-              )
-            }
+            viewerState={selectedViewerState}
+            {...(selectedContractGuid
+              ? {
+                  onRefresh: async () => {
+                    await flowResult(
+                      dashboardState.updateContract(
+                        selectedContractGuid,
+                        auth.user?.access_token,
+                      ),
+                    );
+                  },
+                }
+              : {})}
+            getDataProductUrl={getDataProductUrl}
             initialSelectedUser={selectedContractTargetUser}
             //Derives environment from the fact that other environments are filtered out
             dataProductEnvironment={