@finos/legend-extension-dsl-data-product 0.0.19 → 0.0.21

package/src/components/DataProduct/DataContract/EntitlementsDataContractViewer.tsx

@@ -22,6 +22,7 @@ import {
   Box,
   Button,
   Dialog,
+  DialogActions,
   DialogContent,
   DialogTitle,
   IconButton,
@@ -47,17 +48,20 @@ import {
   V1_ContractUserEventPrivilegeManagerPayload,
   V1_ResourceType,
   V1_UserApprovalStatus,
+  V1_UserType,
 } from '@finos/legend-graph';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   type UserSearchService,
   ActionState,
+  assertErrorThrown,
   formatDate,
   lodashCapitalize,
 } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { useAuth } from 'react-oidc-context';
 import {
+  ArrowUpFromBracketIcon,
   CloseIcon,
   CopyIcon,
   CubesLoadingIndicator,
@@ -75,7 +79,6 @@ import {
 import { UserRenderer } from '../../UserRenderer/UserRenderer.js';
 import { isContractInTerminalState } from '../../../utils/DataContractUtils.js';
 import type { GenericLegendApplicationStore } from '@finos/legend-application';
-import type { DataProductAPGState } from '../../../stores/DataProduct/DataProductAPGState.js';
 
 const AssigneesList = (props: {
   userIds: string[];
@@ -167,6 +170,91 @@ const TaskApprovalView = (props: {
   }
 };
 
+const ContractEscalationModal = (props: {
+  open: boolean;
+  onClose: () => void;
+  currentViewer: EntitlementsDataContractViewerState;
+  selectedUser: string | undefined;
+  refresh: () => Promise<void>;
+}) => {
+  const { open, onClose, currentViewer, selectedUser, refresh } = props;
+
+  const auth = useAuth();
+  const [isLoading, setIsLoading] = useState(false);
+
+  if (!selectedUser) {
+    return (
+      <Dialog open={open} onClose={onClose} fullWidth={true} maxWidth="sm">
+        <DialogContent className="marketplace-lakehouse-entitlements__data-contract-viewer__escalation__content">
+          <div>
+            Can&apos;t escalate privilege manager approval request. No user
+            selected.
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} variant="outlined" disabled={isLoading}>
+            Close
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  }
+
+  const handleEscalate = async () => {
+    setIsLoading(true);
+    try {
+      await currentViewer.lakehouseContractServerClient.escalateUserOnContract(
+        currentViewer.liteContract.guid,
+        selectedUser,
+        false,
+        auth.user?.access_token,
+      );
+      currentViewer.applicationStore.notificationService.notifySuccess(
+        'Successfully escalated contract request',
+      );
+      // eslint-disable-next-line no-void
+      void refresh();
+      onClose();
+    } catch (error) {
+      assertErrorThrown(error);
+      currentViewer.applicationStore.alertUnhandledError(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onClose={onClose} fullWidth={true} maxWidth="sm">
+      <DialogContent className="marketplace-lakehouse-entitlements__data-contract-viewer__escalation__content">
+        <CubesLoadingIndicator isLoading={isLoading}>
+          <CubesLoadingIndicatorIcon />
+        </CubesLoadingIndicator>
+        {!isLoading && (
+          <div>
+            Are you sure you want to escalate the privilege manager approval
+            request?
+          </div>
+        )}
+      </DialogContent>
+      <DialogActions>
+        <Button
+          onClick={() => {
+            // eslint-disable-next-line no-void
+            void handleEscalate();
+          }}
+          variant="contained"
+          disabled={isLoading}
+        >
+          Escalate
+        </Button>
+        <Button onClick={onClose} variant="outlined" disabled={isLoading}>
+          Cancel
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
 export const EntitlementsDataContractViewer = observer(
   (props: {
     open: boolean;
@@ -174,20 +262,20 @@ export const EntitlementsDataContractViewer = observer(
     currentViewer: EntitlementsDataContractViewerState;
     getContractTaskUrl: (taskId: string) => string;
     getDataProductUrl: (dataProductId: string, deploymentId: number) => string;
-    apgState?: DataProductAPGState | undefined;
     initialSelectedUser?: string | undefined;
+    onRefresh?: (() => void) | (() => Promise<void>);
   }) => {
     const {
       open,
       currentViewer,
       getContractTaskUrl,
       getDataProductUrl,
-      apgState,
       onClose,
       initialSelectedUser,
+      onRefresh,
     } = props;
     const auth = useAuth();
-    const consumer = currentViewer.value.consumer;
+    const consumer = currentViewer.liteContract.consumer;
 
     // We try to get the target users from the associated tasks first, since the
     // tasks are what drive the timeline view. If there are no associated tasks,
@@ -244,6 +332,7 @@ export const EntitlementsDataContractViewer = observer(
       string | undefined
     >(initialSelectedUser ?? targetUsers?.[0]);
     const [isLoading, setIsLoading] = useState(false);
+    const [showEscalationModal, setShowEscalationModal] = useState(false);
 
     useEffect(() => {
       if (!currentViewer.initializationState.hasCompleted) {
@@ -267,18 +356,13 @@ export const EntitlementsDataContractViewer = observer(
 
     const refresh = async (): Promise<void> => {
       setIsLoading(true);
-      if (apgState?.associatedUserContract) {
-        apgState.fetchUserAccessStatus(
-          apgState.associatedUserContract.guid,
-          currentViewer.lakehouseContractServerClient,
-          auth.user?.access_token,
-        );
-      }
       currentViewer.initializationState = ActionState.create();
+      await onRefresh?.();
     };
 
     if (
-      currentViewer.value.resourceType !== V1_ResourceType.ACCESS_POINT_GROUP
+      currentViewer.liteContract.resourceType !==
+      V1_ResourceType.ACCESS_POINT_GROUP
     ) {
       return (
         <Dialog open={true} onClose={onClose} fullWidth={true} maxWidth="md">
@@ -291,15 +375,15 @@ export const EntitlementsDataContractViewer = observer(
           </IconButton>
           <DialogContent className="marketplace-lakehouse-entitlements__data-contract-viewer__content">
             Unable to display data contract request details for resource of type{' '}
-            {currentViewer.value.resourceType} on data product{' '}
-            {currentViewer.value.resourceId}.
+            {currentViewer.liteContract.resourceType} on data product{' '}
+            {currentViewer.liteContract.resourceId}.
           </DialogContent>
         </Dialog>
       );
     }
 
-    const dataProduct = currentViewer.value.resourceId;
-    const accessPointGroup = currentViewer.value.accessPointGroup;
+    const dataProduct = currentViewer.liteContract.resourceId;
+    const accessPointGroup = currentViewer.liteContract.accessPointGroup;
     const privilegeManagerApprovalTask = currentViewer.associatedTasks?.find(
       (task) =>
         task.rec.consumer === selectedTargetUser &&
@@ -314,6 +398,28 @@ export const EntitlementsDataContractViewer = observer(
       privilegeManagerApprovalTask?.rec.status ===
         V1_UserApprovalStatus.PENDING ||
       dataOwnerApprovalTask?.rec.status === V1_UserApprovalStatus.PENDING;
+    const showEscalationButton =
+      selectedTargetUser ===
+        currentViewer.applicationStore.identityService.currentUser ||
+      (selectedTargetUser !== undefined &&
+        currentViewer.getContractUserType(selectedTargetUser) ===
+          V1_UserType.SYSTEM_ACCOUNT);
+    const isContractEscalated =
+      privilegeManagerApprovalTask?.rec.isEscalated === true;
+    const canEscalateContract = showEscalationButton && !isContractEscalated;
+
+    const copyContractId = (): void => {
+      currentViewer.applicationStore.clipboardService
+        .copyTextToClipboard(currentViewer.liteContract.guid)
+        .then(() =>
+          currentViewer.applicationStore.notificationService.notifySuccess(
+            'Contract ID Copied to Clipboard',
+            undefined,
+            2500,
+          ),
+        )
+        .catch(currentViewer.applicationStore.alertUnhandledError);
+    };
 
     const copyTaskLink = (text: string): void => {
       currentViewer.applicationStore.clipboardService
@@ -360,6 +466,24 @@ export const EntitlementsDataContractViewer = observer(
               >
                 <CopyIcon />
               </IconButton>
+              {showEscalationButton && (
+                <span
+                  title={
+                    canEscalateContract
+                      ? 'Escalate request'
+                      : isContractEscalated
+                        ? 'Request has already been escalated'
+                        : 'Cannot escalate request'
+                  }
+                >
+                  <IconButton
+                    onClick={() => setShowEscalationModal(true)}
+                    disabled={!canEscalateContract}
+                  >
+                    <ArrowUpFromBracketIcon />
+                  </IconButton>
+                </span>
+              )}
             </>
           ) : (
             <>Privilege Manager Approval</>
@@ -443,144 +567,159 @@ export const EntitlementsDataContractViewer = observer(
     ];
 
     return (
-      <Dialog open={open} onClose={onClose} fullWidth={true} maxWidth="md">
-        <DialogTitle>
-          {isContractInProgressForUser ? 'Pending ' : ''}Data Contract Request
-        </DialogTitle>
-        <IconButton onClick={onClose} className="marketplace-dialog-close-btn">
-          <CloseIcon />
-        </IconButton>
-        <DialogContent className="marketplace-lakehouse-entitlements__data-contract-viewer__content">
-          <CubesLoadingIndicator isLoading={isLoading}>
-            <CubesLoadingIndicatorIcon />
-          </CubesLoadingIndicator>
-          {!isLoading && (
-            <>
-              <div>
-                Access request for{' '}
-                <span className="marketplace-lakehouse-text__emphasis">
-                  {accessPointGroup}
-                </span>{' '}
-                Access Point Group in{' '}
-                <Link
-                  className="marketplace-lakehouse-text__emphasis"
-                  href={getDataProductUrl(
-                    dataProduct,
-                    currentViewer.value.deploymentId,
-                  )}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {dataProduct}
-                </Link>{' '}
-                Data Product
-              </div>
-              <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata">
-                <div className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-by">
-                  <b>Ordered By: </b>
-                  <UserRenderer
-                    userId={currentViewer.value.createdBy}
-                    applicationStore={currentViewer.applicationStore}
-                    userSearchService={currentViewer.userSearchService}
-                  />
+      <>
+        <Dialog open={open} onClose={onClose} fullWidth={true} maxWidth="md">
+          <DialogTitle>
+            {isContractInProgressForUser ? 'Pending ' : ''}Data Contract Request
+          </DialogTitle>
+          <IconButton
+            onClick={onClose}
+            className="marketplace-dialog-close-btn"
+          >
+            <CloseIcon />
+          </IconButton>
+          <DialogContent className="marketplace-lakehouse-entitlements__data-contract-viewer__content">
+            <CubesLoadingIndicator isLoading={isLoading}>
+              <CubesLoadingIndicatorIcon />
+            </CubesLoadingIndicator>
+            {!isLoading && (
+              <>
+                <div>
+                  Access request for{' '}
+                  <span className="marketplace-lakehouse-text__emphasis">
+                    {accessPointGroup}
+                  </span>{' '}
+                  Access Point Group in{' '}
+                  <Link
+                    className="marketplace-lakehouse-text__emphasis"
+                    href={getDataProductUrl(
+                      dataProduct,
+                      currentViewer.liteContract.deploymentId,
+                    )}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {dataProduct}
+                  </Link>{' '}
+                  Data Product
                 </div>
-                <div className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for">
-                  <b>
-                    Ordered For
-                    <Tooltip
-                      className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for__tooltip__icon"
-                      title={
-                        <>
-                          Contract consumer type:{' '}
-                          {getOrganizationalScopeTypeName(
-                            consumer,
-                            currentViewer.applicationStore.pluginManager.getApplicationPlugins(),
-                          )}
-                          {getOrganizationalScopeTypeDetails(
-                            consumer,
-                            currentViewer.applicationStore.pluginManager.getApplicationPlugins(),
-                          )}
-                        </>
-                      }
-                    >
-                      <InfoCircleIcon />
-                    </Tooltip>
-                    :{' '}
-                  </b>
-                  {targetUsers !== undefined ? (
-                    targetUsers.length === 1 ? (
-                      <UserRenderer
-                        key={targetUsers[0]}
-                        userId={targetUsers[0]}
-                        applicationStore={currentViewer.applicationStore}
-                        userSearchService={currentViewer.userSearchService}
-                      />
-                    ) : (
-                      <Select
-                        value={selectedTargetUser}
-                        onChange={(event) =>
-                          setSelectedTargetUser(event.target.value)
+                <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata">
+                  <div className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-by">
+                    <b>Ordered By: </b>
+                    <UserRenderer
+                      userId={currentViewer.liteContract.createdBy}
+                      applicationStore={currentViewer.applicationStore}
+                      userSearchService={currentViewer.userSearchService}
+                    />
+                  </div>
+                  <div className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for">
+                    <b>
+                      Ordered For
+                      <Tooltip
+                        className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for__tooltip__icon"
+                        title={
+                          <>
+                            Contract consumer type:{' '}
+                            {getOrganizationalScopeTypeName(
+                              consumer,
+                              currentViewer.applicationStore.pluginManager.getApplicationPlugins(),
+                            )}
+                            {getOrganizationalScopeTypeDetails(
+                              consumer,
+                              currentViewer.applicationStore.pluginManager.getApplicationPlugins(),
+                            )}
+                          </>
                         }
-                        size="small"
-                        className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for__select"
                       >
-                        {targetUserSelectItems}
-                      </Select>
-                    )
-                  ) : (
-                    stringifyOrganizationalScope(consumer)
-                  )}
-                </div>
-                <div>
-                  <b>Business Justification: </b>
-                  {currentViewer.value.description}
-                </div>
-              </Box>
-              {!isContractInTerminalState(currentViewer.value) && (
-                <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__refresh-btn">
-                  <Button
-                    size="small"
-                    variant="outlined"
-                    startIcon={<RefreshIcon />}
-                    onClick={() => {
-                      // eslint-disable-next-line no-void
-                      void refresh();
-                    }}
-                  >
-                    Refresh
-                  </Button>
-                </Box>
-              )}
-              <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline">
-                <Timeline>
-                  {steps.map((step, index) => (
-                    <TimelineItem key={step.key}>
-                      <TimelineOppositeContent className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline__content">
-                        {step.label}
-                      </TimelineOppositeContent>
-                      <TimelineSeparator>
-                        <TimelineDot
-                          color={step.isDeniedStep ? 'error' : 'primary'}
-                          variant={
-                            step.isCompleteOrActive ? 'filled' : 'outlined'
-                          }
+                        <InfoCircleIcon />
+                      </Tooltip>
+                      :{' '}
+                    </b>
+                    {targetUsers !== undefined ? (
+                      targetUsers.length === 1 ? (
+                        <UserRenderer
+                          key={targetUsers[0]}
+                          userId={targetUsers[0]}
+                          applicationStore={currentViewer.applicationStore}
+                          userSearchService={currentViewer.userSearchService}
                         />
-                        {index < steps.length - 1 && <TimelineConnector />}
-                      </TimelineSeparator>
-                      <TimelineContent className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline__content">
-                        {step.description}
-                      </TimelineContent>
-                    </TimelineItem>
-                  ))}
-                </Timeline>
-              </Box>
-            </>
-          )}
-          <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__footer">
-            Contract ID: {currentViewer.value.guid}
-          </Box>
-        </DialogContent>
-      </Dialog>
+                      ) : (
+                        <Select
+                          value={selectedTargetUser}
+                          onChange={(event) =>
+                            setSelectedTargetUser(event.target.value)
+                          }
+                          size="small"
+                          className="marketplace-lakehouse-entitlements__data-contract-viewer__metadata__ordered-for__select"
+                        >
+                          {targetUserSelectItems}
+                        </Select>
+                      )
+                    ) : (
+                      stringifyOrganizationalScope(consumer)
+                    )}
+                  </div>
+                  <div>
+                    <b>Business Justification: </b>
+                    {currentViewer.liteContract.description}
+                  </div>
+                </Box>
+                {!isContractInTerminalState(currentViewer.liteContract) && (
+                  <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__refresh-btn">
+                    <Button
+                      size="small"
+                      variant="outlined"
+                      startIcon={<RefreshIcon />}
+                      onClick={() => {
+                        // eslint-disable-next-line no-void
+                        void refresh();
+                      }}
+                    >
+                      Refresh
+                    </Button>
+                  </Box>
+                )}
+                <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline">
+                  <Timeline>
+                    {steps.map((step, index) => (
+                      <TimelineItem key={step.key}>
+                        <TimelineOppositeContent className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline__content">
+                          {step.label}
+                        </TimelineOppositeContent>
+                        <TimelineSeparator>
+                          <TimelineDot
+                            color={step.isDeniedStep ? 'error' : 'primary'}
+                            variant={
+                              step.isCompleteOrActive ? 'filled' : 'outlined'
+                            }
+                          />
+                          {index < steps.length - 1 && <TimelineConnector />}
+                        </TimelineSeparator>
+                        <TimelineContent className="marketplace-lakehouse-entitlements__data-contract-viewer__timeline__content">
+                          {step.description}
+                        </TimelineContent>
+                      </TimelineItem>
+                    ))}
+                  </Timeline>
+                </Box>
+              </>
+            )}
+            <Box className="marketplace-lakehouse-entitlements__data-contract-viewer__footer">
+              Contract ID: {currentViewer.liteContract.guid}
+              <IconButton onClick={() => copyContractId()}>
+                <CopyIcon />
+              </IconButton>
+            </Box>
+          </DialogContent>
+        </Dialog>
+        <ContractEscalationModal
+          open={showEscalationModal && canEscalateContract}
+          onClose={() => setShowEscalationModal(false)}
+          currentViewer={currentViewer}
+          selectedUser={selectedTargetUser}
+          refresh={refresh}
+        />
+      </>
     );
   },
 );

package/src/components/DataProduct/DataProductDataAccess.tsx

@@ -38,6 +38,7 @@ import {
 import {
   type V1_RelationTypeColumn,
   extractElementNameFromPath,
+  V1_AccessPointGroupReference,
   V1_AdHocDeploymentDataProductOrigin,
   V1_AppliedFunction,
   V1_AppliedProperty,
@@ -352,6 +353,27 @@ const AccessPointTable = observer(
                 }`
               : '',
         },
+        {
+          headerName: 'Column Sample Values',
+          flex: 1,
+          wrapText: true,
+          autoHeight: true,
+          valueGetter: (_params) => {
+            if (!_params.data || !accessPointState.relationElement) {
+              return 'No sample values provided';
+            }
+            const columnName = _params.data.name;
+            const columnIndex =
+              accessPointState.relationElement.columns.indexOf(columnName);
+            if (columnIndex === -1) {
+              return 'No sample values provided';
+            }
+            const sampleValues = accessPointState.relationElement.rows
+              .map((row) => row.values[columnIndex])
+              .filter((value) => value !== undefined);
+            return sampleValues.join(', ');
+          },
+        },
       ];
 
     return (
@@ -456,13 +478,15 @@ const AccessPointTable = observer(
         <Box className="data-product__viewer__more-info__container">
           {selectedTab === DataProductTabs.COLUMNS && (
             <>
-              {accessPointState.fetchingRelationTypeState.isInProgress ? (
+              {accessPointState.fetchingRelationTypeState.isInProgress ||
+              accessPointState.fetchingRelationElement.isInProgress ? (
                 <Box className="data-product__viewer__more-info__loading-indicator">
                   <CubesLoadingIndicator isLoading={true}>
                     <CubesLoadingIndicatorIcon />
                   </CubesLoadingIndicator>
                 </Box>
-              ) : accessPointState.fetchingRelationTypeState.hasCompleted ? (
+              ) : accessPointState.fetchingRelationTypeState.hasCompleted &&
+                accessPointState.fetchingRelationElement.hasCompleted ? (
                 <Box
                   className={clsx(
                     'data-product__viewer__more-info__columns-grid ag-theme-balham',
@@ -567,18 +591,25 @@ export const DataProductAccessPointGroupViewer = observer(
     const requestAccessButtonGroupRef = useRef<HTMLDivElement | null>(null);
 
     const entitlementsDataContractViewerState = useMemo(() => {
-      return dataAccessState?.dataContract
+      return dataAccessState?.dataContract &&
+        dataAccessState.dataContract.resource instanceof
+          V1_AccessPointGroupReference &&
+        dataAccessState.dataContract.resource.accessPointGroup ===
+          apgState.apg.id
         ? new EntitlementsDataContractViewerState(
             V1_transformDataContractToLiteDatacontract(
               dataAccessState.dataContract,
             ),
             apgState.applicationStore,
             dataAccessState.lakehouseContractServerClient,
+            apgState.dataProductViewerState.graphManagerState,
             apgState.dataProductViewerState.userSearchService,
           )
         : undefined;
     }, [
+      apgState.apg.id,
       apgState.applicationStore,
+      apgState.dataProductViewerState.graphManagerState,
       apgState.dataProductViewerState.userSearchService,
       dataAccessState?.dataContract,
       dataAccessState?.lakehouseContractServerClient,
@@ -821,7 +852,15 @@ export const DataProductAccessPointGroupViewer = observer(
             open={true}
             onClose={() => dataAccessState.setDataContract(undefined)}
             currentViewer={entitlementsDataContractViewerState}
-            apgState={apgState}
+            onRefresh={() => {
+              if (apgState.associatedUserContract) {
+                apgState.fetchUserAccessStatus(
+                  apgState.associatedUserContract.guid,
+                  dataAccessState.lakehouseContractServerClient,
+                  auth.user?.access_token,
+                );
+              }
+            }}
             getContractTaskUrl={dataAccessState.getContractTaskUrl}
             getDataProductUrl={dataAccessState.getDataProductUrl}
           />