IO-3235 FeatureAccess on VisualBoard for SmartSchedule Option of Color Cards

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

client/package-lock.json

@@ -13,21 +13,21 @@
         "@apollo/client": "^3.13.6",
         "@emotion/is-prop-valid": "^1.3.1",
         "@fingerprintjs/fingerprintjs": "^4.6.1",
-        "@firebase/analytics": "^0.10.12",
-        "@firebase/app": "^0.11.4",
-        "@firebase/auth": "^1.10.0",
-        "@firebase/firestore": "^4.7.10",
-        "@firebase/messaging": "^0.12.17",
+        "@firebase/analytics": "^0.10.13",
+        "@firebase/app": "^0.12.1",
+        "@firebase/auth": "^1.10.2",
+        "@firebase/firestore": "^4.7.12",
+        "@firebase/messaging": "^0.12.18",
         "@jsreport/browser-client": "^3.1.0",
-        "@reduxjs/toolkit": "^2.6.1",
-        "@sentry/cli": "^2.44.0",
-        "@sentry/react": "^9.15.0",
+        "@reduxjs/toolkit": "^2.8.1",
+        "@sentry/cli": "^2.45.0",
+        "@sentry/react": "^9.18.0",
         "@sentry/vite-plugin": "^3.4.0",
         "@splitsoftware/splitio-react": "^2.1.1",
         "@tanem/react-nprogress": "^5.0.53",
-        "antd": "^5.24.9",
+        "antd": "^5.25.1",
         "apollo-link-logger": "^2.0.1",
-        "apollo-link-sentry": "^4.2.0",
+        "apollo-link-sentry": "^4.3.0",
         "autosize": "^6.0.1",
         "axios": "^1.8.4",
         "classnames": "^2.5.1",
@@ -42,7 +42,7 @@
         "i18next": "^24.2.3",
         "i18next-browser-languagedetector": "^8.1.0",
         "immutability-helper": "^3.1.1",
-        "libphonenumber-js": "^1.12.6",
+        "libphonenumber-js": "^1.12.8",
         "logrocket": "^9.0.2",
         "markerjs2": "^2.32.4",
         "memoize-one": "^6.0.0",
@@ -78,9 +78,9 @@
         "redux-saga": "^1.3.0",
         "redux-state-sync": "^3.1.4",
         "reselect": "^5.1.1",
-        "sass": "^1.86.3",
+        "sass": "^1.88.0",
         "socket.io-client": "^4.8.1",
-        "styled-components": "^6.1.17",
+        "styled-components": "^6.1.18",
         "subscriptions-transport-ws": "^0.11.0",
         "use-memo-one": "^1.1.3",
         "vite-plugin-ejs": "^1.7.0",
@@ -90,7 +90,7 @@
         "@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.43.0",
+        "@dotenvx/dotenvx": "^1.44.0",
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/react": "^11.14.0",
         "@eslint/js": "^9.26.0",
@@ -2587,9 +2587,9 @@
       }
     },
     "node_modules/@dotenvx/dotenvx": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.43.0.tgz",
-      "integrity": "sha512-Z8XjM75aWZ/ekUzBjlr/OqQsLWtJY4nVtruxopAt+FlYHfY0/gKl85nD16aEqbTkU53kJcm5psID0L2/sQMmuw==",
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.44.0.tgz",
+      "integrity": "sha512-18Aa+7KP/L2Kj9lxmT4EJZnsCq/xGIHgzU26rdzsKMhjpeT3YY+qin/dNAnIaVHPZnee7kXpZL55M9htd30r7Q==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -2931,15 +2931,15 @@
       }
     },
     "node_modules/@firebase/analytics": {
-      "version": "0.10.12",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.12.tgz",
-      "integrity": "sha512-iDCGnw6qdFqwI5ywkgece99WADJNoymu+nLIQI4fZM/vCZ3bEo4wlpEetW71s1HqGpI0hQStiPhqVjFxDb2yyw==",
+      "version": "0.10.13",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.13.tgz",
+      "integrity": "sha512-X+6wMOPgA9l0AeeMdMcMfaCP4XKPvrhx55MGuMrfHvUrOvFKldpzBum7KkoGJMoexKmqmKP+mCmJMY9Fb8K6Hw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
-        "@firebase/installations": "0.6.13",
+        "@firebase/component": "0.6.14",
+        "@firebase/installations": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -2947,14 +2947,14 @@
       }
     },
     "node_modules/@firebase/app": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.11.5.tgz",
-      "integrity": "sha512-uNp8/Rv12GrrM/dfyqzZCftA2i/5X9axmiEtUDmyQw+0S17EV5s9gudOgdIIGr849LmbAk3At2CBZMqiQJVwNw==",
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.12.1.tgz",
+      "integrity": "sha512-ASExOlmmjRMdwOQ65Oj6R9JBqa7iiT1/LgZjtbU7FqxoJZNWHrt39NJ/z2bjyYDdAHX8jkY7muFqzahScCXgfA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -2963,14 +2963,14 @@
       }
     },
     "node_modules/@firebase/auth": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.1.tgz",
-      "integrity": "sha512-YsCppueiV4AsMTf4oQ49KiADvtqKnG5j9Q4mBv7xGa0hnSTAX3jpdwlTluU3n0JxUT2tbPkeOESJmF4a9GWlMQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.2.tgz",
+      "integrity": "sha512-HHudcj3CJyXpoMKslNOVHGSNJdAUjvy5xBA/G/uPb32QFqvx5F3EW9RDYvve2IHEN7Vpc1QTkk/28J32x83UGA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "engines": {
@@ -2987,12 +2987,12 @@
       }
     },
     "node_modules/@firebase/component": {
-      "version": "0.6.13",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.13.tgz",
-      "integrity": "sha512-I/Eg1NpAtZ8AAfq8mpdfXnuUpcLxIDdCDtTzWSh+FXnp/9eCKJ3SNbOCKrUCyhLzNa2SiPJYruei0sxVjaOTeg==",
+      "version": "0.6.14",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.14.tgz",
+      "integrity": "sha512-kf/zAT8GQJ9nYoHuj0mv7twp1QzifKYrO+GsmsVHHM+Hi9KkmI7E3B3J0CtihHpb34vinl4gbJrYJ2p2wfvc9A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "tslib": "^2.1.0"
       },
       "engines": {
@@ -3000,14 +3000,14 @@
       }
     },
     "node_modules/@firebase/firestore": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.11.tgz",
-      "integrity": "sha512-Ve9Q1YZKgG7Of8jhwPCy43CLe0Oi62clCDYLNYs0Rz08U75caIFZyASRmz+2FZWdMt8fLGmRLDNd0KfX16zMvA==",
+      "version": "4.7.12",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.12.tgz",
+      "integrity": "sha512-50KRdSp8xA7+G0wfWxlnCoEN951mt8BVdLMxeP57Rehj2DqIb41q6Fc6JH0dfQ4TlMqWua1YfVY1jPEAaHVF9w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
+        "@firebase/component": "0.6.14",
         "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "@firebase/webchannel-wrapper": "1.0.3",
         "@grpc/grpc-js": "~1.9.0",
         "@grpc/proto-loader": "^0.7.8",
@@ -3021,13 +3021,13 @@
       }
     },
     "node_modules/@firebase/installations": {
-      "version": "0.6.13",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.13.tgz",
-      "integrity": "sha512-6ZpkUiaygPFwgVneYxuuOuHnSPnTA4KefLEaw/sKk/rNYgC7X6twaGfYb0sYLpbi9xV4i5jXsqZ3WO+yaguNgg==",
+      "version": "0.6.14",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.14.tgz",
+      "integrity": "sha512-uE837g9+sv6PfjWPgOfG3JtjZ+hJ7KBHO4UVenVsvhzgOxFkvLjO/bgE7fyvsaD3fOHSXunx3adRIg4eUEMPyA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
-        "@firebase/util": "1.11.0",
+        "@firebase/component": "0.6.14",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -3048,15 +3048,15 @@
       }
     },
     "node_modules/@firebase/messaging": {
-      "version": "0.12.17",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.17.tgz",
-      "integrity": "sha512-W3CnGhTm6Nx8XGb6E5/+jZTuxX/EK8Vur4QXvO1DwZta/t0xqWMRgO9vNsZFMYBqFV4o3j4F9qK/iddGYwWS6g==",
+      "version": "0.12.18",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.18.tgz",
+      "integrity": "sha512-2MGhUGoCZloB7ysoYzG/T2nnRmHYLT+AcqYouZuD6APabpkDhF8lHsmSQq4MFSlXhI3DKFOXxjuvbY8ec4C2JQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@firebase/component": "0.6.13",
-        "@firebase/installations": "0.6.13",
+        "@firebase/component": "0.6.14",
+        "@firebase/installations": "0.6.14",
         "@firebase/messaging-interop-types": "0.2.3",
-        "@firebase/util": "1.11.0",
+        "@firebase/util": "1.11.1",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
@@ -3071,9 +3071,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@firebase/util": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.11.0.tgz",
-      "integrity": "sha512-PzSrhIr++KI6y4P6C/IdgBNMkEx0Ex6554/cYd0Hm+ovyFSJtJXqb/3OSIdnBoa2cpwZT1/GW56EmRc5qEc5fQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.11.1.tgz",
+      "integrity": "sha512-RXg4WE8C2LUrvoV/TMGRTu223zZf9Dq9MR8yHZio9nF9TpLnpCPURw9VWWB2WATDl6HfIdWfl2x2SJYtHkN4hw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3836,9 +3836,9 @@
       "license": "MIT"
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.7.0.tgz",
-      "integrity": "sha512-XVwolG6eTqwV0N8z/oDlN93ITCIGIop6leXlGJI/4EKy+0POYkR+ABHRSdGXY+0MQvJBP8yAzh+EYFxTuvmBiQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.1.tgz",
+      "integrity": "sha512-GLjHS13LiBdiuxSJvfWs3+Cx5yt97mCbuVlDteTusS6VRksPhoWviO8L1e3Re1G94m6lkw/l4pjEEyyNaGf19g==",
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
@@ -4458,50 +4458,50 @@
       "license": "MIT"
     },
     "node_modules/@sentry-internal/browser-utils": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.15.0.tgz",
-      "integrity": "sha512-tIM+9zXCefkInRiNmBkXKgkamRjEOlAcf768cBKlMWVOatfNrSEB0UEV7qkAYqnQGWkbPkHFMbFJxWptydLODw==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.18.0.tgz",
+      "integrity": "sha512-TwSlmgYpHhe55JpOcVApkM0XcXZh1/cYuEPKPFgeaaPD8BrQrLJJvwKxnonSWXOhdnkJxi4GgK7j7mw57PS4aA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "9.15.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/feedback": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.15.0.tgz",
-      "integrity": "sha512-jyN0r57WL8V5ViwZpiNvbIhF9I89jxn6mtIQcyV85EjIXDyzJmeTgxc/FIU0kcDVv6zso3qnGRJUxGK+GvoYZg==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.18.0.tgz",
+      "integrity": "sha512-QlrB8oQK+5bfhbgK6yHF6rLwLNJ9XuGblTc51yVkm4d4jn4W/HDyaNqMfQF+JXdTiFatl8oz2xdKR8kGK8kXyg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "9.15.0"
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.15.0.tgz",
-      "integrity": "sha512-lv6ENRmfeBuod6Tr1WgLeF0+wIIXlHWNAGofsaNUvm8UKS7USicFsQWKOZPk4UyjTfrEClPp2vx+o7aUcZS6TQ==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.18.0.tgz",
+      "integrity": "sha512-2A32FFwrlZtdpBruvpcLEfucu6BpyqOk3F4Bo5smM/5q7u0pa7q5d9FSY5l3nwKEAFAoLGv3hcCb+8wxMm50xA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "9.15.0",
-        "@sentry/core": "9.15.0"
+        "@sentry-internal/browser-utils": "9.18.0",
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.15.0.tgz",
-      "integrity": "sha512-a1/oiXwcW5OmILjD7/R2UEsPQWXJBUr0u388uCKDUGeyXLxBBbIJGS5E8oLwVQLVxhVJrODgxvT19z9OVcbn7g==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.18.0.tgz",
+      "integrity": "sha512-3DEyQLmHcYgcwJ8n8eMhI6bhhawPuMc2xTT+Az8gXMqCO/X9ZACpipAmhXFjYP9Ptl+w0Vh3nllJw+gXc/DOsg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/replay": "9.15.0",
-        "@sentry/core": "9.15.0"
+        "@sentry-internal/replay": "9.18.0",
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
@@ -4517,16 +4517,16 @@
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.15.0.tgz",
-      "integrity": "sha512-ppHESKFVQFpAb3rQI2ateDkmMytVcvAWsjZrZ3hF9iEnO3iTIIu32ib5nqQUL4KKXZQovYnDrSlDcdv3ZwX/8Q==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.18.0.tgz",
+      "integrity": "sha512-0SWfp4J2+mH4lZOcHfyIwt9VoGD7yCGQE1cm0BPcLwKnrVQeXHtUXNYNy8HTHSjTGyoFDhEAYelE/tdA3OLcWQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "9.15.0",
-        "@sentry-internal/feedback": "9.15.0",
-        "@sentry-internal/replay": "9.15.0",
-        "@sentry-internal/replay-canvas": "9.15.0",
-        "@sentry/core": "9.15.0"
+        "@sentry-internal/browser-utils": "9.18.0",
+        "@sentry-internal/feedback": "9.18.0",
+        "@sentry-internal/replay": "9.18.0",
+        "@sentry-internal/replay-canvas": "9.18.0",
+        "@sentry/core": "9.18.0"
       },
       "engines": {
         "node": ">=18"
@@ -4717,9 +4717,9 @@
       }
     },
     "node_modules/@sentry/cli": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.44.0.tgz",
-      "integrity": "sha512-WTWRJb5OD/bqNq66QFWRzNt/S79aCrcXg6ELJFhz1aDdXaQZu9AyElQGu3a+WVNOY0ntTFmatw3HV875qNdJTQ==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.45.0.tgz",
+      "integrity": "sha512-4sWu7zgzgHAjIxIjXUA/66qgeEf5ZOlloO+/JaGD5qXNSW0G7KMTR6iYjReNKMgdBCTH6bUUt9qiuA+Ex9Masw==",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -4736,20 +4736,20 @@
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@sentry/cli-darwin": "2.44.0",
-        "@sentry/cli-linux-arm": "2.44.0",
-        "@sentry/cli-linux-arm64": "2.44.0",
-        "@sentry/cli-linux-i686": "2.44.0",
-        "@sentry/cli-linux-x64": "2.44.0",
-        "@sentry/cli-win32-arm64": "2.44.0",
-        "@sentry/cli-win32-i686": "2.44.0",
-        "@sentry/cli-win32-x64": "2.44.0"
+        "@sentry/cli-darwin": "2.45.0",
+        "@sentry/cli-linux-arm": "2.45.0",
+        "@sentry/cli-linux-arm64": "2.45.0",
+        "@sentry/cli-linux-i686": "2.45.0",
+        "@sentry/cli-linux-x64": "2.45.0",
+        "@sentry/cli-win32-arm64": "2.45.0",
+        "@sentry/cli-win32-i686": "2.45.0",
+        "@sentry/cli-win32-x64": "2.45.0"
       }
     },
     "node_modules/@sentry/cli-darwin": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.44.0.tgz",
-      "integrity": "sha512-avkaxMCjXPGQ9/6W7gbBaU5rDqu6ZsY1guMZiyB27BJWofRaWsLje3d589LjTFjRXmYwytoiKsv3fLUQZQbGuQ==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.45.0.tgz",
+      "integrity": "sha512-p4Uxfv/L2fQdP3/wYnKVVz9gzZJf/1Xp9D+6raax/3Bu5y87yHYUqcdt98y/VAXQD4ofp2QgmhGUVPofvQNZmg==",
       "license": "BSD-3-Clause",
       "optional": true,
       "os": [
@@ -4760,9 +4760,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.44.0.tgz",
-      "integrity": "sha512-Y+y6sJpFlLTO795s8iZILVB0inkhEd/wHKTmagj2JgPrGgC0sWdzRlurIGDJBBIA4R2X3CNuBB6/3nFKHZ5xWA==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.45.0.tgz",
+      "integrity": "sha512-6sEskFLlFKJ+e0MOYgIclBTUX5jYMyYhHIxXahEkI/4vx6JO0uvpyRAkUJRpJkRh/lPog0FM+tbP3so+VxB2qQ==",
       "cpu": [
         "arm"
       ],
@@ -4777,9 +4777,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm64": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.44.0.tgz",
-      "integrity": "sha512-SSyBF81a79Z0JqtzyYyjCDAXAuh2bDJRGEpoSI/4DZvZVAOsoF3H2ZN6WtUQjFq6LWUyke5s4Usxmn3V6knPZw==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.45.0.tgz",
+      "integrity": "sha512-gUcLoEjzg7AIc4QQGEZwRHri+EHf3Gcms9zAR1VHiNF3/C/jL4WeDPJF2YiWAQt6EtH84tHiyhw1Ab/R8XFClg==",
       "cpu": [
         "arm64"
       ],
@@ -4794,9 +4794,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-i686": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.44.0.tgz",
-      "integrity": "sha512-YP42/jd7aTOZi/p4zPkZ/i/g7PnnJJkU43i+pc2s+GtooV2HWHu2uVu8TOazjZAYT/HU+t5W+xVrvnHGUNf0rA==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.45.0.tgz",
+      "integrity": "sha512-VmmOaEAzSW23YdGNdy/+oQjCNAMY+HmOGA77A25/ep/9AV7PQB6FI7xO5Y1PVvlkxZFJ23e373njSsEeg4uDZw==",
       "cpu": [
         "x86",
         "ia32"
@@ -4812,9 +4812,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-x64": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.44.0.tgz",
-      "integrity": "sha512-+BcxpBhgOI2Fz6ppszs46AepvS2izcA/KjDbJMld7Hr9GjigUoZ+oR1+4rctIGkotj0nm+gPHrKoZeZbWS5kQw==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.45.0.tgz",
+      "integrity": "sha512-a0Oj68mrb25a0WjX/ShZ6AAd4PPiuLcgyzQr7bl2+DvYxIOajwkGbR+CZFEhOVZcfhTnixKy/qIXEzApEPHPQg==",
       "cpu": [
         "x64"
       ],
@@ -4829,9 +4829,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-arm64": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.44.0.tgz",
-      "integrity": "sha512-nIhhlClqKg4e2gboHTMIgM89e94xOe6SDYh3ympsNvE668kpEjqCBWKsG3rW3haX30FADl18Gd+V7mvqSk+nzg==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.45.0.tgz",
+      "integrity": "sha512-vn+CwS4p+52pQSLNPoi20ZOrQmv01ZgAmuMnjkh1oUZfTyBAwWLrAh6Cy4cztcN8DfL5dOWKQBo8DBKURE4ttg==",
       "cpu": [
         "arm64"
       ],
@@ -4845,9 +4845,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-i686": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.44.0.tgz",
-      "integrity": "sha512-m9ltCk1ybTbWujARW1Ry7hK2GFryqsdQtr5n6CUcuBXCMIf+VuJqGvVxxdLpGnh9CEY5AbDRNtRnyxi0+8/XGg==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.45.0.tgz",
+      "integrity": "sha512-8mMoDdlwxtcdNIMtteMK7dbi7054jak8wKSHJ5yzMw8UmWxC5thc/gXBc1uPduiaI56VjoJV+phWHBKCD+6I4w==",
       "cpu": [
         "x86",
         "ia32"
@@ -4862,9 +4862,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-x64": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.44.0.tgz",
-      "integrity": "sha512-tFhMQPSXzfH3/9lFNngLcIusfqiXjOwK3xp1EHJNAnOYdNuzcRCbQ9i5IHWRh+VOixp7FEnPsrl/LJErbLgSzg==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.45.0.tgz",
+      "integrity": "sha512-ZvK9cIqFaq7vZ0jkHJ/xh5au6902Dr+AUxSk6L6vCL7JCe2p93KGL/4d8VFB5PD/P7Y9b+105G/e0QIFKzpeOw==",
       "cpu": [
         "x64"
       ],
@@ -4899,22 +4899,22 @@
       }
     },
     "node_modules/@sentry/core": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.15.0.tgz",
-      "integrity": "sha512-lBmo3bzzaYUesdzc2H5K3fajfXyUNuj5koqyFoCAI8rnt9CBl7SUc/P07+E5eipF8mxgiU3QtkI7ALzRQN8pqQ==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.18.0.tgz",
+      "integrity": "sha512-kRVH8BqMiaU2FTHYa68zNlAloS43jl4XtIEHkLKVH/7gUtwRmM4Gqj8P7RTrZdO1Lo7ksYnGj+AG05Z09CRbOw==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/react": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.15.0.tgz",
-      "integrity": "sha512-8nojSjiEd/EWIgoWVfkNIkBGL2yoFZoVMBUTcYlypsMnUHNko2RJItOBqZs5/DRBxuzfBKVt8PF+gkhQOm6mPg==",
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.18.0.tgz",
+      "integrity": "sha512-1cCLYZrZ2gu6H8eE83DC47kLf+pzD1Rim3dDoOEvwt1F5cD3K/DBeIhoHZaXqBeQxuVyHXOOLXSAC/CIuas5Aw==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "9.15.0",
-        "@sentry/core": "9.15.0",
+        "@sentry/browser": "9.18.0",
+        "@sentry/core": "9.18.0",
         "hoist-non-react-statics": "^3.3.2"
       },
       "engines": {
@@ -6088,9 +6088,9 @@
       }
     },
     "node_modules/antd": {
-      "version": "5.24.9",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.24.9.tgz",
-      "integrity": "sha512-liB+Y/JwD5/KSKbK1Z1EVAbWcoWYvWJ1s97AbbT+mOdigpJQuWwH7kG8IXNEljI7onvj0DdD43TXhSRLUu9AMA==",
+      "version": "5.25.1",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.1.tgz",
+      "integrity": "sha512-4KC7KuPCjr0z3Vuw9DsF+ceqJaPLbuUI3lOX1sY8ix25ceamp+P8yxOmk3Y2JHCD2ZAhq+5IQ/DTJRN2adWYKQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^7.2.0",
@@ -6108,7 +6108,7 @@
         "classnames": "^2.5.1",
         "copy-to-clipboard": "^3.3.3",
         "dayjs": "^1.11.11",
-        "rc-cascader": "~3.33.1",
+        "rc-cascader": "~3.34.0",
         "rc-checkbox": "~3.5.0",
         "rc-collapse": "~3.9.0",
         "rc-dialog": "~9.6.0",
@@ -6128,7 +6128,7 @@
         "rc-rate": "~2.13.1",
         "rc-resize-observer": "^1.4.3",
         "rc-segmented": "~2.7.0",
-        "rc-select": "~14.16.6",
+        "rc-select": "~14.16.7",
         "rc-slider": "~11.1.8",
         "rc-steps": "~6.0.1",
         "rc-switch": "~4.1.0",
@@ -6138,7 +6138,7 @@
         "rc-tooltip": "~6.4.0",
         "rc-tree": "~5.13.1",
         "rc-tree-select": "~5.27.0",
-        "rc-upload": "~4.8.1",
+        "rc-upload": "~4.9.0",
         "rc-util": "^5.44.4",
         "scroll-into-view-if-needed": "^3.1.0",
         "throttle-debounce": "^5.0.2"
@@ -6232,9 +6232,9 @@
       }
     },
     "node_modules/apollo-link-sentry": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-4.2.0.tgz",
-      "integrity": "sha512-w8EUM4aEw1/VxIB3KOP11T8qz44oWRcbXRd2vJq/qHnfRMKS5HkMerSIYwKN2e8k9H8ubfkwBvStH51CVf4wwg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-4.3.0.tgz",
+      "integrity": "sha512-C3WK4iwIzW5vC5BoY3VPdKjm16P6ca/LGKFnxg6PvUuboxPlqs7LHQCYvEsdAxBkoY+8kRXd8Q3+3oU+HHUceA==",
       "license": "MIT",
       "dependencies": {
         "deepmerge": "^4.2.2",
@@ -11464,9 +11464,9 @@
       }
     },
     "node_modules/libphonenumber-js": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.7.tgz",
-      "integrity": "sha512-0nYZSNj/QEikyhcM5RZFXGlCB/mr4PVamnT1C2sKBnDDTYndrvbybYjvg+PMqAndQHlLbwQ3socolnL3WWTUFA==",
+      "version": "1.12.8",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.8.tgz",
+      "integrity": "sha512-f1KakiQJa9tdc7w1phC2ST+DyxWimy9c3g3yeF+84QtEanJr2K77wAmBPP22riU05xldniHsvXuflnLZ4oysqA==",
       "license": "MIT"
     },
     "node_modules/lines-and-columns": {
@@ -13652,9 +13652,9 @@
       }
     },
     "node_modules/rc-cascader": {
-      "version": "3.33.1",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.33.1.tgz",
-      "integrity": "sha512-Kyl4EJ7ZfCBuidmZVieegcbFw0RcU5bHHSbtEdmuLYd0fYHCAiYKZ6zon7fWAVyC6rWWOOib0XKdTSf7ElC9rg==",
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.34.0.tgz",
+      "integrity": "sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.25.7",
@@ -14024,9 +14024,9 @@
       }
     },
     "node_modules/rc-select": {
-      "version": "14.16.6",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.6.tgz",
-      "integrity": "sha512-YPMtRPqfZWOm2XGTbx5/YVr1HT0vn//8QS77At0Gjb3Lv+Lbut0IORJPKLWu1hQ3u4GsA0SrDzs7nI8JG7Zmyg==",
+      "version": "14.16.7",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.7.tgz",
+      "integrity": "sha512-lT9kO5gFHQdJzu9a0btcOtNaJHkhenSl8H5mcpgXN9VIMXP59rnkpbdHmPrteixWs1D5zFOTyoTYX3b7joADIQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -14210,9 +14210,9 @@
       }
     },
     "node_modules/rc-upload": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.8.1.tgz",
-      "integrity": "sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.9.0.tgz",
+      "integrity": "sha512-pAzlPnyiFn1GCtEybEG2m9nXNzQyWXqWV2xFYCmDxjN9HzyjS5Pz2F+pbNdYw8mMJsixLEKLG0wVy9vOGxJMJA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -15375,9 +15375,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.87.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz",
-      "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
+      "version": "1.88.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.88.0.tgz",
+      "integrity": "sha512-sF6TWQqjFvr4JILXzG4ucGOLELkESHL+I5QJhh7CNaE+Yge0SI+ehCatsXhJ7ymU1hAFcIS3/PBpjdIbXoyVbg==",
       "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
@@ -16275,9 +16275,9 @@
       }
     },
     "node_modules/styled-components": {
-      "version": "6.1.17",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.17.tgz",
-      "integrity": "sha512-97D7DwWanI7nN24v0D4SvbfjLE9656umNSJZkBkDIWL37aZqG/wRQ+Y9pWtXyBIM/NSfcBzHLErEsqHmJNSVUg==",
+      "version": "6.1.18",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.18.tgz",
+      "integrity": "sha512-Mvf3gJFzZCkhjY2Y/Fx9z1m3dxbza0uI9H1CbNZm/jSHCojzJhQ0R7bByrlFJINnMzz/gPulpoFFGymNwrsMcw==",
       "license": "MIT",
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.2",

client/package.json

@@ -12,21 +12,21 @@
     "@apollo/client": "^3.13.6",
     "@emotion/is-prop-valid": "^1.3.1",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.12",
-    "@firebase/app": "^0.11.4",
-    "@firebase/auth": "^1.10.0",
-    "@firebase/firestore": "^4.7.10",
-    "@firebase/messaging": "^0.12.17",
+    "@firebase/analytics": "^0.10.13",
+    "@firebase/app": "^0.12.1",
+    "@firebase/auth": "^1.10.2",
+    "@firebase/firestore": "^4.7.12",
+    "@firebase/messaging": "^0.12.18",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.6.1",
-    "@sentry/cli": "^2.44.0",
-    "@sentry/react": "^9.15.0",
+    "@reduxjs/toolkit": "^2.8.1",
+    "@sentry/cli": "^2.45.0",
+    "@sentry/react": "^9.18.0",
     "@sentry/vite-plugin": "^3.4.0",
     "@splitsoftware/splitio-react": "^2.1.1",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.24.9",
+    "antd": "^5.25.1",
     "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^4.2.0",
+    "apollo-link-sentry": "^4.3.0",
     "autosize": "^6.0.1",
     "axios": "^1.8.4",
     "classnames": "^2.5.1",
@@ -41,7 +41,7 @@
     "i18next": "^24.2.3",
     "i18next-browser-languagedetector": "^8.1.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.6",
+    "libphonenumber-js": "^1.12.8",
     "logrocket": "^9.0.2",
     "markerjs2": "^2.32.4",
     "memoize-one": "^6.0.0",
@@ -77,9 +77,9 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.86.3",
+    "sass": "^1.88.0",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.17",
+    "styled-components": "^6.1.18",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
     "vite-plugin-ejs": "^1.7.0",
@@ -130,7 +130,7 @@
     "@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.43.0",
+    "@dotenvx/dotenvx": "^1.44.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@eslint/js": "^9.26.0",

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -14,8 +14,21 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  setPartsOrderContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "partsOrder"
+      })
+    ),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillDetailEditReturn);
@@ -69,7 +82,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, b
       <Modal
         open={open}
         onCancel={() => setOpen(false)}
-        destroyOnClose
+        destroyOnHidden
         title={t("bills.actions.return")}
         onOk={() => form.submit()}
       >

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -29,7 +29,7 @@ export default function BillDetailEditcontainer() {
         delete search.billid;
         history({ search: queryString.stringify(search) });
       }}
-      destroyOnClose
+      destroyOnHidden
       open={search.billid}
     >
       <BillDetailEditComponent />

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

@@ -412,7 +412,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           )}
         </Space>
       }
-      destroyOnClose
+      destroyOnHidden
     >
       <Form
         onFinish={handleFinish}

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

@@ -75,7 +75,7 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
       title={t("payments.labels.findermodal")}
       onCancel={() => toggleModalVisible()}
       onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
       forceRender
     >
       <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>

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

@@ -40,7 +40,7 @@ function CardPaymentModalContainer({ cardPaymentModal, toggleModalVisible, bodys
         </Button>
       ]}
       width="80%"
-      destroyOnClose
+      destroyOnHidden
     >
       <CardPaymentModalComponent />
     </Modal>

client/src/components/contracts-find-modal/contracts-find-modal.container.jsx

@@ -63,7 +63,7 @@ export function ContractsFindModalContainer({
       title={t("contracts.labels.findermodal")}
       onCancel={() => toggleModalVisible()}
       onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
       forceRender
     >
       <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>

client/src/components/email-overlay/email-overlay.container.jsx

@@ -152,7 +152,7 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
   }, [modalVisible]); // eslint-disable-line react-hooks/exhaustive-deps
   return (
     <Modal
-      destroyOnClose={true}
+      destroyOnHidden
       open={modalVisible}
       maskClosable={false}
       width={"80%"}

client/src/components/header/header.component.jsx

@@ -51,6 +51,7 @@ import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -98,6 +99,7 @@ function Header({
   const baseTitleRef = useRef(document.title || "");
   const lastSetTitleRef = useRef("");
   const userAssociationId = bodyshop?.associations?.[0]?.id;
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
 
   const {
     data: unreadData,
@@ -682,7 +684,7 @@ function Header({
           icon: unreadLoading ? (
             <Spin size="small" />
           ) : (
-            <Badge offset={[8, 0]} size="small" count={unreadCount}>
+            <Badge offset={[8, 0]} size="small" count={isEmployee ? unreadCount : 0}>
               <BellFilled />
             </Badge>
           ),

client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx

@@ -98,7 +98,7 @@ export function InventoryUpsertModalContainer({ currentUser, bodyshop, inventory
       onCancel={() => {
         toggleModalVisible();
       }}
-      destroyOnClose
+      destroyOnHidden
     >
       <Form form={form} onFinish={handleFinish} layout="vertical">
         <InventoryUpsertModal form={form} />

client/src/components/job-at-change/schedule-event.component.jsx

@@ -66,7 +66,7 @@ export function ScheduleEventComponent({
   const [popOverVisible, setPopOverVisible] = useState(false);
 
   const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
-    variables: { id: event.job.id },
+    variables: { id: event.job?.id },
     onCompleted: (data) => {
       if (data?.jobs_by_pk) {
         const totalHours =
@@ -83,6 +83,7 @@ export function ScheduleEventComponent({
         });
       }
     },
+
     fetchPolicy: "network-only"
   });
 
@@ -409,8 +410,10 @@ export function ScheduleEventComponent({
             open={popOverVisible}
             onOpenChange={setPopOverVisible}
             onClick={(e) => {
-              getJobDetails();
-              e.stopPropagation();
+              if (event.job?.id) {
+                e.stopPropagation();
+                getJobDetails();
+              }
             }}
             getPopupContainer={(trigger) => trigger.parentNode}
             trigger="click"

client/src/components/job-costing-modal/job-costing-modal.container.jsx

@@ -49,7 +49,7 @@ export function JobCostingModalContainer({ jobCostingModal, toggleModalVisible }
       }}
       cancelButtonProps={{ style: { display: "none" } }}
       width="90%"
-      destroyOnClose
+      destroyOnHidden
     >
       {!costingData ? (
         <LoadingSpinner loading={true} />

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

@@ -32,7 +32,13 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  setPrintCenterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "printCenter"
+      })
+    ),
   insertAuditTrail: ({ jobid, operation, type }) =>
     dispatch(
       insertAuditTrail({
@@ -87,7 +93,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra
   };
 
   return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
       {loading ? <LoadingSpinner /> : null}
       {error ? <AlertComponent message={error.message} type="error" /> : null}
       {data ? (

client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx

@@ -44,7 +44,7 @@ function JobReconciliationModalContainer({ reconciliationModal, toggleModalVisib
       onOk={handleCancel}
       onCancel={handleCancel}
       cancelButtonProps={{ display: "none" }}
-      destroyOnClose
+      destroyOnHidden
       className="imex-reconciliation-modal"
     >
       {loading && <LoadingSpinner loading={loading} />}

client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx

@@ -24,7 +24,8 @@ export default function JobWatcherToggleComponent({
   handleToggleSelf,
   handleRemoveWatcher,
   handleWatcherSelect,
-  handleTeamSelect
+  handleTeamSelect,
+  isEmployee
 }) {
   const { t } = useTranslation();
 
@@ -66,22 +67,32 @@ export default function JobWatcherToggleComponent({
       <List>
         <List.Item
           actions={[
-            <Button
-              type={isWatching ? "primary" : "default"}
-              danger={!isWatching}
-              icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
-              size="medium"
-              onClick={handleToggleSelf}
-              loading={adding || removing}
-            >
-              {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
-            </Button>
+            <Tooltip title={!isEmployee ? t("notifications.tooltips.not-employee") : ""} placement="top">
+              <span>
+                <Button
+                  type={isWatching ? "primary" : "default"}
+                  danger={!isWatching}
+                  icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
+                  size="medium"
+                  onClick={handleToggleSelf}
+                  loading={adding || removing}
+                  disabled={!isEmployee || adding || removing}
+                >
+                  {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
+                </Button>
+              </span>
+            </Tooltip>
           ]}
         >
           <List.Item.Meta>
             <Text type="secondary" style={{ marginBottom: 8, display: "block" }}>
               {t("notifications.labels.watching-issue")}
             </Text>
+            {!isEmployee && (
+              <Text type="danger" style={{ marginBottom: 8, display: "block" }}>
+                {t("notifications.tooltips.not-employee")}
+              </Text>
+            )}
           </List.Item.Meta>
         </List.Item>
       </List>
@@ -98,8 +109,11 @@ export default function JobWatcherToggleComponent({
       <EmployeeSearchSelectComponent
         style={{ minWidth: "100%" }}
         options={
-          bodyshop?.employees?.filter((e) =>
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
+          bodyshop?.employees?.filter(
+            (e) =>
+              e.user_email && // Ensure user_email is not null or undefined
+              e.active && // Ensure employee is active
+              jobWatchers.every((w) => w.user_email !== e.user_email) // Ensure not already a watcher
           ) || []
         }
         placeholder={t("notifications.labels.employee-search")}

client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx

@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import JobWatcherToggleComponent from "./job-watcher-toggle.component.jsx";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -21,13 +22,14 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
     splitKey: bodyshop && bodyshop.imexshopid
   });
 
-  const userEmail = currentUser.email;
-  const jobid = job.id;
-
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
   const [open, setOpen] = useState(false);
   const [selectedWatcher, setSelectedWatcher] = useState(null);
   const [selectedTeam, setSelectedTeam] = useState(null);
 
+  const userEmail = currentUser.email;
+  const jobid = job.id;
+
   // Fetch current watchers with refetch capability
   const {
     data: watcherData,
@@ -139,13 +141,13 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
   });
 
   const handleToggleSelf = useCallback(async () => {
-    if (adding || removing) return;
+    if (adding || removing || !isEmployee) return;
     if (isWatching) {
       await removeWatcher({ variables: { jobid, userEmail } });
     } else {
       await addWatcher({ variables: { jobid, userEmail } });
     }
-  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing]);
+  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing, isEmployee]);
 
   const handleRemoveWatcher = useCallback(
     async (email) => {
@@ -187,7 +189,16 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
         setSelectedTeam(null);
         return;
       }
-      await Promise.all(newWatchers.map((email) => addWatcher({ variables: { jobid, userEmail: email } })));
+      await Promise.all(
+        newWatchers.map((email) =>
+          addWatcher({
+            variables: {
+              jobid,
+              userEmail: email
+            }
+          })
+        )
+      );
     },
     [jobWatchers, addWatcher, jobid, adding]
   );
@@ -212,6 +223,7 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
       handleWatcherSelect={handleWatcherSelect}
       handleTeamSelect={handleTeamSelect}
       currentUser={currentUser}
+      isEmployee={isEmployee} // Pass isEmployee to the component
     />
   );
 }

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -106,7 +106,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />
           </Form.Item>
-
+          <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
+            <DateTimePicker />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
+            <DateTimePicker />
+          </Form.Item>
           <Form.Item label={t("jobs.fields.date_scheduled")} name="date_scheduled">
             <DateTimePicker />
           </Form.Item>

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -4,11 +4,12 @@ import { Col, Row } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
@@ -33,7 +34,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -195,7 +195,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
 
       await deleteJob({
         variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
         refetch();
         setInsertLoading(false);
       });
@@ -315,7 +315,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
 
       deleteJob({
         variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
         refetch();
         setInsertLoading(false);
       });
@@ -372,7 +372,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
     loadEstData({ variables: { id: record.id } });
     modalSearchState[1](record.clm_no);
     setJobModalVisible(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line
   }, []);
 
   useEffect(() => {
@@ -456,7 +456,7 @@ function replaceEmpty(someObj, replaceValue = null) {
   return JSON.parse(temp);
 }
 
-async function CheckTaxRatesUSA(estData, bodyshop) {
+async function CheckTaxRatesUSA(estData) {
   if (!estData.parts_tax_rates?.PAM) {
     estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
   }
@@ -568,7 +568,7 @@ async function CheckTaxRates(estData, bodyshop) {
   });
   //}
 }
-function ResolveCCCLineIssues(estData, bodyshop) {
+function ResolveCCCLineIssues(estData) {
   //Find all misc amounts, populate them to the act price.
   //This needs to be done before cleansing unq_seq since some misc prices could move over.
   estData.joblines.data.forEach((line) => {
@@ -585,6 +585,9 @@ function ResolveCCCLineIssues(estData, bodyshop) {
           //  line.notes += ` | ET/UT Update (prev = ${line.mod_lbr_ty})`;
           line.mod_lbr_ty = "LAR";
         }
+        if (line.mod_lbr_ty === "OTSL") {
+          line.mod_lbr_ty = line.mod_lbr_hrs === 0 ? null : "LAB";
+        }
       }
     });
   });

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

@@ -7,6 +7,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
+import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -40,6 +41,20 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
+        <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
+          <DateTimePicker
+            disabled={true}
+            value={job.estimate_sent_approval ? dayjs(job.estimate_sent_approval) : null}
+            placeholder={t("general.labels.na")}
+          />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
+          <DateTimePicker
+            disabled={true}
+            value={job.estimate_approved ? dayjs(job.estimate_approved) : null}
+            placeholder={t("general.labels.na")}
+          />
+        </Form.Item>
       </FormRow>
 
       <FormRow header={t("jobs.forms.scheddates")}>
@@ -76,21 +91,15 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
         <Form.Item shouldUpdate>
-          {() => {
-            return (
-              <Form.Item
-                label={t("jobs.fields.actual_completion")}
-                name="actual_completion"
-                rules={[
-                  {
-                    required: jobInPostProduction
-                  }
-                ]}
-              >
-                <DateTimePicker disabled={jobRO} />
-              </Form.Item>
-            );
-          }}
+          {() => (
+            <Form.Item
+              label={t("jobs.fields.actual_completion")}
+              name="actual_completion"
+              rules={[{ required: jobInPostProduction }]}
+            >
+              <DateTimePicker disabled={jobRO} />
+            </Form.Item>
+          )}
         </Form.Item>
         <Form.Item label={t("jobs.fields.scheduled_delivery")} name="scheduled_delivery">
           <DateTimePicker disabled={jobRO} />
@@ -103,15 +112,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_void")} name="date_void">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_lost_sale")} name="date_lost_sale">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>

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

@@ -1,13 +1,15 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
-import React, { useState } from "react";
+import { Card, Checkbox, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { useMutation } from "@apollo/client";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
@@ -22,6 +24,7 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -29,41 +32,55 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "printCenter"
+      })
+    )
 });
 
 const colSpan = {
-  xs: {
-    span: 24
-  },
-  sm: {
-    span: 24
-  },
-  md: {
-    span: 12
-  },
-  lg: {
-    span: 6
-  },
-  xl: {
-    span: 6
-  }
+  xs: { span: 24 },
+  sm: { span: 24 },
+  md: { span: 12 },
+  lg: { span: 6 },
+  xl: { span: 6 }
 };
 
 export function JobsDetailHeader({ job, bodyshop, disabled }) {
   const { t } = useTranslation();
+  const { notification } = useNotification();
   const [notesClamped, setNotesClamped] = useState(true);
-  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
-  ${job.v_make_desc || ""} 
-  ${job.v_model_desc || ""}`.trim();
-
+  const [updateJob] = useMutation(UPDATE_JOB);
+  const vehicleTitle =
+    `${job.v_model_yr || ""} ${job.v_color || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim();
   const bodyHrs = job.joblines.filter((j) => j.mod_lbr_ty !== "LAR").reduce((acc, val) => acc + val.mod_lb_hrs, 0);
   const refinishHrs = job.joblines
     .filter((line) => line.mod_lbr_ty === "LAR")
     .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
-
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
+  // Handle checkbox changes
+  const handleCheckboxChange = async (field, checked) => {
+    const value = checked ? dayjs().toISOString() : null;
+    try {
+      await updateJob({
+        variables: {
+          jobId: job.id,
+          job: { [field]: value }
+        },
+        refetchQueries: ["GET_JOB_BY_PK"],
+        awaitRefetchQueries: true
+      });
+    } catch (error) {
+      notification.error({
+        message: t("jobs.errors.saving", { error: error.message })
+      });
+    }
+  };
+
   return (
     <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
       <Col {...colSpan}>
@@ -72,11 +89,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel label={t("jobs.fields.status")}>
               <Space wrap>
                 {job.status}
-                {job.inproduction && (
-                  <Tag color="#f50" key="production">
-                    {t("jobs.labels.inproduction")}
-                  </Tag>
-                )}
+                {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
                 {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
                 {job.iouparent && (
                   <Link to={`/manage/jobs/${job.iouparent}`}>
@@ -110,7 +123,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <span style={{ margin: "0rem .5rem" }}>/</span>
               <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
             </DataLabel>
-
             <DataLabel label={t("jobs.fields.alt_transport")}>
               {job.alt_transport}
               <JobAltTransportChange job={job} />
@@ -127,11 +139,39 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 ))}
               </DataLabel>
             )}
-
             <DataLabel label={t("jobs.fields.production_vars.note")}>
               <ProductionListColumnProductionNote record={job} />
             </DataLabel>
-
+            <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
+              <Space>
+                <Checkbox
+                  checked={!!job.estimate_sent_approval}
+                  onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
+                  disabled={disabled}
+                >
+                  {job.estimate_sent_approval && (
+                    <span style={{ color: "#888" }}>
+                      <DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
+                    </span>
+                  )}
+                </Checkbox>
+              </Space>
+            </DataLabel>
+            <DataLabel label={t("jobs.fields.estimate_approved")}>
+              <Space>
+                <Checkbox
+                  checked={!!job.estimate_approved}
+                  onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
+                  disabled={disabled}
+                >
+                  {job.estimate_approved && (
+                    <span style={{ color: "#888" }}>
+                      <DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
+                    </span>
+                  )}
+                </Checkbox>
+              </Space>
+            </DataLabel>
             <Space wrap>
               {job.special_coverage_policy && (
                 <Tag color="tomato">

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -65,7 +65,7 @@ export default connect(
     <Modal
       title={t("jobs.labels.existing_jobs")}
       width={"80%"}
-      destroyOnClose
+      destroyOnHidden
       okButtonProps={{ disabled: selectedJob ? false : true }}
       {...modalProps}
     >

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -20,7 +20,14 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleModalVisible, insertAuditTrail }) {
@@ -123,7 +130,7 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
       onCancel={() => {
         toggleModalVisible();
       }}
-      destroyOnClose
+      destroyOnHidden
     >
       <Form form={form} onFinish={handleFinish} layout="vertical">
         <NoteUpsertModalComponent form={form} />

client/src/components/notification-center/notification-center.component.jsx

@@ -1,11 +1,11 @@
 import { Virtuoso } from "react-virtuoso";
-import { Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
+import { Alert, Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
 import { CheckCircleFilled, CheckCircleOutlined, EyeFilled, EyeOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import "./notification-center.styles.scss";
 import day from "../../utils/day.js";
-import { forwardRef, useRef, useEffect } from "react";
+import { forwardRef, useEffect, useRef } from "react";
 import { DateTimeFormat } from "../../utils/DateFormatter.jsx";
 
 const { Text, Title } = Typography;
@@ -26,7 +26,8 @@ const NotificationCenterComponent = forwardRef(
       markAllRead,
       loadMore,
       onNotificationClick,
-      unreadCount
+      unreadCount,
+      isEmployee
     },
     ref
   ) => {
@@ -93,7 +94,12 @@ const NotificationCenterComponent = forwardRef(
                 ) : (
                   <EyeOutlined className="notification-toggle-icon" />
                 )}
-                <Switch checked={showUnreadOnly} onChange={(checked) => toggleUnreadOnly(checked)} size="small" />
+                <Switch
+                  checked={showUnreadOnly}
+                  onChange={(checked) => toggleUnreadOnly(checked)}
+                  size="small"
+                  disabled={!isEmployee}
+                />
               </Space>
             </Tooltip>
             <Tooltip title={t("notifications.labels.mark-all-read")}>
@@ -106,14 +112,20 @@ const NotificationCenterComponent = forwardRef(
             </Tooltip>
           </div>
         </div>
-        <Virtuoso
-          ref={virtuosoRef}
-          style={{ height: "400px", width: "100%" }}
-          data={notifications}
-          totalCount={notifications.length}
-          endReached={loadMore}
-          itemContent={renderNotification}
-        />
+        {!isEmployee ? (
+          <div style={{ padding: 10 }}>
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
+          </div>
+        ) : (
+          <Virtuoso
+            ref={virtuosoRef}
+            style={{ height: "400px", width: "100%" }}
+            data={notifications}
+            totalCount={notifications.length}
+            endReached={loadMore}
+            itemContent={renderNotification}
+          />
+        )}
       </div>
     );
   }

client/src/components/notification-center/notification-center.container.jsx

@@ -4,9 +4,10 @@ import { connect } from "react-redux";
 import NotificationCenterComponent from "./notification-center.component";
 import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import day from "../../utils/day.js";
 import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.js";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 
 // This will be used to poll for notifications when the socket is disconnected
 const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
@@ -17,17 +18,18 @@ const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
  * @param onClose
  * @param bodyshop
  * @param unreadCount
+ * @param currentUser
  * @returns {JSX.Element}
  * @constructor
  */
-const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }) => {
+const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount, currentUser }) => {
   const [showUnreadOnly, setShowUnreadOnly] = useState(false);
   const [notifications, setNotifications] = useState([]);
   const [isLoading, setIsLoading] = useState(false);
   const { isConnected, markNotificationRead, markAllNotificationsRead } = useSocket();
   const notificationRef = useRef(null);
-
   const userAssociationId = bodyshop?.associations?.[0]?.id;
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
 
   const baseWhereClause = useMemo(() => {
     return { associationid: { _eq: userAssociationId } };
@@ -51,7 +53,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
     fetchPolicy: "cache-and-network",
     notifyOnNetworkStatusChange: true,
     pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId,
+    skip: !userAssociationId || !isEmployee,
     onError: (err) => {
       console.error(`Error polling Notifications: ${err?.message || ""}`);
       setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
@@ -71,7 +73,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
   }, [visible, onClose]);
 
   useEffect(() => {
-    if (data?.notifications) {
+    if (data?.notifications && isEmployee) {
       const processedNotifications = data.notifications
         .map((notif) => {
           let scenarioText;
@@ -101,11 +103,13 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
         })
         .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
       setNotifications(processedNotifications);
+    } else if (!isEmployee) {
+      setNotifications([]); // Clear notifications if not an employee
     }
-  }, [data]);
+  }, [data, isEmployee]);
 
   const loadMore = useCallback(() => {
-    if (!queryLoading && data?.notifications.length) {
+    if (!queryLoading && data?.notifications.length && isEmployee) {
       setIsLoading(true); // Show spinner during fetchMore
       fetchMore({
         variables: { offset: data.notifications.length, where: whereClause },
@@ -121,13 +125,14 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
         })
         .finally(() => setIsLoading(false)); // Hide spinner when done
     }
-  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause]);
+  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause, isEmployee]);
 
   const handleToggleUnreadOnly = (value) => {
     setShowUnreadOnly(value);
   };
 
   const handleMarkAllRead = useCallback(() => {
+    if (!isEmployee) return; // Do nothing if not an employee
     setIsLoading(true);
     markAllNotificationsRead()
       .then(() => {
@@ -147,7 +152,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
       })
       .catch((e) => console.error(`Error marking all notifications read: ${e?.message || ""}`))
       .finally(() => setIsLoading(false));
-  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly]);
+  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly, isEmployee]);
 
   const handleNotificationClick = useCallback(
     (notificationId) => {
@@ -170,17 +175,18 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
   );
 
   useEffect(() => {
-    if (visible && !isConnected) {
+    if (visible && !isConnected && isEmployee) {
       setIsLoading(true);
       refetch()
         .catch((err) => console.error(`Error re-fetching notifications: ${err?.message || ""}`))
         .finally(() => setIsLoading(false));
     }
-  }, [visible, isConnected, refetch]);
+  }, [visible, isConnected, refetch, isEmployee]);
 
   return (
     <NotificationCenterComponent
       ref={notificationRef}
+      isEmployee={isEmployee}
       visible={visible}
       onClose={onClose}
       notifications={notifications}
@@ -196,7 +202,8 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
 };
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
 });
 
 export default connect(mapStateToProps, null)(NotificationCenterContainer);

client/src/components/notification-settings/notification-settings-form.component.jsx

@@ -1,10 +1,10 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { useEffect, useState } from "react";
-import { Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
+import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import {
   QUERY_NOTIFICATION_SETTINGS,
@@ -16,14 +16,16 @@ import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 import PropTypes from "prop-types";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import ColumnHeaderCheckbox from "../notification-settings/column-header-checkbox.component.jsx";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 
 /**
  * Notifications Settings Form
  * @param currentUser
+ * @param bodyshop
  * @returns {JSX.Element}
  * @constructor
  */
-const NotificationSettingsForm = ({ currentUser }) => {
+const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [initialValues, setInitialValues] = useState({});
@@ -31,6 +33,7 @@ const NotificationSettingsForm = ({ currentUser }) => {
   const [autoAddEnabled, setAutoAddEnabled] = useState(false);
   const [initialAutoAdd, setInitialAutoAdd] = useState(false);
   const notification = useNotification();
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
 
   // Fetch notification settings and notifications_autoadd
   const { loading, error, data } = useQuery(QUERY_NOTIFICATION_SETTINGS, {
@@ -199,6 +202,11 @@ const NotificationSettingsForm = ({ currentUser }) => {
           </Space>
         }
       >
+        {!isEmployee && (
+          <div style={{ width: "100%", marginBottom: "10px" }}>
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
+          </div>
+        )}
         <Table dataSource={dataSource} columns={columns} pagination={false} bordered rowKey="key" />
         <Divider />
       </Card>
@@ -209,11 +217,13 @@ const NotificationSettingsForm = ({ currentUser }) => {
 NotificationSettingsForm.propTypes = {
   currentUser: PropTypes.shape({
     email: PropTypes.string.isRequired
-  }).isRequired
+  }).isRequired,
+  bodyshop: PropTypes.object.isRequired
 };
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop
 });
 
 export default connect(mapStateToProps)(NotificationSettingsForm);

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -333,7 +333,7 @@ export function PartsOrderModalContainer({
       onOk={() => form.submit()}
       okButtonProps={{ loading: saving }}
       cancelButtonProps={{ loading: saving }}
-      destroyOnClose
+      destroyOnHidden
       width="75%"
       forceRender
     >

client/src/components/parts-queue-card/parts-queue-card.component.jsx

@@ -46,7 +46,7 @@ export default function PartsQueueDetailCard() {
   };
 
   return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
       {loading ? <LoadingSpinner /> : null}
       {error ? <AlertComponent message={error.message} type="error" /> : null}
       {data ? (

client/src/components/parts-receive-modal/parts-receive-modal.container.jsx

@@ -90,7 +90,7 @@ export function PartsReceiveModalContainer({ partsReceiveModal, toggleModalVisib
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
       okButtonProps={{ loading: loading }}
-      destroyOnClose
+      destroyOnHidden
       forceRender
       width="50%"
     >

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

@@ -134,7 +134,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop }) {
     <Modal
       title={!context || (context && !context.id) ? t("payments.labels.new") : t("payments.labels.edit")}
       open={open}
-      destroyOnClose
+      destroyOnHidden
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"

client/src/components/print-center-modal/print-center-modal.container.jsx

@@ -32,7 +32,7 @@ export function PrintCenterModalContainer({ printCenterModal, toggleModalVisible
       okText={t("general.actions.close")}
       width="90%"
       title={t("printcenter.labels.title")}
-      destroyOnClose
+      destroyOnHidden
     >
       <PrintCenterModalComponent context={context} />
     </Modal>

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

@@ -1,7 +1,15 @@
 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 LayoutSettings = ({ t }) => (
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const LayoutSettings = ({ t, bodyshop }) => (
   <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
     <Row gutter={[16, 16]}>
       {[
@@ -30,14 +38,18 @@ const LayoutSettings = ({ t }) => (
             { value: false, label: t("production.labels.wide") }
           ]
         },
-        {
-          name: "cardcolor",
-          label: t("production.labels.cardcolor"),
-          options: [
-            { value: true, label: t("production.labels.on") },
-            { value: false, label: t("production.labels.off") }
-          ]
-        },
+        ...(HasFeatureAccess({ bodyshop, featureName: "smartscheduling" })
+          ? [
+              {
+                name: "cardcolor",
+                label: t("production.labels.cardcolor"),
+                options: [
+                  { value: true, label: t("production.labels.on") },
+                  { value: false, label: t("production.labels.off") }
+                ]
+              }
+            ]
+          : []),
         {
           name: "kiosk",
           label: t("production.labels.kiosk_mode"),
@@ -67,4 +79,4 @@ LayoutSettings.propTypes = {
   t: PropTypes.func.isRequired
 };
 
-export default LayoutSettings;
+export default connect(mapStateToProps)(LayoutSettings);

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

@@ -28,7 +28,7 @@ export function ReportCenterModalContainer({ reportCenterModal, toggleModalVisib
       onOk={() => toggleModalVisible()}
       onCancel={() => toggleModalVisible()}
       cancelButtonProps={{ style: { display: "none" } }}
-      destroyOnClose
+      destroyOnHidden
       width="80%"
     >
       <RbacWrapperComponent action="shop:reportcenter">

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -209,7 +209,7 @@ export function ScheduleJobModalContainer({
       onOk={() => form.submit()}
       width={"90%"}
       maskClosable={false}
-      destroyOnClose
+      destroyOnHidden
       okButtonProps={{
         loading: loading
       }}

client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx

@@ -106,7 +106,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
     <>
       <Modal
         open={state.open}
-        destroyOnClose
+        destroyOnHidden
         width="80%"
         closable={false}
         cancelButtonProps={{ style: { display: "none" } }}

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -8,7 +8,7 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
   const { t } = useTranslation();
 
   // Filter employee options to ensure active employees with valid IDs
-  const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.id && typeof e.id === "string") || [];
+  const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.user_email && e.id) || [];
 
   return (
     <div>

client/src/components/task-upsert-modal/task-upsert-modal.container.jsx

@@ -275,7 +275,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
         toggleModalVisible();
       }}
       okButtonProps={{ disabled: !isTouched }}
-      destroyOnClose
+      destroyOnHidden
     >
       <Form
         form={form}

client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx

@@ -70,7 +70,7 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
   };
 
   return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
       {loading ? <LoadingSpinner /> : null}
       {error ? <AlertComponent message={error.message} type="error" /> : null}
       {data ? (

client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx

@@ -39,7 +39,7 @@ export function TimeTicketListTeamPay({ bodyshop, context, actions }) {
 
   return (
     <>
-      <Modal width={"80%"} open={visible} destroyOnClose onOk={handleOk} onCancel={() => setVisible(false)}>
+      <Modal width={"80%"} open={visible} destroyOnHidden onOk={handleOk} onCancel={() => setVisible(false)}>
         <Form layout="vertical" form={form} initialValues={{ jobid: jobId }}>
           <LayoutFormRow grow noDivider>
             <Form.Item shouldUpdate>

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -181,7 +181,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
           )}
         </Space>
       }
-      destroyOnClose
+      destroyOnHidden
       id="time-ticket-modal"
     >
       <Form

client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx

@@ -119,7 +119,7 @@ export function TimeTickeTaskModalContainer({
 
   return (
     <Modal
-      destroyOnClose
+      destroyOnHidden
       open={open}
       onCancel={() => {
         toggleModalVisible();

client/src/graphql/jobs.queries.js

@@ -685,6 +685,8 @@ export const GET_JOB_BY_PK = gql`
       scheduled_delivery
       scheduled_in
       selling_dealer
+      estimate_approved
+      estimate_sent_approval
       selling_dealer_contact
       servicing_dealer
       servicing_dealer_contact
@@ -929,6 +931,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       date_exported
       date_repairstarted
       date_scheduled
+      estimate_sent_approval
+      estimate_approved
       date_estimated
       employee_body_rel {
         id
@@ -1077,6 +1081,8 @@ export const UPDATE_JOB = gql`
         date_repairstarted
         date_void
         date_lost_sale
+        estimate_sent_approval
+        estimate_approved
       }
     }
   }
@@ -2431,6 +2437,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       plate_st
       po_number
       production_vars
+      estimate_sent_approval
+      estimate_approved
       ro_number
       scheduled_completion
       scheduled_delivery

client/src/translations/en_us/common.json

@@ -1650,6 +1650,8 @@
         "adjustment_bottom_line": "Adjustments",
         "adjustmenthours": "Adjustment Hours",
         "alt_transport": "Alt. Trans.",
+        "estimate_sent_approval": "Estimate Sent for Approval",
+        "estimate_approved": "Estimate Approved",
         "area_of_damage_impact": {
           "10": "Left Front Side",
           "11": "Left Front Corner",
@@ -1955,6 +1957,8 @@
         "scheddates": "Schedule Dates"
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "Accounts Receivable",
         "act_price_ppc": "New Part Price",
         "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -2470,7 +2474,8 @@
         "teams-search": "Search for a Team",
         "unwatch": "Unwatch",
         "watch": "Watch",
-        "watching-issue": "Watching"
+        "watching-issue": "Watching",
+        "employee-notification": "Notifications are disabled because you do not have an associated Employee record."
       },
       "scenarios": {
         "alternate-transport-changed": "Alternate Transport Changed",
@@ -2490,7 +2495,9 @@
         "tasks-updated-created": "Tasks Updated / Created"
       },
       "tooltips": {
-        "job-watchers": "Job Watchers"
+        "job-watchers": "Job Watchers",
+        "not-employee": "You need to be an employee to watch this job. Reach out to your admin to get set up!",
+        "not-employee-notifications": "You must be an employee to receive notifications"
       }
     },
     "owner": {

client/src/translations/es/common.json

@@ -1642,6 +1642,8 @@
         "voiding": ""
       },
       "fields": {
+        "estimate_sent_approval": "",
+        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Realización real",
         "actual_delivery": "Entrega real",
@@ -1955,6 +1957,8 @@
         "scheddates": ""
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -2472,7 +2476,8 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -2492,7 +2497,8 @@
         "tasks-updated-created": ""
       },
       "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": ""
       }
     },
     "owner": {

client/src/translations/fr/common.json

@@ -1642,6 +1642,8 @@
         "voiding": ""
       },
       "fields": {
+        "estimate_sent_approval": "",
+        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Achèvement réel",
         "actual_delivery": "Livraison réelle",
@@ -1955,6 +1957,8 @@
         "scheddates": ""
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -2472,7 +2476,8 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -2492,7 +2497,8 @@
         "tasks-updated-created": ""
       },
       "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": ""
       }
     },
     "owner": {

client/src/utils/useIsEmployee.js

@@ -0,0 +1,19 @@
+import { useMemo } from "react";
+
+/**
+ * Check if the user is an employee of the bodyshop
+ * @param bodyshop
+ * @param userOrEmail
+ * @returns {boolean|*}
+ */
+export function useIsEmployee(bodyshop, userOrEmail) {
+  return useMemo(() => {
+    if (!bodyshop || !bodyshop.employees) return false;
+
+    // Handle both user object and email string
+    const email = typeof userOrEmail === "string" ? userOrEmail : userOrEmail?.email;
+    if (!email) return false;
+
+    return bodyshop.employees.some((employee) => employee.user_email === email);
+  }, [bodyshop, userOrEmail]);
+}

hasura/metadata/tables.yaml

@@ -3702,6 +3702,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt
@@ -3976,6 +3978,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt
@@ -4262,6 +4266,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt

hasura/migrations/1746563777976_alter_table_public_jobs_add_column_estimate_sent_approval/down.sql

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

hasura/migrations/1746563777976_alter_table_public_jobs_add_column_estimate_sent_approval/up.sql

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

hasura/migrations/1746563808335_alter_table_public_jobs_add_column_estimate_approved/down.sql

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

hasura/migrations/1746563808335_alter_table_public_jobs_add_column_estimate_approved/up.sql

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

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.803.0",
-    "@aws-sdk/client-elasticache": "^3.803.0",
-    "@aws-sdk/client-s3": "^3.803.0",
-    "@aws-sdk/client-secrets-manager": "^3.803.0",
-    "@aws-sdk/client-ses": "^3.803.0",
-    "@aws-sdk/credential-provider-node": "^3.803.0",
-    "@aws-sdk/lib-storage": "^3.803.0",
-    "@aws-sdk/s3-request-presigner": "^3.803.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.808.0",
+    "@aws-sdk/client-elasticache": "^3.808.0",
+    "@aws-sdk/client-s3": "^3.808.0",
+    "@aws-sdk/client-secrets-manager": "^3.808.0",
+    "@aws-sdk/client-ses": "^3.808.0",
+    "@aws-sdk/credential-provider-node": "^3.808.0",
+    "@aws-sdk/lib-storage": "^3.808.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,7 +31,7 @@
     "aws4": "^1.13.2",
     "axios": "^1.8.4",
     "better-queue": "^3.8.12",
-    "bullmq": "^5.52.1",
+    "bullmq": "^5.52.2",
     "chart.js": "^4.4.8",
     "cloudinary": "^2.6.1",
     "compression": "^1.8.0",
@@ -42,7 +42,8 @@
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
-    "firebase-admin": "^13.2.0",
+    "firebase-admin": "^13.4.0",
+    "graphql": "^16.11.0",
     "graphql-request": "^6.1.0",
     "intuit-oauth": "^4.2.0",
     "ioredis": "^5.6.0",
@@ -56,7 +57,7 @@
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
     "phone": "^3.1.58",
-    "query-string": "^9.1.2",
+    "query-string": "7.1.3",
     "recursive-diff": "^1.0.9",
     "rimraf": "^6.0.1",
     "skia-canvas": "^2.0.2",
@@ -64,7 +65,7 @@
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.6.0",
+    "twilio": "^5.6.1",
     "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "winston-cloudwatch": "^6.3.0",
@@ -79,7 +80,7 @@
     "mock-require": "^3.0.3",
     "p-limit": "^3.1.0",
     "prettier": "^3.5.3",
-    "supertest": "^7.1.0",
+    "supertest": "^7.1.1",
     "vitest": "^3.1.3"
   }
 }

server/data/data.js

@@ -4,4 +4,5 @@ exports.chatter = require("./chatter").default;
 exports.claimscorp = require("./claimscorp").default;
 exports.kaizen = require("./kaizen").default;
 exports.usageReport = require("./usageReport").default;
-exports.podium = require("./podium").default;
+exports.podium = require("./podium").default;
+exports.emsUpload = require("./emsUpload").default;

server/data/emsUpload.js

@@ -0,0 +1,22 @@
+const moment = require("moment-timezone");
+const logger = require("../utils/logger");
+const s3Client = require("../utils/s3"); // Using the S3 client utilities with LocalStack support
+
+const emsUpload = async (req, res) => {
+    try {
+        const { bodyshopid, ciecaid, clm_no, ownr_ln } = req.body;
+        const presignedUrl = await s3Client.getPresignedUrl({
+            bucketName: process.env.S3_EMS_UPLOAD_BUCKET,
+            key: `${bodyshopid}/${ciecaid}-${clm_no}-${ownr_ln}-${moment().format("YYYY-MM-DD--HH-mm-ss")}.zip`
+        });
+        res.status(200).json({ presignedUrl });
+    } catch (error) {
+        logger.log("ems-upload-presign-error", "ERROR", req?.user?.email, null, {
+            error: error.message,
+            stack: error.stack
+        });
+        res.status(500).json({ error: error.message, stack: error.stack });
+    }
+};
+
+exports.default = emsUpload;

server/data/podium.js

@@ -185,7 +185,7 @@ async function uploadViaSFTP(csvObj) {
     await sftp.connect(ftpSetup);
 
     try {
-      csvObj.result = await sftp.put(Buffer.from(csvObj.xml), `${csvObj.filename}`);
+      csvObj.result = await sftp.put(Buffer.from(csvObj.csv), `${csvObj.filename}`);
       logger.log("podium-sftp-upload", "DEBUG", "api", csvObj.bodyshopid, {
         imexshopid: csvObj.imexshopid,
         filename: csvObj.filename,

server/routes/miscellaneousRoutes.js

@@ -138,6 +138,9 @@ router.post("/canvastest", validateFirebaseIdTokenMiddleware, canvastest);
 // Alert Check
 router.post("/alertcheck", eventAuthorizationMiddleware, alertCheck);
 
+//EMS Upload
+router.post("/emsupload", validateFirebaseIdTokenMiddleware, data.emsUpload);
+
 // Redis Cache Routes
 router.post("/bodyshop-cache", eventAuthorizationMiddleware, updateBodyshopCache);
 

server/utils/s3.js

@@ -9,6 +9,7 @@ const {
 const { defaultProvider } = require("@aws-sdk/credential-provider-node");
 const { InstanceRegion } = require("./instanceMgr");
 const { isString, isEmpty } = require("lodash");
+const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
 
 const createS3Client = () => {
   const S3Options = {
@@ -95,6 +96,17 @@ const createS3Client = () => {
       throw error;
     }
   };
+
+  const getPresignedUrl = async ({ bucketName, key }) => {
+    const command = new PutObjectCommand({
+      Bucket: bucketName,
+      Key: key,
+      StorageClass: "INTELLIGENT_TIERING"
+    });
+    const presignedUrl = await getSignedUrl(s3Client, command, { expiresIn: 360 });
+    return presignedUrl;
+  }
+
   return {
     uploadFileToS3,
     downloadFileFromS3,
@@ -102,8 +114,12 @@ const createS3Client = () => {
     deleteFileFromS3,
     copyFileInS3,
     fileExistsInS3,
+    getPresignedUrl,
     ...s3Client
   };
 };
 
+
+
+
 module.exports = createS3Client();