Merge branch 'develop' into fix#6771

.env

@@ -8,3 +8,5 @@ REACT_PUBLIC_URL=https://care.coronasafe.in
 
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true
+
+CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"

.github/workflows/cypress.yaml

@@ -32,18 +32,7 @@ jobs:
         run: |
           cd care
           make docker_config_file=docker-compose.pre-built.yaml up 
-          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 10
-          done
-          echo "Migrations are applied"
-          cd ..
-
-      - name: Load dummy data into care backend 📂
-        run: |
-          cd care
-          docker compose exec backend bash -c "python manage.py load_dummy_data"
-          docker restart care-backend-1
+          make docker_config_file=docker-compose.pre-built.yaml load-dummy-data
           cd ..
 
       - name: Wait for care to be up ♻

cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -62,15 +62,15 @@ describe("Asset Tab", () => {
 
   it("Filter Asset", () => {
     assetFilters.filterAssets(
-      "Dummy Facility 1",
+      "Dummy Facility 40",
       "INTERNAL",
       "ACTIVE",
       "ONVIF Camera",
       "Camera Loc"
     );
     assetFilters.clickadvancefilter();
     assetFilters.clickslideoverbackbutton(); // to verify the back button doesn't clear applied filters
-    assetFilters.assertFacilityText("Dummy Facility 1");
+    assetFilters.assertFacilityText("Dummy Facility 40");
     assetFilters.assertAssetTypeText("INTERNAL");
     assetFilters.assertAssetClassText("ONVIF");
     assetFilters.assertStatusText("ACTIVE");
@@ -89,7 +89,7 @@ describe("Asset Tab", () => {
   it("Import new asset", () => {
     assetPage.selectassetimportbutton();
     assetPage.selectImportOption();
-    assetPage.selectImportFacility("Dummy Facility 1");
+    assetPage.selectImportFacility("Dummy Facility 40");
     assetPage.importAssetFile();
     assetPage.selectImportLocation("Camera Loc");
     assetPage.clickImportAsset();

cypress/e2e/assets_spec/assets_creation.cy.ts

@@ -25,7 +25,7 @@ describe("Asset", () => {
 
   it("Verify asset creation fields throws error if empty", () => {
     assetPage.createAsset();
-    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.selectFacility("Dummy Facility 40");
     assetPage.clickCreateAsset();
 
     assetPage.verifyEmptyAssetNameError();
@@ -39,7 +39,7 @@ describe("Asset", () => {
 
   it("Create an Asset", () => {
     assetPage.createAsset();
-    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.selectFacility("Dummy Facility 40");
     assetPage.selectLocation("Camera Loc");
     assetPage.selectAssetType("Internal");
     assetPage.selectAssetClass("ONVIF Camera");
@@ -139,7 +139,7 @@ describe("Asset", () => {
 
   it("Add an vital monitor asset and configure it", () => {
     assetPage.createAsset();
-    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.selectFacility("Dummy Facility 40");
     assetPage.selectLocation("Camera Loc");
     assetPage.selectAssetType("Internal");
     assetPage.selectAssetClass("HL7 Vitals Monitor");

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -17,7 +17,7 @@ describe("Asset", () => {
   const facilityPage = new FacilityPage();
   const assetSearchPage = new AssetSearchPage();
   const assetFilters = new AssetFilters();
-  const fillFacilityName = "Dummy Facility 1";
+  const fillFacilityName = "Dummy Facility 40";
   const assetname = "Dummy Camera";
   const locationName = "Dummy Location 1";
   const initiallocationName = "Camera Location";

cypress/e2e/facility_spec/facility_creation.cy.ts

@@ -30,7 +30,7 @@ describe("Facility Creation", () => {
   const doctorCapacity = "5";
   const totalDoctor = "10";
   const facilityName = "cypress facility";
-  const facilityName2 = "Dummy Facility 1";
+  const facilityName2 = "Dummy Facility 40";
   const facilityAddress = "cypress address";
   const facilityUpdateAddress = "cypress updated address";
   const facilityNumber = "9898469865";

cypress/e2e/facility_spec/facility_homepage.cy.ts

@@ -18,7 +18,7 @@ describe("Facility Homepage Function", () => {
   const capacitiesAlias = "downloadCapacitiesCSV";
   const doctorsAlias = "downloadDoctorsCSV";
   const triagesAlias = "downloadTriagesCSV";
-  const facilityName = "Dummy Facility 1";
+  const facilityName = "Dummy Facility 40";
   const facilityLocaion = "Dummy Location";
   const stateName = "Kerala";
   const district = "Ernakulam";

cypress/e2e/facility_spec/locations.cy.ts

@@ -23,6 +23,7 @@ describe("Location Management Section", () => {
     "Please select a bed type",
   ];
   const locationName = "Test-location";
+  const locationNameTwo = "Test-location-2";
   const locationDescription = "Test Description";
   const locationType = "WARD";
   const locationMiddleware = "dev_middleware.coronasafe.live";
@@ -57,7 +58,20 @@ describe("Location Management Section", () => {
 
   it("Add a Bed to facility location along with duplication and deleting a bed", () => {
     // mandatory field verification in bed creation
-    facilityLocation.clickManageBedButton();
+    cy.get("body").then(($body) => {
+      if ($body.find("#manage-bed-button:visible").length) {
+        // If the '#manage-bed-button' is visible
+        facilityLocation.clickManageBedButton();
+      } else {
+        // If the '#manage-bed-button' is not visible
+        facilityLocation.clickAddNewLocationButton();
+        facilityPage.fillFacilityName(locationName);
+        facilityLocation.selectLocationType(locationType);
+        assetPage.clickassetupdatebutton();
+        facilityLocation.clickNotification();
+        facilityLocation.clickManageBedButton();
+      }
+    });
     facilityLocation.clickAddBedButton();
     assetPage.clickassetupdatebutton();
     userCreationPage.verifyErrorMessages(EXPECTED_BED_ERROR_MESSAGES);
@@ -97,13 +111,14 @@ describe("Location Management Section", () => {
     assetPage.clickassetupdatebutton();
     userCreationPage.verifyErrorMessages(EXPECTED_LOCATION_ERROR_MESSAGES);
     // create a new location
-    facilityPage.fillFacilityName(locationName);
+    facilityPage.fillFacilityName(locationNameTwo);
     facilityLocation.fillDescription(locationDescription);
     facilityLocation.selectLocationType(locationType);
     facilityLocation.fillMiddlewareAddress(locationMiddleware);
     assetPage.clickassetupdatebutton();
+    facilityLocation.clickNotification();
     // verify the reflection
-    facilityLocation.verifyLocationName(locationName);
+    facilityLocation.verifyLocationName(locationNameTwo);
     facilityLocation.verifyLocationType(locationType);
     facilityLocation.verifyLocationDescription(locationDescription);
     facilityLocation.verifyLocationMiddleware(locationMiddleware);
@@ -130,6 +145,7 @@ describe("Location Management Section", () => {
     facilityLocation.selectBedType(bedType);
     facilityLocation.setMultipleBeds(numberOfBeds);
     assetPage.clickassetupdatebutton();
+    facilityLocation.clickNotification();
     // verify the bed creation
     facilityLocation.verifyBedBadge(bedType);
     facilityLocation.verifyBedBadge(bedStatus);

cypress/e2e/patient_spec/patient_crud.cy.ts

@@ -35,7 +35,7 @@ describe("Patient Creation with consultation", () => {
 
   it("Create a new patient with no consultation", () => {
     patientPage.createPatient();
-    patientPage.selectFacility("dummy facility");
+    patientPage.selectFacility("dummy facility 40");
     patientPage.patientformvisibility();
     patientPage.enterPatientDetails(
       phone_number,

cypress/e2e/resource_spec/filter.cy.ts

@@ -16,7 +16,7 @@ describe("Resource filter", () => {
     cy.intercept(/\/api\/v1\/getallfacilities/).as("facilities_filter");
     cy.contains("Filters").click();
     cy.get("[name='origin_facility']")
-      .type("Dummy Facility 1")
+      .type("Dummy Facility 40")
       .wait("@facilities_filter");
     cy.get("[role='option']").first().click();
     cy.contains("Apply").click();

cypress/e2e/resource_spec/resources.cy.ts

@@ -41,7 +41,7 @@ describe("Resource Page", () => {
 
   it("Create a resource request", () => {
     cy.visit("/facility");
-    cy.get("#search").click().type("dummy facility 1");
+    cy.get("#search").click().type("dummy facility 40");
     cy.intercept("GET", "**/api/v1/facility/**").as("loadFacilities");
     cy.get("#facility-details").click();
     cy.wait("@loadFacilities").its("response.statusCode").should("eq", 200);

cypress/e2e/users_spec/user_creation.cy.ts

@@ -15,7 +15,7 @@ describe("User Creation", () => {
   const userCreationPage = new UserCreationPage();
   const facilityPage = new FacilityPage();
   const assetSearchPage = new AssetSearchPage();
-  const fillFacilityName = "Dummy Facility 1";
+  const fillFacilityName = "Dummy Facility 40";
   const makeid = (length: number) => {
     let result = "";
     const characters = "abcdefghijklmnopqrstuvwxyz0123456789";

cypress/e2e/users_spec/user_manage.cy.ts

@@ -16,7 +16,7 @@ describe("Manage User", () => {
   const usernameforworkinghour = "devdistrictadmin";
   const usernamerealname = "Dummy Doctor";
   const facilitytolinkusername = "Dummy Shifting Center";
-  const facilitytolinkskill = "Dummy Facility 1";
+  const facilitytolinkskill = "Dummy Facility 40";
   const workinghour = "23";
   const linkedskill = "General Medicine";
 

cypress/e2e/users_spec/user_profile.cy.ts

@@ -17,7 +17,7 @@ describe("Manage User Profile", () => {
   const doctorYoE = "10";
   const medicalCouncilRegistration = "1234567890";
 
-  const facilitySearch = "Dummy Facility 1";
+  const facilitySearch = "Dummy Facility 40";
 
   before(() => {
     loginPage.loginAsDevDoctor();

cypress/pageobject/Asset/AssetCreation.ts

@@ -129,7 +129,7 @@ export class AssetPage {
     cy.get(
       "[data-testid=asset-last-serviced-on-input] input[type='text']"
     ).click();
-    cy.get("#date-input").click().type(lastServicedOn);
+    cy.get("#date-input").click().clear().type(lastServicedOn);
     cy.get("[data-testid=asset-notes-input] textarea").clear().type(notes);
   }
 

cypress/pageobject/Asset/AssetFilters.ts

@@ -56,9 +56,7 @@ export class AssetFilters {
     });
   }
   clickadvancefilter() {
-    cy.intercept("GET", "**/api/v1/getallfacilities/**").as("advancefilter");
     cy.get("#advanced-filter").click();
-    cy.wait("@advancefilter").its("response.statusCode").should("eq", 200);
   }
   clickslideoverbackbutton() {
     cy.get("#close-slide-over").click();

cypress/pageobject/Facility/FacilityCreation.ts

@@ -26,7 +26,7 @@ class FacilityPage {
   }
 
   fillFacilityName(name: string) {
-    cy.get("#name").clear().type(name);
+    cy.get("#name").click().clear().click().type(name);
   }
 
   fillPincode(pincode: string) {

cypress/pageobject/Facility/FacilityLocation.ts

@@ -56,6 +56,10 @@ class FacilityLocation {
     cy.get("#add-new-bed").click();
   }
 
+  clickNotification() {
+    cy.get(".pnotify").click();
+  }
+
   enterBedName(name: string) {
     cy.get("#bed-name").click().clear().click().type(name);
   }

cypress/support/commands.ts

@@ -69,10 +69,8 @@ Cypress.Commands.add("loginByApi", (username, password) => {
 Cypress.Commands.add(
   "awaitUrl",
   (url: string, disableLoginVerification = false) => {
-    cy.intercept(/fontawesome/).as("fontawesome");
     cy.intercept(/currentuser/).as("currentuser");
     cy.visit(url);
-    cy.wait("@fontawesome");
     disableLoginVerification
       ? cy.wait("@currentuser")
       : cy.wait("@currentuser").its("response.statusCode").should("eq", 200);

index.html

@@ -24,18 +24,12 @@
     <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="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"
-    />
   </head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root">
-      <style>
+      <style nonce="7e14cf80">
         .App-logo {
           height: 10vmin;
           pointer-events: none;
@@ -53,8 +47,14 @@
           75% {opacity: 0.5;}
           100% {opacity: 0;}
         }
+        .temp-loading {
+          display: grid;
+          place-items: center;
+          height: 100vh;
+          text-align: center;
+        }
       </style>
-      <div style="display: grid;place-items: center;height: 100vh; text-align: center;">
+      <div class="temp-loading">
         <img 
         class="App-logo"
         src="https://cdn.coronasafe.network/light-logo.svg"
@@ -63,11 +63,7 @@
       </div>
     </div>
     <script type="module" src="/src/index.tsx"></script>
-    <script
-      src="https://kit.fontawesome.com/d69454c2e7.js"
-      crossorigin="anonymous"
-    ></script>
-    <script>
+    <script nonce="f51b9742">
       window.plausible =
         window.plausible ||
         function () {

netlify.toml

@@ -24,3 +24,12 @@ status = 200
     cache-control = "max-age=0, no-store"
     X-Frame-Options = "DENY"
     X-Content-Type-Options = "nosniff"
+    Content-Security-Policy-Report-Only = '''
+      default-src 'self';
+      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;
+      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/
+      '''