IO-3066 Call partner refresh on shop change.

Merged in release/2025-04-11 (pull request #2267 )
Release/2025-04-11 into master-AIO - IO-2769, IO-2885, IO-3045, IO-3066, IO-3193, IO-3198, IO-3202
2025-04-14 15:29:45 -07:00 · 2025-04-12 01:27:08 +00:00 · 2025-04-10 16:28:21 +00:00 · 2025-04-10 12:27:54 -04:00 · 2025-04-09 16:53:04 +00:00 · 2025-04-09 12:52:23 -04:00
11 changed files with 40 additions and 18 deletions
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -23,7 +23,7 @@
        "@sentry/cli": "^2.43.0",
        "@sentry/react": "^9.11.0",
        "@sentry/vite-plugin": "^3.3.1",
-        "@splitsoftware/splitio-react": "^2.1.0",
+        "@splitsoftware/splitio-react": "^2.1.1",
        "@tanem/react-nprogress": "^5.0.53",
        "antd": "^5.24.6",
        "apollo-link-logger": "^2.0.1",
@@ -4718,9 +4718,9 @@
      }
    },
    "node_modules/@splitsoftware/splitio-react": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-react/-/splitio-react-2.1.0.tgz",
-      "integrity": "sha512-iAGXl/qadHVFUQA/+asX8UGwDPpNi6WCKhNIzLZ6NSvt38+M8Bpc3CMnkYNEXsNsz1J+C26ICsMZ067YQ96k6g==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-react/-/splitio-react-2.1.1.tgz",
+      "integrity": "sha512-cUMyIdsgzDEFgUZxoV/PyjQR0OXt+Ffqqjh2LVcADsVDpTGUf95ydEVYaszZRVoYYj+hMw9xMw6Yfr0b+uejIQ==",
      "license": "Apache-2.0",
      "dependencies": {
        "@splitsoftware/splitio": "11.2.0",
--- a/client/package.json
+++ b/client/package.json
@@ -22,7 +22,7 @@
    "@sentry/cli": "^2.43.0",
    "@sentry/react": "^9.11.0",
    "@sentry/vite-plugin": "^3.3.1",
-    "@splitsoftware/splitio-react": "^2.1.0",
+    "@splitsoftware/splitio-react": "^2.1.1",
    "@tanem/react-nprogress": "^5.0.53",
    "antd": "^5.24.6",
    "apollo-link-logger": "^2.0.1",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -142,11 +142,10 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
    >
      <ProductFruitsWrapper
        currentUser={currentUser}
-        workspaceCode={InstanceRenderMgr({
-          imex: null,
-          rome: "9BkbEseqNqxw8jUH"
-        })}
+        bodyshop={bodyshop}
+        workspaceCode={bodyshop?.tours_enabled ? "9BkbEseqNqxw8jUH" : ""}
      />
+
      <NotificationProvider>
        <Routes>
          <Route
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -1,8 +1,16 @@
 import React from "react";
-import { ProductFruits } from "react-product-fruits";
 import PropTypes from "prop-types";
+import { ProductFruits } from "react-product-fruits";
+import dayjs from "dayjs";
+
+const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode }) => {
+  const featureProps = bodyshop?.features
+    ? Object.entries(bodyshop.features).reduce((acc, [key, value]) => {
+        acc[key] = value === true || (typeof value === "string" && dayjs(value).isAfter(dayjs()));
+        return acc;
+      }, {})
+    : {};

-const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
  return (
    workspaceCode &&
    currentUser?.authorized === true &&
@@ -14,7 +22,8 @@ const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
        language="en"
        user={{
          email: currentUser.email,
-          username: currentUser.email
+          username: currentUser.email,
+          props: featureProps
        }}
      />
    )
@@ -28,5 +37,6 @@ ProductFruitsWrapper.propTypes = {
    authorized: PropTypes.bool,
    email: PropTypes.string
  }),
-  workspaceCode: PropTypes.string
+  workspaceCode: PropTypes.string,
+  bodyshop: PropTypes.object
 };
--- a/client/src/components/profile-shops/profile-shops.container.jsx
+++ b/client/src/components/profile-shops/profile-shops.container.jsx
@@ -54,6 +54,9 @@ export function ProfileShopsContainer({ bodyshop, currentUser }) {

    //Force window refresh.

+    //Ping the new partner to refresh.
+    axios.post("http://localhost:1337/refresh");
+
    window.location.reload();
  };

--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -57,6 +57,7 @@ export const QUERY_BODYSHOP = gql`
      logo_img_path
      md_ro_statuses
      md_order_statuses
+      tours_enabled
      md_functionality_toggles
      shopname
      state
@@ -186,6 +187,7 @@ export const UPDATE_SHOP = gql`
        phone
        federal_tax_id
        id
+        tours_enabled
        insurance_vendor_id
        logo_img_path
        md_ro_statuses
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -965,6 +965,7 @@
          - insurance_vendor_id
          - intakechecklist
          - intellipay_config
+          - intellipay_merchant_id
          - jc_hourly_rates
          - jobsizelimit
          - last_name_first
@@ -1023,6 +1024,7 @@
          - template_header
          - textid
          - timezone
+          - tours_enabled
          - tt_allow_post_to_invoiced
          - tt_enforce_hours_for_tech_console
          - updated_at
--- a/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/down.sql
+++ b/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/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"."bodyshops" add column "tours_enabled" boolean
+--  not null default 'true';
--- a/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/up.sql
+++ b/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "tours_enabled" boolean
+ not null default 'true';
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
        "bee-queue": "^1.7.1",
        "better-queue": "^3.8.12",
        "bluebird": "^3.7.2",
-        "bullmq": "^5.47.2",
+        "bullmq": "^5.48.0",
        "chart.js": "^4.4.8",
        "cloudinary": "^2.6.0",
        "compression": "^1.8.0",
@@ -5139,9 +5139,9 @@
      }
    },
    "node_modules/bullmq": {
-      "version": "5.47.2",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.47.2.tgz",
-      "integrity": "sha512-JMI2uEV3YjohGTcy4Cqt/4LHEXcBA2BVS7x4XS7sv4qa5oLdsZh9p5fkwSWg6f8lqtcHbm3ceXkTFR0JC9gayw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.48.0.tgz",
+      "integrity": "sha512-fUtQrkefr6VAYYPjLXKHR6scWhwGI/0ok1wfAEPyhq8aRnJK8PJGEXUSssTEzDShadgLLXCmIOsVyhbs5/XWWg==",
      "license": "MIT",
      "dependencies": {
        "cron-parser": "^4.9.0",
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
    "bee-queue": "^1.7.1",
    "better-queue": "^3.8.12",
    "bluebird": "^3.7.2",
-    "bullmq": "^5.47.2",
+    "bullmq": "^5.48.0",
    "chart.js": "^4.4.8",
    "cloudinary": "^2.6.0",
    "compression": "^1.8.0",
Author	SHA1	Message	Date
Patrick Fic	22b011139d	IO-3066 Call partner refresh on shop change.	2025-04-14 15:29:45 -07:00
Dave Richer	e015d3574a	Merged in release/2025-04-11 (pull request #2267 ) Release/2025-04-11 into master-AIO - IO-2769, IO-2885, IO-3045, IO-3066, IO-3193, IO-3198, IO-3202	2025-04-12 01:27:08 +00:00
Dave Richer	60140902d4	Merged in feature/IO-3045-Product-Fruits-Tours-Modifications (pull request #2265 ) feature/IO-3045-Product-Fruits-Tours-Modifications - Add in roles prop on Product fruits, tie the usage of it to a new db bodyshop var tours_enabled.	2025-04-10 16:28:21 +00:00
Dave Richer	84f41b2c11	feature/IO-3045-Product-Fruits-Tours-Modifications - Add in roles prop on Product fruits, tie the usage of it to a new db bodyshop var tours_enabled.	2025-04-10 12:27:54 -04:00
Dave Richer	282fa787a9	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2263 ) feature/IO-2769-Job-Totals-Testing - packages, final update	2025-04-09 16:53:04 +00:00
Dave Richer	037efff81c	feature/IO-2769-Job-Totals-Testing - packages, final update	2025-04-09 12:52:23 -04:00
Patrick Fic	e26eb17d09	Merged in feature/IO-3066-ems-parts-order-data (pull request #2262 ) IO-3066 Add additional CIECA fields for new partner Approved-by: Patrick Fic	2025-04-09 16:34:42 +00:00