IO-3075 Crisp Basic Info

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/package-lock.json

@@ -13,19 +13,19 @@
         "@apollo/client": "^3.13.6",
         "@emotion/is-prop-valid": "^1.3.1",
         "@fingerprintjs/fingerprintjs": "^4.6.1",
-        "@firebase/analytics": "^0.10.16",
+        "@firebase/analytics": "^0.10.13",
-        "@firebase/app": "^0.13.0",
+        "@firebase/app": "^0.12.1",
-        "@firebase/auth": "^1.10.5",
+        "@firebase/auth": "^1.10.2",
-        "@firebase/firestore": "^4.7.15",
+        "@firebase/firestore": "^4.7.12",
-        "@firebase/messaging": "^0.12.21",
+        "@firebase/messaging": "^0.12.18",
         "@jsreport/browser-client": "^3.1.0",
-        "@reduxjs/toolkit": "^2.8.2",
+        "@reduxjs/toolkit": "^2.8.1",
         "@sentry/cli": "^2.45.0",
-        "@sentry/react": "^9.22.0",
+        "@sentry/react": "^9.18.0",
-        "@sentry/vite-plugin": "^3.5.0",
+        "@sentry/vite-plugin": "^3.4.0",
         "@splitsoftware/splitio-react": "^2.1.1",
         "@tanem/react-nprogress": "^5.0.53",
-        "antd": "^5.25.2",
+        "antd": "^5.25.1",
         "apollo-link-logger": "^2.0.1",
         "apollo-link-sentry": "^4.3.0",
         "autosize": "^6.0.1",
@@ -49,7 +49,7 @@
         "normalize-url": "^8.0.1",
         "object-hash": "^3.0.0",
         "prop-types": "^15.8.1",
-        "query-string": "^9.2.0",
+        "query-string": "^9.1.2",
         "raf-schd": "^4.0.3",
         "react": "^18.3.1",
         "react-big-calendar": "^1.18.0",
@@ -78,7 +78,7 @@
         "redux-saga": "^1.3.0",
         "redux-state-sync": "^3.1.4",
         "reselect": "^5.1.1",
-        "sass": "^1.89.0",
+        "sass": "^1.88.0",
         "socket.io-client": "^4.8.1",
         "styled-components": "^6.1.18",
         "subscriptions-transport-ws": "^0.11.0",
@@ -90,12 +90,12 @@
         "@ant-design/icons": "^6.0.0",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@babel/preset-react": "^7.27.1",
-        "@dotenvx/dotenvx": "^1.44.1",
+        "@dotenvx/dotenvx": "^1.44.0",
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/react": "^11.14.0",
-        "@eslint/js": "^9.27.0",
+        "@eslint/js": "^9.26.0",
         "@playwright/test": "^1.51.1",
-        "@sentry/webpack-plugin": "^3.5.0",
+        "@sentry/webpack-plugin": "^3.4.0",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.3.0",
@@ -108,7 +108,7 @@
         "eslint-plugin-react": "^7.37.5",
         "globals": "^15.15.0",
         "jsdom": "^26.0.0",
-        "memfs": "^4.17.2",
+        "memfs": "^4.17.1",
         "os-browserify": "^0.3.0",
         "playwright": "^1.51.1",
         "react-error-overlay": "^6.1.0",
@@ -120,7 +120,7 @@
         "vite-plugin-node-polyfills": "^0.23.0",
         "vite-plugin-pwa": "^1.0.0",
         "vite-plugin-style-import": "^2.0.0",
-        "vitest": "^3.1.4",
+        "vitest": "^3.1.3",
         "workbox-window": "^7.3.0"
       },
       "engines": {
@@ -2587,9 +2587,9 @@
       }
     },
     "node_modules/@dotenvx/dotenvx": {
-      "version": "1.44.1",
+      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.44.1.tgz",
+      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.44.0.tgz",
-      "integrity": "sha512-j1QImCqf/XJmhIjC1OPpgiZV9g370HG9MNT9s/CDwCKsoYzNCPEKK+GfsidahJx7yIlBbm+4dPLlGec+bKn7oA==",
+      "integrity": "sha512-18Aa+7KP/L2Kj9lxmT4EJZnsCq/xGIHgzU26rdzsKMhjpeT3YY+qin/dNAnIaVHPZnee7kXpZL55M9htd30r7Q==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -2912,16 +2912,13 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
+      "version": "9.26.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
       }
     },
     "node_modules/@fingerprintjs/fingerprintjs": {
@@ -2934,15 +2931,15 @@
       }
     },
     "node_modules/@firebase/analytics": {
-      "version": "0.10.16",
+      "version": "0.10.13",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.16.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.13.tgz",
-      "integrity": "sha512-cMtp19He7Fd6uaj/nDEul+8JwvJsN8aRSJyuA1QN3QrKvfDDp+efjVurJO61sJpkVftw9O9nNMdhFbRcTmTfRQ==",
+      "integrity": "sha512-X+6wMOPgA9l0AeeMdMcMfaCP4XKPvrhx55MGuMrfHvUrOvFKldpzBum7KkoGJMoexKmqmKP+mCmJMY9Fb8K6Hw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
-        "@firebase/installations": "0.6.17",
+        "@firebase/installations": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -2950,14 +2947,14 @@
       }
     },
     "node_modules/@firebase/app": {
-      "version": "0.13.0",
+      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.12.1.tgz",
-      "integrity": "sha512-Vj3MST245nq+V5UmmfEkB3isIgPouyUr8yGJlFeL9Trg/umG5ogAvrjAYvQ8gV7daKDoQSRnJKWI2JFpQqRsuQ==",
+      "integrity": "sha512-ASExOlmmjRMdwOQ65Oj6R9JBqa7iiT1/LgZjtbU7FqxoJZNWHrt39NJ/z2bjyYDdAHX8jkY7muFqzahScCXgfA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -2966,14 +2963,14 @@
       }
     },
     "node_modules/@firebase/auth": {
-      "version": "1.10.5",
+      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.5.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.2.tgz",
-      "integrity": "sha512-6wF/NdMTwObL4RNQePunuzMr9O3gyftisvFZFFKf57D2HONXo87YymogRV8d+Z7SLA0rcNBN1gLJVk2D0y97gA==",
+      "integrity": "sha512-HHudcj3CJyXpoMKslNOVHGSNJdAUjvy5xBA/G/uPb32QFqvx5F3EW9RDYvve2IHEN7Vpc1QTkk/28J32x83UGA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "engines": {
@@ -2990,12 +2987,12 @@
       }
     },
     "node_modules/@firebase/component": {
-      "version": "0.6.17",
+      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.17.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.14.tgz",
-      "integrity": "sha512-M6DOg7OySrKEFS8kxA3MU5/xc37fiOpKPMz6cTsMUcsuKB6CiZxxNAvgFta8HGRgEpZbi8WjGIj6Uf+TpOhyzg==",
+      "integrity": "sha512-kf/zAT8GQJ9nYoHuj0mv7twp1QzifKYrO+GsmsVHHM+Hi9KkmI7E3B3J0CtihHpb34vinl4gbJrYJ2p2wfvc9A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "engines": {
@@ -3003,14 +3000,14 @@
       }
     },
     "node_modules/@firebase/firestore": {
-      "version": "4.7.15",
+      "version": "4.7.12",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.15.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.12.tgz",
-      "integrity": "sha512-FgWTmkNBEXdKCoN2ngBNjrMaXuBx6QwjiZZVnOGg+VjUmiBq5gAqlDIW5bZY6i/NYvLUrWugdqIs7y9GHEqwww==",
+      "integrity": "sha512-50KRdSp8xA7+G0wfWxlnCoEN951mt8BVdLMxeP57Rehj2DqIb41q6Fc6JH0dfQ4TlMqWua1YfVY1jPEAaHVF9w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "@firebase/webchannel-wrapper": "1.0.3",
         "@grpc/grpc-js": "~1.9.0",
         "@grpc/proto-loader": "^0.7.8",
@@ -3024,13 +3021,13 @@
       }
     },
     "node_modules/@firebase/installations": {
-      "version": "0.6.17",
+      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.17.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.14.tgz",
-      "integrity": "sha512-zfhqCNJZRe12KyADtRrtOj+SeSbD1H/K8J24oQAJVv/u02eQajEGlhZtcx9Qk7vhGWF5z9dvIygVDYqLL4o1XQ==",
+      "integrity": "sha512-uE837g9+sv6PfjWPgOfG3JtjZ+hJ7KBHO4UVenVsvhzgOxFkvLjO/bgE7fyvsaD3fOHSXunx3adRIg4eUEMPyA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -3051,15 +3048,15 @@
       }
     },
     "node_modules/@firebase/messaging": {
-      "version": "0.12.21",
+      "version": "0.12.18",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.21.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.18.tgz",
-      "integrity": "sha512-bYJ2Evj167Z+lJ1ach6UglXz5dUKY1zrJZd15GagBUJSR7d9KfiM1W8dsyL0lDxcmhmA/sLaBYAAhF1uilwN0g==",
+      "integrity": "sha512-2MGhUGoCZloB7ysoYzG/T2nnRmHYLT+AcqYouZuD6APabpkDhF8lHsmSQq4MFSlXhI3DKFOXxjuvbY8ec4C2JQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.17",
+        "@firebase/component": "0.6.14",
-        "@firebase/installations": "0.6.17",
+        "@firebase/installations": "0.6.14",
         "@firebase/messaging-interop-types": "0.2.3",
-        "@firebase/util": "1.12.0",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -3074,9 +3071,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@firebase/util": {
-      "version": "1.12.0",
+      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.11.1.tgz",
-      "integrity": "sha512-Z4rK23xBCwgKDqmzGVMef+Vb4xso2j5Q8OG0vVL4m4fA5ZjPMYQazu8OJJC3vtQRC3SQ/Pgx/6TPNVsCd70QRw==",
+      "integrity": "sha512-RXg4WE8C2LUrvoV/TMGRTu223zZf9Dq9MR8yHZio9nF9TpLnpCPURw9VWWB2WATDl6HfIdWfl2x2SJYtHkN4hw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3839,9 +3836,9 @@
       "license": "MIT"
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.8.2",
+      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.1.tgz",
-      "integrity": "sha512-MYlOhQ0sLdw4ud48FoC5w0dH9VfWQjtCjreKwYTT3l+r427qYC5Y8PihNutepr8XrNaBUDQo9khWUwQxZaqt5A==",
+      "integrity": "sha512-GLjHS13LiBdiuxSJvfWs3+Cx5yt97mCbuVlDteTusS6VRksPhoWviO8L1e3Re1G94m6lkw/l4pjEEyyNaGf19g==",
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
@@ -4461,88 +4458,88 @@
       "license": "MIT"
     },
     "node_modules/@sentry-internal/browser-utils": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.18.0.tgz",
-      "integrity": "sha512-Ou1tBnVxFAIn8i9gvrWzRotNJQYiu3awNXpsFCw6qFwmiKAVPa6b13vCdolhXnrIiuR77jY1LQnKh9hXpoRzsg==",
+      "integrity": "sha512-TwSlmgYpHhe55JpOcVApkM0XcXZh1/cYuEPKPFgeaaPD8BrQrLJJvwKxnonSWXOhdnkJxi4GgK7j7mw57PS4aA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "9.22.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/feedback": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.18.0.tgz",
-      "integrity": "sha512-zgMVkoC61fgi41zLcSZA59vOtKxcLrKBo1ECYhPD1hxEaneNqY5fhXDwlQBw96P5l2yqkgfX6YZtSdU4ejI9yA==",
+      "integrity": "sha512-QlrB8oQK+5bfhbgK6yHF6rLwLNJ9XuGblTc51yVkm4d4jn4W/HDyaNqMfQF+JXdTiFatl8oz2xdKR8kGK8kXyg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "9.22.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.18.0.tgz",
-      "integrity": "sha512-9GOycoKbrclcRXfcbNV8svbmAsOS5R4wXBQmKF4pFLkmFA/lJv9kdZSNYkRvkrxdNfbMIJXP+DV9EqTZcryXig==",
+      "integrity": "sha512-2A32FFwrlZtdpBruvpcLEfucu6BpyqOk3F4Bo5smM/5q7u0pa7q5d9FSY5l3nwKEAFAoLGv3hcCb+8wxMm50xA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "9.22.0",
+        "@sentry-internal/browser-utils": "9.18.0",
-        "@sentry/core": "9.22.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.18.0.tgz",
-      "integrity": "sha512-EcG9IMSEalFe49kowBTJObWjof/iHteDwpyuAszsFDdQUYATrVUtwpwN7o52vDYWJud4arhjrQnMamIGxa79eQ==",
+      "integrity": "sha512-3DEyQLmHcYgcwJ8n8eMhI6bhhawPuMc2xTT+Az8gXMqCO/X9ZACpipAmhXFjYP9Ptl+w0Vh3nllJw+gXc/DOsg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/replay": "9.22.0",
+        "@sentry-internal/replay": "9.18.0",
-        "@sentry/core": "9.22.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/babel-plugin-component-annotate": {
-      "version": "3.5.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.4.0.tgz",
-      "integrity": "sha512-s2go8w03CDHbF9luFGtBHKJp4cSpsQzNVqgIa9Pfa4wnjipvrK6CxVT4icpLA3YO6kg5u622Yoa5GF3cJdippw==",
+      "integrity": "sha512-tSzfc3aE7m0PM0Aj7HBDet5llH9AB9oc+tBQ8AvOqUSnWodLrNCuWeQszJ7mIBovD3figgCU3h0cvI6U5cDtsg==",
       "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.18.0.tgz",
-      "integrity": "sha512-3TeRm74dvX0JdjX0AgkQa+22iUHwHnY+Q6M05NZ+tDeCNHGK/mEBTeqquS1oQX67jWyuvYmG3VV6RJUxtG9Paw==",
+      "integrity": "sha512-0SWfp4J2+mH4lZOcHfyIwt9VoGD7yCGQE1cm0BPcLwKnrVQeXHtUXNYNy8HTHSjTGyoFDhEAYelE/tdA3OLcWQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "9.22.0",
+        "@sentry-internal/browser-utils": "9.18.0",
-        "@sentry-internal/feedback": "9.22.0",
+        "@sentry-internal/feedback": "9.18.0",
-        "@sentry-internal/replay": "9.22.0",
+        "@sentry-internal/replay": "9.18.0",
-        "@sentry-internal/replay-canvas": "9.22.0",
+        "@sentry-internal/replay-canvas": "9.18.0",
-        "@sentry/core": "9.22.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/bundler-plugin-core": {
-      "version": "3.5.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.4.0.tgz",
-      "integrity": "sha512-zDzPrhJqAAy2VzV4g540qAZH4qxzisstK2+NIJPZUUKztWRWUV2cMHsyUtdctYgloGkLyGpZJBE3RE6dmP/xqQ==",
+      "integrity": "sha512-X1Q41AsQ6xcT6hB4wYmBDBukndKM/inT4IsR7pdKLi7ICpX2Qq6lisamBAEPCgEvnLpazSFguaiC0uiwMKAdqw==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.18.5",
-        "@sentry/babel-plugin-component-annotate": "3.5.0",
+        "@sentry/babel-plugin-component-annotate": "3.4.0",
         "@sentry/cli": "2.42.2",
         "dotenv": "^16.3.1",
         "find-up": "^5.0.0",
@@ -4902,22 +4899,22 @@
       }
     },
     "node_modules/@sentry/core": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.18.0.tgz",
-      "integrity": "sha512-ixvtKmPF42Y6ckGUbFlB54OWI75H2gO5UYHojO6eXFpS7xO3ZGgV/QH6wb40mWK+0w5XZ0233FuU9VpsuE6mKA==",
+      "integrity": "sha512-kRVH8BqMiaU2FTHYa68zNlAloS43jl4XtIEHkLKVH/7gUtwRmM4Gqj8P7RTrZdO1Lo7ksYnGj+AG05Z09CRbOw==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/react": {
-      "version": "9.22.0",
+      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.18.0.tgz",
-      "integrity": "sha512-mI43NnioBYdG5TiXqRlhV1feZs9bnrrl+k5HOHBK7VQtymaXO0fkcsRLZTkdSgLRLMJGasZuvVhq2xK+18QyWQ==",
+      "integrity": "sha512-1cCLYZrZ2gu6H8eE83DC47kLf+pzD1Rim3dDoOEvwt1F5cD3K/DBeIhoHZaXqBeQxuVyHXOOLXSAC/CIuas5Aw==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "9.22.0",
+        "@sentry/browser": "9.18.0",
-        "@sentry/core": "9.22.0",
+        "@sentry/core": "9.18.0",
         "hoist-non-react-statics": "^3.3.2"
       },
       "engines": {
@@ -4928,12 +4925,12 @@
       }
     },
     "node_modules/@sentry/vite-plugin": {
-      "version": "3.5.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.4.0.tgz",
-      "integrity": "sha512-jUnpTdpicG8wefamw7eNo2uO+Q3KCbOAiF76xH4gfNHSW6TN2hBfOtmLu7J+ive4c0Al3+NEHz19bIPR0lkwWg==",
+      "integrity": "sha512-pUFBGrKsHuc8K6A7B1wU2nx65n9aIzvTlcHX9yZ1qvjEO0cZFih0JCwu1Fcav/yrtT9RMN44L/ugu/kMBHQhjQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/bundler-plugin-core": "3.5.0",
+        "@sentry/bundler-plugin-core": "3.4.0",
         "unplugin": "1.0.1"
       },
       "engines": {
@@ -4941,13 +4938,13 @@
       }
     },
     "node_modules/@sentry/webpack-plugin": {
-      "version": "3.5.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-3.4.0.tgz",
-      "integrity": "sha512-xvclj0QY2HyU7uJLzOlHSrZQBDwfnGKJxp8mmlU4L7CwmK+8xMCqlO7tYZoqE4K/wU3c2xpXql70x8qmvNMxzQ==",
+      "integrity": "sha512-i+nAxxniJV5ovijojjTF5n+Yj08Xk8my+vm8+oo0C0I7xcnI2gOKft6B0sJOq01CNbo85X5m/3/edL0PKoWE9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sentry/bundler-plugin-core": "3.5.0",
+        "@sentry/bundler-plugin-core": "3.4.0",
         "unplugin": "1.0.1",
         "uuid": "^9.0.0"
       },
@@ -5813,14 +5810,14 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.3.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "integrity": "sha512-7FTQQuuLKmN1Ig/h+h/GO+44Q1IlglPlR2es4ab7Yvfx+Uk5xsv+Ykk+MEt/M2Yn/xGmzaLKxGw2lgy2bwuYqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.1.3",
-        "@vitest/utils": "3.1.4",
+        "@vitest/utils": "3.1.3",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -5829,13 +5826,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.3.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "integrity": "sha512-PJbLjonJK82uCWHjzgBJZuR7zmAOrSvKk1QBxrennDIgtH4uK0TB1PvYmc0XBCigxxtiAVPfWtAdy4lpz8SQGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.1.3",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -5876,9 +5873,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.3.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "integrity": "sha512-i6FDiBeJUGLDKADw2Gb01UtUNb12yyXAqC/mmRWuYl+m/U9GS7s8us5ONmGkGpUUo7/iAYzI2ePVfOZTYvUifA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5889,13 +5886,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.3.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "integrity": "sha512-Tae+ogtlNfFei5DggOsSUvkIaSuVywujMj6HzR97AHK6XK8i3BuVyIifWAm/sE3a15lF5RH9yQIrbXYuo0IFyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.1.4",
+        "@vitest/utils": "3.1.3",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -5910,13 +5907,13 @@
       "license": "MIT"
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.3.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "integrity": "sha512-XVa5OPNTYUsyqG9skuUkFzAeFnEzDp8hQu7kZ0N25B1+6KjGm4hWLtURyBbsIAOekfWQ7Wuz/N/XXzgYO3deWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.1.3",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -5942,9 +5939,9 @@
       "license": "MIT"
     },
     "node_modules/@vitest/spy": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.3.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "integrity": "sha512-x6w+ctOEmEXdWaa6TO4ilb7l9DxPR5bwEb6hILKuxfU1NqWT2mpJD9NJN7t3OTfxmVlOMrvtoFJGdgyzZ605lQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5955,13 +5952,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.3.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "integrity": "sha512-2Ltrpht4OmHO9+c/nmHtF09HWiyWdworqnHIwjfvDyWjuwKbdkcS9AnhsDn+8E2RM4x++foD1/tNuLPVvWG1Rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.1.3",
         "loupe": "^3.1.3",
         "tinyrainbow": "^2.0.0"
       },
@@ -6091,9 +6088,9 @@
       }
     },
     "node_modules/antd": {
-      "version": "5.25.2",
+      "version": "5.25.1",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.2.tgz",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.1.tgz",
-      "integrity": "sha512-7R2nUvlHhey7Trx64+hCtGXOiy+DTUs1Lv5bwbV1LzEIZIhWb0at1AM6V3K108a5lyoR9n7DX3ptlLF7uYV/DQ==",
+      "integrity": "sha512-4KC7KuPCjr0z3Vuw9DsF+ceqJaPLbuUI3lOX1sY8ix25ceamp+P8yxOmk3Y2JHCD2ZAhq+5IQ/DTJRN2adWYKQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^7.2.0",
@@ -6131,11 +6128,11 @@
         "rc-rate": "~2.13.1",
         "rc-resize-observer": "^1.4.3",
         "rc-segmented": "~2.7.0",
-        "rc-select": "~14.16.8",
+        "rc-select": "~14.16.7",
         "rc-slider": "~11.1.8",
         "rc-steps": "~6.0.1",
         "rc-switch": "~4.1.0",
-        "rc-table": "~7.50.5",
+        "rc-table": "~7.50.4",
         "rc-tabs": "~15.6.1",
         "rc-textarea": "~1.10.0",
         "rc-tooltip": "~6.4.0",
@@ -11836,9 +11833,9 @@
       }
     },
     "node_modules/memfs": {
-      "version": "4.17.2",
+      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.2.tgz",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.1.tgz",
-      "integrity": "sha512-NgYhCOWgovOXSzvYgUW0LQ7Qy72rWQMGGFJDoWg4G30RHd3z77VbYdtJ4fembJXBy8pMIUA31XNAupobOQlwdg==",
+      "integrity": "sha512-thuTRd7F4m4dReCIy7vv4eNYnU6XI/tHMLSMMHLiortw/Y0QxqKtinG523U2aerzwYWGi606oBP4oMPy4+edag==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -13572,9 +13569,9 @@
       }
     },
     "node_modules/query-string": {
-      "version": "9.2.0",
+      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.1.2.tgz",
-      "integrity": "sha512-YIRhrHujoQxhexwRLxfy3VSjOXmvZRd2nyw1PwL1UUqZ/ys1dEZd1+NSgXkne2l/4X/7OXkigEAuhTX0g/ivJQ==",
+      "integrity": "sha512-s3UlTyjxRux4KjwWaJsjh1Mp8zoCkSGKirbD9H89pEM9UOZsfpRZpdfzvsy2/mGlLfC3NnYVpy2gk7jXITHEtA==",
       "license": "MIT",
       "dependencies": {
         "decode-uri-component": "^0.4.1",
@@ -14027,9 +14024,9 @@
       }
     },
     "node_modules/rc-select": {
-      "version": "14.16.8",
+      "version": "14.16.7",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.8.tgz",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.7.tgz",
-      "integrity": "sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==",
+      "integrity": "sha512-lT9kO5gFHQdJzu9a0btcOtNaJHkhenSl8H5mcpgXN9VIMXP59rnkpbdHmPrteixWs1D5zFOTyoTYX3b7joADIQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -14100,9 +14097,9 @@
       }
     },
     "node_modules/rc-table": {
-      "version": "7.50.5",
+      "version": "7.50.4",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.50.5.tgz",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.50.4.tgz",
-      "integrity": "sha512-FDZu8aolhSYd3v9KOc3lZOVAU77wmRRu44R0Wfb8Oj1dXRUsloFaXMSl6f7yuWZUxArJTli7k8TEOX2mvhDl4A==",
+      "integrity": "sha512-Y+YuncnQqoS5e7yHvfvlv8BmCvwDYDX/2VixTBEhkMDk9itS9aBINp4nhzXFKiBP/frG4w0pS9d9Rgisl0T1Bw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -15378,9 +15375,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.89.0",
+      "version": "1.88.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.88.0.tgz",
-      "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
+      "integrity": "sha512-sF6TWQqjFvr4JILXzG4ucGOLELkESHL+I5QJhh7CNaE+Yge0SI+ehCatsXhJ7ymU1hAFcIS3/PBpjdIbXoyVbg==",
       "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
@@ -17536,9 +17533,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.3.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "integrity": "sha512-uHV4plJ2IxCl4u1up1FQRrqclylKAogbtBfOTwcuJ28xFi+89PZ57BRh+naIRvH70HPwxy5QHYzg1OrEaC7AbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17734,19 +17731,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.1.4",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.3.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "integrity": "sha512-188iM4hAHQ0km23TN/adso1q5hhwKqUpv+Sd6p5sOuh6FhQnRNW3IsiIpvxqahtBabsJ2SLZgmGSpcYK4wQYJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.1.4",
+        "@vitest/expect": "3.1.3",
-        "@vitest/mocker": "3.1.4",
+        "@vitest/mocker": "3.1.3",
-        "@vitest/pretty-format": "^3.1.4",
+        "@vitest/pretty-format": "^3.1.3",
-        "@vitest/runner": "3.1.4",
+        "@vitest/runner": "3.1.3",
-        "@vitest/snapshot": "3.1.4",
+        "@vitest/snapshot": "3.1.3",
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.1.3",
-        "@vitest/utils": "3.1.4",
+        "@vitest/utils": "3.1.3",
         "chai": "^5.2.0",
         "debug": "^4.4.0",
         "expect-type": "^1.2.1",
@@ -17759,7 +17756,7 @@
         "tinypool": "^1.0.2",
         "tinyrainbow": "^2.0.0",
         "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite-node": "3.1.3",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -17775,8 +17772,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
+        "@vitest/browser": "3.1.3",
-        "@vitest/ui": "3.1.4",
+        "@vitest/ui": "3.1.3",
         "happy-dom": "*",
         "jsdom": "*"
       },

client/package.json

@@ -12,19 +12,19 @@
     "@apollo/client": "^3.13.6",
     "@emotion/is-prop-valid": "^1.3.1",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.16",
+    "@firebase/analytics": "^0.10.13",
-    "@firebase/app": "^0.13.0",
+    "@firebase/app": "^0.12.1",
-    "@firebase/auth": "^1.10.5",
+    "@firebase/auth": "^1.10.2",
-    "@firebase/firestore": "^4.7.15",
+    "@firebase/firestore": "^4.7.12",
-    "@firebase/messaging": "^0.12.21",
+    "@firebase/messaging": "^0.12.18",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.8.2",
+    "@reduxjs/toolkit": "^2.8.1",
     "@sentry/cli": "^2.45.0",
-    "@sentry/react": "^9.22.0",
+    "@sentry/react": "^9.18.0",
-    "@sentry/vite-plugin": "^3.5.0",
+    "@sentry/vite-plugin": "^3.4.0",
     "@splitsoftware/splitio-react": "^2.1.1",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.25.2",
+    "antd": "^5.25.1",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.3.0",
     "autosize": "^6.0.1",
@@ -48,7 +48,7 @@
     "normalize-url": "^8.0.1",
     "object-hash": "^3.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.2.0",
+    "query-string": "^9.1.2",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
     "react-big-calendar": "^1.18.0",
@@ -77,7 +77,7 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.89.0",
+    "sass": "^1.88.0",
     "socket.io-client": "^4.8.1",
     "styled-components": "^6.1.18",
     "subscriptions-transport-ws": "^0.11.0",
@@ -130,12 +130,12 @@
     "@ant-design/icons": "^6.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.44.1",
+    "@dotenvx/dotenvx": "^1.44.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.27.0",
+    "@eslint/js": "^9.26.0",
     "@playwright/test": "^1.51.1",
-    "@sentry/webpack-plugin": "^3.5.0",
+    "@sentry/webpack-plugin": "^3.4.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
@@ -148,7 +148,7 @@
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
-    "memfs": "^4.17.2",
+    "memfs": "^4.17.1",
     "os-browserify": "^0.3.0",
     "playwright": "^1.51.1",
     "react-error-overlay": "^6.1.0",
@@ -160,7 +160,7 @@
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-pwa": "^1.0.0",
     "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.1.4",
+    "vitest": "^3.1.3",
     "workbox-window": "^7.3.0"
   }
 }

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

@@ -34,14 +34,16 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
 
     SubscribeToTopicForFCMNotification();
 
-    // Register WebSocket handlers
+    //Register WS handlers
     if (socket && socket.connected) {
       registerMessagingHandlers({ socket, client });
-
-      return () => {
-        unregisterMessagingHandlers({ socket });
-      };
     }
+
+    return () => {
+      if (socket && socket.connected) {
+        unregisterMessagingHandlers({ socket });
+      }
+    };
   }, [bodyshop, socket, t, client]);
 
   if (!bodyshop || !bodyshop.messagingservicesid) return <></>;

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

@@ -1,5 +1,5 @@
 import { Badge, Card, List, Space, Tag } from "antd";
-import { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -10,60 +10,35 @@ import PhoneFormatter from "../../utils/PhoneFormatter";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import _ from "lodash";
 import "./chat-conversation-list.styles.scss";
-import { useQuery } from "@apollo/client";
-import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
-import { phone } from "phone";
-import { useTranslation } from "react-i18next";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  selectedConversation: selectSelectedConversation,
+  selectedConversation: selectSelectedConversation
-  bodyshop: selectBodyshop
 });
 
 const mapDispatchToProps = (dispatch) => ({
   setSelectedConversation: (conversationId) => dispatch(setSelectedConversation(conversationId))
 });
 
-function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
+function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation }) {
-  const { t } = useTranslation();
+  // That comma is there for a reason, do not remove it
   const [, forceUpdate] = useState(false);
 
-  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
+  // Re-render every minute
-
-  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
-    variables: {
-      bodyshopid: bodyshop.id,
-      phone_numbers: phoneNumbers
-    },
-    skip: !conversationList.length,
-    fetchPolicy: "cache-and-network"
-  });
-
-  const optOutMap = useMemo(() => {
-    const map = new Map();
-    optOutData?.phone_number_opt_out?.forEach((optOut) => {
-      map.set(optOut.phone_number, true);
-    });
-    return map;
-  }, [optOutData?.phone_number_opt_out]);
-
   useEffect(() => {
     const interval = setInterval(() => {
-      forceUpdate((prev) => !prev);
+      forceUpdate((prev) => !prev); // Toggle state to trigger re-render
-    }, 60000);
+    }, 60000); // 1 minute in milliseconds
-    return () => clearInterval(interval);
+
+    return () => clearInterval(interval); // Cleanup on unmount
   }, []);
 
-  const sortedConversationList = useMemo(() => {
+  // Memoize the sorted conversation list
+  const sortedConversationList = React.useMemo(() => {
     return _.orderBy(conversationList, ["updated_at"], ["desc"]);
   }, [conversationList]);
 
-  const renderConversation = (index, t) => {
+  const renderConversation = (index) => {
     const item = sortedConversationList[index];
-    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
-    const hasOptOutEntry = optOutMap.has(normalizedPhone);
-
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
@@ -85,12 +60,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
       </>
     );
 
-    const cardExtra = (
+    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
-      <>
-        <Badge count={item.messages_aggregate.aggregate.count} />
-        {hasOptOutEntry && <Tag color="red">{t("messaging.labels.no_consent")}</Tag>}
-      </>
-    );
 
     const getCardStyle = () =>
       item.id === selectedConversation
@@ -103,25 +73,9 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         onClick={() => setSelectedConversation(item.id)}
         className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
       >
-        <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
+        <Card style={getCardStyle()} bordered={false} size="small" extra={cardExtra} title={cardTitle}>
-          <div
+          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
-            style={{
+          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
-              display: "inline-block",
-              width: "70%",
-              textAlign: "left"
-            }}
-          >
-            {cardContentLeft}
-          </div>
-          <div
-            style={{
-              display: "inline-block",
-              width: "30%",
-              textAlign: "right"
-            }}
-          >
-            {cardContentRight}
-          </div>
         </Card>
       </List.Item>
     );
@@ -131,7 +85,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     <div className="chat-list-container">
       <Virtuoso
         data={sortedConversationList}
-        itemContent={(index) => renderConversation(index, t)}
+        itemContent={(index) => renderConversation(index)}
         style={{ height: "100%", width: "100%" }}
       />
     </div>

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -24,7 +24,7 @@
 
 /* Add spacing and better alignment for items */
 .chat-list-item {
-  padding: 0.2rem 0; /* Add spacing between list items */
+  padding: 0.5rem 0; /* Add spacing between list items */
 
   .ant-card {
     border-radius: 8px; /* Slight rounding for card edges */

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

@@ -37,7 +37,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     variables: {
-      jobId: conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid
+      jobId: conversation.job_conversations[0] && conversation.job_conversations[0].jobid
     },
 
     skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
@@ -67,14 +67,14 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
         <>
           {!bodyshop.uselocalmediaserver && (
             <JobsDocumentImgproxyGalleryExternal
-              jobId={conversation.job_conversations[0]?.jobid}
+              jobId={conversation.job_conversations[0].jobid}
               externalMediaState={[selectedMedia, setSelectedMedia]}
             />
           )}
           {bodyshop.uselocalmediaserver && open && (
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
             />
           )}
         </>
@@ -89,7 +89,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
           {bodyshop.uselocalmediaserver && open && (
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
             />
           )}
         </>

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -1,5 +1,5 @@
 import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
-import { Alert, Input, Spin } from "antd";
+import { Input, Spin } from "antd";
 import React, { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,9 +10,6 @@ import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
-import { useQuery } from "@apollo/client";
-import { phone } from "phone";
-import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -28,24 +25,16 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSending, message, setMessage }) {
   const inputArea = useRef(null);
   const [selectedMedia, setSelectedMedia] = useState([]);
-  const { t } = useTranslation();
-
-  const normalizedPhone = phone(conversation.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
-  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUT, {
-    variables: { bodyshopid: bodyshop.id, phone_number: normalizedPhone },
-    fetchPolicy: "cache-and-network"
-  });
-
-  const isOptedOut = !!optOutData?.phone_number_opt_out?.[0];
 
   useEffect(() => {
     inputArea.current.focus();
   }, [isSending, setMessage]);
 
+  const { t } = useTranslation();
+
   const handleEnter = () => {
     const selectedImages = selectedMedia.filter((i) => i.isSelected);
     if ((message === "" || !message) && selectedImages.length === 0) return;
-    if (isOptedOut) return; // Prevent sending if phone number is opted out
     logImEXEvent("messaging_send_message");
 
     if (selectedImages.length < 11) {
@@ -55,8 +44,7 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
         messagingServiceSid: bodyshop.messagingservicesid,
         conversationid: conversation.id,
         selectedMedia: selectedImages,
-        imexshopid: bodyshop.imexshopid,
+        imexshopid: bodyshop.imexshopid
-        bodyshopid: bodyshop.id
       };
       sendMessage(newMessage);
       setSelectedMedia(
@@ -69,7 +57,6 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
 
   return (
     <div className="imex-flex-row" style={{ width: "100%" }}>
-      {isOptedOut && <Alert message={t("messaging.errors.no_consent")} type="warning" style={{ marginBottom: 8 }} />}
       <ChatPresetsComponent className="imex-flex-row__margin" />
       <ChatMediaSelector
         conversation={conversation}
@@ -84,18 +71,18 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
           ref={inputArea}
           autoSize={{ minRows: 1, maxRows: 4 }}
           value={message}
-          disabled={isSending || isOptedOut}
+          disabled={isSending}
           placeholder={t("messaging.labels.typeamessage")}
           onChange={(e) => setMessage(e.target.value)}
           onPressEnter={(event) => {
             event.preventDefault();
-            if (!event.shiftKey && !isOptedOut) handleEnter();
+            if (!!!event.shiftKey) handleEnter();
           }}
         />
       </span>
       <SendOutlined
         className="chat-send-message-button"
-        disabled={isOptedOut || message === "" || !message}
+        //  disabled={message === "" || !message}
         onClick={handleEnter}
       />
       <Spin

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -81,9 +81,8 @@ export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false
   }
   return (
     bodyshop?.features?.allAccess ||
-    (typeof bodyshop?.features?.[featureName] === "boolean"
+    bodyshop?.features?.[featureName] ||
-      ? bodyshop?.features?.[featureName]
+    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
-      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
   );
 }
 

client/src/components/phone-number-consent/phone-number-consent.component.jsx

@@ -1,62 +0,0 @@
-import { useQuery } from "@apollo/client";
-import { Input, Table } from "antd";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries";
-
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-import { TimeAgoFormatter } from "../../utils/DateFormatter";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
-});
-
-const mapDispatchToProps = () => ({});
-
-function PhoneNumberConsentList({ bodyshop, currentUser }) {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState("");
-  const { loading, data } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
-    variables: { bodyshopid: bodyshop.id, search: search ? `%${search}%` : undefined },
-    fetchPolicy: "network-only"
-  });
-
-  const columns = [
-    {
-      title: t("consent.phone_number"),
-      dataIndex: "phone_number",
-      render: (text) => <PhoneNumberFormatter>{text}</PhoneNumberFormatter>,
-      sorter: (a, b) => a.phone_number.localeCompare(b.phone_number)
-    },
-    {
-      title: t("consent.created_at"),
-      dataIndex: "created_at",
-      render: (text) => <TimeAgoFormatter>{text}</TimeAgoFormatter>,
-      sorter: (a, b) => new Date(a.created_at) - new Date(b.created_at)
-    }
-  ];
-
-  return (
-    <div>
-      <Input.Search
-        placeholder={t("general.labels.search")}
-        onSearch={(value) => setSearch(value)}
-        style={{ marginBottom: 16 }}
-      />
-
-      <Table
-        columns={columns}
-        dataSource={data?.phone_number_opt_out}
-        loading={loading}
-        rowKey="id"
-        style={{ marginTop: 16 }}
-      />
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PhoneNumberConsentList);

client/src/components/production-board-kanban/settings/LayoutSettings.jsx

@@ -1,15 +1,7 @@
 import { Card, Col, Form, Radio, Row } from "antd";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../../redux/user/user.selectors";
-import { HasFeatureAccess } from "../../feature-wrapper/feature-wrapper.component";
 
-const mapStateToProps = createStructuredSelector({
+const LayoutSettings = ({ t }) => (
-  bodyshop: selectBodyshop
-});
-
-const LayoutSettings = ({ t, bodyshop }) => (
   <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
     <Row gutter={[16, 16]}>
       {[
@@ -38,18 +30,14 @@ const LayoutSettings = ({ t, bodyshop }) => (
             { value: false, label: t("production.labels.wide") }
           ]
         },
-        ...(HasFeatureAccess({ bodyshop, featureName: "smartscheduling" })
+        {
-          ? [
+          name: "cardcolor",
-              {
+          label: t("production.labels.cardcolor"),
-                name: "cardcolor",
+          options: [
-                label: t("production.labels.cardcolor"),
+            { value: true, label: t("production.labels.on") },
-                options: [
+            { value: false, label: t("production.labels.off") }
-                  { value: true, label: t("production.labels.on") },
+          ]
-                  { value: false, label: t("production.labels.off") }
+        },
-                ]
-              }
-            ]
-          : []),
         {
           name: "kiosk",
           label: t("production.labels.kiosk_mode"),
@@ -79,4 +67,4 @@ LayoutSettings.propTypes = {
   t: PropTypes.func.isRequired
 };
 
-export default connect(mapStateToProps)(LayoutSettings);
+export default LayoutSettings;

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -6,7 +6,6 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { QUERY_ACTIVE_EMPLOYEES, QUERY_ACTIVE_EMPLOYEES_WITH_EMAIL } from "../../graphql/employees.queries";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
@@ -19,10 +18,11 @@ import EmployeeSearchSelectEmail from "../employee-search-select/employee-search
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
 import "./report-center-modal.styles.scss";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
@@ -389,7 +389,5 @@ const restrictedReports = [
   { key: "job_costing_ro_date_detail", days: 183 },
   { key: "job_costing_ro_estimator", days: 183 },
   { key: "job_lifecycle_date_detail", days: 183 },
-  { key: "job_lifecycle_date_summary", days: 183 },
+  { key: "job_lifecycle_date_summary", days: 183 }
-  { key: "customer_list", days: 183 },
-  { key: "customer_list_excel", days: 183 }
 ];

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

@@ -1,25 +0,0 @@
-import { Typography } from "antd";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import PhoneNumberConsentList from "../phone-number-consent/phone-number-consent.component";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = (dispatch) => ({});
-
-function ShopInfoConsentComponent({ bodyshop }) {
-  const { t } = useTranslation();
-
-  return (
-    <div>
-      <Typography.Title level={4}>{t("settings.title")}</Typography.Title>
-      {<PhoneNumberConsentList bodyshop={bodyshop} />}
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoConsentComponent);

client/src/graphql/phone-number-opt-out.queries.js

@@ -1,28 +0,0 @@
-import { gql } from "@apollo/client";
-
-export const GET_PHONE_NUMBER_OPT_OUT = gql`
-  query GET_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
-    phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
-      id
-      bodyshopid
-      phone_number
-      created_at
-      updated_at
-    }
-  }
-`;
-
-export const GET_PHONE_NUMBER_OPT_OUTS = gql`
-  query GET_PHONE_NUMBER_OPT_OUTS($bodyshopid: uuid!, $search: String) {
-    phone_number_opt_out(
-      where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _ilike: $search } }
-      order_by: [{ phone_number: asc }, { updated_at: desc }]
-    ) {
-      id
-      bodyshopid
-      phone_number
-      created_at
-      updated_at
-    }
-  }
-`;

client/src/pages/shop/shop.page.component.jsx

@@ -10,10 +10,10 @@ import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.comp
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
-import ShopInfoConsentComponent from "../../components/shop-info/shop-info.consent.component";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+
 import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
 
@@ -91,14 +91,6 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
       children: <ShopCsiConfig />
     });
   }
-
-  // Add Consent Settings tab
-  items.push({
-    key: "consent",
-    label: t("bodyshop.labels.consent_settings"),
-    children: <ShopInfoConsentComponent bodyshop={bodyshop} />
-  });
-
   return (
     <RbacWrapper action="shop:config">
       <Tabs activeKey={search.tab} onChange={(key) => history({ search: `?tab=${key}` })} items={items} />

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

@@ -105,6 +105,7 @@ const userReducer = (state = INITIAL_STATE, action) => {
           ...action.payload //Spread current user details in.
         }
       };
+
     case UserActionTypes.SET_SHOP_DETAILS:
       return {
         ...state,
@@ -125,7 +126,6 @@ const userReducer = (state = INITIAL_STATE, action) => {
         ...state,
         imexshopid: action.payload
       };
-
     default:
       return state;
   }

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

@@ -335,20 +335,12 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      InstanceRenderManager({
+      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-        executeFunction: true,
+      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-        args: [],
+      if (authRecord[0] && authRecord[0].user.validemail) {
-        imex: () => {
+        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-          window.$crisp.push(["set", "user:company", [payload.shopname]]);
+      }
-          window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
+
-          if (authRecord[0] && authRecord[0].user.validemail) {
-            window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-          }
-        },
-        rome: () => {
-          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
-        }
-      });
       payload.features?.allAccess === true
         ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
         : (() => {
@@ -359,6 +351,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
             );
             window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
           })();
+
+      InstanceRenderManager({
+        executeFunction: true,
+        args: [],
+        rome: () => {
+          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
+        }
+      });
     } catch (error) {
       console.warn("Couldnt find $crisp.", error.message);
     }

client/src/translations/en_us/common.json

@@ -656,7 +656,6 @@
         }
       },
       "labels": {
-        "consent_settings": "Phone Number Opt-Out List",
         "2tiername": "Name => RO",
         "2tiersetup": "2 Tier Setup",
         "2tiersource": "Source => RO",
@@ -2378,8 +2377,7 @@
       "errors": {
         "invalidphone": "The phone number is invalid.  Unable to open conversation. ",
         "noattachedjobs": "No Jobs have been associated to this conversation. ",
-        "updatinglabel": "Error updating label. {{error}}",
+        "updatinglabel": "Error updating label. {{error}}"
-        "no_consent": "This phone number has not consented to receive messages."
       },
       "labels": {
         "addlabel": "Add a label to this conversation.",
@@ -2395,8 +2393,7 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive",
+        "unarchive": "Unarchive"
-        "no_consent": "No Consent"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -3102,7 +3099,6 @@
         "credits_not_received_date_vendorid": "Credits not Received by Vendor",
         "csi": "CSI Responses",
         "customer_list": "Customer List",
-        "customer_list_excel": "Customer List - Excel",
         "cycle_time_analysis": "Cycle Time Analysis",
         "estimates_written_converted": "Estimates Written/Converted",
         "estimator_detail": "Jobs by Estimator (Detail)",
@@ -3866,14 +3862,6 @@
       "validation": {
         "unique_vendor_name": "You must enter a unique vendor name."
       }
-    },
-    "consent": {
-      "phone_number": "Phone Number",
-      "status": "Consent Status",
-      "created_at": "Created At"
-    },
-    "settings": {
-      "title": "Phone Number Opt-Out List"
     }
   }
 }

client/src/translations/es/common.json

@@ -3100,7 +3100,6 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
-        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",

client/src/translations/fr/common.json

@@ -3100,7 +3100,6 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
-        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",

client/src/utils/TemplateConstants.js

@@ -2004,18 +2004,6 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
-          customer_list_excel: {
-            title: i18n.t("reportcenter.templates.customer_list_excel"),
-            subject: i18n.t("reportcenter.templates.customer_list_excel"),
-            key: "customer_list_excel",
-            reporttype: "excel",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced")
-            },
-            group: "customers"
-          },
           exported_gsr_by_ro: {
             title: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
             subject: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
@@ -2253,7 +2241,7 @@ export const TemplateList = (type, context) => {
               field: i18n.t("bills.fields.date")
             },
             group: "purchases"
-          }
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/metadata/tables.yaml

@@ -2681,9 +2681,6 @@
                 - active:
                     _eq: true
         allow_aggregations: true
-- table:
-    name: integration_log
-    schema: public
 - table:
     name: inventory
     schema: public
@@ -5864,32 +5861,6 @@
         template_engine: Kriti
         url: '{{$base_url}}/opensearch'
         version: 2
-- table:
-    name: phone_number_opt_out
-    schema: public
-  object_relationships:
-    - name: bodyshop
-      using:
-        foreign_key_constraint_on: bodyshopid
-  select_permissions:
-    - role: user
-      permission:
-        columns:
-          - phone_number
-          - created_at
-          - updated_at
-          - bodyshopid
-          - id
-        filter:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
-      comment: ""
 - table:
     name: phonebook
     schema: public

hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/down.sql

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

hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" add column "enforce_sms_consent" boolean
- null;

hasura/migrations/1747158981002_create_table_public_phone_number_consent/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."phone_number_consent";

hasura/migrations/1747158981002_create_table_public_phone_number_consent/up.sql

@@ -1,2 +0,0 @@
-CREATE TABLE "public"."phone_number_consent" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "bodyshopid" uuid NOT NULL, "phone_number" text NOT NULL, "consent_status" boolean NOT NULL, "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "consent_updated_at" timestamptz NOT NULL DEFAULT now(), PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"), UNIQUE ("bodyshopid", "phone_number"));
-CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."phone_number_consent_history";

hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/up.sql

@@ -1,2 +0,0 @@
-CREATE TABLE "public"."phone_number_consent_history" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "phone_number_consent_id" uuid NOT NULL, "old_value" boolean NOT NULL, "new_value" boolean NOT NULL, "reason" text NOT NULL, "changed_at" timestamptz NOT NULL DEFAULT now(), "changed_by" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("phone_number_consent_id") REFERENCES "public"."phone_number_consent"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"));
-CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/down.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_consent_history" alter column "old_value" set not null;

hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/up.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_consent_history" alter column "old_value" drop not null;

hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/down.sql

@@ -1,3 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- DROP table "public"."phone_number_consent_history";

hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/up.sql

@@ -1 +0,0 @@
-DROP table "public"."phone_number_consent_history";

hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/down.sql

@@ -1,2 +0,0 @@
-alter table "public"."phone_number_consent" alter column "consent_status" drop not null;
-alter table "public"."phone_number_consent" add column "consent_status" bool;

hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/up.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_consent" drop column "consent_status" cascade;

hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/down.sql

@@ -1,3 +0,0 @@
-alter table "public"."phone_number_consent" alter column "consent_updated_at" set default now();
-alter table "public"."phone_number_consent" alter column "consent_updated_at" drop not null;
-alter table "public"."phone_number_consent" add column "consent_updated_at" timestamptz;

hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/up.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_consent" drop column "consent_updated_at" cascade;

hasura/migrations/1747850386584_rename_table_public_phone_number_consent/down.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_opt_out" rename to "phone_number_consent";

hasura/migrations/1747850386584_rename_table_public_phone_number_consent/up.sql

@@ -1 +0,0 @@
-alter table "public"."phone_number_consent" rename to "phone_number_opt_out";

hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/down.sql

@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" alter column "enforce_sms_consent" drop not null;
-alter table "public"."bodyshops" add column "enforce_sms_consent" bool;

hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/up.sql

@@ -1 +0,0 @@
-alter table "public"."bodyshops" drop column "enforce_sms_consent" cascade;

hasura/migrations/1747932876194_create_table_public_integration_log/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."integration_log";

hasura/migrations/1747932876194_create_table_public_integration_log/up.sql

@@ -1,18 +0,0 @@
-CREATE TABLE "public"."integration_log" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "email" text NOT NULL, "jobid" uuid, "billid" uuid, "paymentid" uuid, "method" text NOT NULL, "name" text NOT NULL, "status" text NOT NULL, "platform" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("email") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("billid") REFERENCES "public"."bills"("id") ON UPDATE restrict ON DELETE set null, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("paymentid") REFERENCES "public"."payments"("id") ON UPDATE restrict ON DELETE set null);
-CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
-RETURNS TRIGGER AS $$
-DECLARE
-  _new record;
-BEGIN
-  _new := NEW;
-  _new."updated_at" = NOW();
-  RETURN _new;
-END;
-$$ LANGUAGE plpgsql;
-CREATE TRIGGER "set_public_integration_log_updated_at"
-BEFORE UPDATE ON "public"."integration_log"
-FOR EACH ROW
-EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
-COMMENT ON TRIGGER "set_public_integration_log_updated_at" ON "public"."integration_log"
-IS 'trigger to set value of column "updated_at" to current timestamp on row update';
-CREATE EXTENSION IF NOT EXISTS pgcrypto;

package.json

@@ -16,14 +16,14 @@
     "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.812.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.808.0",
-    "@aws-sdk/client-elasticache": "^3.812.0",
+    "@aws-sdk/client-elasticache": "^3.808.0",
-    "@aws-sdk/client-s3": "^3.812.0",
+    "@aws-sdk/client-s3": "^3.808.0",
-    "@aws-sdk/client-secrets-manager": "^3.812.0",
+    "@aws-sdk/client-secrets-manager": "^3.808.0",
-    "@aws-sdk/client-ses": "^3.812.0",
+    "@aws-sdk/client-ses": "^3.808.0",
-    "@aws-sdk/credential-provider-node": "^3.812.0",
+    "@aws-sdk/credential-provider-node": "^3.808.0",
-    "@aws-sdk/lib-storage": "^3.812.0",
+    "@aws-sdk/lib-storage": "^3.808.0",
-    "@aws-sdk/s3-request-presigner": "^3.812.0",
+    "@aws-sdk/s3-request-presigner": "^3.808.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
@@ -31,14 +31,14 @@
     "aws4": "^1.13.2",
     "axios": "^1.8.4",
     "better-queue": "^3.8.12",
-    "bullmq": "^5.53.0",
+    "bullmq": "^5.52.2",
     "chart.js": "^4.4.8",
     "cloudinary": "^2.6.1",
     "compression": "^1.8.0",
     "cookie-parser": "^1.4.7",
-    "cors": "^2.8.5",
+    "cors": "2.8.5",
     "crisp-status-reporter": "^1.2.2",
-    "dd-trace": "^5.52.0",
+    "dd-trace": "^5.51.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
@@ -73,14 +73,14 @@
     "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.27.0",
+    "@eslint/js": "^9.26.0",
-    "eslint": "^9.27.0",
+    "eslint": "^9.26.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "mock-require": "^3.0.3",
     "p-limit": "^3.1.0",
     "prettier": "^3.5.3",
     "supertest": "^7.1.1",
-    "vitest": "^3.1.4"
+    "vitest": "^3.1.3"
   }
 }

server/accounting/qbo/qbo-callback.js

@@ -14,8 +14,10 @@ const oauthClient = new OAuthClient({
   clientSecret: process.env.QBO_SECRET,
   environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
   redirectUri: process.env.QBO_REDIRECT_URI,
+  logging: true
 });
 
+//TODO:AIO Add in QBO callbacks.
 const url = InstanceEndpoints();
 
 exports.default = async (req, res) => {

server/accounting/qbo/qbo-payables.js

@@ -20,6 +20,7 @@ exports.default = async (req, res) => {
     clientSecret: process.env.QBO_SECRET,
     environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
     redirectUri: process.env.QBO_REDIRECT_URI,
+    logging: true
   });
 
   try {
@@ -148,15 +149,6 @@ async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
         "Content-Type": "application/json"
       }
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "QueryVendorRecord",
-      billid: bill.id,
-      status: result.response?.status,
-      bodyshopid: bill.job.shopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return (
       result.json &&
@@ -186,15 +178,6 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
       },
       body: JSON.stringify(Vendor)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertVendorRecord",
-      billid: bill.id,
-      status: result.response?.status,
-      bodyshopid: bill.job.shopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json && result.json.Vendor;
   } catch (error) {
@@ -207,7 +190,7 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
 }
 
 async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) {
-  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, bill.job.shopid);
+  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
 
   const lines = bill.billlines.map((il) =>
     generateBillLine(
@@ -263,11 +246,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       .format("YYYY-MM-DD"),
     ...(!bill.is_credit_memo &&
       bill.vendor.due_date && {
-      DueDate: moment(bill.date)
+        DueDate: moment(bill.date)
-        //.tz(bill.job.bodyshop.timezone)
+          //.tz(bill.job.bodyshop.timezone)
-        .add(bill.vendor.due_date, "days")
+          .add(bill.vendor.due_date, "days")
-        .format("YYYY-MM-DD")
+          .format("YYYY-MM-DD")
-    }),
+      }),
     DocNumber: bill.invoice_number,
     //...(bill.job.class ? { ClassRef: { Id: classes[bill.job.class] } } : {}),
     ...(!(
@@ -280,8 +263,8 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       : {}),
     ...(bodyshop.accountingconfig.qbo_departmentid &&
       bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-    }),
+      }),
     PrivateNote: `RO ${bill.job.ro_number || ""}`,
     Line: lines
   };
@@ -297,15 +280,6 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       },
       body: JSON.stringify(billQbo)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertBill",
-      billid: bill.id,
-      status: result.response?.status,
-      bodyshopid: bill.job.shopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json && result.json.Bill;
   } catch (error) {
@@ -353,8 +327,8 @@ const generateBillLine = (
         accountingconfig.qbo && accountingconfig.qbo_usa && region_config.includes("CA_")
           ? {}
           : {
-            value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
+              value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
-          },
+            },
       AccountRef: {
         value: accounts[account.accountname]
       }
@@ -368,7 +342,7 @@ const generateBillLine = (
   };
 };
 
-async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
+async function QueryMetaData(oauthClient, qbo_realmId, req) {
   const accounts = await oauthClient.makeApiCall({
     url: urlBuilder(
       qbo_realmId,
@@ -380,14 +354,6 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryAccountType",
-    status: accounts.response?.status,
-    bodyshopid,
-    email: req.user.email
-  })
   setNewRefreshToken(req.user.email, accounts);
   const taxCodes = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From TaxCode`),
@@ -396,14 +362,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
+
-    platform: "QBO",
-    method: "POST",
-    name: "QueryTaxCode",
-    status: taxCodes.status,
-    bodyshopid,
-    email: req.user.email
-  })
   const classes = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From Class`),
     method: "POST",
@@ -411,14 +370,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
+
-    platform: "QBO",
-    method: "POST",
-    name: "QueryClasses",
-    status: classes.status,
-    bodyshopid,
-    email: req.user.email
-  })
   const taxCodeMapping = {};
 
   taxCodes.json &&

server/accounting/qbo/qbo-payments.js

@@ -29,6 +29,7 @@ exports.default = async (req, res) => {
     clientSecret: process.env.QBO_SECRET,
     environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
     redirectUri: process.env.QBO_REDIRECT_URI,
+    logging: true
   });
   try {
     //Fetch the API Access Tokens & Set them for the session.
@@ -197,8 +198,7 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
     req,
     payment.job.ro_number,
     false,
-    parentRef,
+    parentRef
-    payment.job.shopid
   );
 
   if (invoices && invoices.length !== 1) {
@@ -227,20 +227,20 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
     PaymentRefNum: payment.transactionid,
     ...(invoices && invoices.length === 1 && invoices[0]
       ? {
-        Line: [
+          Line: [
-          {
+            {
-            Amount: Dinero({
+              Amount: Dinero({
-              amount: Math.round(payment.amount * 100)
+                amount: Math.round(payment.amount * 100)
-            }).toFormat(DineroQbFormat),
+              }).toFormat(DineroQbFormat),
-            LinkedTxn: [
+              LinkedTxn: [
-              {
+                {
-                TxnId: invoices[0].Id,
+                  TxnId: invoices[0].Id,
-                TxnType: "Invoice"
+                  TxnType: "Invoice"
-              }
+                }
-            ]
+              ]
-          }
+            }
-        ]
+          ]
-      }
+        }
       : {})
   };
   logger.log("qbo-payments-objectlog", "DEBUG", req.user.email, payment.id, {
@@ -255,15 +255,6 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
       },
       body: JSON.stringify(paymentQbo)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertPayment",
-      paymentid: payment.id,
-      status: result.response?.status,
-      bodyshopid: payment.job.shopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.Bill;
   } catch (error) {
@@ -275,7 +266,7 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
   }
 }
 
-async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditMemo, parentTierRef, bodyshopid) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditMemo, parentTierRef) {
   const invoice = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From Invoice where DocNumber like '${ro_number}%'`),
     method: "POST",
@@ -283,15 +274,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryInvoice",
 
-    status: invoice.response?.status,
-    bodyshopid,
-    email: req.user.email
-  })
   const paymentMethods = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From PaymentMethod`),
     method: "POST",
@@ -299,14 +282,6 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryPaymentMethod",
-    status: paymentMethods.response?.status,
-    bodyshopid,
-    email: req.user.email
-  })
   setNewRefreshToken(req.user.email, paymentMethods);
 
   //   const classes = await oauthClient.makeApiCall({
@@ -350,15 +325,6 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
         "Content-Type": "application/json"
       }
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "QueryTaxCode",
-
-      status: taxCodes.response?.status,
-      bodyshopid,
-      email: req.user.email
-    })
     const items = await oauthClient.makeApiCall({
       url: urlBuilder(qbo_realmId, "query", `select * From Item`),
       method: "POST",
@@ -366,14 +332,6 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
         "Content-Type": "application/json"
       }
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "QueryItems",
-      status: items.response?.status,
-      bodyshopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, items);
 
     const itemMapping = {};
@@ -419,8 +377,7 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
     req,
     payment.job.ro_number,
     true,
-    parentRef,
+    parentRef
-    payment.job.shopid
   );
 
   if (invoices && invoices.length !== 1) {
@@ -449,14 +406,14 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
           TaxCodeRef: {
             value:
               taxCodes[
-              findTaxCode(
+                findTaxCode(
-                {
+                  {
-                  local: false,
+                    local: false,
-                  federal: false,
+                    federal: false,
-                  state: false
+                    state: false
-                },
+                  },
-                payment.job.bodyshop.md_responsibility_centers.sales_tax_codes
+                  payment.job.bodyshop.md_responsibility_centers.sales_tax_codes
-              )
+                )
               ]
           }
         }
@@ -475,15 +432,6 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
       },
       body: JSON.stringify(paymentQbo)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertCreditMemo",
-      paymentid: payment.id,
-      status: result.response?.status,
-      bodyshopid: req.user.bodyshopid,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.Bill;
   } catch (error) {

server/accounting/qbo/qbo-receivables.js

@@ -22,8 +22,8 @@ exports.default = async (req, res) => {
     clientSecret: process.env.QBO_SECRET,
     environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
     redirectUri: process.env.QBO_REDIRECT_URI,
+    logging: true
   });
-
   try {
     //Fetch the API Access Tokens & Set them for the session.
     const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
@@ -233,15 +233,6 @@ async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
         "Content-Type": "application/json"
       }
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "QueryCustomer",
-      status: result.response?.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return (
       result.json &&
@@ -288,15 +279,6 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
       },
       body: JSON.stringify(Customer)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertCustomer",
-      status: result.response.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json.Customer;
   } catch (error) {
@@ -323,15 +305,6 @@ async function QueryOwner(oauthClient, qbo_realmId, req, job, isThreeTier, paren
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryCustomer",
-    status: result.response?.status,
-    bodyshopid: job.shopid,
-    jobid: job.id,
-    email: req.user.email
-  })
   setNewRefreshToken(req.user.email, result);
   return (
     result.json &&
@@ -358,11 +331,11 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
     ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
     ...(isThreeTier
       ? {
-        Job: true,
+          Job: true,
-        ParentRef: {
+          ParentRef: {
-          value: parentTierRef.Id
+            value: parentTierRef.Id
+          }
         }
-      }
       : {})
   };
   try {
@@ -374,15 +347,6 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       },
       body: JSON.stringify(Customer)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertCustomer",
-      status: result.response?.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json.Customer;
   } catch (error) {
@@ -408,15 +372,6 @@ async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryCustomer",
-    status: result.response?.status,
-    bodyshopid: job.shopid,
-    jobid: job.id,
-    email: req.user.email
-  })
   setNewRefreshToken(req.user.email, result);
   return (
     result.json &&
@@ -456,15 +411,6 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       },
       body: JSON.stringify(Customer)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertCustomer",
-      status: result.response?.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json.Customer;
   } catch (error) {
@@ -478,7 +424,7 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
 
 exports.InsertJob = InsertJob;
 
-async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
+async function QueryMetaData(oauthClient, qbo_realmId, req) {
   const items = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From Item where active=true maxresults 1000`),
     method: "POST",
@@ -486,15 +432,6 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
-    platform: "QBO",
-    method: "POST",
-    name: "QueryItems",
-    status: items.response?.status,
-    bodyshopid,
-    jobid: jobid,
-    email: req.user.email
-  })
   setNewRefreshToken(req.user.email, items);
   const taxCodes = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From TaxCode where active=true`),
@@ -503,15 +440,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
+
-    platform: "QBO",
-    method: "POST",
-    name: "QueryTaxCodes",
-    status: taxCodes.response?.status,
-    bodyshopid,
-    jobid: jobid,
-    email: req.user.email
-  })
   const classes = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From Class`),
     method: "POST",
@@ -519,15 +448,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
       "Content-Type": "application/json"
     }
   });
-  logger.LogIntegrationCall({
+
-    platform: "QBO",
-    method: "POST",
-    name: "QueryClasses",
-    status: classes.response?.status,
-    bodyshopid,
-    jobid: jobid,
-    email: req.user.email
-  })
   const taxCodeMapping = {};
 
   taxCodes.json &&
@@ -562,7 +483,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
 }
 
 async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, parentTierRef) {
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid, job.id);
+  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
   const InvoiceLineAdd = CreateInvoiceLines({
     bodyshop,
     jobs_by_pk: job,
@@ -578,55 +499,57 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
     DocNumber: job.ro_number,
     ...(job.class ? { ClassRef: { value: classes[job.class] } } : {}),
     CustomerMemo: {
-      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${job.po_number ? `PO No: ${job.po_number}` : ``
+      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${
-        } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""
+        job.po_number ? `PO No: ${job.po_number}` : ``
-        } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
+      } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
+        job.v_model_desc || ""
+      } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
     },
     CustomerRef: {
       value: parentTierRef.Id
     },
     ...(bodyshop.accountingconfig.qbo_departmentid &&
       bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-    }),
+      }),
     CustomField: [
       ...(bodyshop.accountingconfig.ReceivableCustomField1
         ? [
-          {
+            {
-            DefinitionId: "1",
+              DefinitionId: "1",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : []),
       ...(bodyshop.accountingconfig.ReceivableCustomField2
         ? [
-          {
+            {
-            DefinitionId: "2",
+              DefinitionId: "2",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : []),
       ...(bodyshop.accountingconfig.ReceivableCustomField3
         ? [
-          {
+            {
-            DefinitionId: "3",
+              DefinitionId: "3",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : [])
     ],
     ...(bodyshop.accountingconfig &&
       bodyshop.accountingconfig.qbo &&
       bodyshop.accountingconfig.qbo_usa && {
-      TxnTaxDetail: {
+        TxnTaxDetail: {
-        TxnTaxCodeRef: {
+          TxnTaxCodeRef: {
-          value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+            value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+          }
         }
-      }
+      }),
-    }),
 
     ...(bodyshop.accountingconfig.printlater ? { PrintStatus: "NeedToPrint" } : {}),
     ...(bodyshop.accountingconfig.emaillater && job.ownr_ea ? { EmailStatus: "NeedToSend" } : {}),
@@ -652,15 +575,6 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
       },
       body: JSON.stringify(invoiceObj)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertInvoice",
-      status: result.response?.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json && result.json.Invoice;
   } catch (error) {
@@ -684,7 +598,7 @@ async function InsertInvoiceMultiPayerInvoice(
   payer,
   suffix
 ) {
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid);
+  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
   const InvoiceLineAdd = createMultiQbPayerLines({
     bodyshop,
     jobs_by_pk: job,
@@ -702,56 +616,58 @@ async function InsertInvoiceMultiPayerInvoice(
     DocNumber: job.ro_number + suffix,
     ...(job.class ? { ClassRef: { value: classes[job.class] } } : {}),
     CustomerMemo: {
-      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${job.po_number ? `PO No: ${job.po_number}` : ``
+      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${
-        } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""
+        job.po_number ? `PO No: ${job.po_number}` : ``
-        } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
+      } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
+        job.v_model_desc || ""
+      } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
     },
     CustomerRef: {
       value: parentTierRef.Id
     },
     ...(bodyshop.accountingconfig.qbo_departmentid &&
       bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-    }),
+      }),
     CustomField: [
       ...(bodyshop.accountingconfig.ReceivableCustomField1
         ? [
-          {
+            {
-            DefinitionId: "1",
+              DefinitionId: "1",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : []),
       ...(bodyshop.accountingconfig.ReceivableCustomField2
         ? [
-          {
+            {
-            DefinitionId: "2",
+              DefinitionId: "2",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : []),
       ...(bodyshop.accountingconfig.ReceivableCustomField3
         ? [
-          {
+            {
-            DefinitionId: "3",
+              DefinitionId: "3",
-            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
+              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
-            Type: "StringType"
+              Type: "StringType"
-          }
+            }
-        ]
+          ]
         : [])
     ],
     ...(bodyshop.accountingconfig &&
       bodyshop.accountingconfig.qbo &&
       bodyshop.accountingconfig.qbo_usa &&
       bodyshop.region_config.includes("CA_") && {
-      TxnTaxDetail: {
+        TxnTaxDetail: {
-        TxnTaxCodeRef: {
+          TxnTaxCodeRef: {
-          value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+            value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
+          }
         }
-      }
+      }),
-    }),
 
     ...(bodyshop.accountingconfig.printlater ? { PrintStatus: "NeedToPrint" } : {}),
     ...(bodyshop.accountingconfig.emaillater && job.ownr_ea ? { EmailStatus: "NeedToSend" } : {}),
@@ -777,15 +693,6 @@ async function InsertInvoiceMultiPayerInvoice(
       },
       body: JSON.stringify(invoiceObj)
     });
-    logger.LogIntegrationCall({
-      platform: "QBO",
-      method: "POST",
-      name: "InsertInvoice",
-      status: result.response?.status,
-      bodyshopid: job.shopid,
-      jobid: job.id,
-      email: req.user.email
-    })
     setNewRefreshToken(req.user.email, result);
     return result && result.json && result.json.Invoice;
   } catch (error) {

server/accounting/qbo/qbo.js

@@ -6,7 +6,7 @@ require("dotenv").config({
 function urlBuilder(realmId, object, query = null) {
   return `https://${
     process.env.NODE_ENV === "production" ? "" : "sandbox-"
-  }quickbooks.api.intuit.com/v3/company/${realmId}/${object}?minorversion=75${query ? `&query=${encodeURIComponent(query)}` : ""}`;
+  }quickbooks.api.intuit.com/v3/company/${realmId}/${object}${query ? `?query=${encodeURIComponent(query)}` : ""}`;
 }
 
 function StandardizeName(str) {

server/graphql-client/queries.js

@@ -222,7 +222,6 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     rate_mash
     rate_matd
     class
-    shopid
     ca_bc_pvrt
     ca_customer_gst
     towing_payable
@@ -481,7 +480,6 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
       ownr_ln
       ownr_co_nm
       class
-      shopid
     }
     billlines{
       id
@@ -532,7 +530,6 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
         ownr_fn
         ownr_ln
         ownr_co_nm
-        shopid
         bodyshop {
           accountingconfig
           md_responsibility_centers
@@ -1599,7 +1596,6 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
       ca_customer_gst
       dms_allocation
       cieca_pfl
-      cieca_stl
       materials
       joblines(where: { removed: { _eq: false } }) {
         id
@@ -1716,7 +1712,6 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
     ca_customer_gst
     dms_allocation
     cieca_pfl
-    cieca_stl
     materials
     joblines(where: {removed: {_eq: false}}) {
       id
@@ -2973,11 +2968,3 @@ exports.GET_JOB_WATCHERS_MINIMAL = `
     }
   }
 `;
-
-exports.INSERT_INTEGRATION_LOG = `
-  mutation INSERT_INTEGRATION_LOG($log: integration_log_insert_input!) {
-    insert_integration_log_one(object: $log) {
-      id
-    }
-  }
-`;

server/job/job-costing.js

@@ -567,29 +567,6 @@ function GenerateCostingData(job) {
     );
   }
 
-  if (InstanceManager({ imex: false, rome: true })) {
-    const stlTowing = job.cieca_stl?.data.find((c) => c.ttl_type === "OTTW");
-    const stlStorage = job.cieca_stl?.data.find((c) => c.ttl_type === "OTST");
-
-    if (!jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]])
-      jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = Dinero();
-
-    jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = stlTowing
-      ? Dinero({ amount: Math.round(stlTowing.ttl_amt * 100) })
-      : Dinero({
-          amount: Math.round((job.towing_payable || 0) * 100)
-        });
-
-    if (!jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]])
-      jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]] = Dinero();
-
-    jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]] = stlStorage
-      ? Dinero({ amount: Math.round(stlStorage.ttl_amt * 100) })
-      : Dinero({
-          amount: Math.round((job.storage_payable || 0) * 100)
-        });
-  }
-  
   //Is it a DMS Setup?
   const selectedDmsAllocationConfig =
     (job.bodyshop.md_responsibility_centers.dms_defaults &&

server/routes/smsRoutes.js

@@ -7,7 +7,7 @@ const { status, markConversationRead } = require("../sms/status");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 
 // Twilio Webhook Middleware for production
-// TODO: This is never actually doing anything, we should probably verify
+// 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/sms/receive.js

@@ -1,23 +1,17 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
+
 const client = require("../graphql-client/graphql-client").client;
-const {
+const queries = require("../graphql-client/queries");
-  FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID,
-  UNARCHIVE_CONVERSATION,
-  CREATE_CONVERSATION,
-  INSERT_MESSAGE
-} = require("../graphql-client/queries");
 const { phone } = require("phone");
 const { admin } = require("../firebase/firebase-handler");
+const logger = require("../utils/logger");
 const InstanceManager = require("../utils/instanceMgr").default;
 
-/**
+exports.receive = async (req, res) => {
- * Receive SMS messages from Twilio and process them
- * @param req
- * @param res
- * @returns {Promise<*>}
- */
-const receive = async (req, res) => {
   const {
-    logger,
     ioRedis,
     ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
   } = req;
@@ -26,7 +20,7 @@ const receive = async (req, res) => {
     msid: req.body.SmsMessageSid,
     text: req.body.Body,
     image: !!req.body.MediaUrl0,
-    image_path: generateMediaArray(req.body, logger)
+    image_path: generateMediaArray(req.body)
   };
 
   logger.log("sms-inbound", "DEBUG", "api", null, loggerData);
@@ -41,7 +35,7 @@ const receive = async (req, res) => {
 
   try {
     // Step 1: Find the bodyshop and existing conversation
-    const response = await client.request(FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
+    const response = await client.request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
       mssid: req.body.MessagingServiceSid,
       phone: phone(req.body.From).phoneNumber
     });
@@ -52,7 +46,7 @@ const receive = async (req, res) => {
 
     const bodyshop = response.bodyshops[0];
 
-    // Step 4: Process conversation
+    // Sort conversations by `updated_at` (or `created_at`) and pick the last one
     const sortedConversations = bodyshop.conversations.sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
     const existingConversation = sortedConversations.length
       ? sortedConversations[sortedConversations.length - 1]
@@ -63,21 +57,25 @@ const receive = async (req, res) => {
       msid: req.body.SmsMessageSid,
       text: req.body.Body,
       image: !!req.body.MediaUrl0,
-      image_path: generateMediaArray(req.body, logger),
+      image_path: generateMediaArray(req.body),
       isoutbound: false,
-      userid: null
+      userid: null // Add additional fields as necessary
     };
 
     if (existingConversation) {
+      // Use the existing conversation
       conversationid = existingConversation.id;
+
+      // Unarchive the conversation if necessary
       if (existingConversation.archived) {
-        await client.request(UNARCHIVE_CONVERSATION, {
+        await client.request(queries.UNARCHIVE_CONVERSATION, {
           id: conversationid,
           archived: false
         });
       }
     } else {
-      const newConversationResponse = await client.request(CREATE_CONVERSATION, {
+      // Create a new conversation
+      const newConversationResponse = await client.request(queries.CREATE_CONVERSATION, {
         conversation: {
           bodyshopid: bodyshop.id,
           phone_num: phone(req.body.From).phoneNumber,
@@ -88,12 +86,13 @@ const receive = async (req, res) => {
       conversationid = createdConversation.id;
     }
 
+    // Ensure `conversationid` is added to the message
     newMessage.conversationid = conversationid;
 
-    // Step 5: Insert the message
+    // Step 3: Insert the message into the conversation
-    const insertresp = await client.request(INSERT_MESSAGE, {
+    const insertresp = await client.request(queries.INSERT_MESSAGE, {
       msg: newMessage,
-      conversationid
+      conversationid: conversationid
     });
 
     const message = insertresp?.insert_messages?.returning?.[0];
@@ -103,7 +102,8 @@ const receive = async (req, res) => {
       throw new Error("Conversation data is missing from the response.");
     }
 
-    // Step 6: Notify clients
+    // Step 4: Notify clients through Redis
+    const broadcastRoom = getBodyshopRoom(conversation.bodyshop.id);
     const conversationRoom = getBodyshopConversationRoom({
       bodyshopId: conversation.bodyshop.id,
       conversationId: conversation.id
@@ -116,8 +116,6 @@ const receive = async (req, res) => {
       msid: message.sid
     };
 
-    const broadcastRoom = getBodyshopRoom(conversation.bodyshop.id);
-
     ioRedis.to(broadcastRoom).emit("new-message-summary", {
       ...commonPayload,
       existingConversation: !!existingConversation,
@@ -133,13 +131,13 @@ const receive = async (req, res) => {
       summary: false
     });
 
-    // Step 7: Send FCM notification
+    // Step 5: Send FCM notification
     const fcmresp = await admin.messaging().send({
       topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
       notification: {
         title: InstanceManager({
           imex: `ImEX Online Message - ${message.conversation.phone_num}`,
-          rome: `Rome Online Message - ${message.conversation.phone_num}`
+          rome: `Rome Online Message - ${message.conversation.phone_num}`,
         }),
         body: message.image_path ? `Image ${message.text}` : message.text
       },
@@ -159,17 +157,11 @@ const receive = async (req, res) => {
 
     res.status(200).send("");
   } catch (e) {
-    handleError(req, e, res, "RECEIVE_MESSAGE", logger);
+    handleError(req, e, res, "RECEIVE_MESSAGE");
   }
 };
 
-/**
+const generateMediaArray = (body) => {
- * Generate media array from the request body
- * @param body
- * @param logger
- * @returns {null|*[]}
- */
-const generateMediaArray = (body, logger) => {
   const { NumMedia } = body;
   if (parseInt(NumMedia) > 0) {
     const ret = [];
@@ -182,20 +174,12 @@ const generateMediaArray = (body, logger) => {
   }
 };
 
-/**
+const handleError = (req, error, res, context) => {
- * Handle error logging and response
- * @param req
- * @param error
- * @param res
- * @param context
- * @param logger
- */
-const handleError = (req, error, res, context, logger) => {
   logger.log("sms-inbound-error", "ERROR", "api", null, {
     msid: req.body.SmsMessageSid,
     text: req.body.Body,
     image: !!req.body.MediaUrl0,
-    image_path: generateMediaArray(req.body, logger),
+    image_path: generateMediaArray(req.body),
     messagingServiceSid: req.body.MessagingServiceSid,
     context,
     error
@@ -203,7 +187,3 @@ const handleError = (req, error, res, context, logger) => {
 
   res.status(500).json({ error: error.message || "Internal Server Error" });
 };
-
-module.exports = {
-  receive
-};

server/sms/send.js

@@ -1,20 +1,19 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
+
 const twilio = require("twilio");
 const { phone } = require("phone");
-const { INSERT_MESSAGE } = require("../graphql-client/queries");
+const queries = require("../graphql-client/queries");
+const logger = require("../utils/logger");
 const client = twilio(process.env.TWILIO_AUTH_TOKEN, process.env.TWILIO_AUTH_KEY);
 const gqlClient = require("../graphql-client/graphql-client").client;
 
-/**
+exports.send = async (req, res) => {
- * Send an outbound SMS message
- * @param req
- * @param res
- * @returns {Promise<void>}
- */
-const send = async (req, res) => {
   const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } = req.body;
   const {
     ioRedis,
-    logger,
     ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
   } = req;
 
@@ -26,8 +25,8 @@ const send = async (req, res) => {
     conversationid,
     isoutbound: true,
     userid: req.user.email,
-    image: selectedMedia.length > 0,
+    image: req.body.selectedMedia.length > 0,
-    image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
+    image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
   });
 
   if (!to || !messagingServiceSid || (!body && selectedMedia.length === 0) || !conversationid) {
@@ -39,8 +38,8 @@ const send = async (req, res) => {
       conversationid,
       isoutbound: true,
       userid: req.user.email,
-      image: selectedMedia.length > 0,
+      image: req.body.selectedMedia.length > 0,
-      image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
+      image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
     });
     res.status(400).json({ success: false, message: "Missing required parameter(s)." });
     return;
@@ -60,15 +59,12 @@ const send = async (req, res) => {
       conversationid,
       isoutbound: true,
       userid: req.user.email,
-      image: selectedMedia.length > 0,
+      image: req.body.selectedMedia.length > 0,
-      image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
+      image_path: req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
     };
 
     try {
-      const gqlResponse = await gqlClient.request(INSERT_MESSAGE, {
+      const gqlResponse = await gqlClient.request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid });
-        msg: newMessage,
-        conversationid
-      });
 
       logger.log("sms-outbound-success", "DEBUG", req.user.email, null, {
         msid: message.sid,
@@ -115,7 +111,3 @@ const send = async (req, res) => {
     res.status(500).json({ success: false, message: "Failed to send message through Twilio." });
   }
 };
-
-module.exports = {
-  send
-};

server/sms/status.js

@@ -1,14 +1,13 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
+
 const client = require("../graphql-client/graphql-client").client;
-const { UPDATE_MESSAGE_STATUS, MARK_MESSAGES_AS_READ } = require("../graphql-client/queries");
+const queries = require("../graphql-client/queries");
 const logger = require("../utils/logger");
 
-/**
+exports.status = async (req, res) => {
- * Handle the status of an SMS message
- * @param req
- * @param res
- * @returns {Promise<*>}
- */
-const status = async (req, res) => {
   const { SmsSid, SmsStatus } = req.body;
   const {
     ioRedis,
@@ -22,7 +21,7 @@ const status = async (req, res) => {
     }
 
     // Update message status in the database
-    const response = await client.request(UPDATE_MESSAGE_STATUS, {
+    const response = await client.request(queries.UPDATE_MESSAGE_STATUS, {
       msid: SmsSid,
       fields: { status: SmsStatus }
     });
@@ -66,13 +65,7 @@ const status = async (req, res) => {
   }
 };
 
-/**
+exports.markConversationRead = async (req, res) => {
- * Mark a conversation as read
- * @param req
- * @param res
- * @returns {Promise<*>}
- */
-const markConversationRead = async (req, res) => {
   const {
     ioRedis,
     ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
@@ -87,7 +80,7 @@ const markConversationRead = async (req, res) => {
   }
 
   try {
-    const response = await client.request(MARK_MESSAGES_AS_READ, {
+    const response = await client.request(queries.MARK_MESSAGES_AS_READ, {
       conversationId
     });
 
@@ -111,8 +104,3 @@ const markConversationRead = async (req, res) => {
     res.status(500).json({ error: "Failed to mark conversation as read." });
   }
 };
-
-module.exports = {
-  status,
-  markConversationRead
-};

server/utils/ioHelpers.js

@@ -1,11 +1,3 @@
-/**
- * @module ioHelpers
- * @param app
- * @param api
- * @param io
- * @param logger
- * @returns {{getBodyshopRoom: (function(*): string), getBodyshopConversationRoom: (function({bodyshopId: *, conversationId: *}): string)}}
- */
 const applyIOHelpers = ({ app, api, io, logger }) => {
   // Global Bodyshop Room
   const getBodyshopRoom = (bodyshopId) => `bodyshop-broadcast-room:${bodyshopId}`;

server/utils/logger.js

@@ -12,9 +12,6 @@ const { uploadFileToS3 } = require("./s3");
 const { v4 } = require("uuid");
 const { InstanceRegion } = require("./instanceMgr");
 const getHostNameOrIP = require("./getHostNameOrIP");
-const client = require("../graphql-client/graphql-client").client;
-const queries = require("../graphql-client/queries");
-
 
 const LOG_LEVELS = {
   error: { level: 0, name: "error" },
@@ -102,11 +99,13 @@ const createLogger = () => {
             const labelColor = "\x1b[33m"; // Yellow
             const separatorColor = "\x1b[35m|\x1b[0m"; // Magenta for separators
 
-            return `${timestampColor} [${hostnameColor}] [${level}]: ${message} ${user ? `${separatorColor} ${labelColor}user:\x1b[0m ${JSON.stringify(user)}` : ""
+            return `${timestampColor} [${hostnameColor}] [${level}]: ${message} ${
-              } ${record ? `${separatorColor} ${labelColor}record:\x1b[0m ${JSON.stringify(record)}` : ""}${meta
+              user ? `${separatorColor} ${labelColor}user:\x1b[0m ${JSON.stringify(user)}` : ""
+            } ${record ? `${separatorColor} ${labelColor}record:\x1b[0m ${JSON.stringify(record)}` : ""}${
+              meta
                 ? `\n${separatorColor} ${labelColor}meta:\x1b[0m ${JSON.stringify(meta, null, 2)} ${separatorColor}`
                 : ""
-              }`;
+            }`;
           })
         )
       })
@@ -195,45 +194,9 @@ const createLogger = () => {
       winstonLogger.log(logEntry);
     };
 
-    const LogIntegrationCall = async ({ platform, method, name, jobid, paymentid, billid, status, bodyshopid, email }) => {
-      try {
-        //Insert the record. 
-        await client.request(queries.INSERT_INTEGRATION_LOG, {
-          log: {
-            platform,
-            method,
-            name,
-            jobid,
-            paymentid,
-            billid,
-            status: status?.toString() ?? "0",
-            bodyshopid,
-            email
-          }
-        });
-
-      } catch (error) {
-        console.trace("Stack", error?.stack);
-        log("integration-log-error", "ERROR", email, null, {
-          message: error?.message,
-          stack: error?.stack,
-          platform,
-          method,
-          name,
-          jobid,
-          paymentid,
-          billid,
-          status,
-          bodyshopid,
-          email
-        });
-      }
-    };
-
     return {
       log,
-      logger: winstonLogger,
+      logger: winstonLogger
-      LogIntegrationCall
     };
   } catch (e) {
     console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");