Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production Release: December Week 4 #6926

Merged
merged 45 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
70127e0
Fix investigation builder crash (#6755)
Ashesh3 Dec 13, 2023
f8aae49
fix responsiveness on patients page (#6759)
Pranshu1902 Dec 13, 2023
c015a29
fixes #6810; format date and time for discharge date (#6813)
rithviknishad Dec 13, 2023
1a6b3d3
Allow occupancy button to resize on default font size change. Fixes #…
Omkar76 Dec 13, 2023
9967dae
Refactor user delete permissions to allow StateAdmin and DistrictAdmi…
Ashesh3 Dec 13, 2023
4f39ce2
Disable submit button in round type normal if no value selected (#6793)
Pranshu1902 Dec 13, 2023
0adb29d
Add MEWS Component (#6760)
AshrafMd-1 Dec 13, 2023
cdbe306
Add loading screen in index.html (#6836)
jainvedant392 Dec 13, 2023
bd4dd95
Show error for invalid records of import external results page (#6832)
Pranshu1902 Dec 13, 2023
e292fb7
Refactor TransferPatientDialog component to display patient name in s…
konavivekramakrishna Dec 13, 2023
27c5766
Prevent CARE from reloading during sign in/out 🏃‍♂️ (#6828)
rithviknishad Dec 13, 2023
20e706f
fix tooltip (#6827)
AshrafMd-1 Dec 13, 2023
68fbb04
Update API path for asset service records (#6826)
Ashesh3 Dec 13, 2023
e857d03
Resolve page scroll resets in consultations tabs. (#6825)
AshrafMd-1 Dec 13, 2023
c8a71f6
Removed required attribute from Respiratory Rate (#6738)
konavivekramakrishna Dec 13, 2023
12b4847
use celery beat to check for pending migrations (#6845)
sainak Dec 14, 2023
881e247
fix flaky test (#6864)
nihal467 Dec 14, 2023
56f0c2b
Sort wards by ward number in filters + adds utility method: `compareB…
rithviknishad Dec 14, 2023
5b0bca7
trim trailing spaces (#6848)
AshrafMd-1 Dec 14, 2023
27e19cc
Fixed update button in bed management. (#6841)
AshrafMd-1 Dec 14, 2023
be3da2e
change tooltip (#6842)
AshrafMd-1 Dec 14, 2023
6b1bf39
Added same logic for disabling in both mobile and desktop view (#6840)
kshitijv256 Dec 14, 2023
3348268
fix resend otp in abdm aadhar signup
khavinshankar Dec 14, 2023
1bb99f0
improved error message for resend otp
khavinshankar Dec 14, 2023
08740cd
Merge pull request #6867 from coronasafe/abdm-resend-otp
gigincg Dec 14, 2023
b7af525
hide user conflict notification (#6869)
rithviknishad Dec 15, 2023
1f5ea20
daily rounds, clone last default to null (#6872)
rithviknishad Dec 15, 2023
5a8803e
thank everyone (#6777)
rithviknishad Dec 19, 2023
7d15c03
Remove Copilot for PR tags (#6725)
rithviknishad Dec 19, 2023
7c21b80
Disable critical care submit if onle basic editor is filled (#6860)
Pranshu1902 Dec 20, 2023
b4a7fbd
Add Telemedicine as a rounds type option (#6831)
Ashesh3 Dec 20, 2023
d5e342c
Fix pincode api (#6884)
Ashesh3 Dec 20, 2023
4c08326
remove irrelevant columns (#6878)
AshrafMd-1 Dec 20, 2023
dc6d049
feat: show correct error message for interval server errors (#6873)
jainvedant392 Dec 20, 2023
541f9b2
Update GitHub action versions (#6863)
Ashesh3 Dec 20, 2023
83c4524
Redesign location card UI (#6853)
GokulramGHV Dec 20, 2023
23af9e0
Add Consultation Specific route for Doctor Notes (#6851)
Pranshu1902 Dec 20, 2023
2a0eec6
Rename "Admission Date" to encounter specific labels (#6719)
rithviknishad Dec 21, 2023
9fc041c
🧹 Remove unused redux actions, fireRequest for file utility method, h…
rithviknishad Dec 21, 2023
89c6382
Fix pincode district name comparison (#6894)
Ashesh3 Dec 22, 2023
d906c6a
Adds support for units for `max_dosage` (#6897)
rithviknishad Dec 23, 2023
97ca611
Fixes Filters Cache restore logic (#6908)
rithviknishad Dec 25, 2023
c74c2f3
New Cypress Test | Facility Location and Bed Management | Facility Mo…
nihal467 Dec 25, 2023
a5a61ca
Revert "Disable critical care submit if onle basic editor is filled (…
Ashesh3 Dec 26, 2023
ce066ce
Hide Camera Feed button for patient with no bed assigned. (#6868)
shyamprakash123 Dec 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
### WHAT
copilot:summary

## Proposed Changes

- Fixes #issue?
- Fixes #issue_number
- Change 1
- Change 2
- More?
Expand All @@ -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
17 changes: 11 additions & 6 deletions .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ..
Expand All @@ -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
Expand Down Expand Up @@ -79,4 +85,3 @@ jobs:
with:
name: cypress-screenshots
path: cypress/screenshots

69 changes: 45 additions & 24 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down Expand Up @@ -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') }}
Expand Down Expand Up @@ -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') }}
Expand Down Expand Up @@ -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/
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ossar-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/thank-you.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Say thanks for the contributors

on:
pull_request:
pull_request_target:
types:
- closed

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/external_results_spec/filter.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
Loading
Loading