@finos/legend-application-marketplace 0.2.16 → 0.2.17

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

@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-import { V1_LiteDataContractWithUserStatus } from '@finos/legend-graph';
+import {
+  GraphManagerState,
+  V1_ContractState,
+  type V1_LiteDataContract,
+  V1_LiteDataContractWithUserStatus,
+} from '@finos/legend-graph';
 import {
   DataGrid,
+  type DataGridCellClickedEvent,
   type DataGridCellRendererParams,
   type DataGridColumnDefinition,
 } from '@finos/legend-lego/data-grid';
@@ -27,8 +33,11 @@ import {
   FormGroup,
   Switch,
 } from '@mui/material';
-import { useEffect, useMemo, useState } from 'react';
-import type { EntitlementsDashboardState } from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
+import { useMemo, useState } from 'react';
+import type {
+  ContractCreatedByUserDetails,
+  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';
@@ -39,72 +48,49 @@ import {
   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,
-  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';
+import { getCommonEntitlementsColDefs } from '../../../utils/EntitlementsUtils.js';
 
-const AssigneesCellRenderer = observer(
-  (props: {
-    row: EntitlementsRow | undefined;
-    entitlementsStore: LakehouseEntitlementsStore;
-  }): React.ReactNode => {
-    const { row, entitlementsStore } = props;
-    if (!row) {
-      return null;
-    }
+const AssigneesCellRenderer = (props: {
+  dataContract:
+    | V1_LiteDataContractWithUserStatus
+    | ContractCreatedByUserDetails
+    | undefined;
+  entitlementsStore: LakehouseEntitlementsStore;
+}): React.ReactNode => {
+  const { dataContract, entitlementsStore } = props;
 
-    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);
-    }
+  const assignees =
+    (dataContract instanceof V1_LiteDataContractWithUserStatus
+      ? dataContract.pendingTaskWithAssignees?.assignees.toSorted()
+      : dataContract?.sortedAssigneeIds) ?? [];
 
-    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,
-      dataRequestsCreatedByUser,
-    } = dashboardState;
+    const { allContractsForUser, allContractsCreatedByUser } = dashboardState;
     const marketplaceBaseStore = useLegendMarketplaceBaseStore();
     const auth = useAuth();
-    const getDataProductUrl = useGetDataProductUrl();
 
     const myPendingContracts = useMemo(
       () =>
@@ -127,110 +113,105 @@ export const EntitlementsPendingContractsDashboard = observer(
       [allContractsCreatedByUser, myPendingContractIds],
     );
 
-    const pendingDataRequests = useMemo(
-      () =>
-        (dataRequestsCreatedByUser ?? []).filter(
-          (dr) => !TERMINAL_DATA_REQUEST_STATES.has(dr.dataRequest.state),
-        ),
-      [dataRequestsCreatedByUser],
-    );
-
-    const [selectedRow, setSelectedRow] = useState<
-      EntitlementsRow | undefined
+    const [selectedContract, setSelectedContract] = useState<
+      V1_LiteDataContract | undefined
     >();
     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,
     );
 
-    useEffect(() => {
+    const handleCellClicked = async (
+      event: DataGridCellClickedEvent<
+        V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+      >,
+    ) => {
+      const contract = event.data?.contractResultLite;
+      setSelectedContract(contract);
       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));
+      if (contract !== undefined) {
+        const result = await dashboardState.getContractErrors(
+          contract.guid,
+          auth.user?.access_token,
+        );
+        setContractErrors(result);
       }
-    }, [selectedRow, auth.user?.access_token, dashboardState]);
+    };
 
-    const selectedContractGuid = getSelectedContractGuid(selectedRow);
+    const defaultColDef: DataGridColumnDefinition<
+      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+    > = useMemo(
+      () => ({
+        minWidth: 50,
+        sortable: true,
+        resizable: true,
+        flex: 1,
+      }),
+      [],
+    );
 
-    const colDefs: DataGridColumnDefinition<EntitlementsRow>[] = useMemo(
+    const colDefs: DataGridColumnDefinition<
+      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+    >[] = useMemo(
       () => [
         ...getCommonEntitlementsColDefs(dashboardState),
         {
-          headerName: EntitlementsColumnHeader.STATE,
+          headerName: 'State',
           valueGetter: (params) => {
-            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;
+            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';
             }
-            return startCase(params.data.data.dataRequest.state);
           },
         },
         {
-          headerName: EntitlementsColumnHeader.ASSIGNEES,
+          headerName: 'Business Justification',
+          valueGetter: (p) => p.data?.contractResultLite.description,
+        },
+        {
+          headerName: 'Assignees',
           colId: 'assignees',
           valueGetter: (params) => {
-            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';
+            const assignees =
+              (params.data instanceof V1_LiteDataContractWithUserStatus
+                ? params.data.pendingTaskWithAssignees?.assignees.toSorted()
+                : params.data?.sortedAssigneeIds) ?? [];
+            return assignees.length > 0 ? assignees.join(', ') : 'Unknown';
           },
           cellRenderer: (
-            params: DataGridCellRendererParams<EntitlementsRow>,
+            params: DataGridCellRendererParams<
+              V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+            >,
           ) => (
             <AssigneesCellRenderer
-              row={params.data}
+              dataContract={params.data}
               entitlementsStore={dashboardState.lakehouseEntitlementsStore}
             />
           ),
         },
+        {
+          hide: true,
+          headerName: 'Contract ID',
+          valueGetter: (p) => p.data?.contractResultLite.guid,
+        },
       ],
       [dashboardState],
     );
 
-    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,
-    ]);
+    const gridRowData = useMemo(
+      () =>
+        showForOthers
+          ? [...myPendingContracts, ...pendingContractsForOthers]
+          : myPendingContracts,
+      [showForOthers, myPendingContracts, pendingContractsForOthers],
+    );
 
     return (
       <Box className="marketplace-lakehouse-entitlements__pending-contracts">
@@ -267,39 +248,60 @@ export const EntitlementsPendingContractsDashboard = observer(
             suppressFieldDotNotation={true}
             suppressContextMenu={false}
             columnDefs={colDefs}
-            onCellClicked={(event) => event.data && setSelectedRow(event.data)}
-            defaultColDef={ENTITLEMENTS_DEFAULT_COL_DEF}
-            rowHeight={45}
-            overlayNoRowsTemplate="You have no pending contracts or data requests"
-            loading={
-              dashboardState.fetchingContractsForUserState.isInProgress ||
-              dashboardState.fetchingDataRequestsCreatedByUserState.isInProgress
+            onCellClicked={(
+              event: DataGridCellClickedEvent<
+                V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+              >,
+            ) =>
+              // eslint-disable-next-line no-void
+              void handleCellClicked(event)
             }
-            overlayLoadingTemplate="Loading"
+            defaultColDef={defaultColDef}
+            rowHeight={45}
+            overlayNoRowsTemplate="You have no pending contracts"
+            loading={dashboardState.fetchingContractsForUserState.isInProgress}
+            overlayLoadingTemplate="Loading contracts"
           />
         </Box>
-        {selectedRow !== undefined && selectedViewerState !== undefined && (
+        {selectedContract !== undefined && (
           <DataAccessRequestViewer
             open={true}
             onClose={() => {
-              setSelectedRow(undefined);
+              setSelectedContract(undefined);
               setContractErrors(undefined);
             }}
             contractErrors={contractErrors}
-            viewerState={selectedViewerState}
-            {...(selectedContractGuid
-              ? {
-                  onRefresh: async () => {
-                    await flowResult(
-                      dashboardState.updateContract(
-                        selectedContractGuid,
-                        auth.user?.access_token,
-                      ),
-                    );
-                  },
-                }
-              : {})}
-            getDataProductUrl={getDataProductUrl}
+            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),
+              )
+            }
+            //Derives environment from the fact that other environments are filtered out
             dataProductEnvironment={
               marketplaceBaseStore.envState.lakehouseEnvironment
             }

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

@@ -15,7 +15,10 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { ActionAlertType } from '@finos/legend-application';
+import {
+  ActionAlertActionType,
+  ActionAlertType,
+} from '@finos/legend-application';
 import { withLegendMarketplaceProductViewerStore } from '../../../application/providers/LegendMarketplaceProductViewerStoreProvider.js';
 import { useParams } from '@finos/legend-application/browser';
 import {
@@ -33,7 +36,7 @@ import {
   V1_RawWorkflowTask,
   V1_WorkflowTaskStatus,
 } from '@finos/legend-graph';
-import { Box, Button } from '@mui/material';
+import { Box, Button, TextField } from '@mui/material';
 import {
   CubesLoadingIndicator,
   CubesLoadingIndicatorIcon,
@@ -43,7 +46,6 @@ import {
   WorkflowDataAccessRequestState,
 } from '@finos/legend-extension-dsl-data-product';
 import { flowResult } from 'mobx';
-import { showTaskActionAlert } from './showTaskActionAlert.js';
 
 export const WorkflowDataAccessRequestTask =
   withLegendMarketplaceProductViewerStore(
@@ -69,11 +71,10 @@ export const WorkflowDataAccessRequestTask =
           return undefined;
         }
         // Prefer workflow server tasks
-        const { privilegeManagerTasks, dataOwnerTasks } =
+        const { privilegeManagerTask, dataOwnerTask } =
           workflowState.workflowTasks;
-        const allTasks = [...privilegeManagerTasks, ...dataOwnerTasks];
-        const workflowServerTask = allTasks.find(
-          (task) => task.status === 'OPEN',
+        const workflowServerTask = [privilegeManagerTask, dataOwnerTask].find(
+          (task) => task !== undefined && task.status === 'OPEN',
         );
         if (workflowServerTask) {
           return workflowServerTask;
@@ -84,8 +85,8 @@ export const WorkflowDataAccessRequestTask =
           .find((task) => task.status === V1_WorkflowTaskStatus.OPEN);
         if (fallbackTask) {
           // Find the matching raw workflow task by taskId, or build a minimal one from the fallback
-          const matchingRaw = allTasks.find(
-            (t) => t.taskId === fallbackTask.taskId,
+          const matchingRaw = [privilegeManagerTask, dataOwnerTask].find(
+            (t) => t?.taskId === fallbackTask.taskId,
           );
           if (matchingRaw) {
             return matchingRaw;
@@ -179,32 +180,100 @@ export const WorkflowDataAccessRequestTask =
       };
 
       const handleApproveClick = () => {
-        showTaskActionAlert({
-          applicationStore: marketplaceBaseStore.applicationStore,
+        let justification = '';
+        marketplaceBaseStore.applicationStore.alertService.setActionAlertInfo({
           title: 'Approve Request',
           message:
             'Please provide a business justification for approving this request.',
-          confirmLabel: 'Approve',
-          alertType: ActionAlertType.STANDARD,
-          isLoading,
-          setIsLoading,
-          onConfirm: (justification) => handleApprove(justification),
-          errorPrefix: 'Error approving request',
+          prompt: (
+            <TextField
+              fullWidth={true}
+              autoFocus={true}
+              multiline={true}
+              minRows={3}
+              placeholder="Business Justification"
+              onChange={(e) => {
+                justification = e.target.value;
+              }}
+              sx={{ marginTop: 2 }}
+            />
+          ),
+          type: ActionAlertType.STANDARD,
+          actions: [
+            {
+              label: 'Approve',
+              type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+              handler: () => {
+                if (!isLoading) {
+                  setIsLoading(true);
+                  handleApprove(justification)
+                    .catch((error) => {
+                      assertErrorThrown(error);
+                      marketplaceBaseStore.applicationStore.notificationService.notifyError(
+                        `Error approving request: ${error.message}`,
+                      );
+                    })
+                    .finally(() => {
+                      setIsLoading(false);
+                    });
+                }
+              },
+            },
+            {
+              label: 'Cancel',
+              type: ActionAlertActionType.PROCEED,
+              default: true,
+            },
+          ],
         });
       };
 
       const handleDenyClick = () => {
-        showTaskActionAlert({
-          applicationStore: marketplaceBaseStore.applicationStore,
+        let justification = '';
+        marketplaceBaseStore.applicationStore.alertService.setActionAlertInfo({
           title: 'Deny Request',
           message:
             'Please provide a business justification for denying this request.',
-          confirmLabel: 'Deny',
-          alertType: ActionAlertType.CAUTION,
-          isLoading,
-          setIsLoading,
-          onConfirm: (justification) => handleDeny(justification),
-          errorPrefix: 'Error denying request',
+          prompt: (
+            <TextField
+              fullWidth={true}
+              autoFocus={true}
+              multiline={true}
+              minRows={3}
+              placeholder="Business Justification"
+              onChange={(e) => {
+                justification = e.target.value;
+              }}
+              sx={{ marginTop: 2 }}
+            />
+          ),
+          type: ActionAlertType.CAUTION,
+          actions: [
+            {
+              label: 'Deny',
+              type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+              handler: () => {
+                if (!isLoading) {
+                  setIsLoading(true);
+                  handleDeny(justification)
+                    .catch((error) => {
+                      assertErrorThrown(error);
+                      marketplaceBaseStore.applicationStore.notificationService.notifyError(
+                        `Error denying request: ${error.message}`,
+                      );
+                    })
+                    .finally(() => {
+                      setIsLoading(false);
+                    });
+                }
+              },
+            },
+            {
+              label: 'Cancel',
+              type: ActionAlertActionType.PROCEED,
+              default: true,
+            },
+          ],
         });
       };
 

package/src/stores/LegendMarketplaceBaseStore.ts

@@ -53,7 +53,6 @@ import {
   LakehouseIngestServerClient,
   LakehousePlatformServerClient,
   LakehouseWorkflowServerClient,
-  PermitWorkflowServerClient,
 } from '@finos/legend-server-lakehouse';
 import { CartStore } from './cart/CartStore.js';
 import { parseGAVCoordinates, type Entity } from '@finos/legend-storage';
@@ -93,7 +92,6 @@ export class LegendMarketplaceBaseStore {
   readonly remoteEngine: V1_RemoteEngine;
   readonly userSearchService: UserSearchService | undefined;
   readonly lakehouseWorkflowServerClient: LakehouseWorkflowServerClient;
-  readonly permitWorkflowServerClient: PermitWorkflowServerClient;
   readonly lakehouseDataProductService: LakehouseDataProductService;
   readonly cartStore: CartStore;
   readonly terminalAccessServerClient: TerminalAccessServerClient;
@@ -179,16 +177,6 @@ export class LegendMarketplaceBaseStore {
       this.applicationStore.tracerService,
     );
 
-    // permit + eTask workflow
-    this.permitWorkflowServerClient = new PermitWorkflowServerClient({
-      authBaseUrl: this.applicationStore.config.lakehouseServerUrl,
-      workflowBaseUrl:
-        this.applicationStore.config.lakehousePermitWorkflowServerUrl,
-    });
-    this.permitWorkflowServerClient.setTracerService(
-      this.applicationStore.tracerService,
-    );
-
     // lakehouse ingest
     this.lakehouseIngestServerClient = new LakehouseIngestServerClient(
       undefined,

package/src/stores/lakehouse/LegendMarketplaceProductViewerStore.ts

@@ -77,7 +77,6 @@ import {
   EXTERNAL_APPLICATION_NAVIGATION__generateStudioSDLCProjectViewUrl,
   generateLakehouseDataProductPath,
   generateContractPagePath,
-  generatePermitDataAccessRequestPagePath,
 } from '../../__lib__/LegendMarketplaceNavigation.js';
 import {
   DataSpaceViewerState,
@@ -444,12 +443,7 @@ 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>,
+    usedImages?: Set<string> | undefined,
   ) {
     makeObservable(this, {
       dataProductElement: observable,
@@ -87,7 +87,8 @@ export class ProductCardState {
   }
 
   get title(): string {
-    return this.searchResult.dataProductTitle ?? this.dataProductId;
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    return this.searchResult.dataProductTitle || this.dataProductId;
   }
 
   get description(): string {
@@ -231,7 +232,7 @@ export class ProductCardState {
 
   private resolveDisplayImage(
     vendorImageMap: ReadonlyMap<string, string>,
-    usedImages?: Set<string>,
+    usedImages?: Set<string> | undefined,
   ): string {
     const GENERIC_IMAGE_COUNT = 20;
     const guidUpper = this.guid.toUpperCase();