ohcnetwork · gigincg · Jan 30, 2024 · Jan 22, 2024 · Jan 23, 2024 · Jan 23, 2024
diff --git a/.env b/.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"
diff --git a/.github/workflows/cypress.yaml b/.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 ♻

diff --git a/cypress/e2e/facility_spec/locations.cy.ts b/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";
@@ -110,14 +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);

diff --git a/cypress/pageobject/Asset/AssetFilters.ts b/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();

diff --git a/cypress/support/commands.ts b/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);

diff --git a/index.html b/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 () {

diff --git a/netlify.toml b/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/
+      '''
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"