Merge branch 'release/2025-03-28' into feature/IO-3176-IntelliPay-Payment-Mapping

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

.circleci/config.yml

@@ -9,13 +9,13 @@ orbs:
 jobs:
   imex-api-deploy:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 22 running on 64bit Amazon Linux 2023"
             eb status --verbose
             eb deploy
             eb status
@@ -28,7 +28,7 @@ jobs:
 
   imex-hasura-migrate:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     parameters:
       secret:
         type: string
@@ -52,7 +52,7 @@ jobs:
           pipeline_number: << pipeline.number >>
   imex-app-build:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     resource_class: large
     working_directory: ~/repo/client
     steps:
@@ -77,7 +77,7 @@ jobs:
 
   imex-app-beta-build:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     resource_class: large
     working_directory: ~/repo/client
 
@@ -88,7 +88,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:production:imex
+      - run: NODE_OPTIONS=--max-old-space-size=8192 npm run build:production:imex
 
       - aws-cli/setup:
           aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -114,7 +114,7 @@ jobs:
       - eb/setup
       - run:
           command: |
-            eb init romeonline-productionapi -r us-east-2 -p "Node.js 18 running on 64bit Amazon Linux 2"
+            eb init romeonline-productionapi -r us-east-2 -p "Node.js 22 running on 64bit Amazon Linux 2023"
             eb status --verbose
             eb deploy
             eb status
@@ -126,7 +126,7 @@ jobs:
           pipeline_number: << pipeline.number >>
   rome-hasura-migrate:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     parameters:
       secret:
         type: string
@@ -150,8 +150,8 @@ jobs:
           pipeline_number: << pipeline.number >>
   rome-app-build:
     docker:
-      - image: cimg/node:18.18.2
-
+      - image: cimg/node:22.13.1
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -161,7 +161,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:production:rome
+      - run: NODE_OPTIONS=--max-old-space-size=8192 npm run build:production:rome
 
       - aws-cli/setup:
           aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -179,40 +179,9 @@ jobs:
           job_type: deployment
           pipeline_number: << pipeline.number >>
 
-  promanager-app-build:
-    docker:
-      - image: cimg/node:18.18.2
-
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:production:promanager
-
-      - aws-cli/setup:
-          aws_access_key_id: AWS_ACCESS_KEY_ID
-          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-          region: AWS_REGION
-
-      - aws-s3/sync:
-          from: dist
-          to: "s3://promanager-production/"
-          arguments: "--exclude '*.map'"
-      - jira/notify:
-          environment: Production (ProManager) - Front End
-          environment_type: production
-          pipeline_id: << pipeline.id >>
-          job_type: deployment
-          pipeline_number: << pipeline.number >>
-
   test-rome-hasura-migrate:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     parameters:
       secret:
         type: string
@@ -239,8 +208,8 @@ jobs:
 
   test-rome-app-build:
     docker:
-      - image: cimg/node:18.18.2
-
+      - image: cimg/node:22.13.1
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -250,7 +219,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:test:rome
+      - run: NODE_OPTIONS=--max-old-space-size=8192 npm run build:test:rome
 
       - aws-cli/setup:
           aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -268,40 +237,9 @@ jobs:
           job_type: deployment
           pipeline_number: << pipeline.number >>
 
-  test-promanager-app-build:
-    docker:
-      - image: cimg/node:18.18.2
-
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:test:promanager
-
-      - aws-cli/setup:
-          aws_access_key_id: AWS_ACCESS_KEY_ID
-          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-          region: AWS_REGION
-
-      - aws-s3/sync:
-          from: dist
-          to: "s3://promanager-testing/"
-          arguments: "--exclude '*.map'"
-      - jira/notify:
-          environment: Test (ProManager) - Front End
-          environment_type: testing
-          pipeline_id: << pipeline.id >>
-          job_type: deployment
-          pipeline_number: << pipeline.number >>
-
   test-hasura-migrate:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     parameters:
       secret:
         type: string
@@ -328,7 +266,7 @@ jobs:
 
   imex-test-app-build:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     resource_class: large
     working_directory: ~/repo/client
 
@@ -339,7 +277,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:test:imex
+      - run: NODE_OPTIONS=--max-old-space-size=8192 npm run build:test:imex
 
       - aws-s3/sync:
           from: build
@@ -348,7 +286,7 @@ jobs:
 
   imex-test-app-beta-build:
     docker:
-      - image: cimg/node:18.18.2
+      - image: cimg/node:22.13.1
     resource_class: large
     working_directory: ~/repo/client
 
@@ -360,7 +298,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:test:imex
+      - run: NODE_OPTIONS=--max-old-space-size=8192 npm run build:test:imex
 
       - aws-cli/setup:
           aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -458,14 +396,6 @@ workflows:
           filters:
             branches:
               only: test-AIO
-      - test-promanager-app-build:
-          filters:
-            branches:
-              only: test-AIO
-      - promanager-app-build:
-          filters:
-            branches:
-              only: master-AIO
       - test-rome-hasura-migrate:
           secret: ${HASURA_ROME_TEST_SECRET}
           filters:

.gitattributes

@@ -1 +1,80 @@
+# Ensure all text files use LF for line endings
 * text eol=lf
+
+# Binary files should not be modified by Git
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.webp binary
+*.svg binary
+
+# Fonts
+*.woff binary
+*.woff2 binary
+*.ttf binary
+*.otf binary
+*.eot binary
+
+# Videos
+*.mp4 binary
+*.mov binary
+*.avi binary
+*.mkv binary
+*.webm binary
+
+# Audio
+*.mp3 binary
+*.wav binary
+*.ogg binary
+*.flac binary
+
+# Archives and compressed files
+*.zip binary
+*.gz binary
+*.tar binary
+*.7z binary
+*.rar binary
+
+# PDF and documents
+*.pdf binary
+*.doc binary
+*.docx binary
+*.xls binary
+*.xlsx binary
+*.ppt binary
+*.pptx binary
+
+# Exclude JSON and other data files from text processing, if necessary
+*.json text
+*.xml text
+*.csv text
+
+# Scripts and code files should maintain LF endings
+*.js text eol=lf
+*.jsx text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+*.html text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.md text eol=lf
+*.sh text eol=lf
+*.py text eol=lf
+*.rb text eol=lf
+*.java text eol=lf
+*.php text eol=lf
+
+# Git configuration files
+.gitattributes text eol=lf
+.gitignore text eol=lf
+*.gitattributes text eol=lf
+
+# Exclude some other potential binary files
+*.db binary
+*.sqlite binary
+*.exe binary
+*.dll binary

.platform/hooks/predeploy/01-install-dd.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DD_API_KEY=58d91898a70c6fd659f6eea768a57976 DD_SITE="us3.datadoghq.com" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
+
+echo "Datadog agent installed."

.vscode/settings.json

@@ -38,5 +38,6 @@
     "smartscheduling",
     "timetickets",
     "touchtime"
-  ]
+  ],
+  "eslint.workingDirectories": ["./", "./client"]
 }

Dockerfile

@@ -3,11 +3,10 @@ FROM amazonlinux:2023
 
 # Install Git and Node.js (Amazon Linux 2023 uses the DNF package manager)
 RUN dnf install -y git \
-    && curl -sL https://rpm.nodesource.com/setup_20.x | bash - \
+    && curl -sL https://rpm.nodesource.com/setup_22.x | bash - \
     && dnf install -y nodejs \
     && dnf clean all
 
-
 # Install dependencies required by node-canvas
 RUN dnf install -y \
     gcc \
@@ -19,9 +18,22 @@ RUN dnf install -y \
     libpng-devel \
     make \
     python3 \
+    fontconfig \
+    freetype \
     python3-pip \
+    wget \
+    unzip \
     && dnf clean all
 
+# Install Montserrat fonts
+RUN cd /tmp \
+    && wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip \
+    && unzip montserrat.zip -d montserrat \
+    && mv montserrat/montserrat/*.ttf /usr/share/fonts \
+    && fc-cache -fv \
+    && rm -rf /tmp/montserrat /tmp/montserrat.zip \
+    && echo "Montserrat fonts installed and cached successfully."
+
 # Set the working directory
 WORKDIR /app
 

_reference/JSON/BodyshopFeatures.json

@@ -10,5 +10,8 @@
   "courtesycars": "date",
   "media": "date",
   "visualboard": "date",
-  "scoreboard": "date"
+  "scoreboard": "date",
+  "checklist": "date",
+  "smartscheduling" :"date",
+  "roguard": "date"
 }

client/.env.development.imex

@@ -9,6 +9,6 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/.env.development.promanager

@@ -1,14 +0,0 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.imex.online/v1/graphql
-VITE_APP_GA_CODE=231099835
-VITE_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
-VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
-VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
-VITE_APP_CLOUDINARY_API_KEY=957865933348715
-VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
-VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
-VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
-VITE_APP_INSTANCE=PROMANAGER

client/.env.development.rome

@@ -10,7 +10,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
 VITE_APP_INSTANCE=ROME

client/.env.production.promanager

@@ -1,15 +0,0 @@
-GENERATE_SOURCEMAP=true
-VITE_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
-VITE_APP_GA_CODE=231103507
-VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
-VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
-VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
-VITE_APP_CLOUDINARY_API_KEY=473322739956866
-VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
-VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
-VITE_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
-VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
-VITE_APP_INSTANCE=PROMANAGER

client/.env.test.imex

@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
-VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/.env.test.promanager

@@ -1,15 +0,0 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.test.romeonline.io/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.romeonline.io/v1/graphql
-VITE_APP_GA_CODE=231099835
-VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
-VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
-VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
-VITE_APP_CLOUDINARY_API_KEY=473322739956866
-VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
-VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=https://api.test.romeonline.io/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
-VITE_APP_IS_TEST=true
-VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
-VITE_APP_INSTANCE=PROMANAGER

client/cypress.config.js

@@ -1,17 +0,0 @@
-const { defineConfig } = require("cypress");
-
-module.exports = defineConfig({
-  experimentalStudio: true,
-  env: {
-    FIREBASE_USERNAME: "cypress@imex.test",
-    FIREBASE_PASSWORD: "cypress"
-  },
-  e2e: {
-    // We've imported your old cypress plugins here.
-    // You may want to clean this up later by importing these.
-    setupNodeEvents(on, config) {
-      return require("./cypress/plugins/index.js")(on, config);
-    },
-    baseUrl: "https://localhost:3000"
-  }
-});

client/cypress/e2e/01-General Render/01-home.cy.js

@@ -1,19 +0,0 @@
-/// <reference types="Cypress" />
-const { FIREBASE_USERNAME, FIREBASE_PASSWORcD } = Cypress.env();
-describe("Renders the General Page", () => {
-  beforeEach(() => {
-    cy.visit("/");
-  });
-  it("Renders Correctly", () => {});
-  it("Has the Slogan", () => {
-    cy.findByText("A whole x22new kind of shop management system.").should("exist");
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get(".ant-menu-item-active > .ant-menu-title-content > .header0-item-block").click();
-    cy.get("#email").clear();
-    cy.get("#email").type("patrick@imex.dev");
-    cy.get("#password").clear();
-    cy.get("#password").type("patrick123{enter}");
-    cy.get(".ant-form > .ant-btn").click();
-    /* ==== End Cypress Studio ==== */
-  });
-});

client/cypress/e2e/1-getting-started/todo.cy.js

@@ -1,124 +0,0 @@
-/// <reference types="cypress" />
-
-// Welcome to Cypress!
-//
-// This spec file contains a variety of sample tests
-// for a todo list app that are designed to demonstrate
-// the power of writing tests in Cypress.
-//
-// To learn more about how Cypress works and
-// what makes it such an awesome testing tool,
-// please read our getting started guide:
-// https://on.cypress.io/introduction-to-cypress
-
-describe("example to-do app", () => {
-  beforeEach(() => {
-    // Cypress starts out with a blank slate for each test
-    // so we must tell it to visit our website with the `cy.visit()` command.
-    // Since we want to visit the same URL at the start of all our tests,
-    // we include it in our beforeEach function so that it runs before each test
-    cy.visit("https://example.cypress.io/todo");
-  });
-
-  it("displays two todo items by default", () => {
-    // We use the `cy.get()` command to get all elements that match the selector.
-    // Then, we use `should` to assert that there are two matched items,
-    // which are the two default items.
-    cy.get(".todo-list li").should("have.length", 2);
-
-    // We can go even further and check that the default todos each contain
-    // the correct text. We use the `first` and `last` functions
-    // to get just the first and last matched elements individually,
-    // and then perform an assertion with `should`.
-    cy.get(".todo-list li").first().should("have.text", "Pay electric bill");
-    cy.get(".todo-list li").last().should("have.text", "Walk the dog");
-  });
-
-  it("can add new todo items", () => {
-    // We'll store our item text in a variable so we can reuse it
-    const newItem = "Feed the cat";
-
-    // Let's get the input element and use the `type` command to
-    // input our new list item. After typing the content of our item,
-    // we need to type the enter key as well in order to submit the input.
-    // This input has a data-test attribute so we'll use that to select the
-    // element in accordance with best practices:
-    // https://on.cypress.io/selecting-elements
-    cy.get("[data-test=new-todo]").type(`${newItem}{enter}`);
-
-    // Now that we've typed our new item, let's check that it actually was added to the list.
-    // Since it's the newest item, it should exist as the last element in the list.
-    // In addition, with the two default items, we should have a total of 3 elements in the list.
-    // Since assertions yield the element that was asserted on,
-    // we can chain both of these assertions together into a single statement.
-    cy.get(".todo-list li").should("have.length", 3).last().should("have.text", newItem);
-  });
-
-  it("can check off an item as completed", () => {
-    // In addition to using the `get` command to get an element by selector,
-    // we can also use the `contains` command to get an element by its contents.
-    // However, this will yield the <label>, which is lowest-level element that contains the text.
-    // In order to check the item, we'll find the <input> element for this <label>
-    // by traversing up the dom to the parent element. From there, we can `find`
-    // the child checkbox <input> element and use the `check` command to check it.
-    cy.contains("Pay electric bill").parent().find("input[type=checkbox]").check();
-
-    // Now that we've checked the button, we can go ahead and make sure
-    // that the list element is now marked as completed.
-    // Again we'll use `contains` to find the <label> element and then use the `parents` command
-    // to traverse multiple levels up the dom until we find the corresponding <li> element.
-    // Once we get that element, we can assert that it has the completed class.
-    cy.contains("Pay electric bill").parents("li").should("have.class", "completed");
-  });
-
-  context("with a checked task", () => {
-    beforeEach(() => {
-      // We'll take the command we used above to check off an element
-      // Since we want to perform multiple tests that start with checking
-      // one element, we put it in the beforeEach hook
-      // so that it runs at the start of every test.
-      cy.contains("Pay electric bill").parent().find("input[type=checkbox]").check();
-    });
-
-    it("can filter for uncompleted tasks", () => {
-      // We'll click on the "active" button in order to
-      // display only incomplete items
-      cy.contains("Active").click();
-
-      // After filtering, we can assert that there is only the one
-      // incomplete item in the list.
-      cy.get(".todo-list li").should("have.length", 1).first().should("have.text", "Walk the dog");
-
-      // For good measure, let's also assert that the task we checked off
-      // does not exist on the page.
-      cy.contains("Pay electric bill").should("not.exist");
-    });
-
-    it("can filter for completed tasks", () => {
-      // We can perform similar steps as the test above to ensure
-      // that only completed tasks are shown
-      cy.contains("Completed").click();
-
-      cy.get(".todo-list li").should("have.length", 1).first().should("have.text", "Pay electric bill");
-
-      cy.contains("Walk the dog").should("not.exist");
-    });
-
-    it("can delete all completed tasks", () => {
-      // First, let's click the "Clear completed" button
-      // `contains` is actually serving two purposes here.
-      // First, it's ensuring that the button exists within the dom.
-      // This button only appears when at least one task is checked
-      // so this command is implicitly verifying that it does exist.
-      // Second, it selects the button so we can click it.
-      cy.contains("Clear completed").click();
-
-      // Then we can make sure that there is only one element
-      // in the list and our element does not exist
-      cy.get(".todo-list li").should("have.length", 1).should("not.have.text", "Pay electric bill");
-
-      // Finally, make sure that the clear button no longer exists.
-      cy.contains("Clear completed").should("not.exist");
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/actions.cy.js

@@ -1,284 +0,0 @@
-/// <reference types="cypress" />
-
-context("Actions", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/actions");
-  });
-
-  // https://on.cypress.io/interacting-with-elements
-
-  it(".type() - type into a DOM element", () => {
-    // https://on.cypress.io/type
-    cy.get(".action-email")
-      .type("fake@email.com")
-      .should("have.value", "fake@email.com")
-
-      // .type() with special character sequences
-      .type("{leftarrow}{rightarrow}{uparrow}{downarrow}")
-      .type("{del}{selectall}{backspace}")
-
-      // .type() with key modifiers
-      .type("{alt}{option}") //these are equivalent
-      .type("{ctrl}{control}") //these are equivalent
-      .type("{meta}{command}{cmd}") //these are equivalent
-      .type("{shift}")
-
-      // Delay each keypress by 0.1 sec
-      .type("slow.typing@email.com", { delay: 100 })
-      .should("have.value", "slow.typing@email.com");
-
-    cy.get(".action-disabled")
-      // Ignore error checking prior to type
-      // like whether the input is visible or disabled
-      .type("disabled error checking", { force: true })
-      .should("have.value", "disabled error checking");
-  });
-
-  it(".focus() - focus on a DOM element", () => {
-    // https://on.cypress.io/focus
-    cy.get(".action-focus").focus().should("have.class", "focus").prev().should("have.attr", "style", "color: orange;");
-  });
-
-  it(".blur() - blur off a DOM element", () => {
-    // https://on.cypress.io/blur
-    cy.get(".action-blur")
-      .type("About to blur")
-      .blur()
-      .should("have.class", "error")
-      .prev()
-      .should("have.attr", "style", "color: red;");
-  });
-
-  it(".clear() - clears an input or textarea element", () => {
-    // https://on.cypress.io/clear
-    cy.get(".action-clear")
-      .type("Clear this text")
-      .should("have.value", "Clear this text")
-      .clear()
-      .should("have.value", "");
-  });
-
-  it(".submit() - submit a form", () => {
-    // https://on.cypress.io/submit
-    cy.get(".action-form").find('[type="text"]').type("HALFOFF");
-
-    cy.get(".action-form").submit().next().should("contain", "Your form has been submitted!");
-  });
-
-  it(".click() - click on a DOM element", () => {
-    // https://on.cypress.io/click
-    cy.get(".action-btn").click();
-
-    // You can click on 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // clicking in the center of the element is the default
-    cy.get("#action-canvas").click();
-
-    cy.get("#action-canvas").click("topLeft");
-    cy.get("#action-canvas").click("top");
-    cy.get("#action-canvas").click("topRight");
-    cy.get("#action-canvas").click("left");
-    cy.get("#action-canvas").click("right");
-    cy.get("#action-canvas").click("bottomLeft");
-    cy.get("#action-canvas").click("bottom");
-    cy.get("#action-canvas").click("bottomRight");
-
-    // .click() accepts an x and y coordinate
-    // that controls where the click occurs :)
-
-    cy.get("#action-canvas")
-      .click(80, 75) // click 80px on x coord and 75px on y coord
-      .click(170, 75)
-      .click(80, 165)
-      .click(100, 185)
-      .click(125, 190)
-      .click(150, 185)
-      .click(170, 165);
-
-    // click multiple elements by passing multiple: true
-    cy.get(".action-labels>.label").click({ multiple: true });
-
-    // Ignore error checking prior to clicking
-    cy.get(".action-opacity>.btn").click({ force: true });
-  });
-
-  it(".dblclick() - double click on a DOM element", () => {
-    // https://on.cypress.io/dblclick
-
-    // Our app has a listener on 'dblclick' event in our 'scripts.js'
-    // that hides the div and shows an input on double click
-    cy.get(".action-div").dblclick().should("not.be.visible");
-    cy.get(".action-input-hidden").should("be.visible");
-  });
-
-  it(".rightclick() - right click on a DOM element", () => {
-    // https://on.cypress.io/rightclick
-
-    // Our app has a listener on 'contextmenu' event in our 'scripts.js'
-    // that hides the div and shows an input on right click
-    cy.get(".rightclick-action-div").rightclick().should("not.be.visible");
-    cy.get(".rightclick-action-input-hidden").should("be.visible");
-  });
-
-  it(".check() - check a checkbox or radio element", () => {
-    // https://on.cypress.io/check
-
-    // By default, .check() will check all
-    // matching checkbox or radio elements in succession, one after another
-    cy.get('.action-checkboxes [type="checkbox"]').not("[disabled]").check().should("be.checked");
-
-    cy.get('.action-radios [type="radio"]').not("[disabled]").check().should("be.checked");
-
-    // .check() accepts a value argument
-    cy.get('.action-radios [type="radio"]').check("radio1").should("be.checked");
-
-    // .check() accepts an array of values
-    cy.get('.action-multiple-checkboxes [type="checkbox"]').check(["checkbox1", "checkbox2"]).should("be.checked");
-
-    // Ignore error checking prior to checking
-    cy.get(".action-checkboxes [disabled]").check({ force: true }).should("be.checked");
-
-    cy.get('.action-radios [type="radio"]').check("radio3", { force: true }).should("be.checked");
-  });
-
-  it(".uncheck() - uncheck a checkbox element", () => {
-    // https://on.cypress.io/uncheck
-
-    // By default, .uncheck() will uncheck all matching
-    // checkbox elements in succession, one after another
-    cy.get('.action-check [type="checkbox"]').not("[disabled]").uncheck().should("not.be.checked");
-
-    // .uncheck() accepts a value argument
-    cy.get('.action-check [type="checkbox"]').check("checkbox1").uncheck("checkbox1").should("not.be.checked");
-
-    // .uncheck() accepts an array of values
-    cy.get('.action-check [type="checkbox"]')
-      .check(["checkbox1", "checkbox3"])
-      .uncheck(["checkbox1", "checkbox3"])
-      .should("not.be.checked");
-
-    // Ignore error checking prior to unchecking
-    cy.get(".action-check [disabled]").uncheck({ force: true }).should("not.be.checked");
-  });
-
-  it(".select() - select an option in a <select> element", () => {
-    // https://on.cypress.io/select
-
-    // at first, no option should be selected
-    cy.get(".action-select").should("have.value", "--Select a fruit--");
-
-    // Select option(s) with matching text content
-    cy.get(".action-select").select("apples");
-    // confirm the apples were selected
-    // note that each value starts with "fr-" in our HTML
-    cy.get(".action-select").should("have.value", "fr-apples");
-
-    cy.get(".action-select-multiple")
-      .select(["apples", "oranges", "bananas"])
-      // when getting multiple values, invoke "val" method first
-      .invoke("val")
-      .should("deep.equal", ["fr-apples", "fr-oranges", "fr-bananas"]);
-
-    // Select option(s) with matching value
-    cy.get(".action-select")
-      .select("fr-bananas")
-      // can attach an assertion right away to the element
-      .should("have.value", "fr-bananas");
-
-    cy.get(".action-select-multiple")
-      .select(["fr-apples", "fr-oranges", "fr-bananas"])
-      .invoke("val")
-      .should("deep.equal", ["fr-apples", "fr-oranges", "fr-bananas"]);
-
-    // assert the selected values include oranges
-    cy.get(".action-select-multiple").invoke("val").should("include", "fr-oranges");
-  });
-
-  it(".scrollIntoView() - scroll an element into view", () => {
-    // https://on.cypress.io/scrollintoview
-
-    // normally all of these buttons are hidden,
-    // because they're not within
-    // the viewable area of their parent
-    // (we need to scroll to see them)
-    cy.get("#scroll-horizontal button").should("not.be.visible");
-
-    // scroll the button into view, as if the user had scrolled
-    cy.get("#scroll-horizontal button").scrollIntoView().should("be.visible");
-
-    cy.get("#scroll-vertical button").should("not.be.visible");
-
-    // Cypress handles the scroll direction needed
-    cy.get("#scroll-vertical button").scrollIntoView().should("be.visible");
-
-    cy.get("#scroll-both button").should("not.be.visible");
-
-    // Cypress knows to scroll to the right and down
-    cy.get("#scroll-both button").scrollIntoView().should("be.visible");
-  });
-
-  it(".trigger() - trigger an event on a DOM element", () => {
-    // https://on.cypress.io/trigger
-
-    // To interact with a range input (slider)
-    // we need to set its value & trigger the
-    // event to signal it changed
-
-    // Here, we invoke jQuery's val() method to set
-    // the value and trigger the 'change' event
-    cy.get(".trigger-input-range")
-      .invoke("val", 25)
-      .trigger("change")
-      .get("input[type=range]")
-      .siblings("p")
-      .should("have.text", "25");
-  });
-
-  it("cy.scrollTo() - scroll the window or element to a position", () => {
-    // https://on.cypress.io/scrollto
-
-    // You can scroll to 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // if you chain .scrollTo() off of cy, we will
-    // scroll the entire window
-    cy.scrollTo("bottom");
-
-    cy.get("#scrollable-horizontal").scrollTo("right");
-
-    // or you can scroll to a specific coordinate:
-    // (x axis, y axis) in pixels
-    cy.get("#scrollable-vertical").scrollTo(250, 250);
-
-    // or you can scroll to a specific percentage
-    // of the (width, height) of the element
-    cy.get("#scrollable-both").scrollTo("75%", "25%");
-
-    // control the easing of the scroll (default is 'swing')
-    cy.get("#scrollable-vertical").scrollTo("center", { easing: "linear" });
-
-    // control the duration of the scroll (in ms)
-    cy.get("#scrollable-both").scrollTo("center", { duration: 2000 });
-  });
-});

client/cypress/e2e/2-advanced-examples/aliasing.cy.js

@@ -1,35 +0,0 @@
-/// <reference types="cypress" />
-
-context("Aliasing", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/aliasing");
-  });
-
-  it(".as() - alias a DOM element for later use", () => {
-    // https://on.cypress.io/as
-
-    // Alias a DOM element for use later
-    // We don't have to traverse to the element
-    // later in our code, we reference it with @
-
-    cy.get(".as-table").find("tbody>tr").first().find("td").first().find("button").as("firstBtn");
-
-    // when we reference the alias, we place an
-    // @ in front of its name
-    cy.get("@firstBtn").click();
-
-    cy.get("@firstBtn").should("have.class", "btn-success").and("contain", "Changed");
-  });
-
-  it(".as() - alias a route for later use", () => {
-    // Alias the route to wait for its response
-    cy.intercept("GET", "**/comments/*").as("getComment");
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get(".network-btn").click();
-
-    // https://on.cypress.io/wait
-    cy.wait("@getComment").its("response.statusCode").should("eq", 200);
-  });
-});

client/cypress/e2e/2-advanced-examples/assertions.cy.js

@@ -1,173 +0,0 @@
-/// <reference types="cypress" />
-
-context("Assertions", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/assertions");
-  });
-
-  describe("Implicit Assertions", () => {
-    it(".should() - make an assertion about the current subject", () => {
-      // https://on.cypress.io/should
-      cy.get(".assertion-table")
-        .find("tbody tr:last")
-        .should("have.class", "success")
-        .find("td")
-        .first()
-        // checking the text of the <td> element in various ways
-        .should("have.text", "Column content")
-        .should("contain", "Column content")
-        .should("have.html", "Column content")
-        // chai-jquery uses "is()" to check if element matches selector
-        .should("match", "td")
-        // to match text content against a regular expression
-        // first need to invoke jQuery method text()
-        // and then match using regular expression
-        .invoke("text")
-        .should("match", /column content/i);
-
-      // a better way to check element's text content against a regular expression
-      // is to use "cy.contains"
-      // https://on.cypress.io/contains
-      cy.get(".assertion-table")
-        .find("tbody tr:last")
-        // finds first <td> element with text content matching regular expression
-        .contains("td", /column content/i)
-        .should("be.visible");
-
-      // for more information about asserting element's text
-      // see https://on.cypress.io/using-cypress-faq#How-do-I-get-an-element’s-text-contents
-    });
-
-    it(".and() - chain multiple assertions together", () => {
-      // https://on.cypress.io/and
-      cy.get(".assertions-link").should("have.class", "active").and("have.attr", "href").and("include", "cypress.io");
-    });
-  });
-
-  describe("Explicit Assertions", () => {
-    // https://on.cypress.io/assertions
-    it("expect - make an assertion about a specified subject", () => {
-      // We can use Chai's BDD style assertions
-      expect(true).to.be.true;
-      const o = { foo: "bar" };
-
-      expect(o).to.equal(o);
-      expect(o).to.deep.equal({ foo: "bar" });
-      // matching text using regular expression
-      expect("FooBar").to.match(/bar$/i);
-    });
-
-    it("pass your own callback function to should()", () => {
-      // Pass a function to should that can have any number
-      // of explicit assertions within it.
-      // The ".should(cb)" function will be retried
-      // automatically until it passes all your explicit assertions or times out.
-      cy.get(".assertions-p")
-        .find("p")
-        .should(($p) => {
-          // https://on.cypress.io/$
-          // return an array of texts from all of the p's
-          // @ts-ignore TS6133 unused variable
-          const texts = $p.map((i, el) => Cypress.$(el).text());
-
-          // jquery map returns jquery object
-          // and .get() convert this to simple array
-          const paragraphs = texts.get();
-
-          // array should have length of 3
-          expect(paragraphs, "has 3 paragraphs").to.have.length(3);
-
-          // use second argument to expect(...) to provide clear
-          // message with each assertion
-          expect(paragraphs, "has expected text in each paragraph").to.deep.eq([
-            "Some text from first p",
-            "More text from second p",
-            "And even more text from third p"
-          ]);
-        });
-    });
-
-    it("finds element by class name regex", () => {
-      cy.get(".docs-header")
-        .find("div")
-        // .should(cb) callback function will be retried
-        .should(($div) => {
-          expect($div).to.have.length(1);
-
-          const className = $div[0].className;
-
-          expect(className).to.match(/heading-/);
-        })
-        // .then(cb) callback is not retried,
-        // it either passes or fails
-        .then(($div) => {
-          expect($div, "text content").to.have.text("Introduction");
-        });
-    });
-
-    it("can throw any error", () => {
-      cy.get(".docs-header")
-        .find("div")
-        .should(($div) => {
-          if ($div.length !== 1) {
-            // you can throw your own errors
-            throw new Error("Did not find 1 element");
-          }
-
-          const className = $div[0].className;
-
-          if (!className.match(/heading-/)) {
-            throw new Error(`Could not find class "heading-" in ${className}`);
-          }
-        });
-    });
-
-    it("matches unknown text between two elements", () => {
-      /**
-       * Text from the first element.
-       * @type {string}
-       */
-      let text;
-
-      /**
-       * Normalizes passed text,
-       * useful before comparing text with spaces and different capitalization.
-       * @param {string} s Text to normalize
-       */
-      const normalizeText = (s) => s.replace(/\s/g, "").toLowerCase();
-
-      cy.get(".two-elements")
-        .find(".first")
-        .then(($first) => {
-          // save text from the first element
-          text = normalizeText($first.text());
-        });
-
-      cy.get(".two-elements")
-        .find(".second")
-        .should(($div) => {
-          // we can massage text before comparing
-          const secondText = normalizeText($div.text());
-
-          expect(secondText, "second text").to.equal(text);
-        });
-    });
-
-    it("assert - assert shape of an object", () => {
-      const person = {
-        name: "Joe",
-        age: 20
-      };
-
-      assert.isObject(person, "value is object");
-    });
-
-    it("retries the should callback until assertions pass", () => {
-      cy.get("#random-number").should(($div) => {
-        const n = parseFloat($div.text());
-
-        expect(n).to.be.gte(1).and.be.lte(10);
-      });
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/connectors.cy.js

@@ -1,96 +0,0 @@
-/// <reference types="cypress" />
-
-context("Connectors", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/connectors");
-  });
-
-  it(".each() - iterate over an array of elements", () => {
-    // https://on.cypress.io/each
-    cy.get(".connectors-each-ul>li").each(($el, index, $list) => {
-      console.log($el, index, $list);
-    });
-  });
-
-  it(".its() - get properties on the current subject", () => {
-    // https://on.cypress.io/its
-    cy.get(".connectors-its-ul>li")
-      // calls the 'length' property yielding that value
-      .its("length")
-      .should("be.gt", 2);
-  });
-
-  it(".invoke() - invoke a function on the current subject", () => {
-    // our div is hidden in our script.js
-    // $('.connectors-div').hide()
-
-    // https://on.cypress.io/invoke
-    cy.get(".connectors-div")
-      .should("be.hidden")
-      // call the jquery method 'show' on the 'div.container'
-      .invoke("show")
-      .should("be.visible");
-  });
-
-  it(".spread() - spread an array as individual args to callback function", () => {
-    // https://on.cypress.io/spread
-    const arr = ["foo", "bar", "baz"];
-
-    cy.wrap(arr).spread((foo, bar, baz) => {
-      expect(foo).to.eq("foo");
-      expect(bar).to.eq("bar");
-      expect(baz).to.eq("baz");
-    });
-  });
-
-  describe(".then()", () => {
-    it("invokes a callback function with the current subject", () => {
-      // https://on.cypress.io/then
-      cy.get(".connectors-list > li").then(($lis) => {
-        expect($lis, "3 items").to.have.length(3);
-        expect($lis.eq(0), "first item").to.contain("Walk the dog");
-        expect($lis.eq(1), "second item").to.contain("Feed the cat");
-        expect($lis.eq(2), "third item").to.contain("Write JavaScript");
-      });
-    });
-
-    it("yields the returned value to the next command", () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1);
-
-          return 2;
-        })
-        .then((num) => {
-          expect(num).to.equal(2);
-        });
-    });
-
-    it("yields the original subject without return", () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1);
-          // note that nothing is returned from this callback
-        })
-        .then((num) => {
-          // this callback receives the original unchanged value 1
-          expect(num).to.equal(1);
-        });
-    });
-
-    it("yields the value yielded by the last Cypress command inside", () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1);
-          // note how we run a Cypress command
-          // the result yielded by this Cypress command
-          // will be passed to the second ".then"
-          cy.wrap(2);
-        })
-        .then((num) => {
-          // this callback receives the value yielded by "cy.wrap(2)"
-          expect(num).to.equal(2);
-        });
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/cookies.cy.js

@@ -1,79 +0,0 @@
-/// <reference types="cypress" />
-
-context("Cookies", () => {
-  beforeEach(() => {
-    Cypress.Cookies.debug(true);
-
-    cy.visit("https://example.cypress.io/commands/cookies");
-
-    // clear cookies again after visiting to remove
-    // any 3rd party cookies picked up such as cloudflare
-    cy.clearCookies();
-  });
-
-  it("cy.getCookie() - get a browser cookie", () => {
-    // https://on.cypress.io/getcookie
-    cy.get("#getCookie .set-a-cookie").click();
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie("token").should("have.property", "value", "123ABC");
-  });
-
-  it("cy.getCookies() - get browser cookies", () => {
-    // https://on.cypress.io/getcookies
-    cy.getCookies().should("be.empty");
-
-    cy.get("#getCookies .set-a-cookie").click();
-
-    // cy.getCookies() yields an array of cookies
-    cy.getCookies()
-      .should("have.length", 1)
-      .should((cookies) => {
-        // each cookie has these properties
-        expect(cookies[0]).to.have.property("name", "token");
-        expect(cookies[0]).to.have.property("value", "123ABC");
-        expect(cookies[0]).to.have.property("httpOnly", false);
-        expect(cookies[0]).to.have.property("secure", false);
-        expect(cookies[0]).to.have.property("domain");
-        expect(cookies[0]).to.have.property("path");
-      });
-  });
-
-  it("cy.setCookie() - set a browser cookie", () => {
-    // https://on.cypress.io/setcookie
-    cy.getCookies().should("be.empty");
-
-    cy.setCookie("foo", "bar");
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie("foo").should("have.property", "value", "bar");
-  });
-
-  it("cy.clearCookie() - clear a browser cookie", () => {
-    // https://on.cypress.io/clearcookie
-    cy.getCookie("token").should("be.null");
-
-    cy.get("#clearCookie .set-a-cookie").click();
-
-    cy.getCookie("token").should("have.property", "value", "123ABC");
-
-    // cy.clearCookies() yields null
-    cy.clearCookie("token").should("be.null");
-
-    cy.getCookie("token").should("be.null");
-  });
-
-  it("cy.clearCookies() - clear browser cookies", () => {
-    // https://on.cypress.io/clearcookies
-    cy.getCookies().should("be.empty");
-
-    cy.get("#clearCookies .set-a-cookie").click();
-
-    cy.getCookies().should("have.length", 1);
-
-    // cy.clearCookies() yields null
-    cy.clearCookies();
-
-    cy.getCookies().should("be.empty");
-  });
-});

client/cypress/e2e/2-advanced-examples/cypress_api.cy.js

@@ -1,208 +0,0 @@
-/// <reference types="cypress" />
-
-context("Cypress.Commands", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  // https://on.cypress.io/custom-commands
-
-  it(".add() - create a custom command", () => {
-    Cypress.Commands.add(
-      "console",
-      {
-        prevSubject: true
-      },
-      (subject, method) => {
-        // the previous subject is automatically received
-        // and the commands arguments are shifted
-
-        // allow us to change the console method used
-        method = method || "log";
-
-        // log the subject to the console
-        // @ts-ignore TS7017
-        console[method]("The subject is", subject);
-
-        // whatever we return becomes the new subject
-        // we don't want to change the subject so
-        // we return whatever was passed in
-        return subject;
-      }
-    );
-
-    // @ts-ignore TS2339
-    cy.get("button")
-      .console("info")
-      .then(($button) => {
-        // subject is still $button
-      });
-  });
-});
-
-context("Cypress.Cookies", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  // https://on.cypress.io/cookies
-  it(".debug() - enable or disable debugging", () => {
-    Cypress.Cookies.debug(true);
-
-    // Cypress will now log in the console when
-    // cookies are set or cleared
-    cy.setCookie("fakeCookie", "123ABC");
-    cy.clearCookie("fakeCookie");
-    cy.setCookie("fakeCookie", "123ABC");
-    cy.clearCookie("fakeCookie");
-    cy.setCookie("fakeCookie", "123ABC");
-  });
-
-  it(".preserveOnce() - preserve cookies by key", () => {
-    // normally cookies are reset after each test
-    cy.getCookie("fakeCookie").should("not.be.ok");
-
-    // preserving a cookie will not clear it when
-    // the next test starts
-    cy.setCookie("lastCookie", "789XYZ");
-    Cypress.Cookies.preserveOnce("lastCookie");
-  });
-
-  it(".defaults() - set defaults for all cookies", () => {
-    // now any cookie with the name 'session_id' will
-    // not be cleared before each new test runs
-    Cypress.Cookies.defaults({
-      preserve: "session_id"
-    });
-  });
-});
-
-context("Cypress.arch", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Get CPU architecture name of underlying OS", () => {
-    // https://on.cypress.io/arch
-    expect(Cypress.arch).to.exist;
-  });
-});
-
-context("Cypress.config()", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Get and set configuration options", () => {
-    // https://on.cypress.io/config
-    let myConfig = Cypress.config();
-
-    expect(myConfig).to.have.property("animationDistanceThreshold", 5);
-    expect(myConfig).to.have.property("baseUrl", null);
-    expect(myConfig).to.have.property("defaultCommandTimeout", 4000);
-    expect(myConfig).to.have.property("requestTimeout", 5000);
-    expect(myConfig).to.have.property("responseTimeout", 30000);
-    expect(myConfig).to.have.property("viewportHeight", 660);
-    expect(myConfig).to.have.property("viewportWidth", 1000);
-    expect(myConfig).to.have.property("pageLoadTimeout", 60000);
-    expect(myConfig).to.have.property("waitForAnimations", true);
-
-    expect(Cypress.config("pageLoadTimeout")).to.eq(60000);
-
-    // this will change the config for the rest of your tests!
-    Cypress.config("pageLoadTimeout", 20000);
-
-    expect(Cypress.config("pageLoadTimeout")).to.eq(20000);
-
-    Cypress.config("pageLoadTimeout", 60000);
-  });
-});
-
-context("Cypress.dom", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  // https://on.cypress.io/dom
-  it(".isHidden() - determine if a DOM element is hidden", () => {
-    let hiddenP = Cypress.$(".dom-p p.hidden").get(0);
-    let visibleP = Cypress.$(".dom-p p.visible").get(0);
-
-    // our first paragraph has css class 'hidden'
-    expect(Cypress.dom.isHidden(hiddenP)).to.be.true;
-    expect(Cypress.dom.isHidden(visibleP)).to.be.false;
-  });
-});
-
-context("Cypress.env()", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  // We can set environment variables for highly dynamic values
-
-  // https://on.cypress.io/environment-variables
-  it("Get environment variables", () => {
-    // https://on.cypress.io/env
-    // set multiple environment variables
-    Cypress.env({
-      host: "veronica.dev.local",
-      api_server: "http://localhost:8888/v1/"
-    });
-
-    // get environment variable
-    expect(Cypress.env("host")).to.eq("veronica.dev.local");
-
-    // set environment variable
-    Cypress.env("api_server", "http://localhost:8888/v2/");
-    expect(Cypress.env("api_server")).to.eq("http://localhost:8888/v2/");
-
-    // get all environment variable
-    expect(Cypress.env()).to.have.property("host", "veronica.dev.local");
-    expect(Cypress.env()).to.have.property("api_server", "http://localhost:8888/v2/");
-  });
-});
-
-context("Cypress.log", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Control what is printed to the Command Log", () => {
-    // https://on.cypress.io/cypress-log
-  });
-});
-
-context("Cypress.platform", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Get underlying OS name", () => {
-    // https://on.cypress.io/platform
-    expect(Cypress.platform).to.be.exist;
-  });
-});
-
-context("Cypress.version", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Get current version of Cypress being run", () => {
-    // https://on.cypress.io/version
-    expect(Cypress.version).to.be.exist;
-  });
-});
-
-context("Cypress.spec", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/cypress-api");
-  });
-
-  it("Get current spec information", () => {
-    // https://on.cypress.io/spec
-    // wrap the object so we can inspect it easily by clicking in the command log
-    cy.wrap(Cypress.spec).should("include.keys", ["name", "relative", "absolute"]);
-  });
-});

client/cypress/e2e/2-advanced-examples/files.cy.js

@@ -1,86 +0,0 @@
-/// <reference types="cypress" />
-
-/// JSON fixture file can be loaded directly using
-// the built-in JavaScript bundler
-// @ts-ignore
-const requiredExample = require("../../fixtures/example");
-
-context("Files", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/files");
-  });
-
-  beforeEach(() => {
-    // load example.json fixture file and store
-    // in the test context object
-    cy.fixture("example.json").as("example");
-  });
-
-  it("cy.fixture() - load a fixture", () => {
-    // https://on.cypress.io/fixture
-
-    // Instead of writing a response inline you can
-    // use a fixture file's content.
-
-    // when application makes an Ajax request matching "GET **/comments/*"
-    // Cypress will intercept it and reply with the object in `example.json` fixture
-    cy.intercept("GET", "**/comments/*", { fixture: "example.json" }).as("getComment");
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get(".fixture-btn").click();
-
-    cy.wait("@getComment")
-      .its("response.body")
-      .should("have.property", "name")
-      .and("include", "Using fixtures to represent data");
-  });
-
-  it("cy.fixture() or require - load a fixture", function () {
-    // we are inside the "function () { ... }"
-    // callback and can use test context object "this"
-    // "this.example" was loaded in "beforeEach" function callback
-    expect(this.example, "fixture in the test context").to.deep.equal(requiredExample);
-
-    // or use "cy.wrap" and "should('deep.equal', ...)" assertion
-    cy.wrap(this.example).should("deep.equal", requiredExample);
-  });
-
-  it("cy.readFile() - read file contents", () => {
-    // https://on.cypress.io/readfile
-
-    // You can read a file and yield its contents
-    // The filePath is relative to your project's root.
-    cy.readFile("cypress.json").then((json) => {
-      expect(json).to.be.an("object");
-    });
-  });
-
-  it("cy.writeFile() - write to a file", () => {
-    // https://on.cypress.io/writefile
-
-    // You can write to a file
-
-    // Use a response from a request to automatically
-    // generate a fixture file for use later
-    cy.request("https://jsonplaceholder.cypress.io/users").then((response) => {
-      cy.writeFile("cypress/fixtures/users.json", response.body);
-    });
-
-    cy.fixture("users").should((users) => {
-      expect(users[0].name).to.exist;
-    });
-
-    // JavaScript arrays and objects are stringified
-    // and formatted into text.
-    cy.writeFile("cypress/fixtures/profile.json", {
-      id: 8739,
-      name: "Jane",
-      email: "jane@example.com"
-    });
-
-    cy.fixture("profile").should((profile) => {
-      expect(profile.name).to.eq("Jane");
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/local_storage.cy.js

@@ -1,58 +0,0 @@
-/// <reference types="cypress" />
-
-context("Local Storage", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/local-storage");
-  });
-  // Although local storage is automatically cleared
-  // in between tests to maintain a clean state
-  // sometimes we need to clear the local storage manually
-
-  it("cy.clearLocalStorage() - clear all data in local storage", () => {
-    // https://on.cypress.io/clearlocalstorage
-    cy.get(".ls-btn")
-      .click()
-      .should(() => {
-        expect(localStorage.getItem("prop1")).to.eq("red");
-        expect(localStorage.getItem("prop2")).to.eq("blue");
-        expect(localStorage.getItem("prop3")).to.eq("magenta");
-      });
-
-    // clearLocalStorage() yields the localStorage object
-    cy.clearLocalStorage().should((ls) => {
-      expect(ls.getItem("prop1")).to.be.null;
-      expect(ls.getItem("prop2")).to.be.null;
-      expect(ls.getItem("prop3")).to.be.null;
-    });
-
-    cy.get(".ls-btn")
-      .click()
-      .should(() => {
-        expect(localStorage.getItem("prop1")).to.eq("red");
-        expect(localStorage.getItem("prop2")).to.eq("blue");
-        expect(localStorage.getItem("prop3")).to.eq("magenta");
-      });
-
-    // Clear key matching string in Local Storage
-    cy.clearLocalStorage("prop1").should((ls) => {
-      expect(ls.getItem("prop1")).to.be.null;
-      expect(ls.getItem("prop2")).to.eq("blue");
-      expect(ls.getItem("prop3")).to.eq("magenta");
-    });
-
-    cy.get(".ls-btn")
-      .click()
-      .should(() => {
-        expect(localStorage.getItem("prop1")).to.eq("red");
-        expect(localStorage.getItem("prop2")).to.eq("blue");
-        expect(localStorage.getItem("prop3")).to.eq("magenta");
-      });
-
-    // Clear keys matching regex in Local Storage
-    cy.clearLocalStorage(/prop1|2/).should((ls) => {
-      expect(ls.getItem("prop1")).to.be.null;
-      expect(ls.getItem("prop2")).to.be.null;
-      expect(ls.getItem("prop3")).to.eq("magenta");
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/location.cy.js

@@ -1,32 +0,0 @@
-/// <reference types="cypress" />
-
-context("Location", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/location");
-  });
-
-  it("cy.hash() - get the current URL hash", () => {
-    // https://on.cypress.io/hash
-    cy.hash().should("be.empty");
-  });
-
-  it("cy.location() - get window.location", () => {
-    // https://on.cypress.io/location
-    cy.location().should((location) => {
-      expect(location.hash).to.be.empty;
-      expect(location.href).to.eq("https://example.cypress.io/commands/location");
-      expect(location.host).to.eq("example.cypress.io");
-      expect(location.hostname).to.eq("example.cypress.io");
-      expect(location.origin).to.eq("https://example.cypress.io");
-      expect(location.pathname).to.eq("/commands/location");
-      expect(location.port).to.eq("");
-      expect(location.protocol).to.eq("https:");
-      expect(location.search).to.be.empty;
-    });
-  });
-
-  it("cy.url() - get the current URL", () => {
-    // https://on.cypress.io/url
-    cy.url().should("eq", "https://example.cypress.io/commands/location");
-  });
-});

client/cypress/e2e/2-advanced-examples/misc.cy.js

@@ -1,98 +0,0 @@
-/// <reference types="cypress" />
-
-context("Misc", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/misc");
-  });
-
-  it(".end() - end the command chain", () => {
-    // https://on.cypress.io/end
-
-    // cy.end is useful when you want to end a chain of commands
-    // and force Cypress to re-query from the root element
-    cy.get(".misc-table").within(() => {
-      // ends the current chain and yields null
-      cy.contains("Cheryl").click().end();
-
-      // queries the entire table again
-      cy.contains("Charles").click();
-    });
-  });
-
-  it("cy.exec() - execute a system command", () => {
-    // execute a system command.
-    // so you can take actions necessary for
-    // your test outside the scope of Cypress.
-    // https://on.cypress.io/exec
-
-    // we can use Cypress.platform string to
-    // select appropriate command
-    // https://on.cypress/io/platform
-    cy.log(`Platform ${Cypress.platform} architecture ${Cypress.arch}`);
-
-    // on CircleCI Windows build machines we have a failure to run bash shell
-    // https://github.com/cypress-io/cypress/issues/5169
-    // so skip some of the tests by passing flag "--env circle=true"
-    const isCircleOnWindows = Cypress.platform === "win32" && Cypress.env("circle");
-
-    if (isCircleOnWindows) {
-      cy.log("Skipping test on CircleCI");
-
-      return;
-    }
-
-    // cy.exec problem on Shippable CI
-    // https://github.com/cypress-io/cypress/issues/6718
-    const isShippable = Cypress.platform === "linux" && Cypress.env("shippable");
-
-    if (isShippable) {
-      cy.log("Skipping test on ShippableCI");
-
-      return;
-    }
-
-    cy.exec("echo Jane Lane").its("stdout").should("contain", "Jane Lane");
-
-    if (Cypress.platform === "win32") {
-      cy.exec("print cypress.json").its("stderr").should("be.empty");
-    } else {
-      cy.exec("cat cypress.json").its("stderr").should("be.empty");
-
-      cy.exec("pwd").its("code").should("eq", 0);
-    }
-  });
-
-  it("cy.focused() - get the DOM element that has focus", () => {
-    // https://on.cypress.io/focused
-    cy.get(".misc-form").find("#name").click();
-    cy.focused().should("have.id", "name");
-
-    cy.get(".misc-form").find("#description").click();
-    cy.focused().should("have.id", "description");
-  });
-
-  context("Cypress.Screenshot", function () {
-    it("cy.screenshot() - take a screenshot", () => {
-      // https://on.cypress.io/screenshot
-      cy.screenshot("my-image");
-    });
-
-    it("Cypress.Screenshot.defaults() - change default config of screenshots", function () {
-      Cypress.Screenshot.defaults({
-        blackout: [".foo"],
-        capture: "viewport",
-        clip: { x: 0, y: 0, width: 200, height: 200 },
-        scale: false,
-        disableTimersAndAnimations: true,
-        screenshotOnRunFailure: true,
-        onBeforeScreenshot() {},
-        onAfterScreenshot() {}
-      });
-    });
-  });
-
-  it("cy.wrap() - wrap an object", () => {
-    // https://on.cypress.io/wrap
-    cy.wrap({ foo: "bar" }).should("have.property", "foo").and("include", "bar");
-  });
-});

client/cypress/e2e/2-advanced-examples/navigation.cy.js

@@ -1,56 +0,0 @@
-/// <reference types="cypress" />
-
-context("Navigation", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io");
-    cy.get(".navbar-nav").contains("Commands").click();
-    cy.get(".dropdown-menu").contains("Navigation").click();
-  });
-
-  it("cy.go() - go back or forward in the browser's history", () => {
-    // https://on.cypress.io/go
-
-    cy.location("pathname").should("include", "navigation");
-
-    cy.go("back");
-    cy.location("pathname").should("not.include", "navigation");
-
-    cy.go("forward");
-    cy.location("pathname").should("include", "navigation");
-
-    // clicking back
-    cy.go(-1);
-    cy.location("pathname").should("not.include", "navigation");
-
-    // clicking forward
-    cy.go(1);
-    cy.location("pathname").should("include", "navigation");
-  });
-
-  it("cy.reload() - reload the page", () => {
-    // https://on.cypress.io/reload
-    cy.reload();
-
-    // reload the page without using the cache
-    cy.reload(true);
-  });
-
-  it("cy.visit() - visit a remote url", () => {
-    // https://on.cypress.io/visit
-
-    // Visit any sub-domain of your current domain
-
-    // Pass options to the visit
-    cy.visit("https://example.cypress.io/commands/navigation", {
-      timeout: 50000, // increase total time for the visit to resolve
-      onBeforeLoad(contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === "object").to.be.true;
-      },
-      onLoad(contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === "object").to.be.true;
-      }
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/network_requests.cy.js

@@ -1,165 +0,0 @@
-/// <reference types="cypress" />
-
-context("Network Requests", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/network-requests");
-  });
-
-  // Manage HTTP requests in your app
-
-  it("cy.request() - make an XHR request", () => {
-    // https://on.cypress.io/request
-    cy.request("https://jsonplaceholder.cypress.io/comments").should((response) => {
-      expect(response.status).to.eq(200);
-      // the server sometimes gets an extra comment posted from another machine
-      // which gets returned as 1 extra object
-      expect(response.body).to.have.property("length").and.be.oneOf([500, 501]);
-      expect(response).to.have.property("headers");
-      expect(response).to.have.property("duration");
-    });
-  });
-
-  it("cy.request() - verify response using BDD syntax", () => {
-    cy.request("https://jsonplaceholder.cypress.io/comments").then((response) => {
-      // https://on.cypress.io/assertions
-      expect(response).property("status").to.equal(200);
-      expect(response).property("body").to.have.property("length").and.be.oneOf([500, 501]);
-      expect(response).to.include.keys("headers", "duration");
-    });
-  });
-
-  it("cy.request() with query parameters", () => {
-    // will execute request
-    // https://jsonplaceholder.cypress.io/comments?postId=1&id=3
-    cy.request({
-      url: "https://jsonplaceholder.cypress.io/comments",
-      qs: {
-        postId: 1,
-        id: 3
-      }
-    })
-      .its("body")
-      .should("be.an", "array")
-      .and("have.length", 1)
-      .its("0") // yields first element of the array
-      .should("contain", {
-        postId: 1,
-        id: 3
-      });
-  });
-
-  it("cy.request() - pass result to the second request", () => {
-    // first, let's find out the userId of the first user we have
-    cy.request("https://jsonplaceholder.cypress.io/users?_limit=1")
-      .its("body") // yields the response object
-      .its("0") // yields the first element of the returned list
-      // the above two commands its('body').its('0')
-      // can be written as its('body.0')
-      // if you do not care about TypeScript checks
-      .then((user) => {
-        expect(user).property("id").to.be.a("number");
-        // make a new post on behalf of the user
-        cy.request("POST", "https://jsonplaceholder.cypress.io/posts", {
-          userId: user.id,
-          title: "Cypress Test Runner",
-          body: "Fast, easy and reliable testing for anything that runs in a browser."
-        });
-      })
-      // note that the value here is the returned value of the 2nd request
-      // which is the new post object
-      .then((response) => {
-        expect(response).property("status").to.equal(201); // new entity created
-        expect(response).property("body").to.contain({
-          title: "Cypress Test Runner"
-        });
-
-        // we don't know the exact post id - only that it will be > 100
-        // since JSONPlaceholder has built-in 100 posts
-        expect(response.body).property("id").to.be.a("number").and.to.be.gt(100);
-
-        // we don't know the user id here - since it was in above closure
-        // so in this test just confirm that the property is there
-        expect(response.body).property("userId").to.be.a("number");
-      });
-  });
-
-  it("cy.request() - save response in the shared test context", () => {
-    // https://on.cypress.io/variables-and-aliases
-    cy.request("https://jsonplaceholder.cypress.io/users?_limit=1")
-      .its("body")
-      .its("0") // yields the first element of the returned list
-      .as("user") // saves the object in the test context
-      .then(function () {
-        // NOTE 👀
-        //  By the time this callback runs the "as('user')" command
-        //  has saved the user object in the test context.
-        //  To access the test context we need to use
-        //  the "function () { ... }" callback form,
-        //  otherwise "this" points at a wrong or undefined object!
-        cy.request("POST", "https://jsonplaceholder.cypress.io/posts", {
-          userId: this.user.id,
-          title: "Cypress Test Runner",
-          body: "Fast, easy and reliable testing for anything that runs in a browser."
-        })
-          .its("body")
-          .as("post"); // save the new post from the response
-      })
-      .then(function () {
-        // When this callback runs, both "cy.request" API commands have finished
-        // and the test context has "user" and "post" objects set.
-        // Let's verify them.
-        expect(this.post, "post has the right user id").property("userId").to.equal(this.user.id);
-      });
-  });
-
-  it("cy.intercept() - route responses to matching requests", () => {
-    // https://on.cypress.io/intercept
-
-    let message = "whoa, this comment does not exist";
-
-    // Listen to GET to comments/1
-    cy.intercept("GET", "**/comments/*").as("getComment");
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get(".network-btn").click();
-
-    // https://on.cypress.io/wait
-    cy.wait("@getComment").its("response.statusCode").should("be.oneOf", [200, 304]);
-
-    // Listen to POST to comments
-    cy.intercept("POST", "**/comments").as("postComment");
-
-    // we have code that posts a comment when
-    // the button is clicked in scripts.js
-    cy.get(".network-post").click();
-    cy.wait("@postComment").should(({ request, response }) => {
-      expect(request.body).to.include("email");
-      expect(request.headers).to.have.property("content-type");
-      expect(response && response.body).to.have.property("name", "Using POST in cy.intercept()");
-    });
-
-    // Stub a response to PUT comments/ ****
-    cy.intercept(
-      {
-        method: "PUT",
-        url: "**/comments/*"
-      },
-      {
-        statusCode: 404,
-        body: { error: message },
-        headers: { "access-control-allow-origin": "*" },
-        delayMs: 500
-      }
-    ).as("putComment");
-
-    // we have code that puts a comment when
-    // the button is clicked in scripts.js
-    cy.get(".network-put").click();
-
-    cy.wait("@putComment");
-
-    // our 404 statusCode logic in scripts.js executed
-    cy.get(".network-put-comment").should("contain", message);
-  });
-});

client/cypress/e2e/2-advanced-examples/querying.cy.js

@@ -1,100 +0,0 @@
-/// <reference types="cypress" />
-
-context("Querying", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/querying");
-  });
-
-  // The most commonly used query is 'cy.get()', you can
-  // think of this like the '$' in jQuery
-
-  it("cy.get() - query DOM elements", () => {
-    // https://on.cypress.io/get
-
-    cy.get("#query-btn").should("contain", "Button");
-
-    cy.get(".query-btn").should("contain", "Button");
-
-    cy.get("#querying .well>button:first").should("contain", "Button");
-    //              ↲
-    // Use CSS selectors just like jQuery
-
-    cy.get('[data-test-id="test-example"]').should("have.class", "example");
-
-    // 'cy.get()' yields jQuery object, you can get its attribute
-    // by invoking `.attr()` method
-    cy.get('[data-test-id="test-example"]').invoke("attr", "data-test-id").should("equal", "test-example");
-
-    // or you can get element's CSS property
-    cy.get('[data-test-id="test-example"]').invoke("css", "position").should("equal", "static");
-
-    // or use assertions directly during 'cy.get()'
-    // https://on.cypress.io/assertions
-    cy.get('[data-test-id="test-example"]')
-      .should("have.attr", "data-test-id", "test-example")
-      .and("have.css", "position", "static");
-  });
-
-  it("cy.contains() - query DOM elements with matching content", () => {
-    // https://on.cypress.io/contains
-    cy.get(".query-list").contains("bananas").should("have.class", "third");
-
-    // we can pass a regexp to `.contains()`
-    cy.get(".query-list").contains(/^b\w+/).should("have.class", "third");
-
-    cy.get(".query-list").contains("apples").should("have.class", "first");
-
-    // passing a selector to contains will
-    // yield the selector containing the text
-    cy.get("#querying").contains("ul", "oranges").should("have.class", "query-list");
-
-    cy.get(".query-button").contains("Save Form").should("have.class", "btn");
-  });
-
-  it(".within() - query DOM elements within a specific element", () => {
-    // https://on.cypress.io/within
-    cy.get(".query-form").within(() => {
-      cy.get("input:first").should("have.attr", "placeholder", "Email");
-      cy.get("input:last").should("have.attr", "placeholder", "Password");
-    });
-  });
-
-  it("cy.root() - query the root DOM element", () => {
-    // https://on.cypress.io/root
-
-    // By default, root is the document
-    cy.root().should("match", "html");
-
-    cy.get(".query-ul").within(() => {
-      // In this within, the root is now the ul DOM element
-      cy.root().should("have.class", "query-ul");
-    });
-  });
-
-  it("best practices - selecting elements", () => {
-    // https://on.cypress.io/best-practices#Selecting-Elements
-    cy.get("[data-cy=best-practices-selecting-elements]").within(() => {
-      // Worst - too generic, no context
-      cy.get("button").click();
-
-      // Bad. Coupled to styling. Highly subject to change.
-      cy.get(".btn.btn-large").click();
-
-      // Average. Coupled to the `name` attribute which has HTML semantics.
-      cy.get("[name=submission]").click();
-
-      // Better. But still coupled to styling or JS event listeners.
-      cy.get("#main").click();
-
-      // Slightly better. Uses an ID but also ensures the element
-      // has an ARIA role attribute
-      cy.get("#main[role=button]").click();
-
-      // Much better. But still coupled to text content that may change.
-      cy.contains("Submit").click();
-
-      // Best. Insulated from all changes.
-      cy.get("[data-cy=submit]").click();
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/spies_stubs_clocks.cy.js

@@ -1,203 +0,0 @@
-/// <reference types="cypress" />
-// remove no check once Cypress.sinon is typed
-// https://github.com/cypress-io/cypress/issues/6720
-
-context("Spies, Stubs, and Clock", () => {
-  it("cy.spy() - wrap a method in a spy", () => {
-    // https://on.cypress.io/spy
-    cy.visit("https://example.cypress.io/commands/spies-stubs-clocks");
-
-    const obj = {
-      foo() {}
-    };
-
-    const spy = cy.spy(obj, "foo").as("anyArgs");
-
-    obj.foo();
-
-    expect(spy).to.be.called;
-  });
-
-  it("cy.spy() retries until assertions pass", () => {
-    cy.visit("https://example.cypress.io/commands/spies-stubs-clocks");
-
-    const obj = {
-      /**
-       * Prints the argument passed
-       * @param x {any}
-       */
-      foo(x) {
-        console.log("obj.foo called with", x);
-      }
-    };
-
-    cy.spy(obj, "foo").as("foo");
-
-    setTimeout(() => {
-      obj.foo("first");
-    }, 500);
-
-    setTimeout(() => {
-      obj.foo("second");
-    }, 2500);
-
-    cy.get("@foo").should("have.been.calledTwice");
-  });
-
-  it("cy.stub() - create a stub and/or replace a function with stub", () => {
-    // https://on.cypress.io/stub
-    cy.visit("https://example.cypress.io/commands/spies-stubs-clocks");
-
-    const obj = {
-      /**
-       * prints both arguments to the console
-       * @param a {string}
-       * @param b {string}
-       */
-      foo(a, b) {
-        console.log("a", a, "b", b);
-      }
-    };
-
-    const stub = cy.stub(obj, "foo").as("foo");
-
-    obj.foo("foo", "bar");
-
-    expect(stub).to.be.called;
-  });
-
-  it("cy.clock() - control time in the browser", () => {
-    // https://on.cypress.io/clock
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime();
-
-    cy.clock(now);
-    cy.visit("https://example.cypress.io/commands/spies-stubs-clocks");
-    cy.get("#clock-div").click().should("have.text", "1489449600");
-  });
-
-  it("cy.tick() - move time in the browser", () => {
-    // https://on.cypress.io/tick
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime();
-
-    cy.clock(now);
-    cy.visit("https://example.cypress.io/commands/spies-stubs-clocks");
-    cy.get("#tick-div").click().should("have.text", "1489449600");
-
-    cy.tick(10000); // 10 seconds passed
-    cy.get("#tick-div").click().should("have.text", "1489449610");
-  });
-
-  it("cy.stub() matches depending on arguments", () => {
-    // see all possible matchers at
-    // https://sinonjs.org/releases/latest/matchers/
-    const greeter = {
-      /**
-       * Greets a person
-       * @param {string} name
-       */
-      greet(name) {
-        return `Hello, ${name}!`;
-      }
-    };
-
-    cy.stub(greeter, "greet")
-      .callThrough() // if you want non-matched calls to call the real method
-      .withArgs(Cypress.sinon.match.string)
-      .returns("Hi")
-      .withArgs(Cypress.sinon.match.number)
-      .throws(new Error("Invalid name"));
-
-    expect(greeter.greet("World")).to.equal("Hi");
-    // @ts-ignore
-    expect(() => greeter.greet(42)).to.throw("Invalid name");
-    expect(greeter.greet).to.have.been.calledTwice;
-
-    // non-matched calls goes the actual method
-    // @ts-ignore
-    expect(greeter.greet()).to.equal("Hello, undefined!");
-  });
-
-  it("matches call arguments using Sinon matchers", () => {
-    // see all possible matchers at
-    // https://sinonjs.org/releases/latest/matchers/
-    const calculator = {
-      /**
-       * returns the sum of two arguments
-       * @param a {number}
-       * @param b {number}
-       */
-      add(a, b) {
-        return a + b;
-      }
-    };
-
-    const spy = cy.spy(calculator, "add").as("add");
-
-    expect(calculator.add(2, 3)).to.equal(5);
-
-    // if we want to assert the exact values used during the call
-    expect(spy).to.be.calledWith(2, 3);
-
-    // let's confirm "add" method was called with two numbers
-    expect(spy).to.be.calledWith(Cypress.sinon.match.number, Cypress.sinon.match.number);
-
-    // alternatively, provide the value to match
-    expect(spy).to.be.calledWith(Cypress.sinon.match(2), Cypress.sinon.match(3));
-
-    // match any value
-    expect(spy).to.be.calledWith(Cypress.sinon.match.any, 3);
-
-    // match any value from a list
-    expect(spy).to.be.calledWith(Cypress.sinon.match.in([1, 2, 3]), 3);
-
-    /**
-     * Returns true if the given number is event
-     * @param {number} x
-     */
-    const isEven = (x) => x % 2 === 0;
-
-    // expect the value to pass a custom predicate function
-    // the second argument to "sinon.match(predicate, message)" is
-    // shown if the predicate does not pass and assertion fails
-    expect(spy).to.be.calledWith(Cypress.sinon.match(isEven, "isEven"), 3);
-
-    /**
-     * Returns a function that checks if a given number is larger than the limit
-     * @param {number} limit
-     * @returns {(x: number) => boolean}
-     */
-    const isGreaterThan = (limit) => (x) => x > limit;
-
-    /**
-     * Returns a function that checks if a given number is less than the limit
-     * @param {number} limit
-     * @returns {(x: number) => boolean}
-     */
-    const isLessThan = (limit) => (x) => x < limit;
-
-    // you can combine several matchers using "and", "or"
-    expect(spy).to.be.calledWith(
-      Cypress.sinon.match.number,
-      Cypress.sinon.match(isGreaterThan(2), "> 2").and(Cypress.sinon.match(isLessThan(4), "< 4"))
-    );
-
-    expect(spy).to.be.calledWith(
-      Cypress.sinon.match.number,
-      Cypress.sinon.match(isGreaterThan(200), "> 200").or(Cypress.sinon.match(3))
-    );
-
-    // matchers can be used from BDD assertions
-    cy.get("@add").should("have.been.calledWith", Cypress.sinon.match.number, Cypress.sinon.match(3));
-
-    // you can alias matchers for shorter test code
-    const { match: M } = Cypress.sinon;
-
-    cy.get("@add").should("have.been.calledWith", M.number, M(3));
-  });
-});

client/cypress/e2e/2-advanced-examples/traversal.cy.js

@@ -1,97 +0,0 @@
-/// <reference types="cypress" />
-
-context("Traversal", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/traversal");
-  });
-
-  it(".children() - get child DOM elements", () => {
-    // https://on.cypress.io/children
-    cy.get(".traversal-breadcrumb").children(".active").should("contain", "Data");
-  });
-
-  it(".closest() - get closest ancestor DOM element", () => {
-    // https://on.cypress.io/closest
-    cy.get(".traversal-badge").closest("ul").should("have.class", "list-group");
-  });
-
-  it(".eq() - get a DOM element at a specific index", () => {
-    // https://on.cypress.io/eq
-    cy.get(".traversal-list>li").eq(1).should("contain", "siamese");
-  });
-
-  it(".filter() - get DOM elements that match the selector", () => {
-    // https://on.cypress.io/filter
-    cy.get(".traversal-nav>li").filter(".active").should("contain", "About");
-  });
-
-  it(".find() - get descendant DOM elements of the selector", () => {
-    // https://on.cypress.io/find
-    cy.get(".traversal-pagination").find("li").find("a").should("have.length", 7);
-  });
-
-  it(".first() - get first DOM element", () => {
-    // https://on.cypress.io/first
-    cy.get(".traversal-table td").first().should("contain", "1");
-  });
-
-  it(".last() - get last DOM element", () => {
-    // https://on.cypress.io/last
-    cy.get(".traversal-buttons .btn").last().should("contain", "Submit");
-  });
-
-  it(".next() - get next sibling DOM element", () => {
-    // https://on.cypress.io/next
-    cy.get(".traversal-ul").contains("apples").next().should("contain", "oranges");
-  });
-
-  it(".nextAll() - get all next sibling DOM elements", () => {
-    // https://on.cypress.io/nextall
-    cy.get(".traversal-next-all").contains("oranges").nextAll().should("have.length", 3);
-  });
-
-  it(".nextUntil() - get next sibling DOM elements until next el", () => {
-    // https://on.cypress.io/nextuntil
-    cy.get("#veggies").nextUntil("#nuts").should("have.length", 3);
-  });
-
-  it(".not() - remove DOM elements from set of DOM elements", () => {
-    // https://on.cypress.io/not
-    cy.get(".traversal-disabled .btn").not("[disabled]").should("not.contain", "Disabled");
-  });
-
-  it(".parent() - get parent DOM element from DOM elements", () => {
-    // https://on.cypress.io/parent
-    cy.get(".traversal-mark").parent().should("contain", "Morbi leo risus");
-  });
-
-  it(".parents() - get parent DOM elements from DOM elements", () => {
-    // https://on.cypress.io/parents
-    cy.get(".traversal-cite").parents().should("match", "blockquote");
-  });
-
-  it(".parentsUntil() - get parent DOM elements from DOM elements until el", () => {
-    // https://on.cypress.io/parentsuntil
-    cy.get(".clothes-nav").find(".active").parentsUntil(".clothes-nav").should("have.length", 2);
-  });
-
-  it(".prev() - get previous sibling DOM element", () => {
-    // https://on.cypress.io/prev
-    cy.get(".birds").find(".active").prev().should("contain", "Lorikeets");
-  });
-
-  it(".prevAll() - get all previous sibling DOM elements", () => {
-    // https://on.cypress.io/prevall
-    cy.get(".fruits-list").find(".third").prevAll().should("have.length", 2);
-  });
-
-  it(".prevUntil() - get all previous sibling DOM elements until el", () => {
-    // https://on.cypress.io/prevuntil
-    cy.get(".foods-list").find("#nuts").prevUntil("#veggies").should("have.length", 3);
-  });
-
-  it(".siblings() - get all sibling DOM elements", () => {
-    // https://on.cypress.io/siblings
-    cy.get(".traversal-pills .active").siblings().should("have.length", 2);
-  });
-});

client/cypress/e2e/2-advanced-examples/utilities.cy.js

@@ -1,108 +0,0 @@
-/// <reference types="cypress" />
-
-context("Utilities", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/utilities");
-  });
-
-  it("Cypress._ - call a lodash method", () => {
-    // https://on.cypress.io/_
-    cy.request("https://jsonplaceholder.cypress.io/users").then((response) => {
-      let ids = Cypress._.chain(response.body).map("id").take(3).value();
-
-      expect(ids).to.deep.eq([1, 2, 3]);
-    });
-  });
-
-  it("Cypress.$ - call a jQuery method", () => {
-    // https://on.cypress.io/$
-    let $li = Cypress.$(".utility-jquery li:first");
-
-    cy.wrap($li).should("not.have.class", "active").click().should("have.class", "active");
-  });
-
-  it("Cypress.Blob - blob utilities and base64 string conversion", () => {
-    // https://on.cypress.io/blob
-    cy.get(".utility-blob").then(($div) => {
-      // https://github.com/nolanlawson/blob-util#imgSrcToDataURL
-      // get the dataUrl string for the javascript-logo
-      return Cypress.Blob.imgSrcToDataURL(
-        "https://example.cypress.io/assets/img/javascript-logo.png",
-        undefined,
-        "anonymous"
-      ).then((dataUrl) => {
-        // create an <img> element and set its src to the dataUrl
-        let img = Cypress.$("<img />", { src: dataUrl });
-
-        // need to explicitly return cy here since we are initially returning
-        // the Cypress.Blob.imgSrcToDataURL promise to our test
-        // append the image
-        $div.append(img);
-
-        cy.get(".utility-blob img").click().should("have.attr", "src", dataUrl);
-      });
-    });
-  });
-
-  it("Cypress.minimatch - test out glob patterns against strings", () => {
-    // https://on.cypress.io/minimatch
-    let matching = Cypress.minimatch("/users/1/comments", "/users/*/comments", {
-      matchBase: true
-    });
-
-    expect(matching, "matching wildcard").to.be.true;
-
-    matching = Cypress.minimatch("/users/1/comments/2", "/users/*/comments", {
-      matchBase: true
-    });
-
-    expect(matching, "comments").to.be.false;
-
-    // ** matches against all downstream path segments
-    matching = Cypress.minimatch("/foo/bar/baz/123/quux?a=b&c=2", "/foo/**", {
-      matchBase: true
-    });
-
-    expect(matching, "comments").to.be.true;
-
-    // whereas * matches only the next path segment
-
-    matching = Cypress.minimatch("/foo/bar/baz/123/quux?a=b&c=2", "/foo/*", {
-      matchBase: false
-    });
-
-    expect(matching, "comments").to.be.false;
-  });
-
-  it("Cypress.Promise - instantiate a bluebird promise", () => {
-    // https://on.cypress.io/promise
-    let waited = false;
-
-    /**
-     * @return Bluebird<string>
-     */
-    function waitOneSecond() {
-      // return a promise that resolves after 1 second
-      // @ts-ignore TS2351 (new Cypress.Promise)
-      return new Cypress.Promise((resolve, reject) => {
-        setTimeout(() => {
-          // set waited to true
-          waited = true;
-
-          // resolve with 'foo' string
-          resolve("foo");
-        }, 1000);
-      });
-    }
-
-    cy.then(() => {
-      // return a promise to cy.then() that
-      // is awaited until it resolves
-      // @ts-ignore TS7006
-      return waitOneSecond().then((str) => {
-        expect(str).to.eq("foo");
-        expect(waited).to.be.true;
-      });
-    });
-  });
-});

client/cypress/e2e/2-advanced-examples/viewport.cy.js

@@ -1,59 +0,0 @@
-/// <reference types="cypress" />
-
-context("Viewport", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/viewport");
-  });
-
-  it("cy.viewport() - set the viewport size and dimension", () => {
-    // https://on.cypress.io/viewport
-
-    cy.get("#navbar").should("be.visible");
-    cy.viewport(320, 480);
-
-    // the navbar should have collapse since our screen is smaller
-    cy.get("#navbar").should("not.be.visible");
-    cy.get(".navbar-toggle").should("be.visible").click();
-    cy.get(".nav").find("a").should("be.visible");
-
-    // lets see what our app looks like on a super large screen
-    cy.viewport(2999, 2999);
-
-    // cy.viewport() accepts a set of preset sizes
-    // to easily set the screen to a device's width and height
-
-    // We added a cy.wait() between each viewport change so you can see
-    // the change otherwise it is a little too fast to see :)
-
-    cy.viewport("macbook-15");
-    cy.wait(200);
-    cy.viewport("macbook-13");
-    cy.wait(200);
-    cy.viewport("macbook-11");
-    cy.wait(200);
-    cy.viewport("ipad-2");
-    cy.wait(200);
-    cy.viewport("ipad-mini");
-    cy.wait(200);
-    cy.viewport("iphone-6+");
-    cy.wait(200);
-    cy.viewport("iphone-6");
-    cy.wait(200);
-    cy.viewport("iphone-5");
-    cy.wait(200);
-    cy.viewport("iphone-4");
-    cy.wait(200);
-    cy.viewport("iphone-3");
-    cy.wait(200);
-
-    // cy.viewport() accepts an orientation for all presets
-    // the default orientation is 'portrait'
-    cy.viewport("ipad-2", "portrait");
-    cy.wait(200);
-    cy.viewport("iphone-4", "landscape");
-    cy.wait(200);
-
-    // The viewport will be reset back to the default dimensions
-    // in between tests (the  default can be set in cypress.json)
-  });
-});

client/cypress/e2e/2-advanced-examples/waiting.cy.js

@@ -1,31 +0,0 @@
-/// <reference types="cypress" />
-
-context("Waiting", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/waiting");
-  });
-  // BE CAREFUL of adding unnecessary wait times.
-  // https://on.cypress.io/best-practices#Unnecessary-Waiting
-
-  // https://on.cypress.io/wait
-  it("cy.wait() - wait for a specific amount of time", () => {
-    cy.get(".wait-input1").type("Wait 1000ms after typing");
-    cy.wait(1000);
-    cy.get(".wait-input2").type("Wait 1000ms after typing");
-    cy.wait(1000);
-    cy.get(".wait-input3").type("Wait 1000ms after typing");
-    cy.wait(1000);
-  });
-
-  it("cy.wait() - wait for a specific route", () => {
-    // Listen to GET to comments/1
-    cy.intercept("GET", "**/comments/*").as("getComment");
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get(".network-btn").click();
-
-    // wait for GET comments/1
-    cy.wait("@getComment").its("response.statusCode").should("be.oneOf", [200, 304]);
-  });
-});

client/cypress/e2e/2-advanced-examples/window.cy.js

@@ -1,22 +0,0 @@
-/// <reference types="cypress" />
-
-context("Window", () => {
-  beforeEach(() => {
-    cy.visit("https://example.cypress.io/commands/window");
-  });
-
-  it("cy.window() - get the global window object", () => {
-    // https://on.cypress.io/window
-    cy.window().should("have.property", "top");
-  });
-
-  it("cy.document() - get the document object", () => {
-    // https://on.cypress.io/document
-    cy.document().should("have.property", "charset").and("eq", "UTF-8");
-  });
-
-  it("cy.title() - get the title", () => {
-    // https://on.cypress.io/title
-    cy.title().should("include", "Kitchen Sink");
-  });
-});

client/cypress/fixtures/example.json

@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}

client/cypress/fixtures/profile.json

@@ -1,5 +0,0 @@
-{
-  "id": 8739,
-  "name": "Jane",
-  "email": "jane@example.com"
-}

client/cypress/fixtures/users.json

@@ -1 +0,0 @@
-[]

client/cypress/plugins/index.js

@@ -1,22 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.jsx can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-// eslint-disable-next-line no-unused-vars
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-};

client/cypress/support/commands.js

@@ -1,27 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
-import "@testing-library/cypress/add-commands";

client/cypress/support/e2e.js

@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.jsx is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import "./commands";
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')

client/cypress/tsconfig.json

@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "../node_modules",
-    "types": ["cypress"]
-  },
-  "include": ["**/*.*"]
-}

client/eslint.config.js

@@ -0,0 +1,21 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import pluginReact from "eslint-plugin-react";
+
+/** @type {import('eslint').Linter.Config[]} */
+
+export default [
+  {
+    files: ["**/*.{js,mjs,cjs,jsx}"]
+  },
+  { languageOptions: { globals: globals.browser } },
+  pluginJs.configs.recommended,
+  {
+    ...pluginReact.configs.flat.recommended,
+    rules: {
+      ...pluginReact.configs.flat.recommended.rules,
+      "react/prop-types": 0
+    }
+  },
+  pluginReact.configs.flat["jsx-runtime"]
+];

client/index.html

@@ -1,29 +1,26 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <meta charset="utf-8"/>
-  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
-  <meta http-equiv="Pragma" content="no-cache">
-  <meta http-equiv="Expires" content="0">
-  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-  <link rel="icon" href="/favicon.png"/>
-  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-  <link rel="icon" href="/ro-favicon.png"/>
-  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
-  <link rel="icon" href="/pm/pm-favicon.ico"/>
-  <% } %>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
+    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+    <link rel="icon" href="/favicon.png" />
+    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+    <link rel="icon" href="/ro-favicon.png" />
+    <% } %>
 
-  <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <meta name="theme-color" content="#1690ff"/>
-  <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-  <!-- TODO:AIo Update the individual logos for each.-->
-  <link rel="apple-touch-icon" href="/logo192.png"/>
-  <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
-  <!--
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#1690ff" />
+    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
+    <link rel="apple-touch-icon" href="/logo192.png" />
+    <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF" />
+    <!--
     manifest.json provides metadata used when your web app is installed on a
     user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
   -->
-  <!--
+    <!--
     Notice the use of %PUBLIC_URL% in the tags above.
     It will be replaced with the URL of the `public` folder during the build.
     Only files inside the `public` folder can be referenced from the HTML.
@@ -32,95 +29,100 @@
     work correctly both with client-side routing and a non-root public URL.
     Learn how to configure a non-root public URL by running `npm run build`.
   -->
-  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-  <meta name="description" content="ImEX Online"/>
-  <title>ImEX Online</title>
-  <script type="text/javascript">
-    window.$crisp = [];
-    window.CRISP_WEBSITE_ID = '36724f62-2eb0-4b29-9cdd-9905fb99913e';
-    (function () {
-      d = document;
-      s = d.createElement('script');
-      s.src = 'https://client.crisp.chat/l.js';
-      s.async = 1;
-      d.getElementsByTagName('head')[0].appendChild(s);
-    })();
-  </script>
-  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-  <meta name="description" content="Rome Online"/>
-  <title>Rome Online</title>
-  <script type="text/javascript" id="zsiqchat">
-    var $zoho = $zoho || {};
-    $zoho.salesiq = $zoho.salesiq || {
-      widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
-      values: {},
-      ready: function () {
-      }
-    };
-    var d = document;
-    s = d.createElement("script");
-    s.type = "text/javascript";
-    s.id = "zsiqscript";
-    s.defer = true;
-    s.src = "https://salesiq.zohopublic.com/widget";
-    t = d.getElementsByTagName("script")[0];
-    t.parentNode.insertBefore(s, t);
-  </script>
+    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+    <meta name="description" content="ImEX Online" />
+    <title>ImEX Online</title>
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
+    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+    <meta name="description" content="Rome Online" />
+    <title>Rome Online</title>
+    <script type="text/javascript" id="zsiqchat">
+      var $zoho = $zoho || {};
+      $zoho.salesiq = $zoho.salesiq || {
+        widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
+        values: {},
+        ready: function () {}
+      };
+      var d = document;
+      s = d.createElement("script");
+      s.type = "text/javascript";
+      s.id = "zsiqscript";
+      s.defer = true;
+      s.src = "https://salesiq.zohopublic.com/widget";
+      t = d.getElementsByTagName("script")[0];
+      t.parentNode.insertBefore(s, t);
+    </script>
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
+    <% } %>
+    <script>
+      !(function () {
+        "use strict";
+        var e = [
+          "debug",
+          "destroy",
+          "do",
+          "help",
+          "identify",
+          "is",
+          "off",
+          "on",
+          "ready",
+          "render",
+          "reset",
+          "safe",
+          "set"
+        ];
+        if (window.noticeable) console.warn("Noticeable SDK code snippet loaded more than once");
+        else {
+          var n = (window.noticeable = window.noticeable || []);
 
-  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
-  <title>ProManager</title>
-  <meta name="description" content="ProManager"/>
-
-  <% } %>
-  <script>
-    !(function () {
-      'use strict';
-      var e = [
-        'debug',
-        'destroy',
-        'do',
-        'help',
-        'identify',
-        'is',
-        'off',
-        'on',
-        'ready',
-        'render',
-        'reset',
-        'safe',
-        'set',
-      ];
-      if (window.noticeable) console.warn('Noticeable SDK code snippet loaded more than once');
-      else {
-        var n = (window.noticeable = window.noticeable || []);
-
-        function t(e) {
-          return function () {
-            var t = Array.prototype.slice.call(arguments);
-            return t.unshift(e), n.push(t), n;
-          };
-        }
-
-        !(function () {
-          for (var o = 0; o < e.length; o++) {
-            var r = e[o];
-            n[r] = t(r);
+          function t(e) {
+            return function () {
+              var t = Array.prototype.slice.call(arguments);
+              return t.unshift(e), n.push(t), n;
+            };
           }
-        })(),
-          (function () {
-            var e = document.createElement('script');
-            (e.async = !0), (e.src = 'https://sdk.noticeable.io/l.js');
-            var n = document.head;
-            n.insertBefore(e, n.firstChild);
-          })();
-      }
-    })();
-  </script>
-</head>
-<body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-<div id="root"></div>
 
-<script type="module" src="src/index.jsx"></script>
-</body>
+          !(function () {
+            for (var o = 0; o < e.length; o++) {
+              var r = e[o];
+              n[r] = t(r);
+            }
+          })(),
+            (function () {
+              var e = document.createElement("script");
+              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
+              var n = document.head;
+              n.insertBefore(e, n.firstChild);
+            })();
+        }
+      })();
+    </script>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+
+    <script type="module" src="src/index.jsx"></script>
+  </body>
 </html>

client/package.json

@@ -2,84 +2,87 @@
   "name": "bodyshop",
   "version": "0.2.1",
   "engines": {
-    "node": ">=18.18.2"
+    "node": ">=22.0.0"
   },
   "type": "module",
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@ant-design/pro-layout": "^7.19.12",
-    "@apollo/client": "^3.11.8",
+    "@ant-design/pro-layout": "^7.22.3",
+    "@apollo/client": "^3.13.5",
     "@emotion/is-prop-valid": "^1.3.1",
-    "@fingerprintjs/fingerprintjs": "^4.5.0",
+    "@fingerprintjs/fingerprintjs": "^4.6.1",
+    "@firebase/analytics": "^0.10.12",
+    "@firebase/app": "^0.11.3",
+    "@firebase/auth": "^1.9.1",
+    "@firebase/firestore": "^4.7.10",
+    "@firebase/messaging": "^0.12.17",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.2.7",
-    "@sentry/cli": "^2.36.2",
-    "@sentry/react": "^7.114.0",
-    "@splitsoftware/splitio-react": "^1.13.0",
-    "@tanem/react-nprogress": "^5.0.51",
-    "@vitejs/plugin-react": "^4.3.1",
-    "antd": "^5.20.1",
+    "@reduxjs/toolkit": "^2.6.1",
+    "@sentry/cli": "^2.42.4",
+    "@sentry/react": "^9.9.0",
+    "@sentry/vite-plugin": "^3.2.2",
+    "@splitsoftware/splitio-react": "^2.0.1",
+    "@tanem/react-nprogress": "^5.0.53",
+    "@vitejs/plugin-react": "^4.3.4",
+    "antd": "^5.24.5",
     "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^3.3.0",
+    "apollo-link-sentry": "^4.2.0",
     "autosize": "^6.0.1",
-    "axios": "^1.7.7",
+    "axios": "^1.8.4",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.13",
-    "dayjs-business-days2": "^1.2.2",
+    "dayjs-business-days2": "^1.3.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.7",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.13.2",
-    "graphql": "^16.9.0",
-    "i18next": "^23.15.1",
-    "i18next-browser-languagedetector": "^8.0.0",
+    "graphql": "^16.10.0",
+    "i18next": "^24.2.3",
+    "i18next-browser-languagedetector": "^8.0.4",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.11.9",
-    "logrocket": "^8.1.2",
-    "markerjs2": "^2.32.2",
+    "libphonenumber-js": "^1.12.6",
+    "logrocket": "^9.0.2",
+    "markerjs2": "^2.32.4",
     "memoize-one": "^6.0.0",
     "normalize-url": "^8.0.1",
     "object-hash": "^3.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.1.0",
+    "query-string": "^9.1.1",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
-    "react-big-calendar": "^1.14.1",
+    "react-big-calendar": "^1.18.0",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.2.0",
+    "react-cookie": "^8.0.1",
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
     "react-grid-layout": "1.3.4",
-    "react-i18next": "^14.1.3",
-    "react-icons": "^5.3.0",
+    "react-i18next": "^15.4.1",
+    "react-icons": "^5.5.0",
     "react-image-lightbox": "^5.1.4",
-    "react-markdown": "^9.0.1",
-    "react-number-format": "^5.4.2",
+    "react-markdown": "^10.1.0",
+    "react-number-format": "^5.4.3",
     "react-popopo": "^2.1.9",
     "react-product-fruits": "^2.2.61",
-    "react-redux": "^9.1.2",
+    "react-redux": "^9.2.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
-    "react-virtualized": "^9.22.5",
-    "react-virtuoso": "^4.10.4",
-    "recharts": "^2.12.7",
+    "react-virtuoso": "^4.12.5",
+    "recharts": "^2.15.0",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.79.3",
-    "socket.io-client": "^4.8.0",
-    "styled-components": "^6.1.13",
+    "sass": "^1.86.0",
+    "socket.io-client": "^4.8.1",
+    "styled-components": "^6.1.16",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
-    "userpilot": "^1.3.6",
     "vite-plugin-ejs": "^1.7.0",
     "web-vitals": "^3.5.2"
   },
@@ -90,28 +93,14 @@
     "build": "dotenvx run --env-file=.env.development.imex -- vite build",
     "start:imex": "dotenvx run --env-file=.env.development.imex -- vite",
     "start:rome": "dotenvx run --env-file=.env.development.rome -- vite",
-    "start:promanager": "dotenvx run --env-file=.env.development.promanager -- vite",
     "preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
     "preview:rome": "dotenvx run --env-file=.env.development.rome -- vite preview",
-    "preview:promanager": "dotenvx run --env-file=.env.development.promanager -- vite preview",
     "build:test:imex": "env-cmd -f .env.test.imex npm run build",
     "build:test:rome": "env-cmd -f .env.test.rome npm run build",
-    "build:test:promanager": "env-cmd -f .env.test.promanager npm run build",
     "build:production:imex": "env-cmd -f .env.production.imex npm run build",
     "build:production:rome": "env-cmd -f .env.production.rome npm run build",
-    "build:production:promanager": "env-cmd -f .env.production.promanager npm run build",
-    "test": "cypress open",
-    "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
-    "eulaize": "node src/utils/eulaize.js",
-    "sentry:sourcemaps:imex": "sentry-cli sourcemaps inject --org imex --project imexonline ./build && sentry-cli sourcemaps upload --org imex --project imexonline ./build"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest",
-      "plugin:cypress/recommended"
-    ]
+    "eulaize": "node src/utils/eulaize.js"
   },
   "browserslist": {
     "production": [
@@ -132,33 +121,32 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^5.5.1",
+    "@ant-design/icons": "^6.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-react": "^7.24.7",
-    "@dotenvx/dotenvx": "^1.14.1",
-    "@emotion/babel-plugin": "^11.12.0",
-    "@emotion/react": "^11.13.3",
-    "@sentry/webpack-plugin": "^2.22.4",
-    "@testing-library/cypress": "^10.0.2",
-    "browserslist": "^4.23.3",
+    "@babel/preset-react": "^7.26.3",
+    "@dotenvx/dotenvx": "^1.39.0",
+    "@emotion/babel-plugin": "^11.13.5",
+    "@emotion/react": "^11.14.0",
+    "@eslint/js": "^9.23.0",
+    "@sentry/webpack-plugin": "^3.2.2",
+    "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.3.0",
-    "cross-env": "^7.0.3",
-    "cypress": "^13.14.2",
-    "eslint": "^8.57.0",
+    "chalk": "^5.4.1",
+    "eslint": "^8.57.1",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-cypress": "^2.15.1",
-    "memfs": "^4.12.0",
+    "eslint-plugin-react": "^7.37.4",
+    "globals": "^15.15.0",
+    "memfs": "^4.17.0",
     "os-browserify": "^0.3.0",
-    "react-error-overlay": "6.0.11",
+    "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^5.4.7",
-    "vite-plugin-babel": "^1.2.0",
+    "vite": "^6.2.3",
+    "vite-plugin-babel": "^1.3.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-node-polyfills": "^0.22.0",
-    "vite-plugin-pwa": "^0.20.5",
+    "vite-plugin-node-polyfills": "^0.23.0",
+    "vite-plugin-pwa": "^0.21.2",
     "vite-plugin-style-import": "^2.0.0",
-    "workbox-window": "^7.1.0"
+    "workbox-window": "^7.3.0"
   }
 }

client/src/App/App.container.jsx

@@ -1,29 +1,38 @@
 import { ApolloProvider } from "@apollo/client";
-import { SplitFactoryProvider, SplitSdk } from "@splitsoftware/splitio-react";
+import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import React from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
 import * as Sentry from "@sentry/react";
-
 import themeProvider from "./themeProvider";
-import { Userpilot } from "userpilot";
-
-// Initialize Userpilot
-if (import.meta.env.DEV) {
-  Userpilot.initialize("NX-69145f08");
-}
 
+// Base Split configuration
 const config = {
   core: {
     authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
-    key: "anon"
+    key: "anon" // Default key, overridden dynamically by SplitClientProvider
   }
 };
-export const factory = SplitSdk(config);
+
+// Custom provider to manage the Split client key based on imexshopid from Redux
+function SplitClientProvider({ children }) {
+  const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
+  const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
+
+  useEffect(() => {
+    if (splitClient && imexshopid) {
+      // Log readiness for debugging; no need for ready() since isReady is available
+      console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
+    }
+  }, [splitClient, imexshopid]);
+
+  return children;
+}
 
 function AppContainer() {
   const { t } = useTranslation();
@@ -31,7 +40,6 @@ function AppContainer() {
   return (
     <ApolloProvider client={client}>
       <ConfigProvider
-        //componentSize="small"
         input={{ autoComplete: "new-password" }}
         locale={enLocale}
         theme={themeProvider}
@@ -43,8 +51,10 @@ function AppContainer() {
         }}
       >
         <GlobalLoadingBar />
-        <SplitFactoryProvider factory={factory}>
-          <App />
+        <SplitFactoryProvider config={config}>
+          <SplitClientProvider>
+            <App />
+          </SplitClientProvider>
         </SplitFactoryProvider>
       </ConfigProvider>
     </ApolloProvider>

client/src/App/App.jsx

@@ -1,10 +1,10 @@
 import { useSplitClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
 import LogRocket from "logrocket";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Route, Routes } from "react-router-dom";
+import { Route, Routes, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import DocumentEditorContainer from "../components/document-editor/document-editor.container";
 import ErrorBoundary from "../components/error-boundary/error-boundary.component"; // Component Imports
@@ -21,7 +21,8 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
-import { SocketProvider } from "../contexts/SocketIO/socketContext.jsx";
+import { SocketProvider } from "../contexts/SocketIO/useSocket.jsx";
+import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -45,6 +46,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
   const client = useSplitClient().client;
   const [listenersAdded, setListenersAdded] = useState(false);
   const { t } = useTranslation();
+  const navigate = useNavigate();
 
   useEffect(() => {
     if (!navigator.onLine) {
@@ -96,8 +98,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         LogRocket.init(
           InstanceRenderMgr({
             imex: "gvfvfw/bodyshopapp",
-            rome: "rome-online/rome-online",
-            promanager: "" // TODO: AIO Add in log rocket for promanager instances.
+            rome: "rome-online/rome-online"
           })
         );
       }
@@ -134,8 +135,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         <LoadingSpinner
           message={InstanceRenderMgr({
             imex: t("titles.imexonline"),
-            rome: t("titles.romeonline"),
-            promanager: t("titles.promanager")
+            rome: t("titles.romeonline")
           })}
         />
       }
@@ -144,88 +144,88 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         currentUser={currentUser}
         workspaceCode={InstanceRenderMgr({
           imex: null,
-          rome: "9BkbEseqNqxw8jUH",
-          promanager: "aoJoEifvezYI0Z0P"
+          rome: "9BkbEseqNqxw8jUH"
         })}
       />
-
-      <Routes>
-        <Route
-          path="*"
-          element={
-            <ErrorBoundary>
-              <LandingPage />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/signin"
-          element={
-            <ErrorBoundary>
-              <SignInPage />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/resetpassword"
-          element={
-            <ErrorBoundary>
-              <ResetPassword />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/csi/:surveyId"
-          element={
-            <ErrorBoundary>
-              <CsiPage />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/disclaimer"
-          element={
-            <ErrorBoundary>
-              <DisclaimerPage />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/mp/:paymentIs"
-          element={
-            <ErrorBoundary>
-              <MobilePaymentContainer />
-            </ErrorBoundary>
-          }
-        />
-        <Route
-          path="/manage/*"
-          element={
-            <ErrorBoundary>
-              <SocketProvider bodyshop={bodyshop}>
-                <PrivateRoute isAuthorized={currentUser.authorized} />
-              </SocketProvider>
-            </ErrorBoundary>
-          }
-        >
-          <Route path="*" element={<ManagePage />} />
-        </Route>
-        <Route
-          path="/tech/*"
-          element={
-            <ErrorBoundary>
-              <SocketProvider bodyshop={bodyshop}>
-                <PrivateRoute isAuthorized={currentUser.authorized} />
-              </SocketProvider>
-            </ErrorBoundary>
-          }
-        >
-          <Route path="*" element={<TechPageContainer />} />
-        </Route>
-        <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
-          <Route path="*" element={<DocumentEditorContainer />} />
-        </Route>
-      </Routes>
+      <NotificationProvider>
+        <Routes>
+          <Route
+            path="*"
+            element={
+              <ErrorBoundary>
+                <LandingPage />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/signin"
+            element={
+              <ErrorBoundary>
+                <SignInPage />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/resetpassword"
+            element={
+              <ErrorBoundary>
+                <ResetPassword />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/csi/:surveyId"
+            element={
+              <ErrorBoundary>
+                <CsiPage />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/disclaimer"
+            element={
+              <ErrorBoundary>
+                <DisclaimerPage />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/mp/:paymentIs"
+            element={
+              <ErrorBoundary>
+                <MobilePaymentContainer />
+              </ErrorBoundary>
+            }
+          />
+          <Route
+            path="/manage/*"
+            element={
+              <ErrorBoundary>
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                  <PrivateRoute isAuthorized={currentUser.authorized} />
+                </SocketProvider>
+              </ErrorBoundary>
+            }
+          >
+            <Route path="*" element={<ManagePage />} />
+          </Route>
+          <Route
+            path="/tech/*"
+            element={
+              <ErrorBoundary>
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                  <PrivateRoute isAuthorized={currentUser.authorized} />
+                </SocketProvider>
+              </ErrorBoundary>
+            }
+          >
+            <Route path="*" element={<TechPageContainer />} />
+          </Route>
+          <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
+            <Route path="*" element={<DocumentEditorContainer />} />
+          </Route>
+        </Routes>
+      </NotificationProvider>
     </Suspense>
   );
 }

client/src/App/App.styles.scss

@@ -5,6 +5,13 @@
   border-bottom: 1px solid #74695c !important;
 }
 
+// TODO: This was added because the newest release of ant was making the text color and the background color the same on a selected header
+// Tried all available tokens (https://ant.design/components/menu?locale=en-US) and even reverted all our custom styles, to no avail
+// This should be kept an eye on, especially if implementing DARK MODE
+.ant-menu-submenu-title {
+  color: rgba(255, 255, 255, 0.65) !important;
+}
+
 .imex-table-header {
   display: flex;
   flex-wrap: wrap;
@@ -173,3 +180,13 @@
 .muted-button:hover {
   color: darkgrey;
 }
+
+.notification-alert-unordered-list {
+  cursor: pointer;
+  padding: 0;
+  margin: 0;
+
+  .notification-alert-unordered-list-item {
+    margin-right: 0;
+  }
+}

client/src/App/themeProvider.js

@@ -26,13 +26,11 @@ const defaultTheme = {
   token: {
     colorPrimary: InstanceRenderMgr({
       imex: "#1890ff",
-      rome: "#326ade",
-      promanager: "#1d69a6"
+      rome: "#326ade"
     }),
     colorInfo: InstanceRenderMgr({
       imex: "#1890ff",
-      rome: "#326ade",
-      promanager: "#1d69a6"
+      rome: "#326ade"
     })
   }
 };

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -85,6 +85,17 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
       sortOrder: state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,
       render: (text, record) => <CurrencyFormatter>{record.amount}</CurrencyFormatter>
     },
+    {
+      title: t("payments.fields.type"),
+      dataIndex: "type",
+      key: "type",
+      sorter: (a, b) => a.type.localeCompare(b.type),
+      sortOrder: state.sortedInfo.columnKey === "type" && state.sortedInfo.order,
+      filters: bodyshop.md_payment_types.map((s) => {
+        return { text: s, value: [s] };
+      }),
+      onFilter: (value, record) => value.includes(record.type)
+    },
     {
       title: t("payments.fields.memo"),
       dataIndex: "memo",

client/src/components/allocations-assignment/allocations-assignment.container.jsx

@@ -3,7 +3,7 @@ import AllocationsAssignmentComponent from "./allocations-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
 import { useTranslation } from "react-i18next";
-import { notification } from "antd";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function AllocationsAssignmentContainer({ jobLineId, hours, refetch }) {
   const visibilityState = useState(false);
@@ -14,6 +14,7 @@ export default function AllocationsAssignmentContainer({ jobLineId, hours, refet
     employeeid: null
   });
   const [insertAllocation] = useMutation(INSERT_ALLOCATION);
+  const notification = useNotification();
 
   const handleAssignment = () => {
     insertAllocation({ variables: { alloc: { ...assignment } } })

client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx

@@ -3,7 +3,7 @@ import AllocationsBulkAssignment from "./allocations-bulk-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
 import { useTranslation } from "react-i18next";
-import { notification } from "antd";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }) {
   const visibilityState = useState(false);
@@ -12,6 +12,7 @@ export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }
     employeeid: null
   });
   const [insertAllocation] = useMutation(INSERT_ALLOCATION);
+  const notification = useNotification();
 
   const handleAssignment = () => {
     const allocs = jobLines.reduce((acc, value) => {

client/src/components/allocations-employee-label/allocations-employee-label.container.jsx

@@ -2,12 +2,13 @@ import React from "react";
 import { useMutation } from "@apollo/client";
 import { DELETE_ALLOCATION } from "../../graphql/allocations.queries";
 import AllocationsLabelComponent from "./allocations-employee-label.component";
-import { notification } from "antd";
 import { useTranslation } from "react-i18next";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function AllocationsLabelContainer({ allocation, refetch }) {
   const [deleteAllocation] = useMutation(DELETE_ALLOCATION);
   const { t } = useTranslation();
+  const notification = useNotification();
 
   const handleClick = (e) => {
     e.preventDefault();

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -1,6 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, notification, Popconfirm } from "antd";
+import { Button, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
@@ -9,6 +9,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
@@ -21,6 +22,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
+  const notification = useNotification();
 
   const handleDelete = async () => {
     setLoading(true);

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useApolloClient, useMutation } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
+import { Button, Checkbox, Form, Modal, Space } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -24,6 +24,7 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -49,6 +50,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
   const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
+  const notification = useNotification();
 
   const {
     treatments: { Enhanced_Payroll }
@@ -291,7 +293,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
               jobid: values.jobid,
               invoice_number: remainingValues.invoice_number,
               vendorid: remainingValues.vendorid
-            }
+            },
+            notification
           });
         });
       } else {
@@ -305,7 +308,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
               billId: billId,
               tagsArray: null,
               callback: null
-            }
+            },
+            notification
           );
         });
       }
@@ -325,7 +329,9 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           }
         },
         {},
-        "p"
+        "p",
+        null,
+        notification
       );
     }
 

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -228,7 +228,6 @@ export function BillEnterModalLinesComponent({
                 }}
               </Form.Item>
             )
-            //Do not need to set for promanager as it will default to Rome.
           })
       },
       {
@@ -462,7 +461,6 @@ export function BillEnterModalLinesComponent({
 
       ...InstanceRenderManager({
         rome: [],
-        promanager: [],
         imex: [
           {
             title: t("billlines.fields.federal_tax_applicable"),
@@ -475,8 +473,7 @@ export function BillEnterModalLinesComponent({
                 valuePropName: "checked",
                 initialValue: InstanceRenderManager({
                   imex: true,
-                  rome: false,
-                  promanager: false
+                  rome: false
                 }),
                 name: [field.name, "applicable_taxes", "federal"]
               };
@@ -503,7 +500,6 @@ export function BillEnterModalLinesComponent({
 
       ...InstanceRenderManager({
         rome: [],
-        promanager: [],
         imex: [
           {
             title: t("billlines.fields.local_tax_applicable"),
@@ -629,11 +625,15 @@ const EditableCell = ({
   wrapper,
   ...restProps
 }) => {
+  const propsFinal = formItemProps && formItemProps(record);
+  if (propsFinal && "key" in propsFinal) {
+    delete propsFinal.key;
+  }
   if (additional)
     return (
       <td {...restProps}>
         <div size="small">
-          <Form.Item name={dataIndex} labelCol={{ span: 0 }} {...(formItemProps && formItemProps(record))}>
+          <Form.Item name={dataIndex} labelCol={{ span: 0 }} {...propsFinal}>
             {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
           {additional && additional(record, record.name)}
@@ -644,7 +644,7 @@ const EditableCell = ({
     return (
       <wrapper>
         <td {...restProps}>
-          <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...(formItemProps && formItemProps(record))}>
+          <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...propsFinal}>
             {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
         </td>
@@ -652,7 +652,7 @@ const EditableCell = ({
     );
   return (
     <td {...restProps}>
-      <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...(formItemProps && formItemProps(record))}>
+      <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...propsFinal}>
         {(formInput && formInput(record, record.name)) || children}
       </Form.Item>
     </td>

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import { Button } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -8,6 +8,7 @@ import { createStructuredSelector } from "reselect";
 import { selectAuthLevel, selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -24,6 +25,7 @@ export function BillMarkExportedButton({ currentUser, bodyshop, authLevel, bill
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const notification = useNotification();
 
   const [updateBill] = useMutation(gql`
     mutation UPDATE_BILL($billId: uuid!) {

client/src/components/bill-print-button/bill-print-button.component.jsx

@@ -3,11 +3,13 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function BillPrintButton({ billid }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const Templates = TemplateList("job_special");
+  const notification = useNotification();
 
   const submitHandler = async () => {
     setLoading(true);
@@ -20,7 +22,9 @@ export default function BillPrintButton({ billid }) {
           }
         },
         {},
-        "p"
+        "p",
+        null,
+        notification
       );
     } catch (e) {
       console.warn("Warning: Error generating a document.");

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import { Button } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,6 +7,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -21,6 +22,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(BillMarkForReexportB
 export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const notification = useNotification();
 
   const [updateBill] = useMutation(gql`
     mutation UPDATE_BILL($billId: uuid!) {

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -1,6 +1,6 @@
 import { FileAddFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, notification, Tooltip } from "antd";
+import { Button, Tooltip } from "antd";
 import { t } from "i18next";
 import dayjs from "./../../utils/day";
 import React, { useState } from "react";
@@ -11,6 +11,7 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -25,6 +26,7 @@ export function BilllineAddInventory({ currentUser, bodyshop, billline, disabled
   const [loading, setLoading] = useState(false);
   const { billid } = queryString.parse(useLocation().search);
   const [insertInventoryLine] = useMutation(INSERT_INVENTORY_AND_CREDIT);
+  const notification = useNotification();
 
   const addToInventory = async () => {
     setLoading(true);

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -2,6 +2,7 @@ import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
@@ -13,8 +14,10 @@ import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import BillDeleteButton from "../bill-delete-button/bill-delete-button.component";
 import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-return.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import { FaTasks } from "react-icons/fa";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -170,6 +173,8 @@ export function BillsListTableComponent({
         )
     : [];
 
+  const hasBillsAccess = HasFeatureAccess({ bodyshop, featureName: "bills" });
+
   return (
     <Card
       title={t("bills.labels.bills")}
@@ -181,6 +186,7 @@ export function BillsListTableComponent({
           {job && job.converted ? (
             <>
               <Button
+                disabled={!hasBillsAccess}
                 onClick={() => {
                   setBillEnterContext({
                     actions: { refetch: billsQuery.refetch },
@@ -190,9 +196,10 @@ export function BillsListTableComponent({
                   });
                 }}
               >
-                {t("jobs.actions.postbills")}
+                <LockerWrapperComponent featureName="bills">{t("jobs.actions.postbills")}</LockerWrapperComponent>
               </Button>
               <Button
+                disabled={!hasBillsAccess}
                 onClick={() => {
                   setReconciliationContext({
                     actions: { refetch: billsQuery.refetch },
@@ -203,7 +210,7 @@ export function BillsListTableComponent({
                   });
                 }}
               >
-                {t("jobs.actions.reconcile")}
+                <LockerWrapperComponent featureName="bills"> {t("jobs.actions.reconcile")}</LockerWrapperComponent>
               </Button>
             </>
           ) : null}
@@ -211,6 +218,7 @@ export function BillsListTableComponent({
           <Input.Search
             placeholder={t("general.labels.search")}
             value={searchText}
+            disabled={!hasBillsAccess}
             onChange={(e) => {
               e.preventDefault();
               setSearchText(e.target.value);
@@ -226,8 +234,13 @@ export function BillsListTableComponent({
         }}
         columns={columns}
         rowKey="id"
-        dataSource={filteredBills}
+        dataSource={hasBillsAccess ? filteredBills : []}
         onChange={handleTableChange}
+        locale={{
+          ...(!hasBillsAccess && {
+            emptyText: <UpsellComponent upsell={upsellEnum().bills.general} />
+          })
+        }}
       />
     </Card>
   );

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx

@@ -9,6 +9,7 @@ import { selectCaBcEtfTableConvert } from "../../redux/modals/modals.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import CaBcEtfTableModalComponent from "./ca-bc-etf-table.modal.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   caBcEtfTableModal: selectCaBcEtfTableConvert
@@ -25,6 +26,7 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
   const EtfTemplate = TemplateList("special").ca_bc_etf_table;
+  const notification = useNotification();
 
   const handleFinish = async (values) => {
     logImEXEvent("ca_bc_etf_table_parse");
@@ -53,7 +55,9 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
         }
       },
       {},
-      values.sendby === "email" ? "e" : "p"
+      values.sendby === "email" ? "e" : "p",
+      null,
+      notification
     );
     setLoading(false);
   };

client/src/components/card-payment-modal/card-payment-modal.component.jsx

@@ -1,6 +1,6 @@
-import { DeleteFilled, CopyFilled } from "@ant-design/icons";
+import { CopyFilled, DeleteFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
+import { Button, Card, Col, Form, Input, message, Row, Space, Spin, Statistic } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,6 +15,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
 import { getCurrentUser } from "../../firebase/firebase.utils";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,
@@ -23,7 +24,14 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    ),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });
 
@@ -39,33 +47,42 @@ const CardPaymentModalComponent = ({
   const [form] = Form.useForm();
   const [paymentLink, setPaymentLink] = useState();
   const [loading, setLoading] = useState(false);
-  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
   const { t } = useTranslation();
+  const notification = useNotification();
 
   const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
     variables: { jobids: [context.jobid] },
     skip: !context?.jobid
   });
 
-  //Initialize the intellipay window.
+  const collectIPayFields = () => {
+    const iPayFields = document.querySelectorAll(".ipayfield");
+    const iPayData = {};
+    iPayFields.forEach((field) => {
+      iPayData[field.dataset.ipayname] = field.value;
+    });
+    return iPayData;
+  };
+
   const SetIntellipayCallbackFunctions = () => {
     console.log("*** Set IntelliPay callback functions.");
+
     window.intellipay.runOnClose(() => {
       //window.intellipay.initialize();
     });
 
-    window.intellipay.runOnApproval(async function (response) {
+    window.intellipay.runOnApproval(() => {
       //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
       //Add a slight delay to allow the refetch to properly get the data.
       setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
+        if (actions?.refetch) actions.refetch();
         setLoading(false);
         toggleModalVisible();
       }, 750);
     });
 
-    window.intellipay.runOnNonApproval(async function (response) {
+    window.intellipay.runOnNonApproval(async (response) => {
       // Mutate unsuccessful payment
 
       const { payments } = form.getFieldsValue();
@@ -98,30 +115,39 @@ const CardPaymentModalComponent = ({
     //Validate
     try {
       await form.validateFields();
-    } catch (error) {
+    } catch {
       setLoading(false);
       return;
     }
 
+    const iPayData = collectIPayFields();
+    const { payments } = form.getFieldsValue();
+
     try {
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue()
+        paymentSplitMeta: form.getFieldsValue(),
+        iPayData: iPayData,
+        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email }))
       });
 
       if (window.intellipay) {
         // eslint-disable-next-line no-eval
         eval(response.data);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.autoOpen();
+        pollForIntelliPay(() => {
+          SetIntellipayCallbackFunctions();
+          window.intellipay.autoOpen();
+        });
       } else {
-        var rg = document.createRange();
-        let node = rg.createContextualFragment(response.data);
+        const rg = document.createRange();
+        const node = rg.createContextualFragment(response.data);
         document.documentElement.appendChild(node);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.isAutoOpen = true;
-        window.intellipay.initialize();
+        pollForIntelliPay(() => {
+          SetIntellipayCallbackFunctions();
+          window.intellipay.isAutoOpen = true;
+          window.intellipay.initialize();
+        });
       }
     } catch (error) {
       notification.open({
@@ -137,25 +163,27 @@ const CardPaymentModalComponent = ({
     //Validate
     try {
       await form.validateFields();
-    } catch (error) {
+    } catch {
       setLoading(false);
       return;
     }
 
+    const iPayData = collectIPayFields();
+
     try {
       const { payments } = form.getFieldsValue();
       const response = await axios.post("/intellipay/generate_payment_url", {
         bodyshop,
-        amount: payments?.reduce((acc, val) => {
-          return acc + (val?.amount || 0);
-        }, 0),
-        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
+        amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),
+        account: payments && data?.jobs?.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
         comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
-        paymentSplitMeta: form.getFieldsValue()
+        paymentSplitMeta: form.getFieldsValue(),
+        iPayData: iPayData
       });
-      if (response.data) {
-        setPaymentLink(response.data?.shorUrl);
-        navigator.clipboard.writeText(response.data?.shorUrl);
+
+      if (response?.data?.shorUrl) {
+        setPaymentLink(response.data.shorUrl);
+        await navigator.clipboard.writeText(response.data.shorUrl);
         message.success(t("general.actions.copied"));
       }
       setLoading(false);
@@ -179,67 +207,44 @@ const CardPaymentModalComponent = ({
           }}
         >
           <Form.List name={["payments"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item key={field.key}>
-                      <Row gutter={[16, 16]}>
-                        <Col span={16}>
-                          <Form.Item
-                            key={`${index}jobid`}
-                            label={t("jobs.fields.ro_number")}
-                            name={[field.name, "jobid"]}
-                            rules={[
-                              {
-                                required: true
-                                //message: t("general.validation.required"),
-                              }
-                            ]}
-                          >
-                            <JobSearchSelectComponent notExported={false} clm_no />
-                          </Form.Item>
-                        </Col>
-                        <Col span={6}>
-                          <Form.Item
-                            key={`${index}amount`}
-                            label={t("payments.fields.amount")}
-                            name={[field.name, "amount"]}
-                            rules={[
-                              {
-                                required: true
-                                //message: t("general.validation.required"),
-                              }
-                            ]}
-                          >
-                            <CurrencyFormItemComponent />
-                          </Form.Item>
-                        </Col>
-                        <Col span={2}>
-                          <DeleteFilled
-                            style={{ margin: "1rem" }}
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
-                        </Col>
-                      </Row>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
+            {(fields, { add, remove }) => (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <Row gutter={[16, 16]}>
+                      <Col span={16}>
+                        <Form.Item
+                          key={`${index}jobid`}
+                          label={t("jobs.fields.ro_number")}
+                          name={[field.name, "jobid"]}
+                          rules={[{ required: true }]}
+                        >
+                          <JobSearchSelectComponent notExported={false} clm_no />
+                        </Form.Item>
+                      </Col>
+                      <Col span={6}>
+                        <Form.Item
+                          key={`${index}amount`}
+                          label={t("payments.fields.amount")}
+                          name={[field.name, "amount"]}
+                          rules={[{ required: true }]}
+                        >
+                          <CurrencyFormItemComponent />
+                        </Form.Item>
+                      </Col>
+                      <Col span={2}>
+                        <DeleteFilled style={{ margin: "1rem" }} onClick={() => remove(field.name)} />
+                      </Col>
+                    </Row>
                   </Form.Item>
-                </div>
-              );
-            }}
+                ))}
+                <Form.Item>
+                  <Button type="dashed" onClick={() => add()} style={{ width: "100%" }}>
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            )}
           </Form.List>
 
           <Form.Item
@@ -283,9 +288,7 @@ const CardPaymentModalComponent = ({
           >
             {() => {
               const { payments } = form.getFieldsValue();
-              const totalAmountToCharge = payments?.reduce((acc, val) => {
-                return acc + (val?.amount || 0);
-              }, 0);
+              const totalAmountToCharge = payments?.reduce((acc, val) => acc + (val?.amount || 0), 0);
               return (
                 <Space style={{ float: "right" }}>
                   <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
@@ -348,3 +351,27 @@ const CardPaymentModalComponent = ({
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(CardPaymentModalComponent);
+
+//Poll for window.IntelliPay.fixAmount for 5 seconds. If it doesn't come up, just try anyways to force the possible error.
+function pollForIntelliPay(callbackFunction) {
+  const timeout = 5000;
+  const interval = 150; // Poll every 100 milliseconds
+  const startTime = Date.now();
+
+  function checkFixAmount() {
+    if (window.intellipay && window.intellipay.fixAmount !== undefined) {
+      callbackFunction();
+      return;
+    }
+
+    if (Date.now() - startTime >= timeout) {
+      console.log("Stopped polling IntelliPay after 10 seconds. Attemping to set functions anyways.");
+      callbackFunction();
+      return;
+    }
+
+    setTimeout(checkFixAmount, interval);
+  }
+
+  checkFixAmount();
+}

client/src/components/card-payment-modal/card-payment-modal.container.jsx

@@ -6,7 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CardPaymentModalComponent from "./card-payment-modal.component.";
+import CardPaymentModalComponent from "./card-payment-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,

client/src/components/chat-affix/chat-affix.container.jsx

@@ -1,9 +1,9 @@
 import { useApolloClient } from "@apollo/client";
 import { getToken } from "@firebase/messaging";
 import axios from "axios";
-import React, { useContext, useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import SocketContext from "../../contexts/SocketIO/socketContext";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
@@ -12,7 +12,7 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
   const { t } = useTranslation();
   const client = useApolloClient();
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
 
   useEffect(() => {
     if (!bodyshop || !bodyshop.messagingservicesid) return;

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -334,29 +334,75 @@ export const registerMessagingHandlers = ({ socket, client }) => {
           break;
 
         case "tag-added":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = []) => [...existing, ...job_conversations]
+          // Ensure `job_conversations` is properly formatted
+          const formattedJobConversations = job_conversations.map((jc) => ({
+            __typename: "job_conversations",
+            jobid: jc.jobid || jc.job?.id,
+            conversationid: conversationId,
+            job: jc.job || {
+              __typename: "jobs",
+              id: data.selectedJob.id,
+              ro_number: data.selectedJob.ro_number,
+              ownr_co_nm: data.selectedJob.ownr_co_nm,
+              ownr_fn: data.selectedJob.ownr_fn,
+              ownr_ln: data.selectedJob.ownr_ln
             }
-          });
-          break;
+          }));
 
-        case "tag-removed":
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
             fields: {
-              job_conversations: (existing = [], { readField }) => {
-                return existing.filter((jobRef) => {
-                  // Read the `jobid` field safely, even if the structure is normalized
-                  const jobId = readField("jobid", jobRef);
-                  return jobId !== fields.jobId;
+              job_conversations: (existing = []) => {
+                // Ensure no duplicates based on both `conversationid` and `jobid`
+                const existingLinks = new Set(
+                  existing.map((jc) => {
+                    const jobId = client.cache.readFragment({
+                      id: client.cache.identify(jc),
+                      fragment: gql`
+                        fragment JobConversationLinkAdded on job_conversations {
+                          jobid
+                          conversationid
+                        }
+                      `
+                    })?.jobid;
+                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
+                  })
+                );
+
+                const newItems = formattedJobConversations.filter((jc) => {
+                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
+                  return !existingLinks.has(uniqueLink);
                 });
+
+                return [...existing, ...newItems];
               }
             }
           });
+
           break;
 
+        case "tag-removed":
+          try {
+            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
+
+            // Evict the specific cache entry for job_conversations
+            client.cache.evict({
+              id: conversationCacheId,
+              fieldName: "job_conversations"
+            });
+
+            // Garbage collect evicted entries
+            client.cache.gc();
+
+            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
+          }
+
+          break;
         default:
           logLocal("handleConversationChanged - Unhandled type", { type });
           client.cache.modify({

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -1,9 +1,9 @@
 import { useMutation } from "@apollo/client";
 import { Button } from "antd";
-import React, { useContext, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -18,7 +18,7 @@ export function ChatArchiveButton({ conversation, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
 
   const handleToggleArchive = async () => {
     setLoading(true);

client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx

@@ -1,11 +1,10 @@
 import { useMutation } from "@apollo/client";
 import { Tag } from "antd";
-import React, { useContext } from "react";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -18,7 +17,7 @@ const mapDispatchToProps = () => ({});
 
 export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
   const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
 
   const handleRemoveTag = async (jobId) => {
     const convId = jobConversations[0].conversationid;

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -1,10 +1,10 @@
 import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
-import React, { useCallback, useContext, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import SocketContext from "../../contexts/SocketIO/socketContext";
-import { GET_CONVERSATION_DETAILS, CONVERSATION_SUBSCRIPTION_BY_PK } from "../../graphql/conversations.queries";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
 
 function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const client = useApolloClient();
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
 
   // Fetch conversation details

client/src/components/chat-label/chat-label.component.jsx

@@ -1,13 +1,14 @@
 import { PlusOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Input, notification, Spin, Tag, Tooltip } from "antd";
-import React, { useContext, useState } from "react";
+import { Input, Spin, Tag, Tooltip } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -19,7 +20,8 @@ export function ChatLabel({ conversation, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const [editing, setEditing] = useState(false);
   const [value, setValue] = useState(conversation.label);
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
+  const notification = useNotification();
 
   const { t } = useTranslation();
   const [updateLabel] = useMutation(UPDATE_CONVERSATION_LABEL);

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -1,7 +1,8 @@
 import { PictureFilled } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Badge, Popover } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -9,6 +10,7 @@ import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
+import JobsDocumentImgproxyGalleryExternal from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component";
 import JobDocumentsLocalGalleryExternal from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
@@ -23,6 +25,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);
 export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, conversation }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
+  const {
+    treatments: { Imgproxy }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Imgproxy"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
 
   const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
     fetchPolicy: "network-only",
@@ -42,6 +51,10 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
     setSelectedMedia([]);
   }, [setSelectedMedia, conversation]);
 
+  //Knowingly taking on the technical debt of poor implementation below. Done this way to avoid an edge case where no component may be displayed.
+  //Cloudinary will be removed once the migration is completed.
+  //If Imageproxy is on, rely only on the LMS selector
+  //If not on, use the old methods.
   const content = (
     <div>
       {loading && <LoadingSpinner />}
@@ -49,17 +62,37 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
       {selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
         <div style={{ color: "red" }}>{t("messaging.labels.maxtenimages")}</div>
       ) : null}
-      {!bodyshop.uselocalmediaserver && data && (
-        <JobDocumentsGalleryExternal
-          data={data ? data.documents : []}
-          externalMediaState={[selectedMedia, setSelectedMedia]}
-        />
-      )}
-      {bodyshop.uselocalmediaserver && open && (
-        <JobDocumentsLocalGalleryExternal
-          externalMediaState={[selectedMedia, setSelectedMedia]}
-          jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
-        />
+
+      {Imgproxy.treatment === "on" ? (
+        <>
+          {!bodyshop.uselocalmediaserver && (
+            <JobsDocumentImgproxyGalleryExternal
+              jobId={conversation.job_conversations[0].jobid}
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+          {bodyshop.uselocalmediaserver && open && (
+            <JobDocumentsLocalGalleryExternal
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+            />
+          )}
+        </>
+      ) : (
+        <>
+          {!bodyshop.uselocalmediaserver && data && (
+            <JobDocumentsGalleryExternal
+              data={data ? data.documents : []}
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+          {bodyshop.uselocalmediaserver && open && (
+            <JobDocumentsLocalGalleryExternal
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+            />
+          )}
+        </>
       )}
     </div>
   );

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { renderMessage } from "./renderMessage";
 import "./chat-message-list.styles.scss";
@@ -16,7 +16,7 @@ export default function ChatMessageListComponent({ messages }) {
     loadedImagesRef.current = 0;
   };
 
-  const preloadImages = (imagePaths, onComplete) => {
+  const preloadImages = useCallback((imagePaths, onComplete) => {
     resetImageLoadState();
 
     if (imagePaths.length === 0) {
@@ -34,7 +34,7 @@ export default function ChatMessageListComponent({ messages }) {
         }
       };
     });
-  };
+  }, []);
 
   // Ensure all images are loaded on initial render
   useEffect(() => {
@@ -51,7 +51,7 @@ export default function ChatMessageListComponent({ messages }) {
         });
       }
     });
-  }, [messages]);
+  }, [messages, preloadImages]);
 
   // Handle scrolling when new messages are added
   useEffect(() => {
@@ -69,7 +69,7 @@ export default function ChatMessageListComponent({ messages }) {
         });
       }
     });
-  }, [messages, atBottom]);
+  }, [messages, atBottom, preloadImages]);
 
   return (
     <div className="chat">

client/src/components/chat-new-conversation/chat-new-conversation.component.jsx

@@ -1,12 +1,11 @@
 import { PlusCircleFilled } from "@ant-design/icons";
 import { Button, Form, Popover } from "antd";
-import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -18,7 +17,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
 
   const handleFinish = (values) => {
     openChatByPhone({ phone_num: values.phoneNumber, socket });

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -1,6 +1,4 @@
-import { notification } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
-import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
@@ -9,7 +7,8 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,7 +21,8 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
   const { t } = useTranslation();
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
+  const notification = useNotification();
 
   if (!phone) return <></>;
 

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,19 +1,20 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useContext, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
+import { CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+
 import "./chat-popup.styles.scss";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
@@ -27,7 +28,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
   const { t } = useTranslation();
   const [pollInterval, setPollInterval] = useState(0);
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
   const client = useApolloClient(); // Apollo Client instance for cache operations
 
   // Lazy query for conversations
@@ -38,6 +39,13 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
     ...(pollInterval > 0 ? { pollInterval } : {})
   });
 
+  // Query for unread count when chat is not visible
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    pollInterval: 60 * 1000 // TODO: This is a fix for now, should be coming from sockets
+  });
+
   // Socket connection status
   useEffect(() => {
     const handleSocketStatus = () => {
@@ -83,7 +91,9 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
         variables: { offset: 0 }
       });
 
-      if (!cachedData?.conversations) return 0;
+      if (!cachedData?.conversations) {
+        return unreadData?.messages_aggregate?.aggregate?.count;
+      }
 
       // Aggregate unread message count
       return cachedData.conversations.reduce((total, conversation) => {

client/src/components/chat-print-button/chat-print-button.component.jsx

@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({});
 
@@ -15,6 +16,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatPrintButton({ conversation }) {
   const [loading, setLoading] = useState(false);
+  const notification = useNotification();
 
   const generateDocument = (type) => {
     setLoading(true);
@@ -27,7 +29,8 @@ export function ChatPrintButton({ conversation }) {
         subject: TemplateList("messaging").conversation_list.subject
       },
       type,
-      conversation.id
+      conversation.id,
+      notification
     ).catch((e) => {
       console.warn("Something went wrong generating a document.");
     });

client/src/components/chat-tag-ro/chat-tag-ro.container.jsx

@@ -2,13 +2,13 @@ import { PlusOutlined } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Tag } from "antd";
 import _ from "lodash";
-import React, { useContext, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import { SEARCH_FOR_JOBS } from "../../graphql/jobs.queries";
 import ChatTagRo from "./chat-tag-ro.component";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -22,7 +22,7 @@ const mapDispatchToProps = () => ({});
 export function ChatTagRoContainer({ conversation, bodyshop }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const { socket } = useContext(SocketContext);
+  const { socket } = useSocket();
 
   const [loadRo, { loading, data }] = useLazyQuery(SEARCH_FOR_JOBS);
 
@@ -52,20 +52,26 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
       // Find the job details from the search data
       const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
       if (!selectedJob) return;
-      const newJobConversation = {
-        __typename: "job_conversations",
-        jobid: selectedJob.id,
-        conversationid: conversation.id,
-        job: {
-          __typename: "jobs",
-          ...selectedJob
-        }
-      };
       socket.emit("conversation-modified", {
         conversationId: conversation.id,
         bodyshopId: bodyshop.id,
         type: "tag-added",
-        job_conversations: [newJobConversation]
+        selectedJob,
+        job_conversations: [
+          {
+            __typename: "job_conversations",
+            jobid: selectedJob.id,
+            conversationid: conversation.id,
+            job: {
+              __typename: "jobs",
+              id: selectedJob.id,
+              ro_number: selectedJob.ro_number,
+              ownr_co_nm: selectedJob.ownr_co_nm,
+              ownr_fn: selectedJob.ownr_fn,
+              ownr_ln: selectedJob.ownr_ln
+            }
+          }
+        ]
       });
     }
 

client/src/components/conflict/conflict.component.jsx

@@ -16,8 +16,7 @@ export default function ConflictComponent() {
               {t("general.labels.instanceconflictext", {
                 app: InstanceRenderManager({
                   imex: "$t(titles.imexonline)",
-                  rome: "$t(titles.romeonline)",
-                  promanager: "$t(titles.promanager)"
+                  rome: "$t(titles.romeonline)"
                 })
               })}
             </div>

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, InputNumber, notification, Popover, Radio, Select, Space } from "antd";
+import { Button, Form, InputNumber, Popover, Radio, Select, Space } from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, { useState } from "react";
@@ -9,6 +9,7 @@ import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -25,6 +26,7 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
   const [loading, setLoading] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const history = useNavigate();
+  const notification = useNotification();
 
   const handleFinish = async (values) => {
     setLoading(true);

client/src/components/contract-form/contract-form-job-prefill.component.jsx

@@ -1,12 +1,14 @@
 import { useLazyQuery } from "@apollo/client";
-import { Button, notification } from "antd";
+import { Button } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { GET_JOB_FOR_CC_CONTRACT } from "../../graphql/jobs.queries";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function ContractCreateJobPrefillComponent({ jobId, form }) {
   const [call, { loading, error, data }] = useLazyQuery(GET_JOB_FOR_CC_CONTRACT);
   const { t } = useTranslation();
+  const notification = useNotification();
 
   const handleClick = () => {
     call({ variables: { id: jobId } });

client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx

@@ -1,4 +1,4 @@
-import { Form, Modal, notification } from "antd";
+import { Form, Modal } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,6 +10,7 @@ import CourtesyCarReturnModalComponent from "./courtesy-car-return-modal.compone
 import dayjs from "../../utils/day";
 import { RETURN_CONTRACT } from "../../graphql/cccontracts.queries";
 import { useMutation } from "@apollo/client";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   courtesyCarReturnModal: selectCourtesyCarReturn,
@@ -26,6 +27,8 @@ export function CCReturnModalContainer({ courtesyCarReturnModal, toggleModalVisi
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [updateContract] = useMutation(RETURN_CONTRACT);
+  const notification = useNotification();
+
   const handleFinish = (values) => {
     setLoading(true);
     updateContract({

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -10,6 +10,7 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
@@ -18,6 +19,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [searchText, setSearchText] = useState("");
   const [filter, setFilter] = useLocalStorage("filter_courtesy_cars_list", null);
   const { t } = useTranslation();
+  const notification = useNotification();
 
   const columns = [
     {
@@ -64,8 +66,8 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         },
         {
           text: t("courtesycars.status.unavailable"),
-          value: "courtesycars.status.unavailable",
-        },
+          value: "courtesycars.status.unavailable"
+        }
       ],
       onFilter: (value, record) => record.status === value,
       sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
@@ -239,7 +241,9 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             }
           },
           {},
-          "p"
+          "p",
+          null,
+          notification
         )
     }
   ];

client/src/components/dashboard-grid/componentList.js

@@ -0,0 +1,132 @@
+import i18next from "i18next";
+import DashboardTotalProductionDollars from "../dashboard-components/total-production-dollars/total-production-dollars.component.jsx";
+import {
+  DashboardTotalProductionHours,
+  DashboardTotalProductionHoursGql
+} from "../dashboard-components/total-production-hours/total-production-hours.component.jsx";
+import DashboardProjectedMonthlySales, {
+  DashboardProjectedMonthlySalesGql
+} from "../dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx";
+import DashboardMonthlyRevenueGraph, {
+  DashboardMonthlyRevenueGraphGql
+} from "../dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx";
+import DashboardMonthlyJobCosting from "../dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx";
+import DashboardMonthlyPartsSales from "../dashboard-components/monthly-parts-sales/monthly-parts-sales.component.jsx";
+import DashboardMonthlyLaborSales from "../dashboard-components/monthly-labor-sales/monthly-labor-sales.component.jsx";
+import DashboardMonthlyEmployeeEfficiency, {
+  DashboardMonthlyEmployeeEfficiencyGql
+} from "../dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component.jsx";
+import DashboardScheduledInToday, {
+  DashboardScheduledInTodayGql
+} from "../dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx";
+import DashboardScheduledOutToday, {
+  DashboardScheduledOutTodayGql
+} from "../dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx";
+import JobLifecycleDashboardComponent, {
+  JobLifecycleDashboardGQL
+} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx";
+
+const componentList = {
+  ProductionDollars: {
+    label: i18next.t("dashboard.titles.productiondollars"),
+    component: DashboardTotalProductionDollars,
+    gqlFragment: null,
+    w: 1,
+    h: 1,
+    minW: 2,
+    minH: 1
+  },
+  ProductionHours: {
+    label: i18next.t("dashboard.titles.productionhours"),
+    component: DashboardTotalProductionHours,
+    gqlFragment: DashboardTotalProductionHoursGql,
+    w: 3,
+    h: 1,
+    minW: 3,
+    minH: 1
+  },
+  ProjectedMonthlySales: {
+    label: i18next.t("dashboard.titles.projectedmonthlysales"),
+    component: DashboardProjectedMonthlySales,
+    gqlFragment: DashboardProjectedMonthlySalesGql,
+    w: 2,
+    h: 1,
+    minW: 2,
+    minH: 1
+  },
+  MonthlyRevenueGraph: {
+    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
+    component: DashboardMonthlyRevenueGraph,
+    gqlFragment: DashboardMonthlyRevenueGraphGql,
+    w: 4,
+    h: 2,
+    minW: 4,
+    minH: 2
+  },
+  MonthlyJobCosting: {
+    label: i18next.t("dashboard.titles.monthlyjobcosting"),
+    component: DashboardMonthlyJobCosting,
+    gqlFragment: null,
+    minW: 6,
+    minH: 3,
+    w: 6,
+    h: 3
+  },
+  MonthlyPartsSales: {
+    label: i18next.t("dashboard.titles.monthlypartssales"),
+    component: DashboardMonthlyPartsSales,
+    gqlFragment: null,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2
+  },
+  MonthlyLaborSales: {
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
+    component: DashboardMonthlyLaborSales,
+    gqlFragment: null,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2
+  },
+  // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
+  MonthlyEmployeeEfficency: {
+    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
+    component: DashboardMonthlyEmployeeEfficiency,
+    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2
+  },
+  ScheduleInToday: {
+    label: i18next.t("dashboard.titles.scheduledintoday"),
+    component: DashboardScheduledInToday,
+    gqlFragment: DashboardScheduledInTodayGql,
+    minW: 6,
+    minH: 2,
+    w: 10,
+    h: 3
+  },
+  ScheduleOutToday: {
+    label: i18next.t("dashboard.titles.scheduledouttoday"),
+    component: DashboardScheduledOutToday,
+    gqlFragment: DashboardScheduledOutTodayGql,
+    minW: 6,
+    minH: 2,
+    w: 10,
+    h: 3
+  },
+  JobLifecycle: {
+    label: i18next.t("dashboard.titles.joblifecycle"),
+    component: JobLifecycleDashboardComponent,
+    gqlFragment: JobLifecycleDashboardGQL,
+    minW: 6,
+    minH: 3,
+    w: 6,
+    h: 3
+  }
+};
+
+export default componentList;

client/src/components/dashboard-grid/createDashboardQuery.js

@@ -0,0 +1,85 @@
+import { gql } from "@apollo/client";
+import dayjs from "../../utils/day.js";
+import componentList from "./componentList.js";
+
+const createDashboardQuery = (state) => {
+  const componentBasedAdditions =
+    state &&
+    Array.isArray(state.layout) &&
+    state.layout.map((item, index) => componentList[item.i].gqlFragment || "").join("");
+  return gql`
+    query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
+      monthly_sales: jobs(where: {_and: [
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${dayjs()
+          .startOf("month")
+          .startOf("day")
+          .toISOString()}"}}, {date_invoiced: {_lte: "${dayjs().endOf("month").endOf("day").toISOString()}"}}]}) {
+      id
+        ro_number
+        date_invoiced
+        job_totals
+        rate_la1
+        rate_la2
+        rate_la3
+        rate_la4
+        rate_laa
+        rate_lab
+        rate_lad
+        rate_lae
+        rate_laf
+        rate_lag
+        rate_lam
+        rate_lar
+        rate_las
+        rate_lau
+        rate_ma2s
+        rate_ma2t
+        rate_ma3s
+        rate_mabl
+        rate_macs
+        rate_mahw
+        rate_mapa
+        rate_mash
+        rate_matd
+        joblines(where: { removed: { _eq: false } }) {
+          id
+          mod_lbr_ty
+          mod_lb_hrs
+          act_price
+          part_qty
+          part_type
+        }
+        }
+        production_jobs: jobs(where: { inproduction: { _eq: true } }) {
+          id
+          ro_number
+          ins_co_nm
+          job_totals
+          joblines(where: { removed: { _eq: false } }) {
+          id
+          mod_lbr_ty
+          mod_lb_hrs
+          act_price
+          part_qty
+          part_type
+        }
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
+          }
+        }
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
+          }
+        }
+        }
+      }`;
+};
+
+export default createDashboardQuery;

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,11 +1,9 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, notification, Space } from "antd";
+import { isEmpty, cloneDeep } from "lodash";
+import { useMutation, useQuery } from "@apollo/client";
+import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import i18next from "i18next";
-import _ from "lodash";
-import dayjs from "../../utils/day";
-import React, { useState } from "react";
+import { useMemo, useState } from "react";
 import { Responsive, WidthProvider } from "react-grid-layout";
 import { useTranslation } from "react-i18next";
 import { MdClose } from "react-icons/md";
@@ -15,37 +13,13 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
-import DashboardMonthlyEmployeeEfficiency, {
-  DashboardMonthlyEmployeeEfficiencyGql
-} from "../dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component";
-import DashboardMonthlyJobCosting from "../dashboard-components/monthly-job-costing/monthly-job-costing.component";
-import DashboardMonthlyLaborSales from "../dashboard-components/monthly-labor-sales/monthly-labor-sales.component";
-import DashboardMonthlyPartsSales from "../dashboard-components/monthly-parts-sales/monthly-parts-sales.component";
-import DashboardMonthlyRevenueGraph, {
-  DashboardMonthlyRevenueGraphGql
-} from "../dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component";
-import DashboardProjectedMonthlySales, {
-  DashboardProjectedMonthlySalesGql
-} from "../dashboard-components/pojected-monthly-sales/projected-monthly-sales.component";
-import DashboardTotalProductionDollars from "../dashboard-components/total-production-dollars/total-production-dollars.component";
-import DashboardTotalProductionHours, {
-  DashboardTotalProductionHoursGql
-} from "../dashboard-components/total-production-hours/total-production-hours.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-//Combination of the following:
-// /node_modules/react-grid-layout/css/styles.css
-// /node_modules/react-resizable/css/styles.css
-import DashboardScheduledInToday, {
-  DashboardScheduledInTodayGql
-} from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
-import DashboardScheduledOutToday, {
-  DashboardScheduledOutTodayGql
-} from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
-import JobLifecycleDashboardComponent, {
-  JobLifecycleDashboardGQL
-} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
-import "./dashboard-grid.styles.scss";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import componentList from "./componentList.js";
+import createDashboardQuery from "./createDashboardQuery.js";
+
+import "./dashboard-grid.styles.scss";
 
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
@@ -53,6 +27,7 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   bodyshop: selectBodyshop
 });
+
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
@@ -64,6 +39,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
       ? bodyshop.associations[0].user.dashboardlayout
       : { items: [], layout: {}, layouts: [] })
   });
+  const notification = useNotification();
 
   const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
     fetchPolicy: "network-only",
@@ -83,19 +59,21 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
         layout: { ...state, layout, layouts }
       }
     });
-    if (!!result.errors) {
-      notification["error"]({
+
+    if (!isEmpty(result?.errors)) {
+      notification.error({
         message: t("dashboard.errors.updatinglayout", {
           message: JSON.stringify(result.errors)
         })
       });
     }
   };
+
   const handleRemoveComponent = (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
     const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-    const items = _.cloneDeep(state.items);
+    const items = cloneDeep(state.items);
 
     items.splice(idxToRemove, 1);
     setState({ ...state, items });
@@ -118,7 +96,8 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
     });
   };
 
-  const dashboarddata = React.useMemo(() => GenerateDashboardData(data), [data]);
+  const dashboardData = useMemo(() => GenerateDashboardData(data), [data]);
+
   const existingLayoutKeys = state.items.map((i) => i.i);
 
   const menuItems = Object.keys(componentList).map((key) => ({
@@ -154,7 +133,6 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
         width="100%"
         layouts={state.layouts}
         onLayoutChange={handleLayoutChange}
-        //   onBreakpointChange={onBreakpointChange}
       >
         {state.items.map((item, index) => {
           const TheComponent = componentList[item.i].component;
@@ -180,7 +158,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
                   }}
                   onClick={() => handleRemoveComponent(item.i)}
                 />
-                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboarddata} />
+                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />
               </LoadingSkeleton>
             </div>
           );
@@ -191,189 +169,3 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(DashboardGridComponent);
-
-const componentList = {
-  ProductionDollars: {
-    label: i18next.t("dashboard.titles.productiondollars"),
-    component: DashboardTotalProductionDollars,
-    gqlFragment: null,
-    w: 1,
-    h: 1,
-    minW: 2,
-    minH: 1
-  },
-  ProductionHours: {
-    label: i18next.t("dashboard.titles.productionhours"),
-    component: DashboardTotalProductionHours,
-    gqlFragment: DashboardTotalProductionHoursGql,
-    w: 3,
-    h: 1,
-    minW: 3,
-    minH: 1
-  },
-  ProjectedMonthlySales: {
-    label: i18next.t("dashboard.titles.projectedmonthlysales"),
-    component: DashboardProjectedMonthlySales,
-    gqlFragment: DashboardProjectedMonthlySalesGql,
-    w: 2,
-    h: 1,
-    minW: 2,
-    minH: 1
-  },
-  MonthlyRevenueGraph: {
-    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
-    component: DashboardMonthlyRevenueGraph,
-    gqlFragment: DashboardMonthlyRevenueGraphGql,
-    w: 4,
-    h: 2,
-    minW: 4,
-    minH: 2
-  },
-  MonthlyJobCosting: {
-    label: i18next.t("dashboard.titles.monthlyjobcosting"),
-    component: DashboardMonthlyJobCosting,
-    gqlFragment: null,
-    minW: 6,
-    minH: 3,
-    w: 6,
-    h: 3
-  },
-  MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
-    component: DashboardMonthlyPartsSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2
-  },
-  MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlylaborsales"),
-    component: DashboardMonthlyLaborSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2
-  },
-  // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
-  MonthlyEmployeeEfficency: {
-    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
-    component: DashboardMonthlyEmployeeEfficiency,
-    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2
-  },
-  ScheduleInToday: {
-    label: i18next.t("dashboard.titles.scheduledintoday"),
-    component: DashboardScheduledInToday,
-    gqlFragment: DashboardScheduledInTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3
-  },
-  ScheduleOutToday: {
-    label: i18next.t("dashboard.titles.scheduledouttoday"),
-    component: DashboardScheduledOutToday,
-    gqlFragment: DashboardScheduledOutTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3
-  },
-  JobLifecycle: {
-    label: i18next.t("dashboard.titles.joblifecycle"),
-    component: JobLifecycleDashboardComponent,
-    gqlFragment: JobLifecycleDashboardGQL,
-    minW: 6,
-    minH: 3,
-    w: 6,
-    h: 3
-  }
-};
-
-const createDashboardQuery = (state) => {
-  const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout.map((item, index) => componentList[item.i].gqlFragment || "").join("");
-  return gql`
-        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
-            monthly_sales: jobs(where: {_and: [
-                { voided: {_eq: false}},
-                {date_invoiced: {_gte: "${dayjs()
-                  .startOf("month")
-                  .startOf("day")
-                  .toISOString()}"}}, {date_invoiced: {_lte: "${dayjs()
-                  .endOf("month")
-                  .endOf("day")
-                  .toISOString()}"}}]}) {
-      id
-                ro_number
-                date_invoiced
-                job_totals
-                rate_la1
-                rate_la2
-                rate_la3
-                rate_la4
-                rate_laa
-                rate_lab
-                rate_lad
-                rate_lae
-                rate_laf
-                rate_lag
-                rate_lam
-                rate_lar
-                rate_las
-                rate_lau
-                rate_ma2s
-                rate_ma2t
-                rate_ma3s
-                rate_mabl
-                rate_macs
-                rate_mahw
-                rate_mapa
-                rate_mash
-                rate_matd
-                joblines(where: { removed: { _eq: false } }) {
-                    id
-                    mod_lbr_ty
-                    mod_lb_hrs
-                    act_price
-                    part_qty
-                    part_type
-                }
-                }
-                production_jobs: jobs(where: { inproduction: { _eq: true } }) {
-                    id
-                    ro_number
-                    ins_co_nm
-                    job_totals
-                    joblines(where: { removed: { _eq: false } }) {
-                    id
-                    mod_lbr_ty
-                    mod_lb_hrs
-                    act_price
-                    part_qty
-                    part_type
-                }
-                labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
-                        sum {
-                            mod_lb_hrs
-                        }
-                    }
-                }
-                larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
-                        sum {
-                            mod_lb_hrs
-                        }
-                    }
-                }
-                }
-            }`;
-};

client/src/components/document-editor/document-editor.component.jsx

@@ -9,6 +9,7 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -24,6 +25,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const [uploaded, setuploaded] = useState(false);
   const markerArea = useRef(null);
   const { t } = useTranslation();
+  const notification = useNotification();
 
   const triggerUpload = useCallback(
     async (dataUrl) => {
@@ -45,10 +47,11 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
           //billId: billId,
           tagsArray: ["edited"]
           //callback: callbackAfterUpload,
-        }
+        },
+        notification
       );
     },
-    [bodyshop, currentUser, document]
+    [bodyshop, currentUser, document, notification]
   );
 
   useEffect(() => {

client/src/components/documents-local-upload/documents-local-upload.component.jsx

@@ -6,6 +6,10 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { handleUpload } from "./documents-local-upload.utility";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
+import { useTranslation } from "react-i18next";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -23,6 +27,8 @@ export function DocumentsLocalUploadComponent({
   allowAllTypes
 }) {
   const [fileList, setFileList] = useState([]);
+  const { t } = useTranslation();
+  const notification = useNotification();
 
   const handleDone = (uid) => {
     setTimeout(() => {
@@ -30,10 +36,13 @@ export function DocumentsLocalUploadComponent({
     }, 2000);
   };
 
+  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
+
   return (
     <Upload.Dragger
       multiple={true}
       fileList={fileList}
+      disabled={!hasMediaAccess}
       onChange={(f) => {
         if (f.event && f.event.percent === 100) handleDone(f.file.uid);
 
@@ -47,7 +56,8 @@ export function DocumentsLocalUploadComponent({
             vendorid,
             invoice_number,
             callback: callbackAfterUpload
-          }
+          },
+          notification
         })
       }
       {...(!allowAllTypes && {
@@ -59,7 +69,9 @@ export function DocumentsLocalUploadComponent({
           <p className="ant-upload-drag-icon">
             <UploadOutlined />
           </p>
-          <p className="ant-upload-text">Click or drag files to this area to upload.</p>
+          <p className="ant-upload-text">
+            <LockWrapperComponent featureName="media">{t("documents.labels.dragtoupload")}</LockWrapperComponent>
+          </p>
         </>
       )}
     </Upload.Dragger>

client/src/components/documents-local-upload/documents-local-upload.utility.js

@@ -2,10 +2,9 @@ import cleanAxios from "../../utils/CleanAxios";
 import { store } from "../../redux/store";
 import { addMediaForJob } from "../../redux/media/media.actions";
 import normalizeUrl from "normalize-url";
-import { notification } from "antd";
 import i18n from "i18next";
 
-export const handleUpload = async ({ ev, context }) => {
+export const handleUpload = async ({ ev, context, notification }) => {
   const { onError, onSuccess, onProgress, file } = ev;
   const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
 
@@ -43,11 +42,15 @@ export const handleUpload = async ({ ev, context }) => {
     }
   } else {
     onSuccess && onSuccess(file);
-    notification.open({
-      type: "success",
-      key: "docuploadsuccess",
-      message: i18n.t("documents.successes.insert")
-    });
+    if (notification) {
+      notification.open({
+        type: "success",
+        key: "docuploadsuccess",
+        message: i18n.t("documents.successes.insert")
+      });
+    } else {
+      console.error("No notification context found in document local upload utility.");
+    }
     store.dispatch(
       addMediaForJob({
         jobid,

client/src/components/documents-upload-imgproxy/documents-upload-imgproxy.component.jsx

@@ -0,0 +1,122 @@
+import { UploadOutlined } from "@ant-design/icons";
+import { Progress, Result, Space, Upload } from "antd";
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import formatBytes from "../../utils/formatbytes";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
+import { handleUpload } from "./documents-upload-imgproxy.utility.js";
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop
+});
+
+export function DocumentsUploadImgproxyComponent({
+  children,
+  currentUser,
+  bodyshop,
+  jobId,
+  tagsArray,
+  billId,
+  callbackAfterUpload,
+  totalSize,
+  ignoreSizeLimit = false
+}) {
+  const { t } = useTranslation();
+  const [fileList, setFileList] = useState([]);
+  const notification = useNotification();
+
+  const pct = useMemo(() => {
+    return parseInt((totalSize / ((bodyshop && bodyshop.jobsizelimit) || 1)) * 100);
+  }, [bodyshop, totalSize]);
+
+  if (pct > 100 && !ignoreSizeLimit)
+    return (
+      <Result
+        status="error"
+        title={t("documents.labels.storageexceeded_title")}
+        subTitle={t("documents.labels.storageexceeded")}
+      />
+    );
+
+  const handleDone = (uid) => {
+    setTimeout(() => {
+      setFileList((fileList) => fileList.filter((x) => x.uid !== uid));
+    }, 2000);
+  };
+  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
+
+  return (
+    <Upload.Dragger
+      multiple={true}
+      fileList={fileList}
+      disabled={!hasMediaAccess}
+      onChange={(f) => {
+        if (f.event && f.event.percent === 100) handleDone(f.file.uid);
+        setFileList(f.fileList);
+      }}
+      beforeUpload={(file, fileList) => {
+        if (ignoreSizeLimit) return true;
+        const newFiles = fileList.reduce((acc, val) => acc + val.size, 0);
+        const shouldStopUpload = (totalSize + newFiles) / ((bodyshop && bodyshop.jobsizelimit) || 1) >= 1;
+
+        //Check to see if old files plus newly uploaded ones will be too much.
+        if (shouldStopUpload) {
+          notification.error({
+            key: "cannotuploaddocuments",
+            message: t("documents.labels.upload_limitexceeded_title"),
+            description: t("documents.labels.upload_limitexceeded")
+          });
+          return Upload.LIST_IGNORE;
+        }
+        return true;
+      }}
+      customRequest={(ev) =>
+        handleUpload(
+          ev,
+          {
+            bodyshop: bodyshop,
+            uploaded_by: currentUser.email,
+            jobId: jobId,
+            billId: billId,
+            tagsArray: tagsArray,
+            callback: callbackAfterUpload
+          },
+          notification
+        )
+      }
+      accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
+      // showUploadList={false}
+    >
+      {children || (
+        <>
+          <p className="ant-upload-drag-icon">
+            <UploadOutlined />
+          </p>
+          <p className="ant-upload-text">
+            <LockWrapperComponent featureName="media">{t("documents.labels.dragtoupload")}</LockWrapperComponent>
+          </p>
+          {!ignoreSizeLimit && (
+            <Space wrap className="ant-upload-text">
+              <Progress type="dashboard" percent={pct} size="small" />
+              <span>
+                {t("documents.labels.usage", {
+                  percent: pct,
+                  used: formatBytes(totalSize),
+                  total: formatBytes(bodyshop && bodyshop.jobsizelimit)
+                })}
+              </span>
+            </Space>
+          )}
+        </>
+      )}
+    </Upload.Dragger>
+  );
+}
+
+export default connect(mapStateToProps, null)(DocumentsUploadImgproxyComponent);

client/src/components/documents-upload-imgproxy/documents-upload-imgproxy.utility.js

@@ -0,0 +1,172 @@
+import axios from "axios";
+import exifr from "exifr";
+import i18n from "i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_NEW_DOCUMENT } from "../../graphql/documents.queries";
+import { axiosAuthInterceptorId } from "../../utils/CleanAxios";
+import client from "../../utils/GraphQLClient";
+
+//Context: currentUserEmail, bodyshop, jobid, invoiceid
+
+//Required to prevent headers from getting set and rejected from Cloudinary.
+var cleanAxios = axios.create();
+cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
+
+export const handleUpload = (ev, context, notification) => {
+  logImEXEvent("document_upload", { filetype: ev.file?.type });
+
+  const { onError, onSuccess, onProgress } = ev;
+  const { bodyshop, jobId } = context;
+
+  const fileName = ev.file?.name || ev.filename;
+
+  let extension = fileName.split(".").pop();
+  let key = `${bodyshop.id}/${jobId}/${replaceAccents(fileName).replace(/[^A-Z0-9]+/gi, "_")}-${new Date().getTime()}.${extension}`;
+
+  uploadToS3(key, extension, ev.file.type, ev.file, onError, onSuccess, onProgress, context, notification).catch(
+    (error) => {
+      console.error("Error uploading file to S3", error);
+      notification.error({
+        message: i18n.t("documents.errors.insert", {
+          message: error.message
+        })
+      });
+    }
+  );
+};
+
+//Handles only 1 file at a time.
+export const uploadToS3 = async (
+  key,
+  extension,
+  fileType,
+  file,
+  onError,
+  onSuccess,
+  onProgress,
+  context,
+  notification
+) => {
+  const { bodyshop, jobId, billId, uploaded_by, callback } = context;
+
+  //Get the signed url allowing us to PUT to S3.
+  const signedURLResponse = await axios.post("/media/imgproxy/sign", {
+    filenames: [key],
+    bodyshopid: bodyshop.id,
+    jobid: jobId
+  });
+
+  if (signedURLResponse.status !== 200) {
+    if (onError) onError(signedURLResponse.statusText);
+    notification.error({
+      message: i18n.t("documents.errors.getpresignurl", {
+        message: signedURLResponse.statusText
+      })
+    });
+    return;
+  }
+
+  //Key should be same as we provided to maintain backwards compatibility.
+  const { presignedUrl: preSignedUploadUrlToS3, key: s3Key } = signedURLResponse.data.signedUrls[0];
+
+  const options = {
+    onUploadProgress: (e) => {
+      if (onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
+    }
+  };
+
+  try {
+    const s3UploadResponse = await cleanAxios.put(preSignedUploadUrlToS3, file, options);
+    //Insert the document with the matching key.
+    let takenat;
+    if (fileType.includes("image")) {
+      try {
+        const exif = await exifr.parse(file);
+        takenat = exif && exif.DateTimeOriginal;
+      } catch (error) {
+        console.log("Unable to parse image file for EXIF Data", error.message);
+      }
+    }
+
+    const documentInsert = await client.mutate({
+      mutation: INSERT_NEW_DOCUMENT,
+      variables: {
+        docInput: [
+          {
+            ...(jobId ? { jobid: jobId } : {}),
+            ...(billId ? { billid: billId } : {}),
+            uploaded_by: uploaded_by,
+            key: s3Key,
+            type: fileType,
+            extension: s3UploadResponse.data.format || extension,
+            bodyshopid: bodyshop.id,
+            size: s3UploadResponse.data.bytes || file.size, //Leftover from Cloudinary. We don't do any optimization on upload, so it will always be file.size.
+            takenat
+          }
+        ]
+      }
+    });
+
+    if (!documentInsert.errors) {
+      if (onSuccess)
+        onSuccess({
+          uid: documentInsert.data.insert_documents.returning[0].id,
+          name: documentInsert.data.insert_documents.returning[0].name,
+          status: "done",
+          key: documentInsert.data.insert_documents.returning[0].key
+        });
+      notification.success({
+        key: "docuploadsuccess",
+        message: i18n.t("documents.successes.insert")
+      });
+      if (callback) {
+        callback();
+      }
+    } else {
+      if (onError) onError(JSON.stringify(documentInsert.errors));
+      notification.error({
+        message: i18n.t("documents.errors.insert", {
+          message: JSON.stringify(documentInsert.errors)
+        })
+      });
+      return;
+    }
+  } catch (error) {
+    console.log("Error uploading file to S3", error.message, error.stack);
+    notification.error({
+      message: i18n.t("documents.errors.insert", {
+        message: error.message
+      })
+    });
+    if (onError) onError(JSON.stringify(error.message));
+  }
+};
+
+function replaceAccents(str) {
+  // Verifies if the String has accents and replace them
+  if (str.search(/[\xC0-\xFF]/g) > -1) {
+    str = str
+      .replace(/[\xC0-\xC5]/g, "A")
+      .replace(/[\xC6]/g, "AE")
+      .replace(/[\xC7]/g, "C")
+      .replace(/[\xC8-\xCB]/g, "E")
+      .replace(/[\xCC-\xCF]/g, "I")
+      .replace(/[\xD0]/g, "D")
+      .replace(/[\xD1]/g, "N")
+      .replace(/[\xD2-\xD6\xD8]/g, "O")
+      .replace(/[\xD9-\xDC]/g, "U")
+      .replace(/[\xDD]/g, "Y")
+      .replace(/[\xDE]/g, "P")
+      .replace(/[\xE0-\xE5]/g, "a")
+      .replace(/[\xE6]/g, "ae")
+      .replace(/[\xE7]/g, "c")
+      .replace(/[\xE8-\xEB]/g, "e")
+      .replace(/[\xEC-\xEF]/g, "i")
+      .replace(/[\xF1]/g, "n")
+      .replace(/[\xF2-\xF6\xF8]/g, "o")
+      .replace(/[\xF9-\xFC]/g, "u")
+      .replace(/[\xFE]/g, "p")
+      .replace(/[\xFD\xFF]/g, "y");
+  }
+  return str;
+}

client/src/components/documents-upload/documents-upload.component.jsx

@@ -1,5 +1,5 @@
 import { UploadOutlined } from "@ant-design/icons";
-import { notification, Progress, Result, Space, Upload } from "antd";
+import { Progress, Result, Space, Upload } from "antd";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,6 +7,9 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import formatBytes from "../../utils/formatbytes";
 import { handleUpload } from "./documents-upload.utility";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -26,6 +29,7 @@ export function DocumentsUploadComponent({
 }) {
   const { t } = useTranslation();
   const [fileList, setFileList] = useState([]);
+  const notification = useNotification();
 
   const pct = useMemo(() => {
     return parseInt((totalSize / ((bodyshop && bodyshop.jobsizelimit) || 1)) * 100);
@@ -45,11 +49,13 @@ export function DocumentsUploadComponent({
       setFileList((fileList) => fileList.filter((x) => x.uid !== uid));
     }, 2000);
   };
+  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
 
   return (
     <Upload.Dragger
       multiple={true}
       fileList={fileList}
+      disabled={!hasMediaAccess}
       onChange={(f) => {
         if (f.event && f.event.percent === 100) handleDone(f.file.uid);
         setFileList(f.fileList);
@@ -72,14 +78,18 @@ export function DocumentsUploadComponent({
         return true;
       }}
       customRequest={(ev) =>
-        handleUpload(ev, {
-          bodyshop: bodyshop,
-          uploaded_by: currentUser.email,
-          jobId: jobId,
-          billId: billId,
-          tagsArray: tagsArray,
-          callback: callbackAfterUpload
-        })
+        handleUpload(
+          ev,
+          {
+            bodyshop: bodyshop,
+            uploaded_by: currentUser.email,
+            jobId: jobId,
+            billId: billId,
+            tagsArray: tagsArray,
+            callback: callbackAfterUpload
+          },
+          notification
+        )
       }
       accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
       // showUploadList={false}
@@ -89,7 +99,9 @@ export function DocumentsUploadComponent({
           <p className="ant-upload-drag-icon">
             <UploadOutlined />
           </p>
-          <p className="ant-upload-text">Click or drag files to this area to upload.</p>
+          <p className="ant-upload-text">
+            <LockWrapperComponent featureName="media">{t("documents.labels.dragtoupload")}</LockWrapperComponent>
+          </p>
           {!ignoreSizeLimit && (
             <Space wrap className="ant-upload-text">
               <Progress type="dashboard" percent={pct} size="small" />

client/src/components/documents-upload/documents-upload.utility.js

@@ -1,4 +1,3 @@
-import { notification } from "antd";
 import axios from "axios";
 import i18n from "i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -14,7 +13,7 @@ import { store } from "../../redux/store";
 var cleanAxios = axios.create();
 cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
 
-export const handleUpload = (ev, context) => {
+export const handleUpload = (ev, context, notification) => {
   logImEXEvent("document_upload", { filetype: ev.file.type });
 
   const { onError, onSuccess, onProgress } = ev;
@@ -24,10 +23,20 @@ export const handleUpload = (ev, context) => {
 
   let key = `${bodyshop.id}/${jobId}/${replaceAccents(fileName).replace(/[^A-Z0-9]+/gi, "_")}-${new Date().getTime()}`;
   let extension = fileName.split(".").pop();
-  uploadToCloudinary(key, extension, ev.file.type, ev.file, onError, onSuccess, onProgress, context);
+  uploadToCloudinary(key, extension, ev.file.type, ev.file, onError, onSuccess, onProgress, context, notification);
 };
 
-export const uploadToCloudinary = async (key, extension, fileType, file, onError, onSuccess, onProgress, context) => {
+export const uploadToCloudinary = async (
+  key,
+  extension,
+  fileType,
+  file,
+  onError,
+  onSuccess,
+  onProgress,
+  context,
+  notification
+) => {
   const { bodyshop, jobId, billId, uploaded_by, callback, tagsArray } = context;
 
   //Set variables for getting the signed URL.

client/src/components/email-documents/email-documents.component.jsx

@@ -10,6 +10,8 @@ import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
 import JobsDocumentsLocalGalleryExternalComponent from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import JobsDocumentImgproxyGalleryExternal from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -23,6 +25,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(EmailDocumentsCompon
 
 export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState, bodyshop }) {
   const { t } = useTranslation();
+  const {
+    treatments: { Imgproxy }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Imgproxy"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
 
   const [selectedMedia, setSelectedMedia] = selectedMediaState;
   const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
@@ -46,17 +55,37 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
         10485760 - new Blob([form.getFieldValue("html")]).size ? (
         <div style={{ color: "red" }}>{t("general.errors.sizelimit")}</div>
       ) : null}
-      {!bodyshop.uselocalmediaserver && data && (
-        <JobDocumentsGalleryExternal
-          data={data ? data.documents : []}
-          externalMediaState={[selectedMedia, setSelectedMedia]}
-        />
-      )}
-      {bodyshop.uselocalmediaserver && (
-        <JobsDocumentsLocalGalleryExternalComponent
-          externalMediaState={[selectedMedia, setSelectedMedia]}
-          jobId={emailConfig.jobid}
-        />
+
+      {Imgproxy.treatment === "on" ? (
+        <>
+          {!bodyshop.uselocalmediaserver && data && (
+            <JobsDocumentImgproxyGalleryExternal
+              jobId={emailConfig.jobid}
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+          {bodyshop.uselocalmediaserver && (
+            <JobsDocumentsLocalGalleryExternalComponent
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+              jobId={emailConfig.jobid}
+            />
+          )}
+        </>
+      ) : (
+        <>
+          {!bodyshop.uselocalmediaserver && data && (
+            <JobDocumentsGalleryExternal
+              data={data ? data.documents : []}
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+          {bodyshop.uselocalmediaserver && (
+            <JobsDocumentsLocalGalleryExternalComponent
+              externalMediaState={[selectedMedia, setSelectedMedia]}
+              jobId={emailConfig.jobid}
+            />
+          )}
+        </>
       )}
     </div>
   );