Merge branch 'develop' into fix#6940

ohcnetwork · Mar 4, 2024 · 7218486 · 7218486
2 parents 1130bd4 + dbf4f88
commit 7218486
Show file tree

Hide file tree

Showing 149 changed files with 17,357 additions and 18,340 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -16,7 +16,8 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:i18next/recommended",
-    "plugin:tailwindcss/recommended"
+    "plugin:tailwindcss/recommended",
+    "plugin:storybook/recommended"
   ],
   "overrides": [
     {
@@ -31,7 +32,7 @@
         "react/jsx-no-target-blank": "off",
         "i18next/no-literal-string": "off"
       }
-    }    
+    }
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
@@ -42,11 +43,14 @@
     "sourceType": "module"
   },
   "plugins": [
-    "@typescript-eslint", 
+    "@typescript-eslint",
     "i18next"
   ],
   "rules": {
-    "quotes": ["error", "double"],
+    "quotes": [
+      "error",
+      "double"
+    ],
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
@@ -62,21 +66,29 @@
       {
         "mode": "jsx-only",
         "jsx-attributes": {
-          "include": ["label", "placeholder", "error", "title"],
-          "exclude": [".*"]
+          "include": [
+            "label",
+            "placeholder",
+            "error",
+            "title"
+          ],
+          "exclude": [
+            ".*"
+          ]
         },
         "callees": {
-          "exclude": [".*"]
+          "exclude": [
+            ".*"
+          ]
         }
       }
     ],
     "tailwindcss/no-custom-classname": "off",
     "tailwindcss/migration-from-tailwind-2": "error",
     "tailwindcss/classnames-order": "error",
-    "tailwindcss/enforces-shorthand": "error",
+    "tailwindcss/enforces-shorthand": "off",
     "tailwindcss/no-contradicting-classname": "error"
   },
-
   "ignorePatterns": [
     "dist",
     "public",

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -42,14 +42,25 @@ jobs:
           max_attempts: 5
           command: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
           on_retry_command: sleep 5
+
+      - name: Determine PR Origin
+        id: pr_origin
+        run: echo "::set-output name=is_forked::$( echo ${{ github.event.pull_request.head.repo.fork }})"
 
       - name: Install dependencies 📦
         run: npm install
 
       - name: Build & Compile rescript files ⚙️
         run: "npm run build"
 
-      - name: Cypress run 🥬
+      - name: Install Specific Chrome Version
+        run: |
+          sudo apt-get install -y wget
+          sudo wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          sudo apt-get install ./google-chrome-stable_current_amd64.deb
+
+      - name: Cypress run for Non-Forked PRs 🥬
+        if: steps.pr_origin.outputs.is_forked == 'false'
         uses: cypress-io/github-action@v5
         with:
           env: SKIP_PREFLIGHT_CHECK=true
@@ -60,6 +71,7 @@ jobs:
           browser: chrome
           record: true
           parallel: true
+          group: "UI-Chrome"
         env:
           CARE_API: http://localhost:9000
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -68,9 +80,41 @@ jobs:
           COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
           COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
 
+      - name: Cypress run for Forked PRs 🥬
+        if: steps.pr_origin.outputs.is_forked == 'true'
+        uses: cypress-io/github-action@v5
+        with:
+          env: SKIP_PREFLIGHT_CHECK=true
+          install: false
+          start: "npx vite preview --host"
+          wait-on: "http://localhost:4000"
+          wait-on-timeout: 300
+          browser: chrome
+          record: true
+          parallel: true
+          group: "UI-Chrome"
+        env:
+          CYPRESS_SPLIT_TESTS: "true"
+          CARE_API: http://localhost:9000
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_OPTIONS: --max_old_space_size=4096
+          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
+          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
+          SPLIT: ${{ strategy.job-total }}
+          SPLIT_INDEX: ${{ strategy.job-index }}
+
       - name: Upload cypress screenshots on failure 📸
         uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
+
+      - name: Upload cypress videos 📹
+        uses: actions/upload-artifact@v3
+        if: steps.pr_origin.outputs.is_forked == 'true'
+        with:
+          name: cypress-videos
+          path: cypress/videos
+
diff --git a/.github/workflows/thank-you.yml b/.github/workflows/thank-you.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/[email protected]
         with:
           script: |
-            const thankyouNote = 'We truly appreciate your efforts. Thank you for taking the time to contribute; this is a very valuable contribution to us :1st_place_medal:. We always welcome your contribution :slightly_smiling_face:, so feel free to contribute to anything anytime, and never lose that spirit of innovation :raised_hands:.'
+            const thankyouNote = 'Your efforts have helped advance digital healthcare and TeleICU systems. :rocket: Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! :raised_hands:'
             const options = {
               issue_number: context.issue.number,
               owner: context.repo.owner,

diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -8,19 +8,15 @@ const config: StorybookConfig = {
   ],
   framework: {
     name: "@storybook/react-vite",
-    options: {},
+    options: {
+      builder: {
+        viteConfigPath: "./.storybook/vite.config.mts",
+      },
+    },
   },
   docs: {
     autodocs: "tag",
   },
   staticDirs: ["../public"],
-  core: {
-    builder: {
-      name: "@storybook/builder-vite",
-      options: {
-        viteConfigPath: "./.storybook/vite.config.ts",
-      },
-    },
-  },
 };
 export default config;
diff --git a/.storybook/vite.config.ts → .storybook/vite.config.mts b/.storybook/vite.config.ts → .storybook/vite.config.mts
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Corona Safe
+Copyright (c) 2024 Open Healthcare Network
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from "cypress";
 import fs from "fs";
+import cypressSplit from "cypress-split";
 
 export default defineConfig({
   projectId: "wf7d2m",
@@ -19,6 +20,11 @@ export default defineConfig({
           return null;
         },
       });
+
+      if (process.env.CYPRESS_SPLIT_TESTS === "true") {
+        cypressSplit(on, config);
+      }
+
       return config;
     },
     baseUrl: "http://localhost:4000",

diff --git a/cypress/e2e/auth_spec/redirect.cy.ts b/cypress/e2e/auth_spec/redirect.cy.ts
@@ -0,0 +1,32 @@
+import { cy, describe, it, beforeEach, Cypress } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+
+describe("redirect", () => {
+  const loginPage = new LoginPage();
+
+  beforeEach(() => {
+    cy.log("Logging in the user devdistrictadmin");
+  });
+
+  it("Check if login redirects to the right url", () => {
+    cy.awaitUrl("/resource/board", true);
+    loginPage.loginManuallyAsDistrictAdmin();
+    loginPage.ensureLoggedIn();
+    cy.url().should("include", "/resource/board");
+  });
+
+  it("Check if the redirect param works", () => {
+    const baseUrl = Cypress.config("baseUrl");
+    cy.awaitUrl(`login?redirect=${baseUrl}/resource/board`, true);
+    loginPage.loginManuallyAsDistrictAdmin();
+    loginPage.ensureLoggedIn();
+    cy.url().should("include", "/resource/board");
+  });
+
+  it("Check to ensure that redirect is the same origin", () => {
+    cy.awaitUrl("login?redirect=https://google.com", true);
+    loginPage.loginManuallyAsDistrictAdmin();
+    loginPage.ensureLoggedIn();
+    cy.url().should("include", "/facility");
+  });
+});
diff --git a/cypress/e2e/death_report_spec/death_report.cy.ts b/cypress/e2e/death_report_spec/death_report.cy.ts
diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -136,25 +136,30 @@ describe("Facility Creation", () => {
     facilityPage.fillExpectedDTypeCylinderRequirement(oxygenExpected);
     facilityPage.selectLocation("Kochi, Kerala");
     facilityPage.submitForm();
+    cy.closeNotification();
     // create multiple bed capacity and verify card reflection
     facilityPage.selectBedType("Oxygen beds");
     facilityPage.fillTotalCapacity(bedCapacity);
     facilityPage.fillCurrentlyOccupied(bedOccupancy);
     facilityPage.clickbedcapcityaddmore();
+    cy.closeNotification();
     facilityPage.selectBedType("Ordinary Bed");
     facilityPage.fillTotalCapacity(bedCapacity);
     facilityPage.fillCurrentlyOccupied(bedOccupancy);
     facilityPage.clickbedcapcityaddmore();
+    cy.closeNotification();
     facilityPage.getTotalBedCapacity().contains(totalCapacity);
     facilityPage.getTotalBedCapacity().contains(totalOccupancy);
     facilityPage.clickcancelbutton();
     // create multiple bed capacity and verify card reflection
     facilityPage.selectAreaOfSpecialization("General Medicine");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.clickdoctorcapacityaddmore();
+    cy.closeNotification();
     facilityPage.selectAreaOfSpecialization("Pulmonology");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.clickdoctorcapacityaddmore();
+    cy.closeNotification();
     facilityPage.getTotalDoctorCapacity().contains(doctorCapacity);
     facilityPage.clickcancelbutton();
     facilityPage.verifyfacilitynewurl();
@@ -186,6 +191,12 @@ describe("Facility Creation", () => {
     facilityPage.getFacilityTotalBedCapacity().contains(totalOccupancy);
     facilityPage.getFacilityTotalDoctorCapacity().scrollIntoView();
     facilityPage.getFacilityTotalDoctorCapacity().contains(totalDoctor);
+    // verify the delete functionality
+    cy.get("#manage-facility-dropdown button").scrollIntoView();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickDeleteFacilityOption();
+    facilityPage.confirmDeleteFacility();
+    cy.verifyNotification("Facility deleted successfully");
   });
 
   it("Create a new facility with single bed and doctor capacity", () => {

diff --git a/cypress/e2e/facility_spec/facility_homepage.cy.ts b/cypress/e2e/facility_spec/facility_homepage.cy.ts
@@ -37,6 +37,9 @@ describe("Facility Homepage Function", () => {
 
   it("Verify the Facility card button redirection", () => {
     // view cns button
+    manageUserPage.typeFacilitySearch(facilityName);
+    facilityPage.verifyFacilityBadgeContent(facilityName);
+    manageUserPage.assertFacilityInCard(facilityName);
     facilityHome.clickViewCnsButton();
     facilityHome.verifyCnsUrl();
     facilityHome.navigateBack();
@@ -121,6 +124,8 @@ describe("Facility Homepage Function", () => {
     facilityPage.selectLocalBody(localBody);
     userPage.applyFilter();
     // go to cns page in the facility details page
+    manageUserPage.typeFacilitySearch(facilityName);
+    facilityPage.verifyFacilityBadgeContent(facilityName);
     manageUserPage.assertFacilityInCard(facilityName);
     facilityHome.clickViewFacilityDetails();
     facilityHome.clickFacilityCnsButton();