Merged release/2025-03-28 into feature/IO-3183-Dependency-Updates-and-maintenance

IO-3185 Job Drawer Suspend Job

Approved-by: Dave Richer

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.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.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/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/package.json

@@ -2,29 +2,34 @@
   "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.22.3",
-    "@apollo/client": "^3.13.1",
+    "@apollo/client": "^3.13.5",
     "@emotion/is-prop-valid": "^1.3.1",
     "@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.6.0",
-    "@sentry/cli": "^2.42.2",
-    "@sentry/react": "^9.3.0",
+    "@reduxjs/toolkit": "^2.6.1",
+    "@sentry/cli": "^2.42.4",
+    "@sentry/react": "^9.9.0",
     "@sentry/vite-plugin": "^3.2.2",
-    "@splitsoftware/splitio-react": "^1.13.0",
+    "@splitsoftware/splitio-react": "^2.0.1",
     "@tanem/react-nprogress": "^5.0.53",
     "@vitejs/plugin-react": "^4.3.4",
-    "antd": "^5.24.2",
+    "antd": "^5.24.5",
     "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^4.1.0",
+    "apollo-link-sentry": "^4.2.0",
     "autosize": "^6.0.1",
-    "axios": "^1.8.1",
+    "axios": "^1.8.4",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.13",
@@ -33,14 +38,13 @@
     "dotenv": "^16.4.7",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.13.2",
     "graphql": "^16.10.0",
-    "i18next": "^23.15.1",
+    "i18next": "^24.2.3",
     "i18next-browser-languagedetector": "^8.0.4",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.4",
-    "logrocket": "^8.1.2",
-    "markerjs2": "^2.32.3",
+    "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",
@@ -50,15 +54,15 @@
     "react": "^18.3.1",
     "react-big-calendar": "^1.18.0",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.2.2",
+    "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-i18next": "^15.4.1",
     "react-icons": "^5.5.0",
     "react-image-lightbox": "^5.1.4",
-    "react-markdown": "^9.0.3",
+    "react-markdown": "^10.1.0",
     "react-number-format": "^5.4.3",
     "react-popopo": "^2.1.9",
     "react-product-fruits": "^2.2.61",
@@ -74,12 +78,11 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.85.1",
+    "sass": "^1.86.0",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.15",
+    "styled-components": "^6.1.16",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
-    "userpilot": "^1.3.8",
     "vite-plugin-ejs": "^1.7.0",
     "web-vitals": "^3.5.2"
   },
@@ -96,8 +99,6 @@
     "build:test:rome": "env-cmd -f .env.test.rome 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",
-    "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"
   },
@@ -120,23 +121,19 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
+    "@ant-design/icons": "^6.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.26.3",
-    "@dotenvx/dotenvx": "^1.38.3",
+    "@dotenvx/dotenvx": "^1.39.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.21.0",
+    "@eslint/js": "^9.23.0",
     "@sentry/webpack-plugin": "^3.2.2",
-    "@testing-library/cypress": "^10.0.2",
     "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
     "chalk": "^5.4.1",
-    "cross-env": "^7.0.3",
-    "cypress": "^13.17.0",
     "eslint": "^8.57.1",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-cypress": "^2.15.1",
     "eslint-plugin-react": "^7.37.4",
     "globals": "^15.15.0",
     "memfs": "^4.17.0",
@@ -144,11 +141,11 @@
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^6.2.0",
+    "vite": "^6.2.3",
     "vite-plugin-babel": "^1.3.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.23.0",
-    "vite-plugin-pwa": "^0.21.1",
+    "vite-plugin-pwa": "^0.21.2",
     "vite-plugin-style-import": "^2.0.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

@@ -48,8 +48,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
   const { t } = useTranslation();
   const navigate = useNavigate();
 
-  const scenarioNotificationsOn = client?.getTreatment("Realtime_Notifications_UI") === "on";
-
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
@@ -203,12 +201,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/manage/*"
             element={
               <ErrorBoundary>
-                <SocketProvider
-                  bodyshop={bodyshop}
-                  navigate={navigate}
-                  currentUser={currentUser}
-                  scenarioNotificationsOn={scenarioNotificationsOn}
-                >
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>
@@ -220,12 +213,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/tech/*"
             element={
               <ErrorBoundary>
-                <SocketProvider
-                  bodyshop={bodyshop}
-                  navigate={navigate}
-                  currentUser={currentUser}
-                  scenarioNotificationsOn={scenarioNotificationsOn}
-                >
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>

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 { 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,38 +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);
 
@@ -54,6 +27,7 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   bodyshop: selectBodyshop
 });
+
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
@@ -85,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 });
@@ -120,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) => ({
@@ -156,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;
@@ -182,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>
           );
@@ -193,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/header/header.component.jsx

@@ -1,15 +1,3 @@
-import { Badge, Layout, Menu, Spin } from "antd";
-import { useTranslation } from "react-i18next";
-import { useEffect, useRef, useState } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { Link } from "react-router-dom";
-import { useQuery } from "@apollo/client";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
-import LockWrapper from "../lock-wrapper/lock-wrapper.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import {
   BankFilled,
   BarChartOutlined,
@@ -38,19 +26,31 @@ import {
   UnorderedListOutlined,
   UserOutlined
 } from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Badge, Layout, Menu, Spin } from "antd";
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
 import { FiLogOut } from "react-icons/fi";
 import { GiPayMoney, GiPlayerTime, GiSettingsKnobs } from "react-icons/gi";
 import { IoBusinessOutline } from "react-icons/io5";
 import { RiSurveyLine } from "react-icons/ri";
+import { connect } from "react-redux";
+import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import day from "../../utils/day.js";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapper from "../lock-wrapper/lock-wrapper.component";
+import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -213,27 +213,12 @@ function Header({
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
-      icon: <Icon component={FaCreditCard} />,
+      icon: <FaCreditCard />,
       label: t("menus.header.enterpayment"),
-      onClick: () => {
+      onClick: () =>
         setPaymentContext({
           actions: {},
           context: null
-        });
-      }
-    }
-  );
-
-  if (ImEXPay.treatment === "on") {
-    accountingChildren.push({
-      key: "entercardpayments",
-      id: "header-accounting-entercardpayments",
-      icon: <Icon component={FaCreditCard} />,
-      label: t("menus.header.entercardpayment"),
-      onClick: () => {
-        setCardPaymentContext({
-          actions: {},
-          context: null
         })
     },
     ...(ImEXPay.treatment === "on"

client/src/components/job-detail-cards/job-detail-cards.component.jsx

@@ -1,17 +1,21 @@
-import { PrinterFilled } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
+import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons";
+import { useMutation, useQuery } from "@apollo/client";
 import { Button, Card, Col, Divider, Drawer, Grid, Row, Space } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import AlertComponent from "../alert/alert.component";
 import JobSyncButton from "../job-sync-button/job-sync-button.component";
+import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import JobDetailCardsDamageComponent from "./job-detail-cards.damage.component";
@@ -21,15 +25,21 @@ import JobDetailCardsInsuranceComponent from "./job-detail-cards.insurance.compo
 import JobDetailCardsNotesComponent from "./job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 const span = {
@@ -38,8 +48,9 @@ const span = {
   xxl: { span: 8 }
 };
 
-export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
+export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTrail }) {
   const { scenarioNotificationsOn } = useSocket();
+  const [updateJob] = useMutation(UPDATE_JOB);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -91,7 +102,29 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
           extra={
             <Space wrap>
               <JobSyncButton job={data.jobs_by_pk} />
-
+              <Button
+                onClick={() => {
+                  logImEXEvent("production_toggle_alert");
+                  updateJob({
+                    variables: {
+                      jobId: data.jobs_by_pk.id,
+                      job: {
+                        suspended: !data.jobs_by_pk.suspended
+                      }
+                    }
+                  });
+                  insertAuditTrail({
+                    jobid: data.jobs_by_pk.id,
+                    operation: AuditTrailMapping.jobsuspend(
+                      data.jobs_by_pk.suspended ? !data.jobs_by_pk.suspended : true
+                    ),
+                    type: "jobsuspend"
+                  });
+                }}
+                icon={data.jobs_by_pk.suspended ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
+              >
+                {data.jobs_by_pk.suspended ? t("production.actions.unsuspend") : t("production.actions.suspend")}
+              </Button>
               <Button
                 onClick={() => {
                   setPrintCenterContext({
@@ -103,8 +136,8 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
                     }
                   });
                 }}
+                icon={<PrinterFilled />}
               >
-                <PrinterFilled />
                 {t("jobs.actions.printCenter")}
               </Button>
               <Link to={`/manage/jobs/${data.jobs_by_pk.id}?tab=repairdata`}>

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -32,6 +32,7 @@ import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -14,9 +15,8 @@ import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component";
 import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component";
 import JobsDetailRatesOther from "./jobs-detail-rates.other.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
-import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
 import JobsDetailRatesProfileOVerride from "./jobs-detail-rates.profile-override.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -66,14 +66,48 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           </Space>
         )}
         <Form.Item label={t("jobs.fields.auto_add_ats")} name="auto_add_ats" valuePropName="checked">
-          <Switch disabled={jobRO} />
+          <Switch
+            disabled={jobRO}
+            onChange={(checked) => {
+              if (checked) {
+                form.setFieldsValue({ flat_rate_ats: false });
+                form.setFieldsValue({ rate_ats: form.getFieldValue('rate_ats') || bodyshop.shoprates.rate_ats });
+              }
+            }}
+          />
         </Form.Item>
-
         <Form.Item noStyle shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}>
           {() => {
             if (form.getFieldValue("auto_add_ats"))
               return (
-                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats" initialValue={bodyshop.shoprates.rate_atp}>
+                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats">
+                  <CurrencyInput disabled={jobRO} />
+                </Form.Item>
+              );
+
+            return null;
+          }}
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.flat_rate_ats")} name="flat_rate_ats" valuePropName="checked">
+          <Switch
+            disabled={jobRO}
+            onChange={(checked) => {
+              if (checked) {
+                form.setFieldsValue({ auto_add_ats: false });
+                form.setFieldsValue({ rate_ats_flat: form.getFieldValue('rate_ats_flat') || bodyshop.shoprates.rate_ats_flat });
+
+              }
+            }}
+          />
+        </Form.Item>
+        <Form.Item noStyle shouldUpdate={(prev, cur) => prev.flat_rate_ats !== cur.flat_rate_ats}>
+          {() => {
+            if (form.getFieldValue("flat_rate_ats"))
+              return (
+                <Form.Item
+                  label={t("jobs.fields.rate_ats_flat")}
+                  name="rate_ats_flat"
+                >
                   <CurrencyInput disabled={jobRO} />
                 </Form.Item>
               );

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -1,17 +1,20 @@
-import { PrinterFilled } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { Button, Descriptions, Drawer, Space } from "antd";
+import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
+import { useMutation, useQuery } from "@apollo/client";
+import { Button, Descriptions, Drawer, Space } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
+import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
@@ -24,22 +27,29 @@ import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.p
 import CardTemplate from "../job-detail-cards/job-detail-cards.template.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
+import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ProductionListDetail);
 
-export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, technician }) {
+export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, technician, insertAuditTrail }) {
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
   const { selected } = search;
@@ -58,6 +68,7 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+  const [updateJob] = useMutation(UPDATE_JOB);
 
   return (
     <Drawer
@@ -72,6 +83,29 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
           extra={
             <Space wrap>
               {!technician ? <ProductionRemoveButton jobId={theJob.id} /> : null}
+              {!technician && (
+                <Button
+                  onClick={() => {
+                    logImEXEvent("production_toggle_alert");
+                    updateJob({
+                      variables: {
+                        jobId: theJob.id,
+                        job: {
+                          suspended: !theJob.suspended
+                        }
+                      }
+                    });
+                    insertAuditTrail({
+                      jobid: theJob.id,
+                      operation: AuditTrailMapping.jobsuspend(theJob.suspended ? !theJob.suspended : true),
+                      type: "jobsuspend"
+                    });
+                  }}
+                  icon={theJob.suspended ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
+                >
+                  {theJob.suspended ? t("production.actions.unsuspend") : t("production.actions.suspend")}
+                </Button>
+              )}
               <Button
                 onClick={() => {
                   setPrintCenterContext({
@@ -83,8 +117,8 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                     }
                   });
                 }}
+                icon={<PrinterFilled />}
               >
-                <PrinterFilled />
                 {t("jobs.actions.printCenter")}
               </Button>
               {!technician ? <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} /> : null}

client/src/components/profile-shops/profile-shops.container.jsx

@@ -5,7 +5,7 @@ import { QUERY_ALL_ASSOCIATIONS, UPDATE_ACTIVE_ASSOCIATION } from "../../graphql
 import AlertComponent from "../alert/alert.component";
 import ProfileShopsComponent from "./profile-shops.component";
 import axios from "axios";
-import { getToken } from "firebase/messaging";
+import { getToken } from "@firebase/messaging";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";

client/src/components/shop-info/shop-info.laborrates.component.jsx

@@ -1,6 +1,5 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input } from "antd";
-import React from "react";
+import { Button, Form, Input, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
@@ -10,326 +9,338 @@ export default function ShopInfoLaborRates({ form }) {
   const { t } = useTranslation();
 
   return (
-    <div>
-      <Form.List name={["md_labor_rates"]}>
-        {(fields, { add, remove, move }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key}>
-                  <LayoutFormRow>
-                    <Form.Item
-                      label={t("jobs.fields.labor_rate_desc")}
-                      key={`${index}rate_label`}
-                      name={[field.name, "rate_label"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_laa")}
-                      key={`${index}rate_laa`}
-                      name={[field.name, "rate_laa"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lab")}
-                      key={`${index}rate_lab`}
-                      name={[field.name, "rate_lab"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lad")}
-                      key={`${index}rate_lad`}
-                      name={[field.name, "rate_lad"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lae")}
-                      key={`${index}rate_lae`}
-                      name={[field.name, "rate_lae"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_laf")}
-                      key={`${index}rate_laf`}
-                      name={[field.name, "rate_laf"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lag")}
-                      key={`${index}rate_lag`}
-                      name={[field.name, "rate_lag"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lam")}
-                      key={`${index}rate_lam`}
-                      name={[field.name, "rate_lam"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_lar")}
-                      key={`${index}rate_lar`}
-                      name={[field.name, "rate_lar"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_las")}
-                      key={`${index}rate_las`}
-                      name={[field.name, "rate_las"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la1")}
-                      key={`${index}rate_la1`}
-                      name={[field.name, "rate_la1"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la2")}
-                      key={`${index}rate_la2`}
-                      name={[field.name, "rate_la2"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la3")}
-                      key={`${index}rate_la3`}
-                      name={[field.name, "rate_la3"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_la4")}
-                      key={`${index}rate_la4`}
-                      name={[field.name, "rate_la4"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mash")}
-                      key={`${index}rate_mash`}
-                      name={[field.name, "rate_mash"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mapa")}
-                      key={`${index}rate_mapa`}
-                      name={[field.name, "rate_mapa"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_ma2s")}
-                      key={`${index}rate_ma2s`}
-                      name={[field.name, "rate_ma2s"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_ma3s")}
-                      key={`${index}rate_ma3s`}
-                      name={[field.name, "rate_ma3s"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    {
-                      // <Form.Item
-                      //   label={t("jobs.fields.rate_mabl")}
-                      //   key={`${index}rate_mabl`}
-                      //   name={[field.name, "rate_mabl"]}
-                      //   rules={[
-                      //     {
-                      //       required: true,
-                      //       //message: t("general.validation.required"),
-                      //     },
-                      //   ]}
-                      // >
-                      //   <CurrencyInput min={0} />
-                      // </Form.Item>
-                      // <Form.Item
-                      //   label={t("jobs.fields.rate_macs")}
-                      //   key={`${index}rate_macs`}
-                      //   name={[field.name, "rate_macs"]}
-                      //   rules={[
-                      //     {
-                      //       required: true,
-                      //       //message: t("general.validation.required"),
-                      //     },
-                      //   ]}
-                      // >
-                      //   <CurrencyInput min={0} />
-                      // </Form.Item>
-                    }
-                    <Form.Item
-                      label={t("jobs.fields.rate_matd")}
-                      key={`${index}rate_matd`}
-                      name={[field.name, "rate_matd"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mahw")}
-                      key={`${index}rate_mahw`}
-                      name={[field.name, "rate_mahw"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
-                  </LayoutFormRow>
+    <>
+      <LayoutFormRow header={t("bodyshop.labels.shoprates")}>
+        <Form.Item label={t("jobs.fields.rate_ats")} name={["shoprates", "rate_ats"]}>
+          <CurrencyInput min={0} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.rate_ats_flat")} name={["shoprates", "rate_ats_flat"]}>
+          <CurrencyInput min={0} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.laborrates")}>
+        <Form.List name={["md_labor_rates"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider={index === 0}>
+                      <Form.Item
+                        label={t("jobs.fields.labor_rate_desc")}
+                        key={`${index}rate_label`}
+                        name={[field.name, "rate_label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_laa")}
+                        key={`${index}rate_laa`}
+                        name={[field.name, "rate_laa"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lab")}
+                        key={`${index}rate_lab`}
+                        name={[field.name, "rate_lab"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lad")}
+                        key={`${index}rate_lad`}
+                        name={[field.name, "rate_lad"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lae")}
+                        key={`${index}rate_lae`}
+                        name={[field.name, "rate_lae"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_laf")}
+                        key={`${index}rate_laf`}
+                        name={[field.name, "rate_laf"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lag")}
+                        key={`${index}rate_lag`}
+                        name={[field.name, "rate_lag"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lam")}
+                        key={`${index}rate_lam`}
+                        name={[field.name, "rate_lam"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_lar")}
+                        key={`${index}rate_lar`}
+                        name={[field.name, "rate_lar"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_las")}
+                        key={`${index}rate_las`}
+                        name={[field.name, "rate_las"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la1")}
+                        key={`${index}rate_la1`}
+                        name={[field.name, "rate_la1"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la2")}
+                        key={`${index}rate_la2`}
+                        name={[field.name, "rate_la2"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la3")}
+                        key={`${index}rate_la3`}
+                        name={[field.name, "rate_la3"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_la4")}
+                        key={`${index}rate_la4`}
+                        name={[field.name, "rate_la4"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mash")}
+                        key={`${index}rate_mash`}
+                        name={[field.name, "rate_mash"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mapa")}
+                        key={`${index}rate_mapa`}
+                        name={[field.name, "rate_mapa"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_ma2s")}
+                        key={`${index}rate_ma2s`}
+                        name={[field.name, "rate_ma2s"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_ma3s")}
+                        key={`${index}rate_ma3s`}
+                        name={[field.name, "rate_ma3s"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      {
+                        // <Form.Item
+                        //   label={t("jobs.fields.rate_mabl")}
+                        //   key={`${index}rate_mabl`}
+                        //   name={[field.name, "rate_mabl"]}
+                        //   rules={[
+                        //     {
+                        //       required: true,
+                        //       //message: t("general.validation.required"),
+                        //     },
+                        //   ]}
+                        // >
+                        //   <CurrencyInput min={0} />
+                        // </Form.Item>
+                        // <Form.Item
+                        //   label={t("jobs.fields.rate_macs")}
+                        //   key={`${index}rate_macs`}
+                        //   name={[field.name, "rate_macs"]}
+                        //   rules={[
+                        //     {
+                        //       required: true,
+                        //       //message: t("general.validation.required"),
+                        //     },
+                        //   ]}
+                        // >
+                        //   <CurrencyInput min={0} />
+                        // </Form.Item>
+                      }
+                      <Form.Item
+                        label={t("jobs.fields.rate_matd")}
+                        key={`${index}rate_matd`}
+                        name={[field.name, "rate_matd"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.rate_mahw")}
+                        key={`${index}rate_mahw`}
+                        name={[field.name, "rate_mahw"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+                      <Space>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.newlaborrate")}
+                  </Button>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("bodyshop.actions.newlaborrate")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-    </div>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+    </>
   );
 }

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -1,11 +1,10 @@
-import { Alert, Form, Switch } from "antd";
-import React from "react";
+import { Alert, Form, Select, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -16,17 +15,17 @@ const mapDispatchToProps = () => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
 
 // noinspection JSUnusedLocalSymbols
-export function ShopInfoIntellipay({bodyshop, form}) {
-  const {t} = useTranslation();
+export function ShopInfoIntellipay({ bodyshop, form }) {
+  const { t } = useTranslation();
 
   return (
     <>
       <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
         {() => {
-          const {intellipay_config} = form.getFieldsValue();
+          const { intellipay_config } = form.getFieldsValue();
 
           if (intellipay_config?.enable_cash_discount)
-            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")}/>;
+            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
         }}
       </Form.Item>
 
@@ -36,7 +35,93 @@ export function ShopInfoIntellipay({bodyshop, form}) {
           valuePropName="checked"
           name={["intellipay_config", "enable_cash_discount"]}
         >
-          <Switch/>
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.fields.intellipay_config.payment_type")}>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.visa")}
+          name={["intellipay_config", "payment_map", "visa"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.mast")}
+          name={["intellipay_config", "payment_map", "mast"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.amex")}
+          name={["intellipay_config", "payment_map", "amex"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.disc")}
+          name={["intellipay_config", "payment_map", "disc"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.dnrs")}
+          name={["intellipay_config", "payment_map", "dnrs"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.jcb")}
+          name={["intellipay_config", "payment_map", "jcb"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.intr")}
+          name={["intellipay_config", "payment_map", "intr"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
     </>

client/src/contexts/SocketIO/useSocket.jsx

@@ -14,6 +14,7 @@ import {
 } from "../../graphql/notifications.queries.js";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const SocketContext = createContext(null);
 
@@ -25,11 +26,10 @@ const INITIAL_NOTIFICATIONS = 10;
  * @param bodyshop
  * @param navigate
  * @param currentUser
- * @param scenarioNotificationsOn
  * @returns {JSX.Element}
  * @constructor
  */
-const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNotificationsOn }) => {
+const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
@@ -37,6 +37,14 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
   const userAssociationId = bodyshop?.associations?.[0]?.id;
   const { t } = useTranslation();
 
+  const {
+    treatments: { Realtime_Notifications_UI }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Realtime_Notifications_UI"],
+    splitKey: bodyshop?.imexshopid
+  });
+
   const [markNotificationRead] = useMutation(MARK_NOTIFICATION_READ, {
     update: (cache, { data: { update_notifications } }) => {
       const timestamp = new Date().toISOString();
@@ -209,7 +217,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleNotification = (data) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -329,7 +337,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleSyncNotificationRead = ({ notificationId, timestamp }) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -371,7 +379,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleSyncAllNotificationsRead = ({ timestamp }) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -462,7 +470,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
     markAllNotificationsRead,
     navigate,
     currentUser,
-    scenarioNotificationsOn,
+    Realtime_Notifications_UI,
     t
   ]);
 
@@ -474,7 +482,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
         isConnected,
         markNotificationRead,
         markAllNotificationsRead,
-        scenarioNotificationsOn
+        scenarioNotificationsOn: Realtime_Notifications_UI?.treatment === "on"
       }}
     >
       {children}

client/src/firebase/firebase.utils.js

@@ -1,8 +1,8 @@
-import { getAnalytics, logEvent } from "firebase/analytics";
-import { initializeApp } from "firebase/app";
-import { getAuth, updatePassword, updateProfile } from "firebase/auth";
-import { getFirestore } from "firebase/firestore";
-import { getMessaging, getToken, onMessage } from "firebase/messaging";
+import { getAnalytics, logEvent } from "@firebase/analytics";
+import { initializeApp } from "@firebase/app";
+import { getAuth, updatePassword, updateProfile } from "@firebase/auth";
+import { getFirestore } from "@firebase/firestore";
+import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);

client/src/graphql/jobs.queries.js

@@ -509,6 +509,7 @@ export const GET_JOB_BY_PK = gql`
       est_ct_ln
       est_ea
       est_ph1
+      flat_rate_ats
       federal_tax_rate
       id
       inproduction
@@ -649,6 +650,7 @@ export const GET_JOB_BY_PK = gql`
       policy_no
       production_vars
       rate_ats
+      rate_ats_flat
       rate_la1
       rate_la2
       rate_la3

client/src/pages/landing/landing.page.jsx

@@ -13,7 +13,6 @@ export default connect(mapStateToProps, null)(LandingPage);
 
 export function LandingPage({ currentUser }) {
   const navigate = useNavigate();
-  console.log("Main");
   useEffect(() => {
     navigate("/manage/jobs");
   }, [currentUser, navigate]);

client/src/redux/user/user.actions.js

@@ -118,3 +118,8 @@ export const setCurrentEula = (eula) => ({
 export const acceptEula = () => ({
   type: UserActionTypes.EULA_ACCEPTED
 });
+
+export const setImexShopId = (imexshopid) => ({
+  type: UserActionTypes.SET_IMEX_SHOP_ID,
+  payload: imexshopid
+});

client/src/redux/user/user.reducer.js

@@ -121,6 +121,11 @@ const userReducer = (state = INITIAL_STATE, action) => {
       };
     case UserActionTypes.SET_AUTH_LEVEL:
       return { ...state, authLevel: action.payload };
+    case UserActionTypes.SET_IMEX_SHOP_ID:
+      return {
+        ...state,
+        imexshopid: action.payload
+      };
     default:
       return state;
   }

client/src/redux/user/user.sagas.js

@@ -2,20 +2,19 @@ import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
 import axios from "axios";
-import { setUserId, setUserProperties } from "firebase/analytics";
+import { setUserId, setUserProperties } from "@firebase/analytics";
 import {
   checkActionCode,
   confirmPasswordReset,
   sendPasswordResetEmail,
   signInWithEmailAndPassword,
   signOut
-} from "firebase/auth";
-import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "firebase/firestore";
-import { getToken } from "firebase/messaging";
+} from "@firebase/auth";
+import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "@firebase/firestore";
+import { getToken } from "@firebase/messaging";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
-import { factory } from "../../App/App.container";
 import {
   analytics,
   auth,
@@ -35,6 +34,7 @@ import {
   sendPasswordResetFailure,
   sendPasswordResetSuccess,
   setAuthlevel,
+  setImexShopId,
   setInstanceConflict,
   setInstanceId,
   setLocalFingerprint,
@@ -318,7 +318,8 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       console.log(error);
     }
 
-    factory.client(payload.imexshopid);
+    // Dispatch the imexshopid to Redux store
+    yield put(setImexShopId(payload.imexshopid));
 
     const authRecord = payload.associations.filter((a) => a.useremail.toLowerCase() === userEmail.toLowerCase());
 

client/src/redux/user/user.types.js

@@ -32,6 +32,7 @@ const UserActionTypes = {
   CHECK_ACTION_CODE_SUCCESS: "CHECK_ACTION_CODE_SUCCESS",
   CHECK_ACTION_CODE_FAILURE: "CHECK_ACTION_CODE_FAILURE",
   SET_CURRENT_EULA: "SET_CURRENT_EULA",
-  EULA_ACCEPTED: "EULA_ACCEPTED"
+  EULA_ACCEPTED: "EULA_ACCEPTED",
+  SET_IMEX_SHOP_ID: "SET_IMEX_SHOP_ID"
 };
 export default UserActionTypes;

client/src/utils/jobNotificationScenarios.js

@@ -1,10 +1,13 @@
+/** Notification Scenarios
+ * @description This file contains the scenarios for job notifications.
+ * @type {string[]}
+ */
 const notificationScenarios = [
   "job-assigned-to-me",
   "bill-posted",
   "critical-parts-status-changed",
   "part-marked-back-ordered",
   "new-note-added",
-  "supplement-imported",
   "schedule-dates-changed",
   "tasks-updated-created",
   "new-media-added-reassigned",
@@ -14,6 +17,7 @@ const notificationScenarios = [
   "job-status-change",
   "payment-collected-completed",
   "alternate-transport-changed"
+  // "supplement-imported", // Disabled for now
 ];
 
 export { notificationScenarios };

client/vite.config.js

@@ -191,24 +191,11 @@ export default defineConfig({
           "@sentry/react": ["@sentry/react"],
           "@splitsoftware/splitio-react": ["@splitsoftware/splitio-react"],
           logrocket: ["logrocket"],
-          "firebase/app": ["firebase/app"],
-          "firebase/firestore": ["firebase/firestore"],
-          "firebase/firestore/lite": ["firebase/firestore/lite"],
-          "firebase/auth": ["firebase/auth"],
-          "firebase/functions": ["firebase/functions"],
-          "firebase/storage": ["firebase/storage"],
-          "firebase/database": ["firebase/database"],
-          "firebase/remote-config": ["firebase/remote-config"],
-          "firebase/performance": ["firebase/performance"],
+          "@firebase/analytics": ["@firebase/analytics"],
           "@firebase/app": ["@firebase/app"],
           "@firebase/firestore": ["@firebase/firestore"],
-          "@firebase/firestore/lite": ["@firebase/firestore/lite"],
           "@firebase/auth": ["@firebase/auth"],
-          "@firebase/functions": ["@firebase/functions"],
-          "@firebase/storage": ["@firebase/storage"],
-          "@firebase/database": ["@firebase/database"],
-          "@firebase/remote-config": ["@firebase/remote-config"],
-          "@firebase/performance": ["@firebase/performance"],
+          "@firebase/messaging": ["@firebase/messaging"],
           markerjs2: ["markerjs2"],
           "@apollo/client": ["@apollo/client"],
           "libphonenumber-js": ["libphonenumber-js"]

hasura/metadata/tables.yaml

@@ -3695,6 +3695,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -3789,6 +3790,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -3965,6 +3967,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4060,6 +4063,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -4247,6 +4251,7 @@
           - est_st
           - est_zip
           - federal_tax_rate
+          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4342,6 +4347,7 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
+          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -5266,32 +5272,6 @@
                   - active:
                       _eq: true
         check: null
-  event_triggers:
-    - name: notifications_parts_dispatch
-      definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        body:
-          action: transform
-          template: |-
-            {
-              "success": true
-            }
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/notifications/events/handlePartsDispatchChange'
-        version: 2
 - table:
     name: parts_dispatch_lines
     schema: public

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."notificiations_idx_jobs";

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "notificiations_idx_jobs" on
+  "public"."notifications" using btree ("jobid");

hasura/migrations/1741904395934_create_index_notifications_idx_associations/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."notifications_idx_associations";

hasura/migrations/1741904395934_create_index_notifications_idx_associations/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "notifications_idx_associations" on
+  "public"."notifications" using btree ("associationid");

hasura/migrations/1741904614090_run_sql_migration/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904614090_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904805838_run_sql_migration/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_notifications_associations_not_read ON notifications(associationid, read) where read is null;

hasura/migrations/1741904805838_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_notifications_associations_not_read ON notifications(associationid, read) where read is null;

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "flat_rate_ats" boolean
+--  null default 'false';

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "flat_rate_ats" boolean
+ null default 'false';

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "rate_ats_flat" numeric
+--  null;

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "rate_ats_flat" numeric
+ null;

package.json

@@ -9,56 +9,50 @@
   "scripts": {
     "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
     "setup:win": "rimraf node_modules && npm i && cd client && rimraf node_modules && npm i",
-    "admin": "cd admin && npm start",
-    "client": "cd client && npm start",
-    "server": "nodemon server.js",
-    "build": "cd client && npm run build",
-    "dev": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\"",
-    "deva": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\" \"npm run admin\"",
     "start": "node server.js",
     "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.758.0",
-    "@aws-sdk/client-elasticache": "^3.758.0",
-    "@aws-sdk/client-s3": "^3.758.0",
-    "@aws-sdk/client-secrets-manager": "^3.758.0",
-    "@aws-sdk/client-ses": "^3.758.0",
-    "@aws-sdk/credential-provider-node": "^3.758.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.772.0",
+    "@aws-sdk/client-elasticache": "^3.772.0",
+    "@aws-sdk/client-s3": "^3.772.0",
+    "@aws-sdk/client-secrets-manager": "^3.772.0",
+    "@aws-sdk/client-ses": "^3.772.0",
+    "@aws-sdk/credential-provider-node": "^3.772.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
     "aws4": "^1.13.2",
-    "axios": "^1.8.1",
+    "axios": "^1.8.4",
     "bee-queue": "^1.7.1",
     "better-queue": "^3.8.12",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.3",
-    "bullmq": "^5.41.7",
+    "bullmq": "^5.44.4",
     "chart.js": "^4.4.8",
-    "cloudinary": "^2.5.1",
+    "cloudinary": "^2.6.0",
     "compression": "^1.8.0",
     "cookie-parser": "^1.4.7",
     "cors": "2.8.5",
     "crisp-status-reporter": "^1.2.2",
     "csrf": "^3.1.0",
-    "dd-trace": "^5.40.0",
+    "dd-trace": "^5.43.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
-    "firebase-admin": "^13.1.0",
+    "firebase-admin": "^13.2.0",
     "graphql": "^16.10.0",
     "graphql-request": "^6.1.0",
     "inline-css": "^4.0.3",
     "intuit-oauth": "^4.2.0",
-    "ioredis": "^5.5.0",
-    "json-2-csv": "^5.5.8",
+    "ioredis": "^5.6.0",
+    "json-2-csv": "^5.5.9",
     "juice": "^11.0.1",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "moment-timezone": "^0.5.47",
+    "moment-timezone": "^0.5.48",
     "multer": "^1.4.5-lts.1",
-    "node-mailjet": "^6.0.6",
+    "node-mailjet": "^6.0.8",
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
     "phone": "^3.1.58",
@@ -66,22 +60,21 @@
     "redis": "^4.7.0",
     "rimraf": "^6.0.1",
     "skia-canvas": "^2.0.2",
-    "soap": "^1.1.9",
+    "soap": "^1.1.10",
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^4.23.0",
-    "uuid": "^10.0.0",
+    "twilio": "^5.5.1",
+    "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "winston-cloudwatch": "^6.3.0",
     "xml2js": "^0.6.2",
     "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
+    "@eslint/js": "^9.23.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "concurrently": "^8.2.2",
-    "eslint": "^9.21.0",
+    "eslint": "^9.23.0",
     "eslint-plugin-react": "^7.37.4",
     "globals": "^15.15.0",
     "p-limit": "^3.1.0",

server.js

@@ -22,7 +22,7 @@ const cookieParser = require("cookie-parser");
 const { Server } = require("socket.io");
 const { createAdapter } = require("@socket.io/redis-adapter");
 const { instrument } = require("@socket.io/admin-ui");
-const { isString, isEmpty } = require("lodash");
+const { isString, isEmpty, isFunction } = require("lodash");
 
 const logger = require("./server/utils/logger");
 const { applyRedisHelpers } = require("./server/utils/redisHelpers");
@@ -393,7 +393,9 @@ const main = async () => {
 
   const StatusReporter = StartStatusReporter();
   registerCleanupTask(async () => {
-    StatusReporter.end();
+    if (isFunction(StatusReporter?.end)) {
+      StatusReporter.end();
+    }
   });
 
   try {

server/accounting/pbs/pbs-ap-allocations.js

@@ -12,7 +12,7 @@ const AxiosLib = require("axios").default;
 const axios = AxiosLib.create();
 const { PBS_ENDPOINTS, PBS_CREDENTIALS } = require("./pbs-constants");
 const { CheckForErrors } = require("./pbs-job-export");
-const uuid = require("uuid").v4;
+
 axios.interceptors.request.use((x) => {
   const socket = x.socket;
 
@@ -21,6 +21,7 @@ axios.interceptors.request.use((x) => {
     ...x.headers[x.method],
     ...x.headers
   };
+
   const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
     x.url
   } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;

server/data/arms.js

@@ -18,7 +18,7 @@ const entegralEndpoint =
     : "https://uat-ws.armsbusinesssolutions.net/RepairOrderFolderService/RepairOrderFolderService.asmx?WSDL";
 
 const client = require("../graphql-client/graphql-client").client;
-const uuid = require("uuid").v4;
+const { v4 } = require("uuid");
 
 const momentFormat = "yyyy-MM-DDTHH:mm:ss.SSS";
 
@@ -79,7 +79,7 @@ exports.default = async (req, res) => {
   }
 
   try {
-    const transId = uuid(); // Can this actually be the job id?
+    const transId = v4(); // Can this actually be the job id?
     let obj = {
       RqUID: transId,
       DocumentInfo: {

server/email/generateTemplate.js

@@ -20,6 +20,11 @@ const defaultFooter = () => {
 
 const now = () => moment().format("MM/DD/YYYY @ hh:mm a");
 
+/**
+ * Generate the email template
+ * @param strings
+ * @returns {string}
+ */
 const generateEmailTemplate = (strings) => {
   return (
     `

server/graphql-client/queries.js

@@ -1485,6 +1485,8 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       materials
       auto_add_ats
       rate_ats
+      flat_rate_ats
+      rate_ats_flat
       joblines(where: { removed: { _eq: false } }){
         id
         line_no

server/intellipay/intellipay.js

@@ -371,6 +371,7 @@ exports.postback = async (req, res) => {
     iprequest: values,
     decodedComment
   };
+  const ipMapping = req.body?.bodyshop?.intellipay_config?.payment_map;
 
   logger.log("intellipay-postback-received", "DEBUG", req.user?.email, null, logResponseMeta);
 
@@ -417,7 +418,7 @@ exports.postback = async (req, res) => {
           amount: p.amount,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
           jobid: p.jobid,
           date: moment(Date.now()),
           payment_responses: {
@@ -481,7 +482,7 @@ exports.postback = async (req, res) => {
           amount: values.total,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
           jobid: values.invoice,
           date: moment(Date.now())
         }

server/job/job-totals-USA.js

@@ -1,7 +1,7 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-const adminClient = require("../graphql-client/graphql-client").client;
-const _ = require("lodash");
+// const adminClient = require("../graphql-client/graphql-client").client;
+// const _ = require("lodash");
 const logger = require("../utils/logger");
 const InstanceMgr = require("../utils/instanceMgr").default;
 
@@ -45,7 +45,9 @@ exports.totalsSsu = async function (req, res) {
       }
     });
 
-    res.status(200).send();
+    if (result) {
+      res.status(200).send();
+    }
   } catch (error) {
     logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
       jobid: id,
@@ -59,7 +61,7 @@ exports.totalsSsu = async function (req, res) {
 //IMPORTANT*** These two functions MUST be mirrrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
-  await AutoAddAtsIfRequired({ job: job, client: client });
+  await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
 
   try {
     let ret = {
@@ -138,10 +140,11 @@ async function Totals(req, res) {
   const client = req.userGraphQLClient;
 
   logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
-    jobid: job.id
+    jobid: job.id,
+    id: id
   });
 
-  await AutoAddAtsIfRequired({ job, client });
+  await AtsAdjustmentsIfRequired({ job, client, user: req.user });
 
   try {
     let ret = {
@@ -153,7 +156,7 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-USA-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -162,40 +165,45 @@ async function Totals(req, res) {
   }
 }
 
-async function AutoAddAtsIfRequired({ job, client }) {
-  //Check if ATS should be automatically added.
-  if (job.auto_add_ats) {
-    //Get the total sum of hours that should be the ATS amount.
-    //Check to see if an ATS line exists.
+async function AtsAdjustmentsIfRequired({ job, client, user }) {
+  if (job.auto_add_ats || job.flat_rate_ats) {
+    let atsAmount = 0;
     let atsLineIndex = null;
-    const atsHours = job.joblines.reduce((acc, val, index) => {
-      if (val.line_desc && val.line_desc.toLowerCase() === "ats amount") {
-        atsLineIndex = index;
-      }
 
-      if (
-        val.mod_lbr_ty !== "LA1" &&
-        val.mod_lbr_ty !== "LA2" &&
-        val.mod_lbr_ty !== "LA3" &&
-        val.mod_lbr_ty !== "LA4" &&
-        val.mod_lbr_ty !== "LAU" &&
-        val.mod_lbr_ty !== "LAG" &&
-        val.mod_lbr_ty !== "LAS" &&
-        val.mod_lbr_ty !== "LAA"
-      ) {
-        acc = acc + val.mod_lb_hrs;
-      }
+    //Check if ATS should be automatically added.
+    if (job.auto_add_ats) {
+      const excludedLaborTypes = new Set(["LAA", "LAG", "LAS", "LAU", "LA1", "LA2", "LA3", "LA4"]);
 
-      return acc;
-    }, 0);
+      //Get the total sum of hours that should be the ATS amount.
+      //Check to see if an ATS line exists.
+      const atsHours = job.joblines.reduce((acc, val, index) => {
+        if (val.line_desc?.toLowerCase() === "ats amount") {
+          atsLineIndex = index;
+        }
 
-    const atsAmount = atsHours * (job.rate_ats || 0);
-    //If it does, update it in place, and make sure it is updated for local calculations.
+        if (!excludedLaborTypes.has(val.mod_lbr_ty)) {
+          acc = acc + val.mod_lb_hrs;
+        }
+
+        return acc;
+      }, 0);
+
+      atsAmount = atsHours * (job.rate_ats || 0);
+    }
+
+    //Check if a Flat Rate ATS should be added.
+    if (job.flat_rate_ats) {
+      atsLineIndex = ((i) => (i === -1 ? null : i))(
+        job.joblines.findIndex((line) => line.line_desc?.toLowerCase() === "ats amount")
+      );
+      atsAmount = job.rate_ats_flat || 0;
+    }
+
+    //If it does not, create one for local calculations and insert it.
     if (atsLineIndex === null) {
       const newAtsLine = {
         jobid: job.id,
         alt_partm: null,
-        line_no: 35,
         unq_seq: 0,
         line_ind: "E",
         line_desc: "ATS Amount",
@@ -220,19 +228,42 @@ async function AutoAddAtsIfRequired({ job, client }) {
         prt_dsmk_m: 0.0
       };
 
-      const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
-        lineInput: [newAtsLine]
-      });
+      try {
+        const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
+          lineInput: [newAtsLine]
+        });
 
-      job.joblines.push(newAtsLine);
+        if (result) {
+          job.joblines.push(newAtsLine);
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-    //If it does not, create one for local calculations and insert it.
+    //If it does, update it in place, and make sure it is updated for local calculations.
     else {
-      const result = await client.request(queries.UPDATE_JOB_LINE, {
-        line: { act_price: atsAmount },
-        lineId: job.joblines[atsLineIndex].id
-      });
-      job.joblines[atsLineIndex].act_price = atsAmount;
+      try {
+        const result = await client.request(queries.UPDATE_JOB_LINE, {
+          line: { act_price: atsAmount },
+          lineId: job.joblines[atsLineIndex].id
+        });
+        if (result) {
+          job.joblines[atsLineIndex].act_price = atsAmount;
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          atsLineIndex: atsLineIndex,
+          atsAmount: atsAmount,
+          jobline: job.joblines[atsLineIndex],
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
   }
 }
@@ -314,7 +345,7 @@ async function CalculateRatesTotals({ job, client }) {
   let hasMashLine = false;
   let hasMahwLine = false;
   let hasCustomMahwLine;
-  let mapaOpCodes = ParseCalopCode(job.materials["MAPA"]?.cal_opcode);
+  // let mapaOpCodes = ParseCalopCode(job.materials["MAPA"]?.cal_opcode);
   let mashOpCodes = ParseCalopCode(job.materials["MASH"]?.cal_opcode);
 
   jobLines.forEach((item) => {
@@ -564,7 +595,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
             }
           };
 
-        default:
+        default: {
           if (!value.part_type && value.db_ref !== "900510" && value.db_ref !== "900511") return acc;
 
           const discountAmount =
@@ -631,6 +662,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
                 )
             }
           };
+        }
       }
     },
     {
@@ -652,7 +684,7 @@ function CalculatePartsTotals(jobLines, parts_tax_rates, job) {
   let adjustments = {};
   //Track all adjustments that need to be made.
 
-  const linesToAdjustForDiscount = [];
+  //const linesToAdjustForDiscount = [];
   Object.keys(parts_tax_rates).forEach((key) => {
     //Check if there's a discount or a mark up.
     let disc = Dinero(),
@@ -1019,7 +1051,9 @@ function CalculateTaxesTotals(job, otherTotals) {
       }
     } catch (error) {
       logger.log("job-totals-USA Key with issue", "error", null, job.id, {
-        key
+        key: key,
+        error: error.message,
+        stack: error.stack
       });
     }
   });
@@ -1157,6 +1191,7 @@ function CalculateTaxesTotals(job, otherTotals) {
 
 exports.default = Totals;
 
+//eslint-disable-next-line no-unused-vars
 function DiscountNotAlreadyCounted(jobline, joblines) {
   return false;
 }
@@ -1172,27 +1207,35 @@ function IsTrueOrYes(value) {
   return value === true || value === "Y" || value === "y";
 }
 
-async function UpdateJobLines(joblinesToUpdate) {
-  if (joblinesToUpdate.length === 0) return;
-  const updateQueries = joblinesToUpdate.map((line, index) =>
-    generateUpdateQuery(_.pick(line, ["id", "prt_dsmk_m", "prt_dsmk_p"]), index)
-  );
-  const query = `
-    mutation UPDATE_EST_LINES{
-      ${updateQueries}
-    }
-    `;
+// Function not in use from RO to IO Merger 02/05/2024
+// async function UpdateJobLines(joblinesToUpdate) {
+//   if (joblinesToUpdate.length === 0) return;
+//   const updateQueries = joblinesToUpdate.map((line, index) =>
+//     generateUpdateQuery(_.pick(line, ["id", "prt_dsmk_m", "prt_dsmk_p"]), index)
+//   );
+//   const query = `
+//     mutation UPDATE_EST_LINES{
+//       ${updateQueries}
+//     }
+//     `;
+//   try {
+//     const result = await adminClient.request(query);
+//     void result;
+//   } catch (error) {
+//     logger.log("update-job-lines", "error", null, null, {
+//       error: error.message,
+//       stack: error.stack
+//     });
+//   }
+// }
 
-  const result = await adminClient.request(query);
-}
-
-const generateUpdateQuery = (lineToUpdate, index) => {
-  return `
-  update_joblines${index}: update_joblines(where: { id: { _eq: "${
-    lineToUpdate.id
-  }" } }, _set: ${JSON.stringify(lineToUpdate).replace(/"(\w+)"\s*:/g, "$1:")}) {
-    returning {
-      id
-    }
-  }`;
-};
+// const generateUpdateQuery = (lineToUpdate, index) => {
+//   return `
+//   update_joblines${index}: update_joblines(where: { id: { _eq: "${
+//     lineToUpdate.id
+//   }" } }, _set: ${JSON.stringify(lineToUpdate).replace(/"(\w+)"\s*:/g, "$1:")}) {
+//     returning {
+//       id
+//     }
+//   }`;
+// };

server/job/job-totals.js

@@ -1,7 +1,5 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-const adminClient = require("../graphql-client/graphql-client").client;
-const _ = require("lodash");
 const logger = require("../utils/logger");
 
 //****************************************************** */
@@ -44,11 +42,16 @@ exports.totalsSsu = async function (req, res) {
       }
     });
 
+    if (!result) {
+      throw new Error("Failed to update job totals");
+    }
+
     res.status(200).send();
   } catch (error) {
     logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
       jobid: id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(503).send();
   }
@@ -57,7 +60,7 @@ exports.totalsSsu = async function (req, res) {
 //IMPORTANT*** These two functions MUST be mirrrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
-  await AutoAddAtsIfRequired({ job: job, client: client });
+  await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
 
   try {
     let ret = {
@@ -71,7 +74,8 @@ async function TotalsServerSide(req, res) {
   } catch (error) {
     logger.log("job-totals-ssu-error", "ERROR", req?.user?.email, job.id, {
       jobid: job.id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(400).send(JSON.stringify(error));
   }
@@ -83,13 +87,12 @@ async function Totals(req, res) {
   const logger = req.logger;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals", "DEBUG", req.user.email, job.id, {
-    jobid: job.id
+  logger.log("job-totals-ssu", "DEBUG", req.user.email, job.id, {
+    jobid: job.id,
+    id: id
   });
 
-  logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
-
-  await AutoAddAtsIfRequired({ job, client });
+  await AtsAdjustmentsIfRequired({ job, client, user: req.user });
 
   try {
     let ret = {
@@ -101,48 +104,54 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-error", "ERROR", req.user.email, job.id, {
       jobid: job.id,
-      error
+      error: error.message,
+      stack: error.stack
     });
     res.status(400).send(JSON.stringify(error));
   }
 }
 
-async function AutoAddAtsIfRequired({ job, client }) {
-  //Check if ATS should be automatically added.
-  if (job.auto_add_ats) {
-    //Get the total sum of hours that should be the ATS amount.
-    //Check to see if an ATS line exists.
+async function AtsAdjustmentsIfRequired({ job, client, user }) {
+  if (job.auto_add_ats || job.flat_rate_ats) {
+    let atsAmount = 0;
     let atsLineIndex = null;
-    const atsHours = job.joblines.reduce((acc, val, index) => {
-      if (val.line_desc && val.line_desc.toLowerCase() === "ats amount") {
-        atsLineIndex = index;
-      }
 
-      if (
-        val.mod_lbr_ty !== "LA1" &&
-        val.mod_lbr_ty !== "LA2" &&
-        val.mod_lbr_ty !== "LA3" &&
-        val.mod_lbr_ty !== "LA4" &&
-        val.mod_lbr_ty !== "LAU" &&
-        val.mod_lbr_ty !== "LAG" &&
-        val.mod_lbr_ty !== "LAS" &&
-        val.mod_lbr_ty !== "LAA"
-      ) {
-        acc = acc + val.mod_lb_hrs;
-      }
+    //Check if ATS should be automatically added.
+    if (job.auto_add_ats) {
+      const excludedLaborTypes = new Set(["LAA", "LAG", "LAS", "LAU", "LA1", "LA2", "LA3", "LA4"]);
 
-      return acc;
-    }, 0);
+      //Get the total sum of hours that should be the ATS amount.
+      //Check to see if an ATS line exists.
+      const atsHours = job.joblines.reduce((acc, val, index) => {
+        if (val.line_desc?.toLowerCase() === "ats amount") {
+          atsLineIndex = index;
+        }
 
-    const atsAmount = atsHours * (job.rate_ats || 0);
-    //If it does, update it in place, and make sure it is updated for local calculations.
+        if (!excludedLaborTypes.has(val.mod_lbr_ty)) {
+          acc = acc + val.mod_lb_hrs;
+        }
+
+        return acc;
+      }, 0);
+
+      atsAmount = atsHours * (job.rate_ats || 0);
+    }
+
+    //Check if a Flat Rate ATS should be added.
+    if (job.flat_rate_ats) {
+      atsLineIndex = ((i) => (i === -1 ? null : i))(
+        job.joblines.findIndex((line) => line.line_desc?.toLowerCase() === "ats amount")
+      );
+      atsAmount = job.rate_ats_flat || 0;
+    }
+
+    //If it does not, create one for local calculations and insert it.
     if (atsLineIndex === null) {
       const newAtsLine = {
         jobid: job.id,
         alt_partm: null,
-        line_no: 35,
         unq_seq: 0,
         line_ind: "E",
         line_desc: "ATS Amount",
@@ -167,22 +176,43 @@ async function AutoAddAtsIfRequired({ job, client }) {
         prt_dsmk_m: 0.0
       };
 
-      const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
-        lineInput: [newAtsLine]
-      });
+      try {
+        const result = await client.request(queries.INSERT_NEW_JOB_LINE, {
+          lineInput: [newAtsLine]
+        });
 
-      job.joblines.push(newAtsLine);
+        if (result) {
+          job.joblines.push(newAtsLine);
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-    //If it does not, create one for local calculations and insert it.
+    //If it does, update it in place, and make sure it is updated for local calculations.
     else {
-      const result = await client.request(queries.UPDATE_JOB_LINE, {
-        line: { act_price: atsAmount },
-        lineId: job.joblines[atsLineIndex].id
-      });
-      job.joblines[atsLineIndex].act_price = atsAmount;
+      try {
+        const result = await client.request(queries.UPDATE_JOB_LINE, {
+          line: { act_price: atsAmount },
+          lineId: job.joblines[atsLineIndex].id
+        });
+        if (result) {
+          job.joblines[atsLineIndex].act_price = atsAmount;
+        }
+      } catch (error) {
+        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+          jobid: job.id,
+          atsLineIndex: atsLineIndex,
+          atsAmount: atsAmount,
+          jobline: job.joblines[atsLineIndex],
+          error: error.message,
+          stack: error.stack
+        });
+      }
     }
-
-    //console.log(job.jobLines);
   }
 }
 

server/notifications/eventHandlers.js

@@ -134,24 +134,6 @@ const handleJobLinesChange = async (req, res) =>
 const handleNotesChange = async (req, res) =>
   processNotificationEvent(req, res, "req.body.event.new.jobid", "Notes Changed Notification Event Handled.");
 
-/**
- * Handle parts dispatch change notifications.
- *
- * @param {Object} req - Express request object.
- * @param {Object} res - Express response object.
- * @returns {Object} JSON response with a success message.
- */
-const handlePartsDispatchChange = (req, res) => res.status(200).json({ message: "Parts Dispatch change handled." });
-
-/**
- * Handle parts order change notifications.
- *
- * @param {Object} req - Express request object.
- * @param {Object} res - Express response object.
- * @returns {Object} JSON response with a success message.
- */
-const handlePartsOrderChange = (req, res) => res.status(200).json({ message: "Parts Order change handled." });
-
 /**
  * Handle payments change notifications.
  *
@@ -182,6 +164,27 @@ const handleTasksChange = async (req, res) =>
 const handleTimeTicketsChange = async (req, res) =>
   processNotificationEvent(req, res, "req.body.event.new.jobid", "Time Tickets Changed Notification Event Handled.");
 
+/**
+ * Handle parts dispatch change notifications.
+ * Note: Placeholder
+ *
+ * @param {Object} req - Express request object.
+ * @param {Object} res - Express response object.
+ * @returns {Object} JSON response with a success message.
+ *
+ */
+const handlePartsDispatchChange = (req, res) => res.status(200).json({ message: "Parts Dispatch change handled." });
+
+/**
+ * Handle parts order change notifications.
+ * Note: Placeholder
+ *
+ * @param {Object} req - Express request object.
+ * @param {Object} res - Express response object.
+ * @returns {Object} JSON response with a success message.
+ */
+const handlePartsOrderChange = (req, res) => res.status(200).json({ message: "Parts Order change handled." });
+
 module.exports = {
   handleJobsChange,
   handleBillsChange,

server/notifications/queues/appQueue.js

@@ -1,6 +1,8 @@
 const { Queue, Worker } = require("bullmq");
 const { INSERT_NOTIFICATIONS_MUTATION } = require("../../graphql-client/queries");
 const { registerCleanupTask } = require("../../utils/cleanupManager");
+const getBullMQPrefix = require("../../utils/getBullMQPrefix");
+const devDebugLogger = require("../../utils/devDebugLogger");
 const graphQLClient = require("../../graphql-client/graphql-client").client;
 
 // Base time-related constant in minutes, sourced from environment variable or defaulting to 1
@@ -45,17 +47,20 @@ const buildNotificationContent = (notifications) => {
  */
 const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   if (!addQueue || !consolidateQueue) {
-    logger.logger.debug("Initializing Notifications Queues");
+    const prefix = getBullMQPrefix();
+    const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
+
+    devDebugLogger(`Initializing Notifications Queues with prefix: ${prefix}`);
 
     addQueue = new Queue("notificationsAdd", {
+      prefix,
       connection: pubClient,
-      prefix: "{BULLMQ}",
       defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
     });
 
     consolidateQueue = new Queue("notificationsConsolidate", {
+      prefix,
       connection: pubClient,
-      prefix: "{BULLMQ}",
       defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
     });
 
@@ -63,9 +68,9 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
       "notificationsAdd",
       async (job) => {
         const { jobId, key, variables, recipients, body, jobRoNumber } = job.data;
-        logger.logger.debug(`Adding notifications for jobId ${jobId}`);
+        devDebugLogger(`Adding notifications for jobId ${jobId}`);
 
-        const redisKeyPrefix = `app:notifications:${jobId}`;
+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
         const notification = { key, variables, body, jobRoNumber, timestamp: Date.now() };
 
         for (const recipient of recipients) {
@@ -75,12 +80,12 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
           const notifications = existingNotifications ? JSON.parse(existingNotifications) : [];
           notifications.push(notification);
           await pubClient.set(userKey, JSON.stringify(notifications), "EX", NOTIFICATION_STORAGE_EXPIRATION / 1000);
-          logger.logger.debug(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
+          devDebugLogger(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
         }
 
-        const consolidateKey = `app:consolidate:${jobId}`;
+        const consolidateKey = `app:${devKey}:consolidate:${jobId}`;
         const flagSet = await pubClient.setnx(consolidateKey, "pending");
-        logger.logger.debug(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);
+        devDebugLogger(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);
 
         if (flagSet) {
           await consolidateQueue.add(
@@ -93,15 +98,15 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
               backoff: LOCK_EXPIRATION
             }
           );
-          logger.logger.debug(`Scheduled consolidation for jobId ${jobId}`);
+          devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
           await pubClient.expire(consolidateKey, CONSOLIDATION_FLAG_EXPIRATION / 1000);
         } else {
-          logger.logger.debug(`Consolidation already scheduled for jobId ${jobId}`);
+          devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
         }
       },
       {
+        prefix,
         connection: pubClient,
-        prefix: "{BULLMQ}",
         concurrency: 5
       }
     );
@@ -110,23 +115,24 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
       "notificationsConsolidate",
       async (job) => {
         const { jobId, recipients } = job.data;
-        logger.logger.debug(`Consolidating notifications for jobId ${jobId}`);
+        devDebugLogger(`Consolidating notifications for jobId ${jobId}`);
+
+        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
+        const lockKey = `lock:${devKey}:consolidate:${jobId}`;
 
-        const redisKeyPrefix = `app:notifications:${jobId}`;
-        const lockKey = `lock:consolidate:${jobId}`;
         const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
-        logger.logger.debug(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);
+        devDebugLogger(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);
 
         if (lockAcquired) {
           try {
             const allNotifications = {};
             const uniqueUsers = [...new Set(recipients.map((r) => r.user))];
-            logger.logger.debug(`Unique users for jobId ${jobId}: ${uniqueUsers}`);
+            devDebugLogger(`Unique users for jobId ${jobId}: ${uniqueUsers}`);
 
             for (const user of uniqueUsers) {
               const userKey = `${redisKeyPrefix}:${user}`;
               const notifications = await pubClient.get(userKey);
-              logger.logger.debug(`Retrieved notifications for ${user}: ${notifications}`);
+              devDebugLogger(`Retrieved notifications for ${user}: ${notifications}`);
 
               if (notifications) {
                 const parsedNotifications = JSON.parse(notifications);
@@ -136,13 +142,13 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
                   allNotifications[user][bodyShopId] = parsedNotifications;
                 }
                 await pubClient.del(userKey);
-                logger.logger.debug(`Deleted Redis key ${userKey}`);
+                devDebugLogger(`Deleted Redis key ${userKey}`);
               } else {
-                logger.logger.debug(`No notifications found for ${user} under ${userKey}`);
+                devDebugLogger(`No notifications found for ${user} under ${userKey}`);
               }
             }
 
-            logger.logger.debug(`Consolidated notifications: ${JSON.stringify(allNotifications)}`);
+            devDebugLogger(`Consolidated notifications: ${JSON.stringify(allNotifications)}`);
 
             // Insert notifications into the database and collect IDs
             const notificationInserts = [];
@@ -169,7 +175,7 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
               const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, {
                 objects: notificationInserts
               });
-              logger.logger.debug(
+              devDebugLogger(
                 `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
               );
 
@@ -203,16 +209,16 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
                       associationId
                     });
                   });
-                  logger.logger.debug(
+                  devDebugLogger(
                     `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}`
                   );
                 } else {
-                  logger.logger.debug(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+                  devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
                 }
               }
             }
 
-            await pubClient.del(`app:consolidate:${jobId}`);
+            await pubClient.del(`app:${devKey}:consolidate:${jobId}`);
           } catch (err) {
             logger.log(`app-queue-consolidation-error`, "ERROR", "notifications", "api", {
               message: err?.message,
@@ -223,19 +229,20 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
             await pubClient.del(lockKey);
           }
         } else {
-          logger.logger.debug(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
+          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
         }
       },
       {
+        prefix,
         connection: pubClient,
-        prefix: "{BULLMQ}",
         concurrency: 1,
         limiter: { max: 1, duration: RATE_LIMITER_DURATION }
       }
     );
 
-    addWorker.on("completed", (job) => logger.logger.debug(`Add job ${job.id} completed`));
-    consolidateWorker.on("completed", (job) => logger.logger.debug(`Consolidate job ${job.id} completed`));
+    addWorker.on("completed", (job) => devDebugLogger(`Add job ${job.id} completed`));
+    consolidateWorker.on("completed", (job) => devDebugLogger(`Consolidate job ${job.id} completed`));
+
     addWorker.on("failed", (job, err) =>
       logger.log(`app-queue-notification-error`, "ERROR", "notifications", "api", {
         message: err?.message,
@@ -251,9 +258,9 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
 
     // Register cleanup task instead of direct process listeners
     const shutdown = async () => {
-      logger.logger.debug("Closing app queue workers...");
+      devDebugLogger("Closing app queue workers...");
       await Promise.all([addWorker.close(), consolidateWorker.close()]);
-      logger.logger.debug("App queue workers closed");
+      devDebugLogger("App queue workers closed");
     };
 
     registerCleanupTask(shutdown);
@@ -283,7 +290,7 @@ const dispatchAppsToQueue = async ({ appsToDispatch, logger }) => {
       { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
       { jobId: `${jobId}:${Date.now()}` }
     );
-    logger.logger.debug(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
+    devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
   }
 };
 

server/notifications/queues/emailQueue.js

@@ -3,6 +3,9 @@ const { sendTaskEmail } = require("../../email/sendemail");
 const generateEmailTemplate = require("../../email/generateTemplate");
 const { InstanceEndpoints } = require("../../utils/instanceMgr");
 const { registerCleanupTask } = require("../../utils/cleanupManager");
+const getBullMQPrefix = require("../../utils/getBullMQPrefix");
+const devDebugLogger = require("../../utils/devDebugLogger");
+const moment = require("moment-timezone");
 
 const EMAIL_CONSOLIDATION_DELAY_IN_MINS = (() => {
   const envValue = process.env?.EMAIL_CONSOLIDATION_DELAY_IN_MINS;
@@ -34,19 +37,22 @@ let emailConsolidateWorker;
  */
 const loadEmailQueue = async ({ pubClient, logger }) => {
   if (!emailAddQueue || !emailConsolidateQueue) {
-    logger.logger.debug("Initializing Email Notification Queues");
+    const prefix = getBullMQPrefix();
+    const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
+
+    devDebugLogger(`Initializing Email Notification Queues with prefix: ${prefix}`);
 
     // Queue for adding email notifications
     emailAddQueue = new Queue("emailAdd", {
+      prefix,
       connection: pubClient,
-      prefix: "{BULLMQ}",
       defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
     });
 
     // Queue for consolidating and sending emails
     emailConsolidateQueue = new Queue("emailConsolidate", {
+      prefix,
       connection: pubClient,
-      prefix: "{BULLMQ}",
       defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
     });
 
@@ -54,29 +60,31 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
     emailAddWorker = new Worker(
       "emailAdd",
       async (job) => {
-        const { jobId, jobRoNumber, bodyShopName, body, recipients } = job.data;
-        logger.logger.debug(`Adding email notifications for jobId ${jobId}`);
+        const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = job.data;
+        devDebugLogger(`Adding email notifications for jobId ${jobId}`);
+
+        const redisKeyPrefix = `email:${devKey}:notifications:${jobId}`;
 
-        const redisKeyPrefix = `email:notifications:${jobId}`;
         for (const recipient of recipients) {
           const { user, firstName, lastName } = recipient;
           const userKey = `${redisKeyPrefix}:${user}`;
           await pubClient.rpush(userKey, body);
           await pubClient.expire(userKey, NOTIFICATION_EXPIRATION / 1000);
-          const detailsKey = `email:recipientDetails:${jobId}:${user}`;
+          const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
           await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
           await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
           await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
-          await pubClient.sadd(`email:recipients:${jobId}`, user);
-          logger.logger.debug(`Stored message for ${user} under ${userKey}: ${body}`);
+          await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
+          devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
         }
 
-        const consolidateKey = `email:consolidate:${jobId}`;
+        const consolidateKey = `email:${devKey}:consolidate:${jobId}`;
         const flagSet = await pubClient.setnx(consolidateKey, "pending");
         if (flagSet) {
           await emailConsolidateQueue.add(
             "consolidate-emails",
-            { jobId, jobRoNumber, bodyShopName },
+            { jobId, jobRoNumber, bodyShopName, bodyShopTimezone },
             {
               jobId: `consolidate:${jobId}`,
               delay: EMAIL_CONSOLIDATION_DELAY,
@@ -84,15 +92,15 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
               backoff: LOCK_EXPIRATION
             }
           );
-          logger.logger.debug(`Scheduled email consolidation for jobId ${jobId}`);
+          devDebugLogger(`Scheduled email consolidation for jobId ${jobId}`);
           await pubClient.expire(consolidateKey, CONSOLIDATION_KEY_EXPIRATION / 1000);
         } else {
-          logger.logger.debug(`Email consolidation already scheduled for jobId ${jobId}`);
+          devDebugLogger(`Email consolidation already scheduled for jobId ${jobId}`);
         }
       },
       {
+        prefix,
         connection: pubClient,
-        prefix: "{BULLMQ}",
         concurrency: 5
       }
     );
@@ -102,26 +110,28 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
       "emailConsolidate",
       async (job) => {
         const { jobId, jobRoNumber, bodyShopName } = job.data;
-        logger.logger.debug(`Consolidating emails for jobId ${jobId}`);
+        devDebugLogger(`Consolidating emails for jobId ${jobId}`);
 
-        const lockKey = `lock:emailConsolidate:${jobId}`;
+        const lockKey = `lock:${devKey}:emailConsolidate:${jobId}`;
         const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
         if (lockAcquired) {
           try {
-            const recipientsSet = `email:recipients:${jobId}`;
+            const recipientsSet = `email:${devKey}:recipients:${jobId}`;
             const recipients = await pubClient.smembers(recipientsSet);
             for (const recipient of recipients) {
-              const userKey = `email:notifications:${jobId}:${recipient}`;
-              const detailsKey = `email:recipientDetails:${jobId}:${recipient}`;
+              const userKey = `email:${devKey}:notifications:${jobId}:${recipient}`;
+              const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${recipient}`;
               const messages = await pubClient.lrange(userKey, 0, -1);
               if (messages.length > 0) {
                 const details = await pubClient.hgetall(detailsKey);
                 const firstName = details.firstName || "User";
                 const multipleUpdateString = messages.length > 1 ? "Updates" : "Update";
                 const subject = `${multipleUpdateString} for job ${jobRoNumber || "N/A"} at ${bodyShopName}`;
+                const timezone = moment.tz.zone(details?.bodyShopTimezone) ? details.bodyShopTimezone : "UTC";
                 const emailBody = generateEmailTemplate({
                   header: `${multipleUpdateString} for Job ${jobRoNumber || "N/A"}`,
                   subHeader: `Dear ${firstName},`,
+                  dateLine: moment().tz(timezone).format("MM/DD/YYYY hh:mm a"),
                   body: `
                     <p>There have been updates to job ${jobRoNumber || "N/A"} at ${bodyShopName}:</p><br/>
                     <ul>
@@ -136,7 +146,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                   type: "html",
                   html: emailBody
                 });
-                logger.logger.debug(
+                devDebugLogger(
                   `Sent consolidated email to ${recipient} for jobId ${jobId} with ${messages.length} updates`
                 );
                 await pubClient.del(userKey);
@@ -144,7 +154,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
               }
             }
             await pubClient.del(recipientsSet);
-            await pubClient.del(`email:consolidate:${jobId}`);
+            await pubClient.del(`email:${devKey}:consolidate:${jobId}`);
           } catch (err) {
             logger.log(`email-queue-consolidation-error`, "ERROR", "notifications", "api", {
               message: err?.message,
@@ -155,20 +165,21 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
             await pubClient.del(lockKey);
           }
         } else {
-          logger.logger.debug(`Skipped email consolidation for jobId ${jobId} - lock held by another worker`);
+          devDebugLogger(`Skipped email consolidation for jobId ${jobId} - lock held by another worker`);
         }
       },
       {
+        prefix,
         connection: pubClient,
-        prefix: "{BULLMQ}",
         concurrency: 1,
         limiter: { max: 1, duration: RATE_LIMITER_DURATION }
       }
     );
 
     // Event handlers for workers
-    emailAddWorker.on("completed", (job) => logger.logger.debug(`Email add job ${job.id} completed`));
-    emailConsolidateWorker.on("completed", (job) => logger.logger.debug(`Email consolidate job ${job.id} completed`));
+    emailAddWorker.on("completed", (job) => devDebugLogger(`Email add job ${job.id} completed`));
+    emailConsolidateWorker.on("completed", (job) => devDebugLogger(`Email consolidate job ${job.id} completed`));
+
     emailAddWorker.on("failed", (job, err) =>
       logger.log(`add-email-queue-failed`, "ERROR", "notifications", "api", {
         message: err?.message,
@@ -184,9 +195,9 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
 
     // Register cleanup task instead of direct process listeners
     const shutdown = async () => {
-      logger.logger.debug("Closing email queue workers...");
+      devDebugLogger("Closing email queue workers...");
       await Promise.all([emailAddWorker.close(), emailConsolidateWorker.close()]);
-      logger.logger.debug("Email queue workers closed");
+      devDebugLogger("Email queue workers closed");
     };
     registerCleanupTask(shutdown);
   }
@@ -219,10 +230,10 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 
   for (const email of emailsToDispatch) {
-    const { jobId, jobRoNumber, bodyShopName, body, recipients } = email;
+    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;
 
     if (!jobId || !jobRoNumber || !bodyShopName || !body || !recipients.length) {
-      logger.logger.warn(
+      devDebugLogger(
         `Skipping email dispatch for jobId ${jobId} due to missing data: ` +
           `jobRoNumber=${jobRoNumber || "N/A"}, bodyShopName=${bodyShopName}, body=${body}, recipients=${recipients.length}`
       );
@@ -231,10 +242,10 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
 
     await emailAddQueue.add(
       "add-email-notification",
-      { jobId, jobRoNumber, bodyShopName, body, recipients },
+      { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients },
       { jobId: `${jobId}:${Date.now()}` }
     );
-    logger.logger.debug(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
+    devDebugLogger(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
   }
 };
 

server/notifications/scenarioBuilders.js

@@ -6,12 +6,36 @@ const Dinero = require("dinero.js");
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 /**
- * Populates the recipients for app, email, and FCM notifications based on scenario watchers.
- *
- * @param {Object} data - The data object containing scenarioWatchers and bodyShopId.
- * @param {Object} result - The result object to populate with recipients for app, email, and FCM notifications.
+ * Creates a standard notification object with app, email, and FCM properties and populates recipients.
+ * @param {Object} data - Input data containing jobId, jobRoNumber, bodyShopId, bodyShopName, and scenarioWatchers
+ * @param {string} key - Notification key for the app
+ * @param {string} body - Notification body text
+ * @param {Object} [variables={}] - Variables for the app notification
+ * @returns {Object} Notification object with populated recipients
  */
-const populateWatchers = (data, result) => {
+const buildNotification = (data, key, body, variables = {}) => {
+  const result = {
+    app: {
+      jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
+      bodyShopId: data.bodyShopId,
+      key,
+      body,
+      variables,
+      recipients: []
+    },
+    email: {
+      jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
+      bodyShopName: data.bodyShopName,
+      bodyShopTimezone: data.bodyShopTimezone,
+      body,
+      recipients: []
+    },
+    fcm: { recipients: [] }
+  };
+
+  // Populate recipients from scenarioWatchers
   data.scenarioWatchers.forEach((recipients) => {
     const { user, app, fcm, email, firstName, lastName, employeeId, associationId } = recipients;
     if (app === true)
@@ -24,287 +48,153 @@ const populateWatchers = (data, result) => {
     if (fcm === true) result.fcm.recipients.push(user);
     if (email === true) result.email.recipients.push({ user, firstName, lastName });
   });
-};
 
-/**
- * Builds notification data for changes to alternate transport.
- */
-const alternateTransportChangedBuilder = (data) => {
-  const body = `The alternate transportation has been changed from ${data.changedFields.alt_transport?.old || "unset"} to ${data?.changedFields?.alt_transport?.new || "unset"}.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      bodyShopId: data.bodyShopId,
-      jobRoNumber: data.jobRoNumber,
-      key: "notifications.job.alternateTransportChanged",
-      body,
-      variables: {
-        alternateTransport: data?.changedFields?.alt_transport?.new,
-        oldAlternateTransport: data?.changedFields?.alt_transport?.old
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
   return result;
 };
 
 /**
- * Builds notification data for bill posted events.
+ * Creates a notification for when the alternate transport is changed.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
-const billPostedHandler = (data) => {
+const alternateTransportChangedBuilder = (data) => {
+  const oldTransport = data?.changedFields?.alt_transport?.old;
+  const newTransport = data?.changedFields?.alt_transport?.new;
+  let body;
+
+  if (oldTransport && newTransport)
+    body = `The alternate transportation has been changed from ${oldTransport} to ${newTransport}.`;
+  else if (!oldTransport && newTransport) body = `The alternate transportation has been set to ${newTransport}.`;
+  else if (oldTransport && !newTransport)
+    body = `The alternate transportation has been canceled (previously ${oldTransport}).`;
+  else body = `The alternate transportation has been updated.`;
+
+  return buildNotification(data, "notifications.job.alternateTransportChanged", body, {
+    alternateTransport: newTransport,
+    oldAlternateTransport: oldTransport
+  });
+};
+
+/**
+ * Creates a notification for when a bill is posted.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
+ */
+const billPostedBuilder = (data) => {
   const facing = data?.data?.isinhouse ? "in-house" : "vendor";
   const body = `An ${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.billPosted",
-      body,
-      variables: {
-        isInHouse: data?.data?.isinhouse,
-        isCreditMemo: data?.data?.is_credit_memo
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.billPosted", body, {
+    isInHouse: data?.data?.isinhouse,
+    isCreditMemo: data?.data?.is_credit_memo
+  });
 };
 
 /**
- * Builds notification data for changes to critical parts status.
+ * Creates a notification for when the status of critical parts changes.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
-//
 const criticalPartsStatusChangedBuilder = (data) => {
-  const body = `The status on a critical part line (${data?.data?.line_desc}) has changed to ${data?.data?.status || "unset"}.`;
+  const lineDesc = data?.data?.line_desc;
+  const status = data?.data?.status;
+  const body = status
+    ? `The status on a critical part line (${lineDesc}) has been set to ${status}.`
+    : `The status on a critical part line (${lineDesc}) has been cleared.`;
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      bodyShopId: data.bodyShopId,
-      jobRoNumber: data.jobRoNumber,
-      key: "notifications.job.criticalPartsStatusChanged",
-      body,
-      variables: {
-        joblineId: data?.data?.id, // If we want to deeplink to the jobline
-        status: data?.data?.status,
-        line_desc: data?.data?.line_desc
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.criticalPartsStatusChanged", body, {
+    joblineId: data?.data?.id,
+    status: data?.data?.status,
+    line_desc: lineDesc
+  });
 };
 
 /**
- * Builds notification data for completed intake or delivery checklists.
+ * Creates a notification for when the intake or delivery checklist is completed.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const intakeDeliveryChecklistCompletedBuilder = (data) => {
   const checklistType = data?.changedFields?.intakechecklist ? "intake" : "delivery";
   const body = `The ${checklistType.charAt(0).toUpperCase() + checklistType.slice(1)} checklist has been completed.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.checklistCompleted",
-      body,
-      variables: {
-        checklistType,
-        completed: true
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
 
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.checklistCompleted", body, {
+    checklistType,
+    completed: true
+  });
 };
 
 /**
- * Builds notification data for job assignment events.
+ * Creates a notification for when a job is assigned to the user.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const jobAssignedToMeBuilder = (data) => {
   const body = `You have been assigned to ${getJobAssignmentType(data.scenarioFields?.[0])}.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.assigned",
-      body,
-      variables: {
-        type: data.scenarioFields?.[0]
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
 
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.assigned", body, {
+    type: data.scenarioFields?.[0]
+  });
 };
 
 /**
- * Builds notification data for jobs added to production.
+ * Creates a notification for when jobs are added to production.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const jobsAddedToProductionBuilder = (data) => {
   const body = `Job is now in production.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.addedToProduction",
-      body,
-      variables: {},
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.addedToProduction", body);
 };
 
 /**
- * Builds notification data for job status changes.
+ * Creates a notification for when the job status changes.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const jobStatusChangeBuilder = (data) => {
-  const body = `The status has changed from ${data?.changedFields?.status?.old || "unset"} to ${data?.changedFields?.status?.new || "unset"}`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.statusChanged",
-      body,
-      variables: {
-        status: data.changedFields.status.new,
-        oldStatus: data.changedFields.status.old
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
+  const oldStatus = data?.changedFields?.status?.old;
+  const newStatus = data?.changedFields?.status?.new;
+  let body;
 
-  populateWatchers(data, result);
-  return result;
+  if (oldStatus && newStatus) body = `The status has been changed from ${oldStatus} to ${newStatus}.`;
+  else if (!oldStatus && newStatus) body = `The status has been set to ${newStatus}.`;
+  else if (oldStatus && !newStatus) body = `The status has been cleared (previously ${oldStatus}).`;
+  else body = `The status has been updated.`;
+
+  return buildNotification(data, "notifications.job.statusChanged", body, {
+    status: newStatus,
+    oldStatus: oldStatus
+  });
 };
 
 /**
- * Builds notification data for new media added or reassigned events.
+ * Creates a notification for when new media is added or reassigned.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const newMediaAddedReassignedBuilder = (data) => {
-  // Determine if it's an image or document
   const mediaType = data?.data?.type?.startsWith("image") ? "Image" : "Document";
-
-  // Determine the action
-  let action;
-
-  if (data?.data?._documentMoved) {
-    action = "moved to another job"; // Special case for document moved from this job
-  } else if (data.isNew) {
-    action = "added"; // New media
-  } else if (data.changedFields?.jobid && data.changedFields.jobid.old !== data.changedFields.jobid.new) {
-    action = "moved to this job";
-  } else {
-    action = "updated";
-  }
-
-  // Construct the body string
+  const action = data?.data?._documentMoved
+    ? "moved to another job"
+    : data.isNew
+      ? "added"
+      : data.changedFields?.jobid && data.changedFields.jobid.old !== data.changedFields.jobid.new
+        ? "moved to this job"
+        : "updated";
   const body = `An ${mediaType} has been ${action}.`;
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.newMediaAdded",
-      body,
-      variables: {
-        mediaType,
-        action,
-        movedToJob: data?.data?._movedToJob
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.newMediaAdded", body, {
+    mediaType,
+    action,
+    movedToJob: data?.data?._movedToJob
+  });
 };
 
 /**
- * Builds notification data for new notes added to a job.
+ * Creates a notification for when a new note is added.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const newNoteAddedBuilder = (data) => {
   const body = [
@@ -318,240 +208,119 @@ const newNoteAddedBuilder = (data) => {
     .filter(Boolean)
     .join(" ");
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.newNoteAdded",
-      body,
-      variables: {
-        createdBy: data?.data?.created_by,
-        critical: data?.data?.critical,
-        type: data?.data?.type,
-        private: data?.data?.private
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.newNoteAdded", body, {
+    createdBy: data?.data?.created_by,
+    critical: data?.data?.critical,
+    type: data?.data?.type,
+    private: data?.data?.private
+  });
 };
 
 /**
- * Builds notification data for new time tickets posted.
+ * Creates a notification for when a new time ticket is posted.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const newTimeTicketPostedBuilder = (data) => {
   const type = data?.data?.cost_center;
   const body = `A ${startCase(type.toLowerCase())} time ticket for ${data?.data?.date} has been posted.`.trim();
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.newTimeTicketPosted",
-      body,
-      variables: {
-        type,
-        date: data?.data?.date
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.newTimeTicketPosted", body, {
+    type,
+    date: data?.data?.date
+  });
 };
 
 /**
- * Builds notification data for parts marked as back-ordered.
+ * Creates a notification for when a part is marked as back-ordered.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const partMarkedBackOrderedBuilder = (data) => {
   const body = `A part ${data?.data?.line_desc} has been marked as back-ordered.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.partBackOrdered",
-      body,
-      variables: {
-        line_desc: data?.data?.line_desc
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
 
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.partBackOrdered", body, {
+    line_desc: data?.data?.line_desc
+  });
 };
 
 /**
- * Builds notification data for payment collection events.
+ * Creates a notification for when payment is collected or completed.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const paymentCollectedCompletedBuilder = (data) => {
   const momentFormat = "MM/DD/YYYY";
-
-  // Format amount using Dinero.js
-  const amountDinero = Dinero({
-    amount: Math.round((data.data.amount || 0) * 100) // Convert to cents, default to 0 if missing
-  });
-
+  const amountDinero = Dinero({ amount: Math.round((data.data.amount || 0) * 100) });
   const amountFormatted = amountDinero.toFormat();
-
   const payer = data.data.payer;
   const paymentType = data.data.type;
   const paymentDate = moment(data.data.date).format(momentFormat);
-
   const body = `Payment of ${amountFormatted} has been collected from ${payer} via ${paymentType} on ${paymentDate}`;
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.paymentCollected",
-      body,
-      variables: {
-        amount: data.data.amount,
-        payer: data.data.payer,
-        type: data.data.type,
-        date: data.data.date
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.paymentCollected", body, {
+    amount: data.data.amount,
+    payer: data.data.payer,
+    type: data.data.type,
+    date: data.data.date
+  });
 };
 
 /**
- * Builds notification data for changes to scheduled dates.
+ * Creates a notification for when scheduled dates are changed.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const scheduledDatesChangedBuilder = (data) => {
   const changedFields = data.changedFields;
-
-  // Define field configurations
   const fieldConfigs = {
     scheduled_in: "Scheduled In",
     scheduled_completion: "Scheduled Completion",
     scheduled_delivery: "Scheduled Delivery"
   };
-
-  // Helper function to format date and time with "at"
   const formatDateTime = (date) => {
-    if (!date) return "unset";
+    if (!date) return "(no date set)";
     const formatted = moment(date).tz(data.bodyShopTimezone);
-    const datePart = formatted.format("MM/DD/YYYY");
-    const timePart = formatted.format("hh:mm a");
-    return `${datePart} at ${timePart}`;
+    return `${formatted.format("MM/DD/YYYY")} at ${formatted.format("hh:mm a")}`;
   };
 
-  // Build field messages dynamically
   const fieldMessages = Object.entries(fieldConfigs)
-    .filter(([field]) => changedFields[field]) // Only include changed fields
+    .filter(([field]) => changedFields[field])
     .map(([field, label]) => {
       const { old, new: newValue } = changedFields[field];
-
-      // Case 1: Scheduled date cancelled (from value to null)
-      if (old && !newValue) {
-        return `${label} was cancelled (previously ${formatDateTime(old)}).`;
-      }
-      // Case 2: Scheduled date set (from null to value)
-      else if (!old && newValue) {
-        return `${label} was set to ${formatDateTime(newValue)}.`;
-      }
-      // Case 3: Scheduled date changed (from value to value)
-      else if (old && newValue) {
-        return `${label} changed from ${formatDateTime(old)} to ${formatDateTime(newValue)}.`;
-      }
-      return ""; // Fallback, though this shouldn't happen with the filter
+      if (old && !newValue) return `${label} was cancelled (previously ${formatDateTime(old)}).`;
+      else if (!old && newValue) return `${label} was set to ${formatDateTime(newValue)}.`;
+      else if (old && newValue) return `${label} changed from ${formatDateTime(old)} to ${formatDateTime(newValue)}.`;
+      return "";
     })
-    .filter(Boolean); // Remove any empty strings
+    .filter(Boolean);
 
   const body = fieldMessages.length > 0 ? fieldMessages.join(" ") : "Scheduled dates have been updated.";
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.scheduledDatesChanged",
-      body,
-      variables: {
-        scheduledIn: changedFields.scheduled_in?.new,
-        oldScheduledIn: changedFields.scheduled_in?.old,
-        scheduledCompletion: changedFields.scheduled_completion?.new,
-        oldScheduledCompletion: changedFields.scheduled_completion?.old,
-        scheduledDelivery: changedFields.scheduled_delivery?.new,
-        oldScheduledDelivery: changedFields.scheduled_delivery?.old
-      },
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.scheduledDatesChanged", body, {
+    scheduledIn: changedFields.scheduled_in?.new,
+    oldScheduledIn: changedFields.scheduled_in?.old,
+    scheduledCompletion: changedFields.scheduled_completion?.new,
+    oldScheduledCompletion: changedFields.scheduled_completion?.old,
+    scheduledDelivery: changedFields.scheduled_delivery?.new,
+    oldScheduledDelivery: changedFields.scheduled_delivery?.old
+  });
 };
 
 /**
- * Builds notification data for tasks updated or created.
+ * Creates a notification for when tasks are updated or created.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const tasksUpdatedCreatedBuilder = (data) => {
   const momentFormat = "MM/DD/YYYY hh:mm a";
   const timezone = data.bodyShopTimezone;
   const taskTitle = data?.data?.title ? `"${data.data.title}"` : "Unnamed Task";
 
-  let body;
-  let variables;
-
+  let body, variables;
   if (data.isNew) {
-    // Created case
     const priority = formatTaskPriority(data?.data?.priority);
-    const createdBy = data?.data?.created_by || "Unknown"; // Fallback for undefined created_by
+    const createdBy = data?.data?.created_by || "Unknown";
     const dueDate = data.data.due_date ? ` due on ${moment(data.data.due_date).tz(timezone).format(momentFormat)}` : "";
     const completedOnCreation = data.data.completed === true;
     body = `A ${priority} task ${taskTitle} has been created${completedOnCreation ? " and marked completed" : ""} by ${createdBy}${dueDate}.`;
@@ -562,119 +331,73 @@ const tasksUpdatedCreatedBuilder = (data) => {
       priority: data?.data?.priority,
       createdBy: data?.data?.created_by,
       dueDate: data?.data?.due_date,
-      completed: completedOnCreation ? data?.data?.completed : undefined // Only include if true
+      completed: completedOnCreation ? data?.data?.completed : undefined
     };
   } else {
-    // Updated case
     const changedFields = data.changedFields;
     const fieldNames = Object.keys(changedFields);
     const oldTitle = changedFields.title ? `"${changedFields.title.old || "Unnamed Task"}"` : taskTitle;
 
-    // Special case: Only 'completed' changed
     if (fieldNames.length === 1 && changedFields.completed) {
       body = `Task ${oldTitle} was marked ${changedFields.completed.new ? "complete" : "incomplete"}`;
       variables = {
         isNew: data.isNew,
         roNumber: data.jobRoNumber,
         title: data?.data?.title,
-        changedCompleted: data?.changedFields?.completed?.new
+        changedCompleted: changedFields.completed.new
       };
     } else {
-      // General update case
       const fieldMessages = [];
-
-      if (changedFields.title) {
+      if (changedFields.title)
         fieldMessages.push(`Task ${oldTitle} changed title to "${changedFields.title.new || "unnamed task"}".`);
-      }
-      if (changedFields.description) {
-        fieldMessages.push("Description updated.");
-      }
-      if (changedFields.priority) {
+      if (changedFields.description) fieldMessages.push("Description updated.");
+      if (changedFields.priority)
         fieldMessages.push(`Priority changed to ${formatTaskPriority(changedFields.priority.new)}.`);
-      }
-      if (changedFields.due_date) {
+      if (changedFields.due_date)
         fieldMessages.push(`Due date set to ${moment(changedFields.due_date.new).tz(timezone).format(momentFormat)}.`);
-      }
-      if (changedFields.completed) {
+      if (changedFields.completed)
         fieldMessages.push(`Status changed to ${changedFields.completed.new ? "complete" : "incomplete"}.`);
-      }
 
       body =
         fieldMessages.length > 0
           ? fieldMessages.length === 1 && changedFields.title
-            ? fieldMessages[0] // If only title changed, use it standalone
+            ? fieldMessages[0]
             : `Task ${oldTitle} updated: ${fieldMessages.join(", ")}`
           : `Task ${oldTitle} has been updated.`;
       variables = {
         isNew: data.isNew,
         roNumber: data.jobRoNumber,
         title: data?.data?.title,
-        changedTitleOld: data?.changedFields?.title?.old,
-        changedTitleNew: data?.changedFields?.title?.new,
-        changedPriority: data?.changedFields?.priority?.new,
-        changedDueDate: data?.changedFields?.due_date?.new,
-        changedCompleted: data?.changedFields?.completed?.new
+        changedTitleOld: changedFields.title?.old,
+        changedTitleNew: changedFields.title?.new,
+        changedPriority: changedFields.priority?.new,
+        changedDueDate: changedFields.due_date?.new,
+        changedCompleted: changedFields.completed?.new
       };
     }
   }
 
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: data.isNew ? "notifications.job.taskCreated" : "notifications.job.taskUpdated",
-      body,
-      variables,
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(
+    data,
+    data.isNew ? "notifications.job.taskCreated" : "notifications.job.taskUpdated",
+    body,
+    variables
+  );
 };
 
 /**
- * Builds notification data for supplement imported events.
- * TODO: This is an advanced case and will be done later
+ * Creates a notification for when a supplement is imported.
+ * @param data
+ * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
  */
 const supplementImportedBuilder = (data) => {
   const body = `A supplement has been imported.`;
-  const result = {
-    app: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopId: data.bodyShopId,
-      key: "notifications.job.supplementImported",
-      body,
-      variables: {},
-      recipients: []
-    },
-    email: {
-      jobId: data.jobId,
-      jobRoNumber: data.jobRoNumber,
-      bodyShopName: data.bodyShopName,
-      body,
-      recipients: []
-    },
-    fcm: { recipients: [] }
-  };
-
-  populateWatchers(data, result);
-  return result;
+  return buildNotification(data, "notifications.job.supplementImported", body);
 };
 
 module.exports = {
   alternateTransportChangedBuilder,
-  billPostedHandler,
+  billPostedBuilder,
   criticalPartsStatusChangedBuilder,
   intakeDeliveryChecklistCompletedBuilder,
   jobAssignedToMeBuilder,

server/notifications/scenarioMapper.js

@@ -1,6 +1,6 @@
 const {
   jobAssignedToMeBuilder,
-  billPostedHandler,
+  billPostedBuilder,
   newNoteAddedBuilder,
   scheduledDatesChangedBuilder,
   tasksUpdatedCreatedBuilder,
@@ -30,10 +30,12 @@ const { isFunction } = require("lodash");
  * - builder {Function}: A function to handle the scenario.
  * - onlyTruthyValues {boolean|Array<string>}: Specifies fields that must have truthy values for the scenario to match.
  * - filterCallback {Function}: Optional callback (sync or async) to further filter the scenario based on event data (returns boolean).
+ * - enabled {boolean}: If true, the scenario is active; if false or omitted, the scenario is skipped.
  */
 const notificationScenarios = [
   {
     key: "job-assigned-to-me",
+    enabled: true,
     table: "jobs",
     fields: ["employee_prep", "employee_body", "employee_csr", "employee_refinish"],
     matchToUserFields: ["employee_prep", "employee_body", "employee_csr", "employee_refinish"],
@@ -41,24 +43,28 @@ const notificationScenarios = [
   },
   {
     key: "bill-posted",
+    enabled: true,
     table: "bills",
-    builder: billPostedHandler,
+    builder: billPostedBuilder,
     onNew: true
   },
   {
     key: "new-note-added",
+    enabled: true,
     table: "notes",
     builder: newNoteAddedBuilder,
     onNew: true
   },
   {
     key: "schedule-dates-changed",
+    enabled: true,
     table: "jobs",
     fields: ["scheduled_in", "scheduled_completion", "scheduled_delivery"],
     builder: scheduledDatesChangedBuilder
   },
   {
     key: "tasks-updated-created",
+    enabled: true,
     table: "tasks",
     fields: ["updated_at"],
     // onNew: true,
@@ -66,12 +72,14 @@ const notificationScenarios = [
   },
   {
     key: "job-status-change",
+    enabled: true,
     table: "jobs",
     fields: ["status"],
     builder: jobStatusChangeBuilder
   },
   {
     key: "job-added-to-production",
+    enabled: true,
     table: "jobs",
     fields: ["inproduction"],
     onlyTruthyValues: ["inproduction"],
@@ -79,36 +87,42 @@ const notificationScenarios = [
   },
   {
     key: "alternate-transport-changed",
+    enabled: true,
     table: "jobs",
     fields: ["alt_transport"],
     builder: alternateTransportChangedBuilder
   },
   {
     key: "new-time-ticket-posted",
+    enabled: true,
     table: "timetickets",
     builder: newTimeTicketPostedBuilder
   },
   {
     key: "intake-delivery-checklist-completed",
+    enabled: true,
     table: "jobs",
     fields: ["intakechecklist", "deliverchecklist"],
     builder: intakeDeliveryChecklistCompletedBuilder
   },
   {
     key: "payment-collected-completed",
+    enabled: true,
     table: "payments",
     onNew: true,
     builder: paymentCollectedCompletedBuilder
   },
   {
-    // MAKE SURE YOU ARE NOT ON A LMS ENVIRONMENT
+    // Only works on a non LMS ENV
     key: "new-media-added-reassigned",
+    enabled: true,
     table: "documents",
     fields: ["jobid"],
     builder: newMediaAddedReassignedBuilder
   },
   {
     key: "critical-parts-status-changed",
+    enabled: true,
     table: "joblines",
     fields: ["status"],
     onlyTruthyValues: ["status"],
@@ -117,6 +131,7 @@ const notificationScenarios = [
   },
   {
     key: "part-marked-back-ordered",
+    enabled: true,
     table: "joblines",
     fields: ["status"],
     builder: partMarkedBackOrderedBuilder,
@@ -133,12 +148,11 @@ const notificationScenarios = [
       }
     }
   },
-  // -------------- Difficult ---------------
-  // Holding off on this one for now
+  // Holding off on this one for now, spans multiple tables
   {
     key: "supplement-imported",
+    enabled: false,
     builder: supplementImportedBuilder
-    // spans multiple tables,
   }
 ];
 
@@ -159,6 +173,11 @@ const notificationScenarios = [
 const getMatchingScenarios = async (eventData, getBodyshopFromRedis) => {
   const matches = [];
   for (const scenario of notificationScenarios) {
+    // Check if the scenario is enabled; skip if not explicitly true
+    if (scenario.enabled !== true) {
+      continue;
+    }
+
     // If eventData has a table, then only scenarios with a table property that matches should be considered.
     if (eventData.table) {
       if (!scenario.table || eventData.table.name !== scenario.table) {

server/notifications/scenarioParser.js

@@ -35,7 +35,6 @@ const scenarioParser = async (req, jobIdField) => {
   } = req;
 
   // Step 1: Validate we know what user committed the action that fired the parser
-  // console.log("Step 1");
 
   const hasuraUserRole = event?.session_variables?.["x-hasura-role"];
   const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
@@ -52,7 +51,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 2: Extract just the jobId using the provided jobIdField
-  // console.log("Step 2");
 
   let jobId = null;
   if (jobIdField) {
@@ -70,7 +68,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 3: Query job watchers associated with the job ID using GraphQL
-  // console.log("Step 3");
 
   const watcherData = await gqlClient.request(queries.GET_JOB_WATCHERS, {
     jobid: jobId
@@ -96,7 +93,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 5: Perform the full event diff now that we know there are watchers
-  // console.log("Step 5");
 
   const eventData = await eventParser({
     newData: event.data.new,
@@ -107,7 +103,6 @@ const scenarioParser = async (req, jobIdField) => {
   });
 
   // Step 6: Extract body shop information from the job data
-  // console.log("Step 6");
 
   const bodyShopId = watcherData?.job?.bodyshop?.id;
   const bodyShopName = watcherData?.job?.bodyshop?.shopname;
@@ -122,7 +117,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 7: Identify scenarios that match the event data and job context
-  // console.log("Step 7");
 
   const matchingScenarios = await getMatchingScenarios(
     {
@@ -155,7 +149,6 @@ const scenarioParser = async (req, jobIdField) => {
   };
 
   // Step 8: Query notification settings for the job watchers
-  // console.log("Step 8");
 
   const associationsData = await gqlClient.request(queries.GET_NOTIFICATION_ASSOCIATIONS, {
     emails: jobWatchers.map((x) => x.email),
@@ -173,7 +166,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 9: Filter scenario watchers based on their enabled notification methods
-  // console.log("Step 9");
 
   finalScenarioData.matchingScenarios = finalScenarioData.matchingScenarios.map((scenario) => ({
     ...scenario,
@@ -213,7 +205,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 10: Build and collect scenarios to dispatch notifications for
-  // console.log("Step 10");
 
   const scenariosToDispatch = [];
 
@@ -240,7 +231,6 @@ const scenarioParser = async (req, jobIdField) => {
     }
 
     // Step 11: Filter scenario fields to include only those that changed
-    // console.log("Step 11");
 
     const filteredScenarioFields =
       scenario.fields?.filter((field) => eventData.changedFieldNames.includes(field)) || [];
@@ -274,7 +264,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 12: Dispatch email notifications to the email queue
-  // console.log("Step 12");
 
   const emailsToDispatch = scenariosToDispatch.map((scenario) => scenario?.email);
   if (!isEmpty(emailsToDispatch)) {
@@ -287,7 +276,6 @@ const scenarioParser = async (req, jobIdField) => {
   }
 
   // Step 13: Dispatch app notifications to the app queue
-  // console.log("Step 13");
 
   const appsToDispatch = scenariosToDispatch.map((scenario) => scenario?.app);
   if (!isEmpty(appsToDispatch)) {

server/opensearch/os-handler.js

@@ -160,6 +160,11 @@ async function OpenSearchUpdateHandler(req, res) {
       res.status(200).json(response.body);
     }
   } catch (error) {
+    // We don't want this spam message existing in development/test,
+    if (process.env?.NODE_ENV !== "production" && error?.message === "Invalid URL") {
+      return res.status(400).json(JSON.stringify(error));
+    }
+
     logger.log("os-handler-error", "ERROR", null, null, {
       id: req.body.event.data.new.id,
       index: req.body.table.name,
@@ -167,6 +172,7 @@ async function OpenSearchUpdateHandler(req, res) {
       stack: error.stack
       // body: document
     });
+
     res.status(400).json(JSON.stringify(error));
   }
 }

server/routes/miscellaneousRoutes.js

@@ -14,7 +14,7 @@ const { taskAssignedEmail, tasksRemindEmail } = require("../email/tasksEmails");
 const { canvastest } = require("../render/canvas-handler");
 const { alertCheck } = require("../alerts/alertcheck");
 const updateBodyshopCache = require("../web-sockets/updateBodyshopCache");
-const uuid = require("uuid").v4;
+const { v4 } = require("uuid");
 
 //Test route to ensure Express is responding.
 router.get("/test", eventAuthorizationMiddleware, async function (req, res) {
@@ -83,7 +83,7 @@ router.get("/wstest", eventAuthorizationMiddleware, (req, res) => {
       // image_path: [],
       newMessage: {
         conversation: {
-          id: uuid(),
+          id: v4(),
           archived: false,
           bodyshop: {
             id: "bfec8c8c-b7f1-49e0-be4c-524455f4e582",

server/routes/smsRoutes.js

@@ -7,6 +7,7 @@ const { status, markConversationRead } = require("../sms/status");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 
 // Twilio Webhook Middleware for production
+// TODO: Look into this because it technically is never validating anything
 const twilioWebhookMiddleware = twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" });
 
 router.post("/receive", twilioWebhookMiddleware, receive);

server/utils/devDebugLogger.js

@@ -0,0 +1,10 @@
+const logger = require("./logger");
+
+const devDebugLogger = (message, meta) => {
+  if (process.env?.NODE_ENV === "production") {
+    return;
+  }
+  logger.logger.debug(message, meta);
+};
+
+module.exports = devDebugLogger;

server/utils/getBullMQPrefix.js

@@ -0,0 +1,3 @@
+const getBullMQPrefix = () => (process.env?.NODE_ENV === "production" ? "{PROD-BULLMQ}" : "{DEV-BULLMQ}");
+
+module.exports = getBullMQPrefix;

server/utils/redisHelpers.js

@@ -1,4 +1,5 @@
 const { GET_BODYSHOP_BY_ID } = require("../graphql-client/queries");
+const devDebugLogger = require("./devDebugLogger");
 const client = require("../graphql-client/graphql-client").client;
 
 const BODYSHOP_CACHE_TTL = 3600; // 1 hour
@@ -10,6 +11,14 @@ const BODYSHOP_CACHE_TTL = 3600; // 1 hour
  */
 const getBodyshopCacheKey = (bodyshopId) => `bodyshop-cache:${bodyshopId}`;
 
+/**
+ * Generate a cache key for a user socket mapping
+ * @param email
+ * @returns {`user:${string}:${string}:socketMapping`}
+ */
+const getUserSocketMappingKey = (email) =>
+  `user:${process.env?.NODE_ENV === "production" ? "prod" : "dev"}:${email}:socketMapping`;
+
 /**
  * Fetch bodyshop data from the database
  * @param bodyshopId
@@ -69,112 +78,17 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
-  // Store multiple session data in Redis
-  const setMultipleSessionData = async (socketId, keyValues) => {
-    try {
-      // keyValues is expected to be an object { key1: value1, key2: value2, ... }
-      const entries = Object.entries(keyValues).map(([key, value]) => [key, JSON.stringify(value)]);
-      await pubClient.hset(`socket:${socketId}`, ...entries.flat());
-    } catch (error) {
-      logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  // Retrieve multiple session data from Redis
-  const getMultipleSessionData = async (socketId, keys) => {
-    try {
-      const data = await pubClient.hmget(`socket:${socketId}`, keys);
-      // Redis returns an object with null values for missing keys, so we parse the non-null ones
-      return Object.fromEntries(keys.map((key, index) => [key, data[index] ? JSON.parse(data[index]) : null]));
-    } catch (error) {
-      logger.log(`Error Getting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  const setMultipleFromArraySessionData = async (socketId, keyValueArray) => {
-    try {
-      // Use Redis multi/pipeline to batch the commands
-      const multi = pubClient.multi();
-      keyValueArray.forEach(([key, value]) => {
-        multi.hset(`socket:${socketId}`, key, JSON.stringify(value));
-      });
-      await multi.exec(); // Execute all queued commands
-    } catch (error) {
-      logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  // Helper function to add an item to the end of the Redis list
-  const addItemToEndOfList = async (socketId, key, newItem) => {
-    try {
-      await pubClient.rpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
-    } catch (error) {
-      let userEmail = "unknown";
-      let socketMappings = {};
-      try {
-        const userData = await getSessionData(socketId, "user");
-        if (userData && userData.email) {
-          userEmail = userData.email;
-          socketMappings = await getUserSocketMapping(userEmail);
-        }
-      } catch (sessionError) {
-        logger.log(`Failed to fetch session data for socket ${socketId}: ${sessionError}`, "ERROR", "redis");
-      }
-      const mappingString = JSON.stringify(socketMappings, null, 2);
-      const errorMessage = `Error adding item to the end of the list for socket ${socketId}: ${error}. User: ${userEmail}, Socket Mappings: ${mappingString}`;
-      logger.log(errorMessage, "ERROR", "redis");
-    }
-  };
-
-  // Helper function to add an item to the beginning of the Redis list
-  const addItemToBeginningOfList = async (socketId, key, newItem) => {
-    try {
-      await pubClient.lpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
-    } catch (error) {
-      logger.log(`Error adding item to the beginning of the list for socket ${socketId}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  // Helper function to clear a list in Redis
-  const clearList = async (socketId, key) => {
-    try {
-      await pubClient.del(`socket:${socketId}:${key}`);
-    } catch (error) {
-      logger.log(`Error clearing list for socket ${socketId}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  // Add methods to manage room users
-  const addUserToRoom = async (room, user) => {
-    try {
-      await pubClient.sadd(room, JSON.stringify(user));
-    } catch (error) {
-      logger.log(`Error adding user to room ${room}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  const removeUserFromRoom = async (room, user) => {
-    try {
-      await pubClient.srem(room, JSON.stringify(user));
-    } catch (error) {
-      logger.log(`Error removing user to room ${room}: ${error}`, "ERROR", "redis");
-    }
-  };
-
-  const getUsersInRoom = async (room) => {
-    try {
-      const users = await pubClient.smembers(room);
-      return users.map((user) => JSON.parse(user));
-    } catch (error) {
-      logger.log(`Error getting users in room ${room}: ${error}`, "ERROR", "redis");
-    }
-  };
-
+  /**
+   * Add a socket mapping for a user
+   * @param email
+   * @param socketId
+   * @param bodyshopId
+   * @returns {Promise<void>}
+   */
   const addUserSocketMapping = async (email, socketId, bodyshopId) => {
-    const userKey = `user:${email}`;
-    const socketMappingKey = `${userKey}:socketMapping`;
+    const socketMappingKey = getUserSocketMappingKey(email);
     try {
-      logger.log(`Adding socket ${socketId} to user ${email} for bodyshop ${bodyshopId}`, "debug", "redis");
+      devDebugLogger(`Adding socket ${socketId} to user ${email} for bodyshop ${bodyshopId}`);
       // Save the mapping: socketId -> bodyshopId
       await pubClient.hset(socketMappingKey, socketId, bodyshopId);
       // Set TTL (24 hours) for the mapping hash
@@ -184,38 +98,45 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
+  /**
+   * Refresh the TTL for a user's socket mapping
+   * @param email
+   * @returns {Promise<void>}
+   */
   const refreshUserSocketTTL = async (email) => {
-    const userKey = `user:${email}`;
-    const socketMappingKey = `${userKey}:socketMapping`;
+    const socketMappingKey = getUserSocketMappingKey(email);
+
     try {
       const exists = await pubClient.exists(socketMappingKey);
       if (exists) {
         await pubClient.expire(socketMappingKey, 86400);
-        logger.log(`Refreshed TTL for ${email} socket mapping`, "debug", "redis");
+        devDebugLogger(`Refreshed TTL for ${email} socket mapping`);
       }
     } catch (error) {
       logger.log(`Error refreshing TTL for ${email}: ${error}`, "ERROR", "redis");
     }
   };
 
+  /**
+   * Remove a socket mapping for a user
+   * @param email
+   * @param socketId
+   * @returns {Promise<void>}
+   */
   const removeUserSocketMapping = async (email, socketId) => {
-    const userKey = `user:${email}`;
-    const socketMappingKey = `${userKey}:socketMapping`;
+    const socketMappingKey = getUserSocketMappingKey(email);
+
     try {
-      logger.log(`Removing socket ${socketId} mapping for user ${email}`, "DEBUG", "redis");
+      devDebugLogger(`Removing socket ${socketId} mapping for user ${email}`);
       // Look up the bodyshopId associated with this socket
       const bodyshopId = await pubClient.hget(socketMappingKey, socketId);
       if (!bodyshopId) {
-        logger.log(`Socket ${socketId} not found for user ${email}`, "DEBUG", "redis");
+        devDebugLogger(`Socket ${socketId} not found for user ${email}`);
         return;
       }
       // Remove the socket mapping
       await pubClient.hdel(socketMappingKey, socketId);
-      logger.log(
-        `Removed socket ${socketId} (associated with bodyshop ${bodyshopId}) for user ${email}`,
-        "DEBUG",
-        "redis"
-      );
+      devDebugLogger(`Removed socket ${socketId} (associated with bodyshop ${bodyshopId}) for user ${email}`);
 
       // Refresh TTL if any socket mappings remain
       const remainingSockets = await pubClient.hlen(socketMappingKey);
@@ -227,9 +148,14 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
+  /**
+   * Get all socket mappings for a user
+   * @param email
+   * @returns {Promise<{}>}
+   */
   const getUserSocketMapping = async (email) => {
-    const userKey = `user:${email}`;
-    const socketMappingKey = `${userKey}:socketMapping`;
+    const socketMappingKey = getUserSocketMappingKey(email);
+
     try {
       // Retrieve all socket mappings for the user
       const mapping = await pubClient.hgetall(socketMappingKey);
@@ -249,9 +175,15 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
+  /**
+   * Get socket IDs for a user by bodyshopId
+   * @param email
+   * @param bodyshopId
+   * @returns {Promise<{socketIds: [string, string], ttl: *}>}
+   */
   const getUserSocketMappingByBodyshop = async (email, bodyshopId) => {
-    const userKey = `user:${email}`;
-    const socketMappingKey = `${userKey}:socketMapping`;
+    const socketMappingKey = getUserSocketMappingKey(email);
+
     try {
       // Retrieve all socket mappings for the user
       const mapping = await pubClient.hgetall(socketMappingKey);
@@ -270,7 +202,11 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
-  // Get bodyshop data from Redis or fetch from DB if missing
+  /**
+   * Get bodyshop data from Redis
+   * @param bodyshopId
+   * @returns {Promise<*>}
+   */
   const getBodyshopFromRedis = async (bodyshopId) => {
     const key = getBodyshopCacheKey(bodyshopId);
     try {
@@ -288,7 +224,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
       await pubClient.set(key, jsonData);
       await pubClient.expire(key, BODYSHOP_CACHE_TTL);
 
-      logger.log("bodyshop-cache-miss", "DEBUG", "redis", null, {
+      devDebugLogger("bodyshop-cache-miss", {
         bodyshopId,
         action: "Fetched from DB and cached"
       });
@@ -303,14 +239,19 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
-  // Update or invalidate bodyshop data in Redis
+  /**
+   * Update or invalidate bodyshop data in Redis
+   * @param bodyshopId
+   * @param values
+   * @returns {Promise<void>}
+   */
   const updateOrInvalidateBodyshopFromRedis = async (bodyshopId, values = null) => {
     const key = getBodyshopCacheKey(bodyshopId);
     try {
       if (!values) {
         // Invalidate cache by deleting the key
         await pubClient.del(key);
-        logger.log("bodyshop-cache-invalidate", "DEBUG", "api", "redis", {
+        devDebugLogger("bodyshop-cache-invalidate", {
           bodyshopId,
           action: "Cache invalidated"
         });
@@ -319,7 +260,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
         const jsonData = JSON.stringify(values);
         await pubClient.set(key, jsonData);
         await pubClient.expire(key, BODYSHOP_CACHE_TTL);
-        logger.log("bodyshop-cache-update", "DEBUG", "api", "redis", {
+        devDebugLogger("bodyshop-cache-update", {
           bodyshopId,
           action: "Cache updated",
           values
@@ -335,19 +276,118 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     }
   };
 
+  // NOTE: The following code was written for an abandoned branch and things have changes since the,
+  // Leaving it here for demonstration purposes, commenting it out so it does not get used
+
+  // Store multiple session data in Redis
+  // const setMultipleSessionData = async (socketId, keyValues) => {
+  //   try {
+  //     // keyValues is expected to be an object { key1: value1, key2: value2, ... }
+  //     const entries = Object.entries(keyValues).map(([key, value]) => [key, JSON.stringify(value)]);
+  //     await pubClient.hset(`socket:${socketId}`, ...entries.flat());
+  //   } catch (error) {
+  //     logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Retrieve multiple session data from Redis
+  // const getMultipleSessionData = async (socketId, keys) => {
+  //   try {
+  //     const data = await pubClient.hmget(`socket:${socketId}`, keys);
+  //     // Redis returns an object with null values for missing keys, so we parse the non-null ones
+  //     return Object.fromEntries(keys.map((key, index) => [key, data[index] ? JSON.parse(data[index]) : null]));
+  //   } catch (error) {
+  //     logger.log(`Error Getting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // const setMultipleFromArraySessionData = async (socketId, keyValueArray) => {
+  //   try {
+  //     // Use Redis multi/pipeline to batch the commands
+  //     const multi = pubClient.multi();
+  //     keyValueArray.forEach(([key, value]) => {
+  //       multi.hset(`socket:${socketId}`, key, JSON.stringify(value));
+  //     });
+  //     await multi.exec(); // Execute all queued commands
+  //   } catch (error) {
+  //     logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Helper function to add an item to the end of the Redis list
+  // const addItemToEndOfList = async (socketId, key, newItem) => {
+  //   try {
+  //     await pubClient.rpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
+  //   } catch (error) {
+  //     let userEmail = "unknown";
+  //     let socketMappings = {};
+  //     try {
+  //       const userData = await getSessionData(socketId, "user");
+  //       if (userData && userData.email) {
+  //         userEmail = userData.email;
+  //         socketMappings = await getUserSocketMapping(userEmail);
+  //       }
+  //     } catch (sessionError) {
+  //       logger.log(`Failed to fetch session data for socket ${socketId}: ${sessionError}`, "ERROR", "redis");
+  //     }
+  //     const mappingString = JSON.stringify(socketMappings, null, 2);
+  //     const errorMessage = `Error adding item to the end of the list for socket ${socketId}: ${error}. User: ${userEmail}, Socket Mappings: ${mappingString}`;
+  //     logger.log(errorMessage, "ERROR", "redis");
+  //   }
+  // };
+
+  // Helper function to add an item to the beginning of the Redis list
+  // const addItemToBeginningOfList = async (socketId, key, newItem) => {
+  //   try {
+  //     await pubClient.lpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
+  //   } catch (error) {
+  //     logger.log(`Error adding item to the beginning of the list for socket ${socketId}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Helper function to clear a list in Redis
+  // const clearList = async (socketId, key) => {
+  //   try {
+  //     await pubClient.del(`socket:${socketId}:${key}`);
+  //   } catch (error) {
+  //     logger.log(`Error clearing list for socket ${socketId}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Add methods to manage room users
+  // const addUserToRoom = async (room, user) => {
+  //   try {
+  //     await pubClient.sadd(room, JSON.stringify(user));
+  //   } catch (error) {
+  //     logger.log(`Error adding user to room ${room}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Remove users from room
+  // const removeUserFromRoom = async (room, user) => {
+  //   try {
+  //     await pubClient.srem(room, JSON.stringify(user));
+  //   } catch (error) {
+  //     logger.log(`Error removing user to room ${room}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
+  // Get Users in room
+  // const getUsersInRoom = async (room) => {
+  //   try {
+  //     const users = await pubClient.smembers(room);
+  //     return users.map((user) => JSON.parse(user));
+  //   } catch (error) {
+  //     logger.log(`Error getting users in room ${room}: ${error}`, "ERROR", "redis");
+  //   }
+  // };
+
   const api = {
+    getUserSocketMappingKey,
+    getBodyshopCacheKey,
     setSessionData,
     getSessionData,
     clearSessionData,
-    setMultipleSessionData,
-    getMultipleSessionData,
-    setMultipleFromArraySessionData,
-    addItemToEndOfList,
-    addItemToBeginningOfList,
-    clearList,
-    addUserToRoom,
-    removeUserFromRoom,
-    getUsersInRoom,
     addUserSocketMapping,
     removeUserSocketMapping,
     getUserSocketMappingByBodyshop,
@@ -355,6 +395,15 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
     refreshUserSocketTTL,
     getBodyshopFromRedis,
     updateOrInvalidateBodyshopFromRedis
+    // setMultipleSessionData,
+    // getMultipleSessionData,
+    // setMultipleFromArraySessionData,
+    // addItemToEndOfList,
+    // addItemToBeginningOfList,
+    // clearList,
+    // addUserToRoom,
+    // removeUserFromRoom,
+    // getUsersInRoom,
   };
 
   Object.assign(module.exports, api);