Merge pull request #6926 from coronasafe/develop

ohcnetwork · Dec 27, 2023 · 73b199a · 73b199a · vercel · Dec 27, 2023
2 parents 801e8a0 + ce066ce
commit 73b199a
Show file tree

Hide file tree

Showing 97 changed files with 1,739 additions and 1,219 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,9 +1,6 @@
-### WHAT
-copilot:summary
-
 ## Proposed Changes
 
-- Fixes #issue?
+- Fixes #issue_number
 - Change 1
 - Change 2
 - More?
@@ -18,6 +15,3 @@ copilot:summary
 - [ ] Prep screenshot or demo video for changelog entry, and attach it to issue.
 - [ ] Request for Peer Reviews
 - [ ] Completion of QA
-
-### HOW
-copilot:walkthrough
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1,2,3,4,5,6,7,8]
+        containers: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
       - name: Checkout 📥
         uses: actions/checkout@v3
@@ -32,9 +32,9 @@ jobs:
         run: |
           cd care
           make docker_config_file=docker-compose.pre-built.yaml up 
-          while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
+          while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
             >&2 echo "Migrations are not yet applied - sleeping"
-            sleep 5
+            sleep 10
           done
           echo "Migrations are applied"
           cd ..
@@ -43,10 +43,16 @@ jobs:
         run: |
           cd care
           docker compose exec backend bash -c "python manage.py load_dummy_data"
+          docker restart care-backend-1
           cd ..
 
-      - name: Check care is up ♻
-        run: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+      - name: Wait for care to be up ♻
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 1
+          max_attempts: 5
+          command: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+          on_retry_command: sleep 5
 
       - name: Install dependencies 📦
         run: npm install
@@ -79,4 +85,3 @@ jobs:
         with:
           name: cypress-screenshots
           path: cypress/screenshots
-
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -35,7 +35,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('package-lock.json', 'Dockerfile') }}
@@ -87,7 +87,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('package-lock.json', 'Dockerfile') }}
@@ -149,7 +149,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('package-lock.json', 'Dockerfile') }}
@@ -188,6 +188,9 @@ jobs:
     needs: build-staging
     name: Deploy to staging GCP cluster
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Staging-GCP
       url: https://care-staging.ohc.network/
@@ -201,20 +204,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -230,6 +233,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Manipur
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production-Manipur
       url: https://care.mn.gov.in
@@ -243,20 +249,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -272,6 +278,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Karnataka
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production-Karnataka
       url: https://karnataka.care
@@ -285,20 +294,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -314,6 +323,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Sikkim
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production-Sikkim
       url: https://care.sikkim.gov.in
@@ -327,20 +339,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -356,6 +368,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Assam
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production-Assam
       url: https://care.assam.gov.in
@@ -369,20 +384,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -398,6 +413,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Nagaland
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production - Nagaland
       url: https://care.nagaland.gov.in
@@ -411,20 +429,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install
@@ -440,6 +458,9 @@ jobs:
     needs: build-production
     name: Deploy to GKE Meghalaya
     runs-on: ubuntu-latest
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '20'
     environment:
       name: Production-Meghalaya
       url: https://care.meghealth.gov.in
@@ -453,20 +474,20 @@ jobs:
           ref: main
 
       # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
+      - uses: google-github-actions/setup-gcloud@v2
         with:
           service_account_key: ${{ secrets.GKE_SA_KEY }}
           project_id: ${{ secrets.GKE_PROJECT }}
 
       # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
+      - uses: google-github-actions/get-gke-credentials@v2
         with:
           cluster_name: ${{ secrets.GKE_CLUSTER }}
           location: ${{ secrets.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
+        uses: azure/setup-kubectl@v3
         with:
           version: "v1.23.6"
         id: install

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -17,12 +17,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: '20'
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/ossar-analysis.yml b/.github/workflows/ossar-analysis.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # Checkout your code repository to scan
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -30,7 +30,7 @@ jobs:
 
       # Run open source static analysis tools
       - name: Run OSSAR
-        uses: github/ossar-action@v1
+        uses: github/ossar-action@fae13e456b9973657a670eef6bccc3a4c2b5153d
         id: ossar
 
         # Upload results to the Security tab

diff --git a/.github/workflows/thank-you.yml b/.github/workflows/thank-you.yml
@@ -1,7 +1,7 @@
 name: Say thanks for the contributors
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
 

diff --git a/cypress/e2e/external_results_spec/filter.cy.ts b/cypress/e2e/external_results_spec/filter.cy.ts
@@ -20,7 +20,7 @@ describe("External Results Filters", () => {
     cy.get("#local_bodies").click();
     cy.get("#wards").click();
     cy.get("[role='option']").should("be.visible");
-    cy.contains("[role='option']", "12").click();
+    cy.contains("[role='option']", "4").click();
     cy.contains("Apply").click();
   });