Merge pull request #3891 from coronasafe/develop

Production Release; Oct Week 5

.github/workflows/cypress.yaml

@@ -43,15 +43,33 @@ jobs:
       - name: Install dependencies 📦
         run: npm install --legacy-peer-deps
 
+      - name: Compile rescript files ⚙️
+        run: "npm run re:build"
+
       - name: Cypress run 🥬
         uses: cypress-io/github-action@v4
         with:
+          env: SKIP_PREFLIGHT_CHECK=true
           install: false
-          start: npm run start
+          start: "npm run start:react"
           wait-on: "http://localhost:4000"
           wait-on-timeout: 300
           browser: electron
 
+      - name: Remove cypress failed label on success 🏷️
+        uses: actions-ecosystem/action-remove-labels@v1
+        if: success()
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          labels: cypress failed
+
+      - name: Add cypress failed label on failure 🏷️
+        uses: actions-ecosystem/action-add-labels@v1
+        if: failure()
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          labels: cypress failed
+
       - name: Upload cypress screenshots on failure 📸
         uses: actions/upload-artifact@v2
         if: failure()

.storybook/main.js

@@ -0,0 +1,32 @@
+const path = require("path");
+
+module.exports = {
+  stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-interactions",
+    "storybook-dark-mode",
+  ],
+  framework: "@storybook/react",
+  core: {
+    builder: "webpack5",
+  },
+  webpackFinal: (config) => {
+    config.module.rules.push({
+      test: /\.css$/,
+      use: [
+        {
+          loader: "postcss-loader",
+          options: {
+            postcssOptions: {
+              plugins: [require("tailwindcss"), require("autoprefixer")],
+            },
+          },
+        },
+      ],
+      include: path.resolve(__dirname, "../"),
+    });
+    return config;
+  },
+};

.storybook/preview-head.html

@@ -0,0 +1,10 @@
+<script
+  src="https://kit.fontawesome.com/d69454c2e7.js"
+  crossorigin="anonymous"
+></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"
+/>

.storybook/preview.js

@@ -0,0 +1,11 @@
+import "../src/style/index.css";
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+};

cypress/e2e/assets_spec/filter.cy.ts

@@ -15,7 +15,7 @@ describe("Assets Filter", () => {
   });
 
   it("Filter by Facility", () => {
-    cy.get("[placeholder='Search by facility name or by district']")
+    cy.get("[name=Facilities]")
       .type("test")
       .wait(3000)
       .type("{downarrow}{enter}");

cypress/e2e/facility_spec/inventory.cy.ts

@@ -13,7 +13,7 @@ describe("Inventory Management Section", () => {
       .should("contain", "Facility")
       .contains("Facility")
       .click({ force: true });
-    cy.contains("Inventory Management").click();
+    cy.contains("Manage Inventory").click();
   });
 
   it("Adds Inventory", () => {

cypress/e2e/facility_spec/locations.cy.ts

@@ -13,7 +13,7 @@ describe("Location Management Section", () => {
       .should("contain", "Facility")
       .contains("Facility")
       .click({ force: true });
-    cy.contains("Location Management").click();
+    cy.contains("Manage Locations").click();
   });
 
   it("Adds Location", () => {