Merge branch 'staging' into stg_sanction_list_test_file

unicef · Nov 14, 2024 · 346fa7e · 346fa7e
2 parents 01e72da + 18e0711
commit 346fa7e
Show file tree

Hide file tree

Showing 63 changed files with 1,178 additions and 261 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,13 +24,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             src/frontend/node_modules
@@ -50,11 +50,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -93,9 +93,9 @@ jobs:
     needs: [build_and_push_dev]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -111,9 +111,9 @@ jobs:
     needs: [build_and_push_dev]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -129,9 +129,9 @@ jobs:
     needs: [build_and_push_dev]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -147,9 +147,9 @@ jobs:
     needs: [build_and_push_dev]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -165,11 +165,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -219,9 +219,9 @@ jobs:
     needs: [build_and_push_dev]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -245,9 +245,9 @@ jobs:
     needs: [build_and_push_dist]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -289,9 +289,9 @@ jobs:
     needs: [build_and_push_dist]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: DockerHub login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -225,7 +225,6 @@ dependencies = [
     "sorl-thumbnail==12.9",
     "swapper<2.0.0,>=1.3.0",
     "tblib<2.0.0,>=1.7.0",
-    "unicef-power-query<1.0,>=0.4",
     "update<1.0.0,>=0.0.1",
     "urllib3<2.0.0,>=1.26.9",
     "xlrd<2.0,>=1.2",

diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.12.3",
+  "version": "2.13.0",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/...omponents/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx b/...omponents/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx
@@ -76,6 +76,7 @@ export function PaymentGrievanceDetails({
           {canApprovePaymentVerification &&
           ticket.status === GRIEVANCE_TICKET_STATES.FOR_APPROVAL ? (
             <Button
+              data-cy="grievance-approve"
               onClick={() =>
                 confirm({
                   title: t('Approve'),

diff --git a/...mentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap b/...mentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`components/grievances/PaymentGrievanceDetails should render with data 1
         </h6>
         <button
           class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
+          data-cy="grievance-approve"
           tabindex="0"
           type="button"
         >

diff --git a/.../components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx b/.../components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx
@@ -74,6 +74,7 @@ export function VerifyPaymentGrievance({
             <Button
               color="primary"
               variant="contained"
+              data-cy="grievance-verify"
               onClick={() => setVerifyManualDialogOpen(true)}
             >
               {t('Verify')}

diff --git a/...aymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap b/...aymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`components/grievances/VerifyPaymentGrievance should render with data 1`
     >
       <button
         class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
+        data-cy="grievance-verify"
         tabindex="0"
         type="button"
       >