Back merge STG > DEV

pyproject.toml

@@ -137,7 +137,7 @@ distribution = true
 
 [project]
 name = "hope"
-version = "2.15.0"
+version = "2.16.0"
 description = "HCT MIS is UNICEF's humanitarian cash transfer platform."
 authors = [
     { name = "Tivix" },

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,
+  };

src/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "private": true,
   "type": "module",
   "scripts": {

src/frontend/src/apollo/queries/paymentmodule/PaymentPlan.ts

@@ -7,6 +7,9 @@ export const PAYMENT_PLAN_QUERY = gql`
       version
       unicefId
       status
+      programCycle {
+        id
+      }
       canCreateFollowUp
       backgroundActionStatus
       canCreatePaymentVerificationPlan

src/frontend/src/components/grievances/GrievancesSidebar/GrievancesSidebar.tsx

@@ -22,23 +22,41 @@ export function GrievancesSidebar({
   const shouldShowReassignBoxDataChange = (): boolean => {
     let { individual, household } = ticket;
     const { category, issueType, status } = ticket;
+
     if (category.toString() === GRIEVANCE_CATEGORIES.NEEDS_ADJUDICATION) {
       individual = ticket.needsAdjudicationTicketDetails.selectedIndividual;
       household =
         ticket.needsAdjudicationTicketDetails.selectedIndividual?.household;
     }
-    const isOneIndividual = household?.activeIndividualsCount === 1;
 
+    const isOneIndividual = household?.activeIndividualsCount === 1;
     if (isOneIndividual) return false;
-    const isRightCategory =
-      (category.toString() === GRIEVANCE_CATEGORIES.DATA_CHANGE &&
-        issueType.toString() === GRIEVANCE_ISSUE_TYPES.DELETE_INDIVIDUAL) ||
-      (category.toString() === GRIEVANCE_CATEGORIES.DATA_CHANGE &&
-        issueType.toString() === GRIEVANCE_ISSUE_TYPES.EDIT_INDIVIDUAL) ||
-      (category.toString() === GRIEVANCE_CATEGORIES.SYSTEM_FLAGGING &&
-        ticket?.systemFlaggingTicketDetails?.approveStatus) ||
-      (category.toString() === GRIEVANCE_CATEGORIES.NEEDS_ADJUDICATION &&
-        ticket?.needsAdjudicationTicketDetails?.selectedIndividual);
+
+    const isRightCategory = [
+      {
+        category: GRIEVANCE_CATEGORIES.DATA_CHANGE,
+        issueType: GRIEVANCE_ISSUE_TYPES.DELETE_INDIVIDUAL,
+      },
+      {
+        category: GRIEVANCE_CATEGORIES.DATA_CHANGE,
+        issueType: GRIEVANCE_ISSUE_TYPES.EDIT_INDIVIDUAL,
+      },
+      {
+        category: GRIEVANCE_CATEGORIES.SYSTEM_FLAGGING,
+        approveStatus: ticket?.systemFlaggingTicketDetails?.approveStatus,
+      },
+      {
+        category: GRIEVANCE_CATEGORIES.NEEDS_ADJUDICATION,
+        selectedIndividual:
+          ticket?.needsAdjudicationTicketDetails?.selectedIndividual,
+      },
+    ].some(
+      (condition) =>
+        category.toString() === condition.category &&
+        (issueType.toString() === condition.issueType ||
+          condition.approveStatus ||
+          condition.selectedIndividual),
+    );
 
     if (!isRightCategory) return false;
 
@@ -47,23 +65,22 @@ export function GrievancesSidebar({
 
     const householdsAndRoles = individual?.householdsAndRoles || [];
     const isHeadOfHousehold = individual?.id === household?.headOfHousehold?.id;
-    const hasRolesToReassign =
-      householdsAndRoles?.filter((el) => el.role !== 'NO_ROLE').length > 0;
+    const hasRolesToReassign = householdsAndRoles.some(
+      (el) => el.role !== 'NO_ROLE',
+    );
 
     let isProperDataChange = true;
     if (
       category.toString() === GRIEVANCE_CATEGORIES.DATA_CHANGE &&
       issueType.toString() === GRIEVANCE_ISSUE_TYPES.EDIT_INDIVIDUAL
     ) {
-      if (
-        isEmpty(ticket.individualDataUpdateTicketDetails.individualData.role) &&
-        isEmpty(
-          ticket.individualDataUpdateTicketDetails.individualData.relationship,
-        )
-      ) {
+      const { role, relationship } =
+        ticket.individualDataUpdateTicketDetails.individualData;
+      if (isEmpty(role) && isEmpty(relationship)) {
         isProperDataChange = false;
       }
     }
+
     return (
       (isHeadOfHousehold || hasRolesToReassign) &&
       isProperDataChange &&