Merge branch 'develop' into capitalized-names

ohcnetwork · May 14, 2024 · 798fa87 · 798fa87
2 parents 864d5e6 + 81a9d6e
commit 798fa87
Show file tree

Hide file tree

Showing 71 changed files with 5,068 additions and 5,274 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -1,19 +1,24 @@
 import type { StorybookConfig } from "@storybook/react-vite";
+
 const config: StorybookConfig = {
-  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
+  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials",
     "@storybook/addon-interactions",
   ],
-  framework: {
-    name: "@storybook/react-vite",
-    options: {
-      builder: {
+  core: {
+    builder: {
+      name: "@storybook/builder-vite",
+      options: {
         viteConfigPath: "./.storybook/vite.config.mts",
       },
     },
   },
+  framework: {
+    name: "@storybook/react-vite",
+    options: {},
+  },
   docs: {
     autodocs: "tag",
   },

diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -1,9 +1,3 @@
-<script>
-  window.global = window;
-</script>
-<link rel="preconnect" href="https://fonts.googleapis.com" />
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-<link
-  href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap"
-  rel="stylesheet"
-/>
+  <script>
+    window.global = window;
+  </script>
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
@@ -3,11 +3,10 @@ import "../src/style/index.css";
 
 const preview: Preview = {
   parameters: {
-    actions: { argTypesRegex: "^on[A-Z].*" },
     controls: {
       matchers: {
         color: /(background|color)$/i,
-        date: /Date$/,
+        date: /Date$/i,
       },
     },
   },

diff --git a/cypress/e2e/assets_spec/assets_creation.cy.ts b/cypress/e2e/assets_spec/assets_creation.cy.ts
@@ -57,7 +57,7 @@ describe("Asset", () => {
       "Vendor's Name",
       serialNumber,
       "25122021",
-      "Test note for asset creation!"
+      "Test note for asset creation!",
     );
 
     assetPage.clickCreateAddMore();
@@ -80,7 +80,7 @@ describe("Asset", () => {
       "Vendor's Name",
       serialNumber,
       "25122021",
-      "Test note for asset creation!"
+      "Test note for asset creation!",
     );
 
     assetPage.interceptAssetCreation();
@@ -106,7 +106,7 @@ describe("Asset", () => {
       "Customer Support's Name Edited",
       "Vendor's Name Edited",
       "Test note for asset creation edited!",
-      "25122021"
+      "25122021",
     );
 
     assetPage.clickUpdateAsset();
@@ -128,7 +128,7 @@ describe("Asset", () => {
       "192.168.1.64",
       "remote_user",
       "2jCkrCRSeahzKEU",
-      "d5694af2-21e2-4a39-9bad-2fb98d9818bd"
+      "d5694af2-21e2-4a39-9bad-2fb98d9818bd",
     );
     assetPage.clickConfigureAsset();
     assetPage.verifyAssetConfiguration(200);
@@ -155,7 +155,7 @@ describe("Asset", () => {
       "Vendor's Name",
       serialNumber,
       "25122021",
-      "Test note for asset creation!"
+      "Test note for asset creation!",
     );
     assetPage.interceptAssetCreation();
     assetPage.clickCreateAsset();

diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -94,7 +94,7 @@ describe("Facility Creation", () => {
       initialTriageValue,
       initialTriageValue,
       initialTriageValue,
-      initialTriageValue
+      initialTriageValue,
     );
     manageUserPage.clickSubmit();
     // edit the entry and verify reflection
@@ -106,7 +106,7 @@ describe("Facility Creation", () => {
       modifiedTriageValue,
       modifiedTriageValue,
       modifiedTriageValue,
-      modifiedTriageValue
+      modifiedTriageValue,
     );
     manageUserPage.clickSubmit();
     facilityPage.scrollToFacilityTriage();
@@ -318,7 +318,7 @@ describe("Facility Creation", () => {
     facilityPage.fillMiddleWareAddress("dev_middleware.coronasafe.live");
     facilityPage.clickupdateMiddleWare();
     facilityPage.verifySuccessNotification(
-      "Facility middleware updated successfully"
+      "Facility middleware updated successfully",
     );
   });
 

diff --git a/cypress/e2e/facility_spec/facility_manage.cy.ts b/cypress/e2e/facility_spec/facility_manage.cy.ts
@@ -53,13 +53,13 @@ describe("Facility Manage Functions", () => {
     // verify mandatory field error message
     facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
     facilityManage.checkErrorMessageVisibility(
-      "Middleware Address is required"
+      "Middleware Address is required",
     );
     // add middleware and verify the notification
     facilityManage.typeMiddlewareAddress(facilityMiddleware);
     facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityMiddlewareSuccessfullNotification
+      facilityMiddlewareSuccessfullNotification,
     );
     // update the existing middleware
     facilityPage.clickManageFacilityDropdown();
@@ -68,7 +68,7 @@ describe("Facility Manage Functions", () => {
     facilityManage.typeMiddlewareAddress(facilityUpdatedMiddleware);
     facilityManage.clickButtonWithText(facilityMiddlewareUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityMiddlewareSuccessfullNotification
+      facilityMiddlewareSuccessfullNotification,
     );
     // verify the updated middleware
     facilityPage.clickManageFacilityDropdown();
@@ -83,21 +83,23 @@ describe("Facility Manage Functions", () => {
     facilityManage.clearHfrId();
     facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.checkErrorMessageVisibility(
-      "Health Facility Id is required"
+      "Health Facility Id is required",
     );
     // add facility health ID and verify notification
     facilityManage.typeHfrId(facilityHfrId);
     facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHfridToastNotificationText
+      facilityHfridToastNotificationText,
+      true,
     );
     // update the existing middleware
     facilityPage.clickManageFacilityDropdown();
     facilityManage.clickFacilityConfigureButton();
     facilityManage.typeHfrId(facilityUpdatedHfrId);
     facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHfridToastNotificationText
+      facilityHfridToastNotificationText,
+      true,
     );
     // verify its reflection
     facilityPage.clickManageFacilityDropdown();
@@ -112,22 +114,22 @@ describe("Facility Manage Functions", () => {
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.saveAndExitDoctorForm();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count added successfully"
+      "Doctor count added successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorCapacity);
     // edit a existing doctor
     facilityManage.clickEditFacilityDoctorCapacity();
     facilityPage.fillDoctorCount(doctorModifiedCapacity);
     facilityPage.clickdoctorcapacityaddmore();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count updated successfully"
+      "Doctor count updated successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorModifiedCapacity);
     // delete a bed
     facilityManage.clickDeleteFacilityDoctorCapacity();
     facilityManage.clickButtonWithText("Delete");
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor specialization type deleted successfully"
+      "Doctor specialization type deleted successfully",
     );
   });
 
@@ -139,7 +141,7 @@ describe("Facility Manage Functions", () => {
     facilityPage.fillCurrentlyOccupied(currentOccupied);
     facilityPage.saveAndExitBedCapacityForm();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed capacity added successfully"
+      "Bed capacity added successfully",
     );
     cy.closeNotification();
     facilityManage.verifyFacilityBedCapacity(totalCapacity);
@@ -150,7 +152,7 @@ describe("Facility Manage Functions", () => {
     facilityPage.fillCurrentlyOccupied(currentUpdatedOccupied);
     facilityPage.clickbedcapcityaddmore();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed capacity updated successfully"
+      "Bed capacity updated successfully",
     );
     cy.closeNotification();
     facilityManage.verifyFacilityBedCapacity(totalUpdatedCapacity);
@@ -159,7 +161,7 @@ describe("Facility Manage Functions", () => {
     facilityManage.clickDeleteFacilityBedCapacity();
     facilityManage.clickButtonWithText("Delete");
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed type deleted successfully"
+      "Bed type deleted successfully",
     );
   });
 

diff --git a/cypress/e2e/facility_spec/inventory.cy.ts b/cypress/e2e/facility_spec/inventory.cy.ts
@@ -73,7 +73,7 @@ describe("Inventory Management Section", () => {
         facilityPage.fillInventoryMinimumDetails(inventoryName, "1");
         facilityPage.clickSetButton();
         facilityPage.verifySuccessNotification(
-          "Minimum quantiy updated successfully"
+          "Minimum quantiy updated successfully",
         );
       }
     });