@finos/legend-application-marketplace 0.2.11 → 0.2.13

package/lib/stores/lakehouse/fieldSearch/FieldSearchResultState.js

@@ -14,15 +14,39 @@
  * limitations under the License.
  */
 import { DataProductSearchResultDetailsType, } from '@finos/legend-server-marketplace';
+import { hashArray } from '@finos/legend-shared';
 import { DataProductTypeFilter } from '../LegendMarketplaceSearchResultsStore.js';
 import { generateGAVCoordinates } from '@finos/legend-storage';
 import { generateLakehouseDataProductPath, generateLegacyDataProductPath, } from '../../../__lib__/LegendMarketplaceNavigation.js';
+var FieldSearchResultStateDefaultValue;
+(function (FieldSearchResultStateDefaultValue) {
+    FieldSearchResultStateDefaultValue["UNKNOWN_FIELD_TYPE"] = "Unknown";
+    FieldSearchResultStateDefaultValue["EMPTY_FIELD_DESCRIPTION"] = "-";
+})(FieldSearchResultStateDefaultValue || (FieldSearchResultStateDefaultValue = {}));
+var FieldSearchDataProductKey;
+(function (FieldSearchDataProductKey) {
+    FieldSearchDataProductKey["DISTINCT_SEPARATOR"] = "|";
+})(FieldSearchDataProductKey || (FieldSearchDataProductKey = {}));
 const PRODUCT_TYPE_FILTER_MAP = {
     [DataProductSearchResultDetailsType.LEGACY]: DataProductTypeFilter.LEGACY,
     [DataProductSearchResultDetailsType.LAKEHOUSE]: DataProductTypeFilter.LAKEHOUSE,
     [DataProductSearchResultDetailsType.ERROR]: DataProductTypeFilter.LEGACY,
 };
 const getDataProductName = (path) => path.split('::').at(-1) ?? path;
+const generateFieldSearchResultId = (fieldName, fieldType, fieldDescription) => `${hashArray([fieldName, fieldType, fieldDescription])}`;
+const getDistinctDataProducts = (dataProducts) => {
+    const seen = new Set();
+    return dataProducts.filter((dp) => {
+        // Dedupe primarily by owning data product path. Fallback to a stable
+        // composite key only when path is unavailable.
+        const dedupeKey = dp.path || dp.distinctKey;
+        if (seen.has(dedupeKey)) {
+            return false;
+        }
+        seen.add(dedupeKey);
+        return true;
+    });
+};
 const getOwningDataProductPath = (dataProduct) => {
     if (dataProduct.productType === DataProductSearchResultDetailsType.LEGACY &&
         dataProduct.groupId) {
@@ -38,6 +62,8 @@ const getOwningDataProductPath = (dataProduct) => {
 export class FieldSearchDataProductEntry {
     name;
     datasetName;
+    datasetDescription;
+    executionContextKey;
     modelPath;
     path;
     entityPath;
@@ -47,11 +73,14 @@ export class FieldSearchDataProductEntry {
     artifactId;
     versionId;
     productType;
+    distinctKey;
     constructor(dataProduct) {
         const productType = PRODUCT_TYPE_FILTER_MAP[dataProduct.productType];
         const dataProductName = getDataProductName(dataProduct.path);
         this.name = dataProductName;
         this.datasetName = dataProduct.datasetName;
+        this.datasetDescription = dataProduct.datasetDescription;
+        this.executionContextKey = dataProduct.defaultExecutionContext;
         this.modelPath = dataProduct.modelPath;
         this.path = getOwningDataProductPath(dataProduct);
         this.entityPath = dataProduct.path;
@@ -61,6 +90,12 @@ export class FieldSearchDataProductEntry {
         this.artifactId = dataProduct.artifactId;
         this.versionId = dataProduct.versionId;
         this.productType = productType;
+        this.distinctKey = [
+            this.path,
+            this.entityPath,
+            this.dataProductId,
+            this.name,
+        ].join(FieldSearchDataProductKey.DISTINCT_SEPARATOR);
     }
 }
 export class FieldSearchResultState {
@@ -69,16 +104,18 @@ export class FieldSearchResultState {
     fieldType;
     fieldDescription;
     dataProducts;
+    distinctDataProducts;
     constructor(result) {
         this.fieldName = result.fieldName;
-        this.fieldType = result.fieldType ?? 'Unknown';
-        this.fieldDescription = result.fieldDescription ?? '-';
-        this.id = JSON.stringify([
-            this.fieldName,
-            this.fieldType,
-            this.fieldDescription,
-        ]);
+        this.fieldType =
+            result.fieldType ?? FieldSearchResultStateDefaultValue.UNKNOWN_FIELD_TYPE;
+        this.fieldDescription =
+            result.fieldDescription ??
+                FieldSearchResultStateDefaultValue.EMPTY_FIELD_DESCRIPTION;
+        this.id = generateFieldSearchResultId(this.fieldName, this.fieldType, this.fieldDescription);
         this.dataProducts = result.dataProducts.map((dp) => new FieldSearchDataProductEntry(dp));
+        // Precompute once since dataProducts are immutable after construction.
+        this.distinctDataProducts = getDistinctDataProducts(this.dataProducts);
     }
 }
 //# sourceMappingURL=FieldSearchResultState.js.map

package/lib/stores/lakehouse/fieldSearch/FieldSearchResultState.js.map

@@ -1 +1 @@
-{"version":3,"file":"FieldSearchResultState.js","sourceRoot":"","sources":["../../../../src/stores/lakehouse/fieldSearch/FieldSearchResultState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FieldSearchResultState.js","sourceRoot":"","sources":["../../../../src/stores/lakehouse/fieldSearch/FieldSearchResultState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-marketplace",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Legend Marketplace application core",
   "keywords": [
     "legend",
@@ -45,16 +45,16 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.106",
+    "@finos/legend-application": "16.0.107",
     "@finos/legend-art": "7.1.148",
-    "@finos/legend-code-editor": "2.0.171",
-    "@finos/legend-extension-dsl-data-product": "0.0.80",
-    "@finos/legend-extension-dsl-data-space": "10.4.219",
-    "@finos/legend-graph": "32.6.3",
-    "@finos/legend-lego": "2.0.191",
+    "@finos/legend-code-editor": "2.0.172",
+    "@finos/legend-extension-dsl-data-product": "0.0.82",
+    "@finos/legend-extension-dsl-data-space": "10.4.221",
+    "@finos/legend-graph": "32.6.4",
+    "@finos/legend-lego": "2.0.192",
     "@finos/legend-server-depot": "6.1.12",
-    "@finos/legend-server-lakehouse": "0.3.52",
-    "@finos/legend-server-marketplace": "0.1.66",
+    "@finos/legend-server-lakehouse": "0.3.53",
+    "@finos/legend-server-marketplace": "0.1.68",
     "@finos/legend-shared": "11.0.25",
     "@finos/legend-storage": "3.0.146",
     "@mui/material": "7.3.4",

package/src/application/LegendMarketplaceWebApplication.tsx

@@ -21,7 +21,10 @@ import {
   CubesLoadingIndicatorIcon,
   GhostIcon,
 } from '@finos/legend-art';
-import { useApplicationStore } from '@finos/legend-application';
+import {
+  useApplicationStore,
+  LegendTokenSync,
+} from '@finos/legend-application';
 import {
   BrowserEnvironmentProvider,
   Outlet,
@@ -463,11 +466,13 @@ export const LegendMarketplaceWebApplication = observer(
 
     return (
       <AuthProvider {...mergedOIDCConfig}>
-        <BrowserEnvironmentProvider baseUrl={baseUrl}>
-          <LegendMarketplaceFrameworkProvider>
-            <LegendMarketplaceWebApplicationRouter />
-          </LegendMarketplaceFrameworkProvider>
-        </BrowserEnvironmentProvider>
+        <LegendTokenSync>
+          <BrowserEnvironmentProvider baseUrl={baseUrl}>
+            <LegendMarketplaceFrameworkProvider>
+              <LegendMarketplaceWebApplicationRouter />
+            </LegendMarketplaceFrameworkProvider>
+          </BrowserEnvironmentProvider>
+        </LegendTokenSync>
       </AuthProvider>
     );
   },

package/src/components/MarketplaceCard/FieldSearchResultListItem.tsx

@@ -16,7 +16,7 @@
 
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
-import { Chip, Typography } from '@mui/material';
+import { Chip, Tooltip, Typography } from '@mui/material';
 import { DatasetIcon, PackageIcon } from '@finos/legend-art';
 import type {
   FieldSearchDataProductEntry,
@@ -26,6 +26,8 @@ import { LegendMarketplaceListItem } from '../MarketplaceCard/LegendMarketplaceL
 
 enum FieldSearchResultListItemLabel {
   SHOW_LESS = 'Show Less',
+  SHOW_LESS_INLINE = 'Show less',
+  SHOW_MORE_INLINE = 'Show more',
   MORE_SUFFIX = 'More',
   DATASET_SEPARATOR = '|',
   EMPTY_VALUE = '-',
@@ -36,21 +38,52 @@ enum FieldSearchResultListItemValue {
   MAX_DESCRIPTION_LENGTH = 150,
 }
 
+function getCollapsibleListState<T>(
+  items: T[],
+  expanded: boolean,
+): { visibleItems: T[]; toggleLabel: string; shouldShowToggle: boolean } {
+  const visibleItems = expanded
+    ? items
+    : items.slice(
+        0,
+        FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS,
+      );
+  const hiddenItemCount = Math.max(
+    0,
+    items.length -
+      FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS,
+  );
+  const toggleLabel = expanded
+    ? FieldSearchResultListItemLabel.SHOW_LESS
+    : `+${hiddenItemCount} ${FieldSearchResultListItemLabel.MORE_SUFFIX}`;
+
+  return {
+    visibleItems,
+    toggleLabel,
+    shouldShowToggle:
+      items.length >
+      FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS,
+  };
+}
+
 export const FieldSearchResultListRow = observer(
   (props: {
     fieldSearchResultState: FieldSearchResultState;
     expanded: boolean;
     onToggleExpanded: (rowId: string) => void;
     onOpenDataProduct: (dataProduct: FieldSearchDataProductEntry) => void;
+    onOpenDatasetInQuery: (dataProduct: FieldSearchDataProductEntry) => void;
   }): React.ReactNode => {
     const {
       fieldSearchResultState,
       expanded,
       onToggleExpanded,
       onOpenDataProduct,
+      onOpenDatasetInQuery,
     } = props;
 
     const [descriptionExpanded, setDescriptionExpanded] = useState(false);
+    const [dpExpanded, setDpExpanded] = useState(false);
     const description = fieldSearchResultState.fieldDescription;
     const isDescriptionTruncatable =
       description.length >
@@ -60,20 +93,19 @@ export const FieldSearchResultListRow = observer(
         ? `${description.substring(0, FieldSearchResultListItemValue.MAX_DESCRIPTION_LENGTH)}...`
         : description;
 
-    const visibleDataProducts = expanded
-      ? fieldSearchResultState.dataProducts
-      : fieldSearchResultState.dataProducts.slice(
-          0,
-          FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS,
-        );
-    const hiddenDataProductCount = Math.max(
-      0,
-      fieldSearchResultState.dataProducts.length -
-        FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS,
-    );
-    const toggleLabel = expanded
-      ? FieldSearchResultListItemLabel.SHOW_LESS
-      : `+${hiddenDataProductCount} ${FieldSearchResultListItemLabel.MORE_SUFFIX}`;
+    const distinctDataProducts = fieldSearchResultState.distinctDataProducts;
+
+    const {
+      visibleItems: visibleDataProducts,
+      toggleLabel,
+      shouldShowToggle: shouldShowDataProductToggle,
+    } = getCollapsibleListState(fieldSearchResultState.dataProducts, expanded);
+
+    const {
+      visibleItems: visibleDistinctDataProducts,
+      toggleLabel: dpToggleLabel,
+      shouldShowToggle: shouldShowDistinctDataProductToggle,
+    } = getCollapsibleListState(distinctDataProducts, dpExpanded);
 
     const content = (
       <div className="marketplace-lakehouse-field-search-results__list-item-grid">
@@ -99,32 +131,23 @@ export const FieldSearchResultListRow = observer(
                 setDescriptionExpanded(!descriptionExpanded);
               }}
             >
-              {descriptionExpanded ? 'Show less' : 'Show more'}
+              {descriptionExpanded
+                ? FieldSearchResultListItemLabel.SHOW_LESS_INLINE
+                : FieldSearchResultListItemLabel.SHOW_MORE_INLINE}
             </button>
           )}
         </div>
         <div className="marketplace-lakehouse-field-search-results__data-products-cell">
-          {fieldSearchResultState.dataProducts.length > 0 ? (
+          {distinctDataProducts.length > 0 ? (
             <>
-              {visibleDataProducts.map((dataProduct) => (
+              {visibleDistinctDataProducts.map((dataProduct) => (
                 <Chip
-                  key={`${fieldSearchResultState.id}-${dataProduct.path}-${dataProduct.datasetName ?? ''}`}
+                  key={`${fieldSearchResultState.id}-dp-${dataProduct.distinctKey}`}
                   clickable={true}
                   label={
                     <span className="marketplace-lakehouse-field-search-results__chip-label">
                       <PackageIcon className="marketplace-lakehouse-field-search-results__chip-icon" />
                       <span>{dataProduct.name}</span>
-                      {dataProduct.datasetName && (
-                        <span className="marketplace-lakehouse-field-search-results__chip-secondary">
-                          <span className="marketplace-lakehouse-field-search-results__chip-separator">
-                            {FieldSearchResultListItemLabel.DATASET_SEPARATOR}
-                          </span>
-                          <DatasetIcon className="marketplace-lakehouse-field-search-results__chip-icon" />
-                          <span className="marketplace-lakehouse-field-search-results__chip-secondary-text">
-                            {dataProduct.datasetName}
-                          </span>
-                        </span>
-                      )}
                     </span>
                   }
                   onClick={() => onOpenDataProduct(dataProduct)}
@@ -132,8 +155,63 @@ export const FieldSearchResultListRow = observer(
                   size="small"
                 />
               ))}
-              {fieldSearchResultState.dataProducts.length >
-                FieldSearchResultListItemValue.COLLAPSED_VISIBLE_DATA_PRODUCTS && (
+              {shouldShowDistinctDataProductToggle && (
+                <Chip
+                  key={`${fieldSearchResultState.id}-dp-toggle`}
+                  label={dpToggleLabel}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    setDpExpanded(!dpExpanded);
+                  }}
+                  size="small"
+                  variant="outlined"
+                  className="marketplace-lakehouse-field-search-results__data-product-toggle"
+                />
+              )}
+            </>
+          ) : (
+            <Typography className="marketplace-lakehouse-field-search-results__list-item-text marketplace-lakehouse-field-search-results__list-item-text--empty">
+              {FieldSearchResultListItemLabel.EMPTY_VALUE}
+            </Typography>
+          )}
+        </div>
+        <div className="marketplace-lakehouse-field-search-results__data-products-cell">
+          {fieldSearchResultState.dataProducts.length > 0 ? (
+            <>
+              {visibleDataProducts.map((dataProduct) => (
+                <Tooltip
+                  key={`${fieldSearchResultState.id}-${dataProduct.path}-${dataProduct.datasetName ?? ''}`}
+                  title={dataProduct.datasetDescription ?? ''}
+                  placement="top"
+                  arrow={true}
+                  disableHoverListener={!dataProduct.datasetDescription}
+                >
+                  <Chip
+                    clickable={true}
+                    label={
+                      <span className="marketplace-lakehouse-field-search-results__chip-label">
+                        <PackageIcon className="marketplace-lakehouse-field-search-results__chip-icon" />
+                        <span>{dataProduct.name}</span>
+                        {dataProduct.datasetName && (
+                          <span className="marketplace-lakehouse-field-search-results__chip-secondary">
+                            <span className="marketplace-lakehouse-field-search-results__chip-separator">
+                              {FieldSearchResultListItemLabel.DATASET_SEPARATOR}
+                            </span>
+                            <DatasetIcon className="marketplace-lakehouse-field-search-results__chip-icon" />
+                            <span className="marketplace-lakehouse-field-search-results__chip-secondary-text">
+                              {dataProduct.datasetName}
+                            </span>
+                          </span>
+                        )}
+                      </span>
+                    }
+                    onClick={() => onOpenDatasetInQuery(dataProduct)}
+                    className="marketplace-lakehouse-field-search-results__data-product-link"
+                    size="small"
+                  />
+                </Tooltip>
+              ))}
+              {shouldShowDataProductToggle && (
                 <Chip
                   key={`${fieldSearchResultState.id}-toggle`}
                   label={toggleLabel}

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

@@ -84,6 +84,10 @@ export const EntitlementsClosedContractsDashboard = observer(
     const [selectedContract, setSelectedContract] = useState<
       V1_LiteDataContract | undefined
     >();
+    const [unverifiedIngestDefinitions, setUnverifiedIngestDefinitions] =
+      useState<string[] | undefined>(undefined);
+    const [ingestVerificationInProgress, setIngestVerificationInProgress] =
+      useState(false);
     const [showForOthers, setShowForOthers] = useState<boolean>(
       myClosedContracts.length === 0 && closedContractsForOthers.length > 0,
     );
@@ -93,7 +97,20 @@ export const EntitlementsClosedContractsDashboard = observer(
         V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
       >,
     ) => {
-      setSelectedContract(event.data?.contractResultLite);
+      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);
+      }
     };
 
     const defaultColDef: DataGridColumnDefinition<
@@ -210,10 +227,15 @@ export const EntitlementsClosedContractsDashboard = observer(
             overlayLoadingTemplate="Loading contracts"
           />
         </Box>
-        {selectedContract !== undefined && (
+        {selectedContract !== undefined && !ingestVerificationInProgress && (
           <DataAccessRequestViewer
             open={true}
-            onClose={() => setSelectedContract(undefined)}
+            onClose={() => {
+              setSelectedContract(undefined);
+              setUnverifiedIngestDefinitions(undefined);
+              setIngestVerificationInProgress(false);
+            }}
+            unverifiedIngestDefinitions={unverifiedIngestDefinitions}
             viewerState={
               new DataContractViewerState(
                 selectedContract,

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

@@ -115,16 +115,33 @@ export const EntitlementsPendingContractsDashboard = observer(
     const [selectedContract, setSelectedContract] = useState<
       V1_LiteDataContract | undefined
     >();
+    const [unverifiedIngestDefinitions, setUnverifiedIngestDefinitions] =
+      useState<string[] | undefined>(undefined);
+    const [ingestVerificationInProgress, setIngestVerificationInProgress] =
+      useState(false);
     const [showForOthers, setShowForOthers] = useState<boolean>(
       myPendingContracts.length === 0 && pendingContractsForOthers.length > 0,
     );
 
-    const handleCellClicked = (
+    const handleCellClicked = async (
       event: DataGridCellClickedEvent<
         V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
       >,
     ) => {
-      setSelectedContract(event.data?.contractResultLite);
+      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);
+      }
     };
 
     const defaultColDef: DataGridColumnDefinition<
@@ -235,7 +252,14 @@ export const EntitlementsPendingContractsDashboard = observer(
             suppressFieldDotNotation={true}
             suppressContextMenu={false}
             columnDefs={colDefs}
-            onCellClicked={handleCellClicked}
+            onCellClicked={(
+              event: DataGridCellClickedEvent<
+                V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+              >,
+            ) =>
+              // eslint-disable-next-line no-void
+              void handleCellClicked(event)
+            }
             defaultColDef={defaultColDef}
             rowHeight={45}
             overlayNoRowsTemplate="You have no pending contracts"
@@ -243,10 +267,15 @@ export const EntitlementsPendingContractsDashboard = observer(
             overlayLoadingTemplate="Loading contracts"
           />
         </Box>
-        {selectedContract !== undefined && (
+        {selectedContract !== undefined && !ingestVerificationInProgress && (
           <DataAccessRequestViewer
             open={true}
-            onClose={() => setSelectedContract(undefined)}
+            onClose={() => {
+              setSelectedContract(undefined);
+              setUnverifiedIngestDefinitions(undefined);
+              setIngestVerificationInProgress(false);
+            }}
+            unverifiedIngestDefinitions={unverifiedIngestDefinitions}
             viewerState={
               new DataContractViewerState(
                 selectedContract,

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

@@ -289,6 +289,10 @@ export const EntitlementsPendingTasksDashboard = observer(
     >();
     const [selectedContractTargetUser, setSelectedContractTargetUser] =
       useState<string | undefined>();
+    const [unverifiedIngestDefinitions, setUnverifiedIngestDefinitions] =
+      useState<string[] | undefined>(undefined);
+    const [ingestVerificationInProgress, setIngestVerificationInProgress] =
+      useState(false);
 
     const auth = useAuth();
 
@@ -309,7 +313,7 @@ export const EntitlementsPendingTasksDashboard = observer(
       event.api.setNodesSelected({ nodes: nodesToSelect, newValue: true });
     };
 
-    const handleCellClicked = (
+    const handleCellClicked = async (
       event: DataGridCellClickedEvent<V1_ContractUserEventRecord, unknown>,
     ) => {
       if (event.colDef.colId !== 'selection') {
@@ -318,6 +322,18 @@ export const EntitlementsPendingTasksDashboard = observer(
         );
         setSelectedContract(contract);
         setSelectedContractTargetUser(event.data?.consumer);
+        setUnverifiedIngestDefinitions(undefined);
+        if (contract !== undefined) {
+          setIngestVerificationInProgress(true);
+          const result = await flowResult(
+            dashboardState.getUnverifiedIngestDefinitions(
+              contract.guid,
+              auth.user?.access_token,
+            ),
+          );
+          setUnverifiedIngestDefinitions(result);
+          setIngestVerificationInProgress(false);
+        }
       }
     };
 
@@ -737,7 +753,15 @@ export const EntitlementsPendingTasksDashboard = observer(
                   rowHeight={45}
                   rowSelection={rowSelection}
                   onFirstDataRendered={handleFirstDataRendered}
-                  onCellClicked={handleCellClicked}
+                  onCellClicked={(
+                    event: DataGridCellClickedEvent<
+                      V1_ContractUserEventRecord,
+                      unknown
+                    >,
+                  ) =>
+                    // eslint-disable-next-line no-void
+                    void handleCellClicked(event)
+                  }
                   columnDefs={privilegeManagerColDefs}
                   overlayNoRowsTemplate="You have no contracts to approve as a Privilege Manager"
                   loading={loading}
@@ -772,7 +796,15 @@ export const EntitlementsPendingTasksDashboard = observer(
                   rowHeight={45}
                   rowSelection={rowSelection}
                   onFirstDataRendered={handleFirstDataRendered}
-                  onCellClicked={handleCellClicked}
+                  onCellClicked={(
+                    event: DataGridCellClickedEvent<
+                      V1_ContractUserEventRecord,
+                      unknown
+                    >,
+                  ) =>
+                    // eslint-disable-next-line no-void
+                    void handleCellClicked(event)
+                  }
                   columnDefs={dataOwnerColDefs}
                   overlayNoRowsTemplate="You have no contracts to approve as a Data Owner"
                   loading={loading}
@@ -796,7 +828,15 @@ export const EntitlementsPendingTasksDashboard = observer(
                     rowHeight={45}
                     rowSelection={rowSelection}
                     onFirstDataRendered={handleFirstDataRendered}
-                    onCellClicked={handleCellClicked}
+                    onCellClicked={(
+                      event: DataGridCellClickedEvent<
+                        V1_ContractUserEventRecord,
+                        unknown
+                      >,
+                    ) =>
+                      // eslint-disable-next-line no-void
+                      void handleCellClicked(event)
+                    }
                     columnDefs={otherTasksColDefs}
                     loading={loading}
                     overlayLoadingTemplate="Loading contracts"
@@ -819,10 +859,15 @@ export const EntitlementsPendingTasksDashboard = observer(
           pendingTaskContracts={pendingTaskContracts}
           marketplaceBaseStore={marketplaceBaseStore}
         />
-        {selectedContract !== undefined && (
+        {selectedContract !== undefined && !ingestVerificationInProgress && (
           <DataAccessRequestViewer
             open={true}
-            onClose={() => setSelectedContract(undefined)}
+            onClose={() => {
+              setSelectedContract(undefined);
+              setUnverifiedIngestDefinitions(undefined);
+              setIngestVerificationInProgress(false);
+            }}
+            unverifiedIngestDefinitions={unverifiedIngestDefinitions}
             viewerState={
               new DataContractViewerState(
                 selectedContract,