Merge branch 'develop' into hcx-plug

.env

@@ -2,9 +2,9 @@
 
 REACT_APP_TITLE=CARE
 REACT_APP_META_DESCRIPTION=Revolutionizing EMR with AI: Open Healthcare Network develops free, open-source tools to enhance efficiency in global healthcare delivery. Our EMR system is recognized as a Digital Public Good by the United Nations.
-REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
-REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
-REACT_PUBLIC_URL=https://care.coronasafe.in
+REACT_APP_COVER_IMAGE=https://cdn.ohc.network/care_logo.svg
+REACT_APP_COVER_IMAGE_ALT=https://cdn.ohc.network/care_logo.svg
+REACT_PUBLIC_URL=https://care.ohc.network
 
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true

.github/CODEOWNERS

@@ -1 +1 @@
-* @coronasafe/code-reviewers @coronasafe/care-fe-code-reviewers
+* @ohcnetwork/care-fe-code-reviewers

.github/pull_request_template.md

@@ -5,12 +5,12 @@
 - Change 2
 - More?
 
-@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers
+@ohcnetwork/code-reviewers
 
 ## Merge Checklist
 
 - [ ] Add specs that demonstrate bug / test a new feature.
-- [ ] Update [product documentation](https://docs.coronasafe.network/coronasafe-care-documentation/architecture/architecture-and-layering-of-care).
+- [ ] Update [product documentation](https://docs.ohc.network).
 - [ ] Ensure that UI text is kept in I18n files.
 - [ ] Prep screenshot or demo video for changelog entry, and attach it to issue.
 - [ ] Request for Peer Reviews

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   CodeQL-Build:
     runs-on: ubuntu-latest
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     permissions:
       security-events: write
       actions: read

.github/workflows/comment-p1-issues.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   add-comment:
-    if: github.event.label.name == 'P1' && github.repository == 'coronasafe/care_fe'
+    if: github.event.label.name == 'P1' && github.repository == 'ohcnetwork/care_fe'
     runs-on: ubuntu-latest
     permissions:
       issues: write

.github/workflows/cypress.yaml

@@ -12,7 +12,7 @@ on:
 jobs:
   cypress-run:
     permissions: write-all
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -34,7 +34,7 @@ jobs:
       - name: Checkout care 📥
         uses: actions/checkout@v3
         with:
-          repository: coronasafe/care
+          repository: ohcnetwork/care
           path: care
           ref: ${{ steps.backend-branch.outputs.branch }}
 

.github/workflows/deploy.yaml

@@ -27,7 +27,7 @@ env:
 
 jobs:
   test:
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     runs-on: ubuntu-latest
     name: Test
     steps:

.github/workflows/issue-automation.yml

@@ -10,39 +10,39 @@ jobs:
   issue_opened_and_reopened:
     name: issue_opened_and_reopened
     runs-on: ubuntu-latest
-    if: github.repository == 'coronasafe/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
+    if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Triage"'
         uses: leonsteinhaeuser/[email protected]
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          organization: coronasafe
+          organization: ohcnetwork
           project_id: 4
           resource_node_id: ${{ github.event.issue.node_id }}
           status_value: "Triage"
   issue_closed:
     name: issue_closed
     runs-on: ubuntu-latest
-    if: github.repository == 'coronasafe/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
+    if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
         uses: leonsteinhaeuser/[email protected]
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          organization: coronasafe
+          organization: ohcnetwork
           project_id: 4
           resource_node_id: ${{ github.event.issue.node_id }}
           status_value: "Done"
   issue_assigned:
     name: issue_assigned
     runs-on: ubuntu-latest
-    if: github.repository == 'coronasafe/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
+    if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
     steps:
       - name: 'Move issue to "In Progress"'
         uses: leonsteinhaeuser/[email protected]
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          organization: coronasafe
+          organization: ohcnetwork
           project_id: 4
           resource_node_id: ${{ github.event.issue.node_id }}
           status_value: "In Progress"

.github/workflows/label-deploy-failed.yml

@@ -13,7 +13,7 @@ jobs:
   auto-label-deploy-failed:
     runs-on: ubuntu-latest
     if: |
-      github.repository == 'coronasafe/care_fe' && github.event.issue.pull_request &&
+      github.repository == 'ohcnetwork/care_fe' && github.event.issue.pull_request &&
       contains(github.event.comment.body, 'Deploy Preview')
     steps:
       - name: Add 'Deploy-Failed'

.github/workflows/label-merge-conflict.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   auto-label:
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     runs-on: ubuntu-latest
     steps:
       - uses: prince-chrismc/label-merge-conflicts-action@v2

.github/workflows/label-wip.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   check-linked-issues:
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     name: Check linked issues
     runs-on: ubuntu-latest
     outputs:
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-linked-issues
     permissions: write-all
-    if: github.repository == 'coronasafe/care_fe' && join(needs.check-linked-issues.outputs.linked_issues) != ''
+    if: github.repository == 'ohcnetwork/care_fe' && join(needs.check-linked-issues.outputs.linked_issues) != ''
     steps:
       - name: Label
         uses: actions/github-script@v6

.github/workflows/ossar-analysis.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   OSSAR-Scan:
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     # OSSAR runs on windows-latest.
     # ubuntu-latest and macos-latest support coming soon
     runs-on: windows-latest

.github/workflows/stale.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
-    if: github.repository == 'coronasafe/care_fe'
+    if: github.repository == 'ohcnetwork/care_fe'
     steps:
       - uses: actions/stale@v6
         with:

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at info@coronasafe.network. All
+reported by contacting the project team at info@ohc.network. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

README.md

@@ -1,7 +1,7 @@
 <a href="https://ohc.network/">
   <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://cdn.coronasafe.network/light-logo.svg">
+      <source media="(prefers-color-scheme: dark)" srcset="https://cdn.ohc.network/light-logo.svg">
       <img alt="CARE Logo" src="https://user-images.githubusercontent.com/25143503/193396107-27e0d587-b195-4e95-a795-5d0663d5cd81.svg">
     </picture>
   </p>
@@ -12,23 +12,23 @@
 <p align="center"><img src="https://api.netlify.com/api/v1/badges/fd123f42-ef65-448c-9b03-39959d60e60b/deploy-status"></p>
 <p align="center">Auto deployed to <a href="https://care.ohc.network/">care.ohc.network</a> for <code>develop</code> branch. All pull requests have preview builds powered by <a href="https://netlify.com">Netlify</a>.</p>
 
-[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/0)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/0)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/1)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/1)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/2)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/2)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/3)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/3)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/4)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/4)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/5)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/5)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/6)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/6)[![](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/images/7)](https://sourcerer.io/fame/tomahawk-pilot/coronasafe/care_fe/links/7)
+[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/0)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/0)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/1)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/1)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/2)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/2)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/3)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/3)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/4)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/4)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/5)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/5)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/6)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/6)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/7)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/7)
 
 [![Storybook](https://raw.githubusercontent.com/storybooks/brand/master/badge/badge-storybook.svg)](https://careui.coronasafe.in)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=coronasafe_care_fe&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=coronasafe_care_fe)
-![Code scanning - action](https://github.com/coronasafe/care_fe/workflows/Code%20scanning%20-%20action/badge.svg)
-![OSSAR](https://github.com/coronasafe/care_fe/workflows/OSSAR/badge.svg)
+![Code scanning - action](https://github.com/ohcnetwork/care_fe/workflows/Code%20scanning%20-%20action/badge.svg)
+![OSSAR](https://github.com/ohcnetwork/care_fe/workflows/OSSAR/badge.svg)
 [![Cypress Tests](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/wf7d2m/develop&style=flat&logo=cypress)](https://cloud.cypress.io/projects/wf7d2m/runs)
-![Staging Release](https://github.com/coronasafe/care_fe/workflows/CARE%20Develop%20Registry/badge.svg)
-![Production Release](https://github.com/coronasafe/care_fe/workflows/Production%20Release/badge.svg)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/200482ab117e4b5397ff3f5ae5719aa2)](https://www.codacy.com/gh/coronasafe/care_fe?utm_source=github.com&utm_medium=referral&utm_content=coronasafe/care_fe&utm_campaign=Badge_Grade)
-[![CircleCI](https://circleci.com/gh/coronasafe/care_fe.svg?style=svg)](https://circleci.com/gh/coronasafe/care_fe)
-[![Maintainability](https://api.codeclimate.com/v1/badges/f1438f693aa459805301/maintainability)](https://codeclimate.com/github/coronasafe/care_fe/maintainability)
+![Staging Release](https://github.com/ohcnetwork/care_fe/workflows/CARE%20Develop%20Registry/badge.svg)
+![Production Release](https://github.com/ohcnetwork/care_fe/workflows/Production%20Release/badge.svg)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/200482ab117e4b5397ff3f5ae5719aa2)](https://www.codacy.com/gh/ohcnetwork/care_fe?utm_source=github.com&utm_medium=referral&utm_content=ohcnetwork/care_fe&utm_campaign=Badge_Grade)
+[![CircleCI](https://circleci.com/gh/ohcnetwork/care_fe.svg?style=svg)](https://circleci.com/gh/ohcnetwork/care_fe)
+[![Maintainability](https://api.codeclimate.com/v1/badges/f1438f693aa459805301/maintainability)](https://codeclimate.com/github/ohcnetwork/care_fe/maintainability)
 
 ## Getting started
 
 - 💬 Comment on the issue if you are willing to take it up, and link the pull request with the issue.
-- 🏷️ Tag `@coronasafe/code-reviewers` for faster resolution.
+- 🏷️ Tag `@ohcnetwork/care-fe-code-reviewers` for faster resolution.
 - 📸 Attach screenshots in the pull requests showing the changes made in the UI.
 
 #### Install the required dependencies
@@ -65,7 +65,7 @@ Authenticate to staging API with any of the following credentials
 
 #### Contributing to CARE
 
-- Create a branch with branch name of the format `issues/{issue#}/{short-name}` (example `issues/7001/edit-prescriptions`) from the latest [`develop`](https://github.com/coronasafe/care_fe/tree/develop) branch when starting to work on an issue.
+- Create a branch with branch name of the format `issues/{issue#}/{short-name}` (example `issues/7001/edit-prescriptions`) from the latest [`develop`](https://github.com/ohcnetwork/care_fe/tree/develop) branch when starting to work on an issue.
 - Once the changes are pushed to the branch, make a pull request with a meaningful title (example: "💊 Adds support for editing prescriptions" #6369)
 - Ensure the issue number is mentioned in the PR with a closing tag by following the PR body template. (Refer: [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
 - Once the code review is done, the PR will be marked with a "Needs Testing" label where it'll be queued for QA testing.
@@ -80,7 +80,7 @@ To ensure the quality of our pull requests, we use a variety of tools:
 
 #### 🧪 Run cypress tests
 
-To run cypress tests locally, you'll need to setup the backend to run locally and load dummy data required for cypress to the database. See [docs](https://github.com/coronasafe/care#self-hosting).
+To run cypress tests locally, you'll need to setup the backend to run locally and load dummy data required for cypress to the database. See [docs](https://github.com/ohcnetwork/care#self-hosting).
 
 Once backend is running locally, you'll have to ensure your local front-end is connected to local backend, by setting the `CARE_API` env.
 
@@ -114,7 +114,7 @@ npm run cypress:open       # To debug and run tests individually.
 
 ## 📖 Documentations
 
-- [CARE Documentation](https://docs.coronasafe.network/coronasafe-care-documentation/)
+- [CARE Documentation](https://docs.ohc.network/docs/care)
 - [Swagger API Documentation](https://careapi.ohc.network/swagger/)
 - [Storybook component library](https://careui.coronasafe.in/)
 - [Testing Documentation](https://docs.coronasafe.network/care-testing-documentation/)

SECURITY.md

@@ -23,4 +23,4 @@
 
 ## Reporting a Vulnerability
 
-Please create an issue at https://github.com/coronasafe/care_fe/issues/new
+Please create an issue at https://github.com/ohcnetwork/care_fe/issues/new

UPGRADING.md

@@ -7,7 +7,7 @@ sidebar_label: Upgrading
 ## Breaking changes
 
 These are a list of changes that should be accounted for when upgrading an existing installation of Care. If you
-encounter any problems while following these instructions, please [create a new issue](https://github.com/coronasafe/care_fe/issues/new/choose)
+encounter any problems while following these instructions, please [create a new issue](https://github.com/ohcnetwork/care_fe/issues/new/choose)
 on our Github repo.
 
 Breaking Changes before **September Minor Release v11.2** are not yet documented

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -345,8 +345,8 @@ describe("Patient Consultation in multiple combination", () => {
       "Bleeding",
     ]);
     patientConsultationPage.clickAddSymptom();
-    // Comfort Care category
-    patientConsultationPage.selectPatientCategory("Comfort Care");
+    // Mild category
+    patientConsultationPage.selectPatientCategory("Mild");
     // Date of symptoms
     // Decision after consultation - Referred to Facility
     patientConsultationPage.selectPatientSuggestion(

index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -23,7 +23,10 @@
     <meta name="apple-mobile-web-app-title" content="Care" />
     <meta name="theme-color" content="#0e9f6e" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link rel="apple-touch-icon" href="/images/icons/apple-touch-icon-180x180.png">
+    <link
+      rel="apple-touch-icon"
+      href="/images/icons/apple-touch-icon-180x180.png"
+    />
   </head>
 
   <body>
@@ -35,17 +38,27 @@
           pointer-events: none;
           filter: brightness(80%);
         }
-       @media (prefers-reduced-motion: no-preference) {
+        @media (prefers-reduced-motion: no-preference) {
           .App-logo {
             animation: App-logo-blink 1s linear infinite;
           }
         }
         @keyframes App-logo-blink {
-          0% { opacity: 0;}
-          25% { opacity: 0.5;}
-          50% {opacity: 1;}
-          75% {opacity: 0.5;}
-          100% {opacity: 0;}
+          0% {
+            opacity: 0;
+          }
+          25% {
+            opacity: 0.5;
+          }
+          50% {
+            opacity: 1;
+          }
+          75% {
+            opacity: 0.5;
+          }
+          100% {
+            opacity: 0;
+          }
         }
         .temp-loading {
           display: grid;
@@ -55,10 +68,10 @@
         }
       </style>
       <div class="temp-loading">
-        <img 
-        class="App-logo"
-        src="https://cdn.coronasafe.network/light-logo.svg"
-        alt="Care is loading"
+        <img
+          class="App-logo"
+          src="https://cdn.ohc.network/light-logo.svg"
+          alt="Care is loading"
         />
       </div>
     </div>

netlify.toml

@@ -29,7 +29,7 @@ status = 200
       script-src 'self' 'nonce-f51b9742' https://plausible.10bedicu.in;
       style-src 'self' 'unsafe-inline';
       connect-src 'self' https://plausible.10bedicu.in;
-      img-src 'self' https://cdn.coronasafe.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
+      img-src 'self' https://cdn.ohc.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       object-src 'self' https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       report-uri https://csp-logger.ohc.network/
       '''