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

package/src/components/__test-utils__/TEST_DATA__LakehouseContractData.ts

@@ -17,6 +17,7 @@
 import {
   type V1_ContractUserEventDataProducerPayload,
   type V1_ContractUserEventPrivilegeManagerPayload,
+  type V1_DataContract,
   type V1_LiteDataContract,
   type V1_TaskResponse,
   V1_ApprovalType,
@@ -76,7 +77,53 @@ export const mockDataContractMultipleConsumers: V1_LiteDataContract = {
   accessPointGroup: 'GROUP1',
 };
 
-export const mockPendingManagerApprovalTasksResponse: V1_TaskResponse = {
+export const mockDataContractWithSystemAccountMember: V1_DataContract = {
+  description: 'Test data contract with system account member',
+  guid: 'test-data-contract-with-system-account-member-id',
+  version: 0,
+  state: V1_ContractState.OPEN_FOR_PRIVILEGE_MANAGER_APPROVAL,
+  resource: {
+    _type: V1_ResourceType.ACCESS_POINT_GROUP,
+    dataProduct: 'MOCK_SDLC_DATAPRODUCT',
+    accessPointGroup: 'GROUP1',
+  },
+  members: [
+    {
+      guid: 'member-1-guid',
+      user: {
+        name: 'test-consumer-user-id',
+        userType: V1_UserType.WORKFORCE_USER,
+      },
+      status: V1_UserApprovalStatus.PENDING,
+    },
+    {
+      guid: 'member-2-guid',
+      user: {
+        name: 'test-system-account-user-id',
+        userType: V1_UserType.SYSTEM_ACCOUNT,
+      },
+      status: V1_UserApprovalStatus.PENDING,
+    },
+  ],
+  consumer: {
+    _type: V1_OrganizationalScopeType.AdHocTeam,
+    users: [
+      {
+        name: 'test-consumer-user-id',
+        type: V1_UserType.WORKFORCE_USER,
+      },
+      {
+        name: 'test-system-account-user-id',
+        type: V1_UserType.SYSTEM_ACCOUNT,
+      },
+    ],
+  },
+  createdBy: 'test-requester-user-id',
+};
+
+export const getMockPendingManagerApprovalTasksResponse = (
+  isEscalated: boolean = false,
+): V1_TaskResponse => ({
   tasks: [
     {
       assignees: ['test-privilege-manager-user-id'],
@@ -90,10 +137,74 @@ export const mockPendingManagerApprovalTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.PENDING,
         taskId: 'mock-privilege-manager-approval-task-id',
         type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated,
+      },
+    },
+    {
+      assignees: ['test-privilege-manager-user-id'],
+      rec: {
+        consumer: 'test-consumer-user-id-2',
+        dataContractId: 'test-data-contract-id',
+        eventPayload: {
+          type: V1_ContractEventPayloadType.SUBMITTED,
+          eventTimestamp: '2025-08-06T11:54:46.069672876Z',
+        },
+        status: V1_UserApprovalStatus.PENDING,
+        taskId: 'mock-privilege-manager-approval-task-id-2',
+        type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated,
+      },
+    },
+    {
+      assignees: ['test-privilege-manager-user-id'],
+      rec: {
+        consumer: 'test-system-account-user-id',
+        dataContractId: 'test-data-contract-id',
+        eventPayload: {
+          type: V1_ContractEventPayloadType.SUBMITTED,
+          eventTimestamp: '2025-08-06T11:54:46.069672876Z',
+        },
+        status: V1_UserApprovalStatus.PENDING,
+        taskId: 'mock-privilege-manager-approval-task-id-3',
+        type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated,
       },
     },
   ],
-};
+});
+
+export const mockEscalatedPendingManagerApprovalTasksResponse: V1_TaskResponse =
+  {
+    tasks: [
+      {
+        assignees: [
+          'test-privilege-manager-user-id',
+          'test-privilege-manager-user-id-2',
+          'test-privilege-manager-user-id-3',
+        ],
+        rec: {
+          consumer: 'test-consumer-user-id',
+          dataContractId: 'test-data-contract-id',
+          eventPayload: {
+            type: V1_ContractEventPayloadType.SUBMITTED,
+            eventTimestamp: '2025-08-06T11:54:46.069672876Z',
+          },
+          status: V1_UserApprovalStatus.PENDING,
+          taskId: 'mock-privilege-manager-approval-task-id',
+          type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+          effectiveFrom: '2025-08-07T00:00:00.000Z',
+          effectiveTo: '2026-08-07T00:00:00.000Z',
+          isEscalated: true,
+        },
+      },
+    ],
+  };
 
 export const mockPendingManagerApprovalMultipleAssigneesTasksResponse: V1_TaskResponse =
   {
@@ -113,6 +224,9 @@ export const mockPendingManagerApprovalMultipleAssigneesTasksResponse: V1_TaskRe
           status: V1_UserApprovalStatus.PENDING,
           taskId: 'mock-privilege-manager-approval-task-id',
           type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+          effectiveFrom: '2025-08-07T00:00:00.000Z',
+          effectiveTo: '2026-08-07T00:00:00.000Z',
+          isEscalated: false,
         },
       },
     ],
@@ -133,6 +247,9 @@ export const mockPendingManagerApprovalMultipleConsumersTasksResponse: V1_TaskRe
           status: V1_UserApprovalStatus.PENDING,
           taskId: 'mock-privilege-manager-approval-task-id',
           type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+          effectiveFrom: '2025-08-07T00:00:00.000Z',
+          effectiveTo: '2026-08-07T00:00:00.000Z',
+          isEscalated: false,
         },
       },
       {
@@ -147,6 +264,9 @@ export const mockPendingManagerApprovalMultipleConsumersTasksResponse: V1_TaskRe
           status: V1_UserApprovalStatus.PENDING,
           taskId: 'mock-privilege-manager-approval-task-id',
           type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+          effectiveFrom: '2025-08-07T00:00:00.000Z',
+          effectiveTo: '2026-08-07T00:00:00.000Z',
+          isEscalated: false,
         },
       },
     ],
@@ -169,6 +289,9 @@ export const mockPendingDataOwnerApprovalTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.APPROVED,
         taskId: 'mock-privilege-manager-approval-task-id',
         type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated: false,
       },
     },
     {
@@ -186,6 +309,9 @@ export const mockPendingDataOwnerApprovalTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.PENDING,
         taskId: 'mock-data-owner-approval-task-id',
         type: V1_ApprovalType.DATA_OWNER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated: false,
       },
     },
   ],
@@ -208,6 +334,9 @@ export const mockApprovedTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.APPROVED,
         taskId: 'mock-privilege-manager-approval-task-id',
         type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated: false,
       },
     },
     {
@@ -225,6 +354,9 @@ export const mockApprovedTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.APPROVED,
         taskId: 'mock-data-owner-approval-task-id',
         type: V1_ApprovalType.DATA_OWNER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated: false,
       },
     },
   ],
@@ -247,6 +379,9 @@ export const mockDeniedTasksResponse: V1_TaskResponse = {
         status: V1_UserApprovalStatus.DENIED,
         taskId: 'mock-privilege-manager-denied-task-id',
         type: V1_ApprovalType.CONSUMER_PRIVILEGE_MANAGER_APPROVAL,
+        effectiveFrom: '2025-08-07T00:00:00.000Z',
+        effectiveTo: '2026-08-07T00:00:00.000Z',
+        isEscalated: false,
       },
     },
   ],

package/src/components/__test-utils__/TEST_DATA__LakehouseDataProducts.ts

@@ -59,7 +59,7 @@ export const mockEntitlementsSDLCDataProduct: V1_EntitlementsDataProductDetails
   });
 
 export const mockSDLCDataProduct: V1_DataProduct = deserialize(
-  V1_dataProductModelSchema,
+  V1_dataProductModelSchema([]),
   {
     _type: 'dataProduct',
     package: 'test',
@@ -153,7 +153,7 @@ export const mockEntitlementsSDLCDataProductNoSupportInfo: V1_EntitlementsDataPr
   });
 
 export const mockSDLCDataProductNoSupportInfo: V1_DataProduct = deserialize(
-  V1_dataProductModelSchema,
+  V1_dataProductModelSchema([]),
   {
     _type: 'dataProduct',
     package: 'test',
@@ -226,7 +226,7 @@ export const mockEntitlementsEnterpriseDataProduct: V1_EntitlementsDataProductDe
   });
 
 export const mockEnterpriseDataProduct: V1_DataProduct = deserialize(
-  V1_dataProductModelSchema,
+  V1_dataProductModelSchema([]),
   {
     _type: 'dataProduct',
     package: 'test',

package/src/stores/DataProduct/DataProductAccessPointState.ts

@@ -26,6 +26,7 @@ import {
   V1_Protocol,
   V1_PureGraphManager,
   V1_PureModelContextPointer,
+  type V1_RelationElement,
   V1_RelationType,
   V1_relationTypeModelSchema,
   V1_RenderStyle,
@@ -48,9 +49,11 @@ export class DataProductAccessPointState {
   readonly apgState: DataProductAPGState;
   readonly accessPoint: V1_AccessPoint;
   relationType: V1_RelationType | undefined;
+  relationElement: V1_RelationElement | undefined;
   grammar: string | undefined;
 
   readonly fetchingRelationTypeState = ActionState.create();
+  readonly fetchingRelationElement = ActionState.create();
   readonly fetchingGrammarState = ActionState.create();
 
   constructor(apgState: DataProductAPGState, accessPoint: V1_AccessPoint) {
@@ -75,6 +78,7 @@ export class DataProductAccessPointState {
         dataProductArtifactPromise,
         entitlementsDataProductDetails,
       ),
+      this.fetchSampleDataFromArtifact(dataProductArtifactPromise),
       this.fetchGrammar(),
     ]);
   }
@@ -97,6 +101,27 @@ export class DataProductAccessPointState {
     }
   }
 
+  async fetchSampleDataFromArtifact(
+    dataProductArtifactPromise: Promise<V1_DataProductArtifact | undefined>,
+  ): Promise<void> {
+    this.fetchingRelationElement.inProgress();
+    try {
+      const artifact = await dataProductArtifactPromise;
+      this.relationElement = artifact?.accessPointGroups
+        .find((apg) => apg.id === this.apgState.apg.id)
+        ?.accessPointImplementations.find(
+          (ap) => ap.id === this.accessPoint.id,
+        )?.relationElement;
+    } catch (error) {
+      assertErrorThrown(error);
+      this.apgState.applicationStore.notificationService.notifyError(
+        `Error fetching access point sample data: ${error.message}`,
+      );
+    } finally {
+      this.fetchingRelationElement.complete();
+    }
+  }
+
   async fetchRelationTypeFromEngine(
     abortController: AbortController,
     entitlementsDataProductDetails?:

package/src/stores/DataProduct/EntitlementsDataContractViewerState.ts

@@ -15,15 +15,18 @@
  */
 
 import {
+  type GraphManagerState,
+  type V1_DataContract,
   type V1_LiteDataContract,
   type V1_TaskMetadata,
-  type V1_TaskResponse,
+  type V1_UserType,
+  V1_dataContractsResponseModelSchemaToContracts,
   V1_deserializeTaskResponse,
+  V1_observe_DataContract,
   V1_observe_LiteDataContract,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
-  type PlainObject,
   type UserSearchService,
   ActionState,
   assertErrorThrown,
@@ -33,29 +36,37 @@ import type { GenericLegendApplicationStore } from '@finos/legend-application';
 import type { LakehouseContractServerClient } from '@finos/legend-server-lakehouse';
 
 export class EntitlementsDataContractViewerState {
-  readonly value: V1_LiteDataContract;
+  readonly liteContract: V1_LiteDataContract;
   readonly applicationStore: GenericLegendApplicationStore;
   readonly lakehouseContractServerClient: LakehouseContractServerClient;
+  readonly graphManagerState: GraphManagerState;
   readonly userSearchService?: UserSearchService | undefined;
   associatedTasks: V1_TaskMetadata[] | undefined;
   initializationState = ActionState.create();
+  contractWithMembers: V1_DataContract | undefined;
+
+  readonly fetchingMembersState = ActionState.create();
 
   constructor(
     dataContract: V1_LiteDataContract,
     applicationStore: GenericLegendApplicationStore,
     lakehouseContractServerClient: LakehouseContractServerClient,
+    graphManagerState: GraphManagerState,
     userSearchService: UserSearchService | undefined,
   ) {
     makeObservable(this, {
-      value: observable,
+      liteContract: observable,
       associatedTasks: observable,
+      contractWithMembers: observable,
       setAssociatedTasks: action,
+      setContractWithMembers: action,
       init: flow,
     });
 
-    this.value = V1_observe_LiteDataContract(dataContract);
+    this.liteContract = V1_observe_LiteDataContract(dataContract);
     this.applicationStore = applicationStore;
     this.lakehouseContractServerClient = lakehouseContractServerClient;
+    this.graphManagerState = graphManagerState;
     this.userSearchService = userSearchService;
   }
 
@@ -63,21 +74,61 @@ export class EntitlementsDataContractViewerState {
     this.associatedTasks = associatedTasks;
   }
 
+  setContractWithMembers(
+    contractWithMembers: V1_DataContract | undefined,
+  ): void {
+    this.contractWithMembers = contractWithMembers;
+  }
+
+  async fetchTasks(token: string | undefined): Promise<void> {
+    this.setAssociatedTasks(undefined);
+    const pendingTasks =
+      await this.lakehouseContractServerClient.getContractTasks(
+        this.liteContract.guid,
+        token,
+      );
+    const tasks = V1_deserializeTaskResponse(pendingTasks);
+    this.setAssociatedTasks(tasks);
+  }
+
+  async fetchContractWithMembers(token: string | undefined): Promise<void> {
+    this.fetchingMembersState.inProgress();
+    try {
+      const rawContracts =
+        await this.lakehouseContractServerClient.getDataContract(
+          this.liteContract.guid,
+          true,
+          token,
+        );
+      const contracts = V1_dataContractsResponseModelSchemaToContracts(
+        rawContracts,
+        this.graphManagerState.pluginManager.getPureProtocolProcessorPlugins(),
+      );
+      this.setContractWithMembers(
+        contracts[0] ? V1_observe_DataContract(contracts[0]) : undefined,
+      );
+    } finally {
+      this.fetchingMembersState.complete();
+    }
+  }
+
   *init(token: string | undefined): GeneratorFn<void> {
     try {
       this.initializationState.inProgress();
-      this.setAssociatedTasks(undefined);
-      const pendingTasks =
-        (yield this.lakehouseContractServerClient.getContractTasks(
-          this.value.guid,
-          token,
-        )) as PlainObject<V1_TaskResponse>;
-      const tasks = V1_deserializeTaskResponse(pendingTasks);
-      this.setAssociatedTasks(tasks);
+      yield Promise.all([
+        this.fetchTasks(token),
+        this.fetchContractWithMembers(token),
+      ]);
     } catch (error) {
       assertErrorThrown(error);
     } finally {
       this.initializationState.complete();
     }
   }
+
+  getContractUserType(userId: string): V1_UserType | undefined {
+    return this.contractWithMembers?.members.find(
+      (member) => member.user.name === userId,
+    )?.user.userType;
+  }
 }