Merge branch 'staging' into generateroles_handle_2

unicef · Dec 11, 2024 · 3228cd2 · 3228cd2
2 parents 43d0927 + 5b15e07
commit 3228cd2
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 35 deletions.
diff --git a/src/frontend/data/schema.graphql b/src/frontend/data/schema.graphql
@@ -1272,6 +1272,7 @@ type FinancialServiceProviderXlsxTemplateNode implements Node {
   columns: [String]
   coreFields: [String!]!
   flexFields: [String!]!
+  documentTypes: [String!]!
   financialServiceProviders(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderNodeConnection!
 }
 
@@ -2513,8 +2514,8 @@ type PaymentNode implements Node {
   fspAuthCode: String
   isCashAssist: Boolean!
   followUps(offset: Int, before: String, after: String, first: Int, last: Int): PaymentNodeConnection!
-  paymentVerification: PaymentVerificationNode
   householdSnapshot: PaymentHouseholdSnapshotNode
+  paymentVerification: PaymentVerificationNode
   ticketComplaintDetails: TicketComplaintDetailsNode
   ticketSensitiveDetails: TicketSensitiveDetailsNode
   adminUrl: String
@@ -2607,13 +2608,13 @@ type PaymentPlanNode implements Node {
   excludeHouseholdError: String!
   name: String
   isCashAssist: Boolean!
+  approvalProcess(offset: Int, before: String, after: String, first: Int, last: Int): ApprovalProcessNodeConnection!
   followUps(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanNodeConnection!
   deliveryMechanisms: [DeliveryMechanismPerPaymentPlanNode]
   paymentItems(offset: Int, before: String, after: String, first: Int, last: Int): PaymentNodeConnection!
+  documents(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanSupportingDocumentNodeConnection!
   paymentVerificationPlans(offset: Int, before: String, after: String, first: Int, last: Int): PaymentVerificationPlanNodeConnection!
   paymentVerificationSummary: PaymentVerificationSummaryNode
-  approvalProcess(offset: Int, before: String, after: String, first: Int, last: Int): ApprovalProcessNodeConnection!
-  documents(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanSupportingDocumentNodeConnection!
   adminUrl: String
   currencyName: String
   hasPaymentListExportFile: Boolean
@@ -4681,13 +4682,13 @@ type UserNode implements Node {
   doapHash: String!
   userRoles: [UserRoleNode!]!
   documentSet(offset: Int, before: String, after: String, first: Int, last: Int): DocumentNodeConnection!
+  approvalSet: [ApprovalNode!]!
   registrationDataImports(offset: Int, before: String, after: String, first: Int, last: Int): RegistrationDataImportNodeConnection!
   createdPaymentPlans(offset: Int, before: String, after: String, first: Int, last: Int): PaymentPlanNodeConnection!
   createdFinancialServiceProviderXlsxTemplates(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderXlsxTemplateNodeConnection!
   createdFinancialServiceProviders(offset: Int, before: String, after: String, first: Int, last: Int): FinancialServiceProviderNodeConnection!
   createdDeliveryMechanisms(offset: Int, before: String, after: String, first: Int, last: Int): DeliveryMechanismPerPaymentPlanNodeConnection!
   sentDeliveryMechanisms(offset: Int, before: String, after: String, first: Int, last: Int): DeliveryMechanismPerPaymentPlanNodeConnection!
-  approvalSet: [ApprovalNode!]!
   createdTickets(offset: Int, before: String, after: String, first: Int, last: Int): GrievanceTicketNodeConnection!
   assignedTickets(offset: Int, before: String, after: String, first: Int, last: Int): GrievanceTicketNodeConnection!
   ticketNotes(offset: Int, before: String, after: String, first: Int, last: Int): TicketNoteNodeConnection!

diff --git a/src/frontend/fixtures/paymentmodule/fakeApolloPaymentPlan.ts b/src/frontend/fixtures/paymentmodule/fakeApolloPaymentPlan.ts
@@ -14,6 +14,9 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
   version: 1000,
   unicefId: 'PP-0060-22-00000001',
   status: PaymentPlanStatus.Locked,
+  programCycle: {
+    id: 'UHJvZ3JhbUN5Y2xlOjljNDMzZWQzLTcwZjUtNDRhOC1iZmQ5LTA1Mjg3YTAwNzQxNQ==',
+  },
   isFollowUp: false,
   sourcePaymentPlan: null,
   excludedHouseholds: null,
@@ -43,7 +46,7 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
     name: 'Report should property early adult.',
     __typename: 'TargetPopulationNode',
   },
-  currency: "PLN",
+  currency: 'PLN',
   currencyName: 'Polish złoty',
   startDate: '2020-10-27',
   endDate: '2021-09-08',
@@ -301,7 +304,8 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
   __typename: 'PaymentPlanNode',
 };
 
-export const fakeApolloPaymentPlanWithWrongBackgroundActionStatus: PaymentPlanQuery['paymentPlan'] = {
-  ...fakeApolloPaymentPlan,
-  backgroundActionStatus: PaymentPlanBackgroundActionStatus.XlsxExporting,
-};
+export const fakeApolloPaymentPlanWithWrongBackgroundActionStatus: PaymentPlanQuery['paymentPlan'] =
+  {
+    ...fakeApolloPaymentPlan,
+    backgroundActionStatus: PaymentPlanBackgroundActionStatus.XlsxExporting,
+  };