diff --git a/client/package-lock.json b/client/package-lock.json index 52ec61f4a..b54e89f57 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@amplitude/analytics-browser": "^2.33.1", "@ant-design/pro-layout": "^7.22.6", - "@apollo/client": "^3.13.9", + "@apollo/client": "^4.0.12", "@emotion/is-prop-valid": "^1.4.0", "@fingerprintjs/fingerprintjs": "^4.6.1", "@firebase/analytics": "^0.10.19", @@ -26,9 +26,8 @@ "@sentry/vite-plugin": "^4.6.1", "@splitsoftware/splitio-react": "^2.6.1", "@tanem/react-nprogress": "^5.0.56", - "antd": "^6.1.4", - "apollo-link-logger": "^2.0.1", - "apollo-link-sentry": "^4.4.0", + "antd": "^6.2.0", + "apollo-link-logger": "^3.0.0", "autosize": "^6.0.1", "axios": "^1.13.2", "classnames": "^2.5.1", @@ -40,10 +39,11 @@ "env-cmd": "^10.1.0", "exifr": "^7.1.3", "graphql": "^16.12.0", + "graphql-ws": "^6.0.6", "i18next": "^25.7.4", "i18next-browser-languagedetector": "^8.2.0", "immutability-helper": "^3.1.1", - "libphonenumber-js": "^1.12.33", + "libphonenumber-js": "^1.12.34", "lightningcss": "^1.30.2", "logrocket": "^9.0.2", "markerjs2": "^2.32.7", @@ -51,7 +51,7 @@ "normalize-url": "^8.1.1", "object-hash": "^3.0.0", "phone": "^3.1.69", - "posthog-js": "^1.318.2", + "posthog-js": "^1.319.0", "prop-types": "^15.8.1", "query-string": "^9.3.1", "raf-schd": "^4.0.3", @@ -82,10 +82,10 @@ "redux-saga": "^1.4.2", "redux-state-sync": "^3.1.4", "reselect": "^5.1.1", + "rxjs": "^7.8.2", "sass": "^1.97.2", "socket.io-client": "^4.8.3", - "styled-components": "^6.3.5", - "subscriptions-transport-ws": "^0.11.0", + "styled-components": "^6.3.6", "use-memo-one": "^1.1.3", "vite-plugin-ejs": "^1.7.0", "web-vitals": "^3.5.2" @@ -118,7 +118,7 @@ "redux-logger": "^3.0.6", "source-map-explorer": "^2.5.3", "vite": "^7.3.1", - "vite-plugin-babel": "^1.3.2", + "vite-plugin-babel": "^1.4.1", "vite-plugin-eslint": "^1.8.1", "vite-plugin-node-polyfills": "^0.24.0", "vite-plugin-pwa": "^1.2.0", @@ -244,9 +244,9 @@ } }, "node_modules/@ant-design/colors": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-8.0.0.tgz", - "integrity": "sha512-6YzkKCw30EI/E9kHOIXsQDHmMvTllT8STzjMb4K2qzit33RW2pqCJP0sk+hidBntXxE+Vz4n1+RvCTfBw6OErw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-8.0.1.tgz", + "integrity": "sha512-foPVl0+SWIslGUtD/xBr1p9U4AKzPhNYEseXYRRo5QSzGACYZrQbe11AYJbYfAWnWSpGBx6JjBmSeugUsD9vqQ==", "license": "MIT", "dependencies": { "@ant-design/fast-color": "^3.0.0" @@ -553,30 +553,30 @@ } }, "node_modules/@apollo/client": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.14.0.tgz", - "integrity": "sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.0.12.tgz", + "integrity": "sha512-CyDR+2A18TFH08rKvH3DaV63eRE0E4pj34gT8UZIQVP64bRRXnQiYuKTf/c6oJNY8+4FrCrcPwWEldnVbh02bA==", "license": "MIT", + "workspaces": [ + "dist", + "codegen", + "scripts/codemods/ac3-to-ac4" + ], "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "@wry/caches": "^1.0.0", "@wry/equality": "^0.5.6", "@wry/trie": "^0.5.0", "graphql-tag": "^2.12.6", - "hoist-non-react-statics": "^3.3.2", "optimism": "^0.18.0", - "prop-types": "^15.7.2", - "rehackt": "^0.1.0", - "symbol-observable": "^4.0.0", - "ts-invariant": "^0.10.3", - "tslib": "^2.3.0", - "zen-observable-ts": "^1.2.5" + "tslib": "^2.3.0" }, "peerDependencies": { - "graphql": "^15.0.0 || ^16.0.0", + "graphql": "^16.0.0", "graphql-ws": "^5.5.5 || ^6.0.3", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "react": "^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "react-dom": "^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "rxjs": "^7.3.0", "subscriptions-transport-ws": "^0.9.0 || ^0.11.0" }, "peerDependenciesMeta": { @@ -3870,6 +3870,252 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@opentelemetry/api-logs": { + "version": "0.208.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.208.0.tgz", + "integrity": "sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api": "^1.3.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@opentelemetry/core": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.2.0.tgz", + "integrity": "sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/exporter-logs-otlp-http": { + "version": "0.208.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.208.0.tgz", + "integrity": "sha512-jOv40Bs9jy9bZVLo/i8FwUiuCvbjWDI+ZW13wimJm4LjnlwJxGgB+N/VWOZUTpM+ah/awXeQqKdNlpLf2EjvYg==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "0.208.0", + "@opentelemetry/core": "2.2.0", + "@opentelemetry/otlp-exporter-base": "0.208.0", + "@opentelemetry/otlp-transformer": "0.208.0", + "@opentelemetry/sdk-logs": "0.208.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/otlp-exporter-base": { + "version": "0.208.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.208.0.tgz", + "integrity": "sha512-gMd39gIfVb2OgxldxUtOwGJYSH8P1kVFFlJLuut32L6KgUC4gl1dMhn+YC2mGn0bDOiQYSk/uHOdSjuKp58vvA==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/otlp-transformer": "0.208.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/otlp-transformer": { + "version": "0.208.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.208.0.tgz", + "integrity": "sha512-DCFPY8C6lAQHUNkzcNT9R+qYExvsk6C5Bto2pbNxgicpcSWbe2WHShLxkOxIdNcBiYPdVHv/e7vH7K6TI+C+fQ==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "0.208.0", + "@opentelemetry/core": "2.2.0", + "@opentelemetry/resources": "2.2.0", + "@opentelemetry/sdk-logs": "0.208.0", + "@opentelemetry/sdk-metrics": "2.2.0", + "@opentelemetry/sdk-trace-base": "2.2.0", + "protobufjs": "^7.3.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", + "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/resources": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.3.0.tgz", + "integrity": "sha512-shlr2l5g+87J8wqYlsLyaUsgKVRO7RtX70Ckd5CtDOWtImZgaUDmf4Z2ozuSKQLM2wPDR0TE/3bPVBNJtRm/cQ==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.3.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.3.0.tgz", + "integrity": "sha512-PcmxJQzs31cfD0R2dE91YGFcLxOSN4Bxz7gez5UwSUjCai8BwH/GI5HchfVshHkWdTkUs0qcaPJgVHKXUp7I3A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-logs": { + "version": "0.208.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.208.0.tgz", + "integrity": "sha512-QlAyL1jRpOeaqx7/leG1vJMp84g0xKP6gJmfELBpnI4O/9xPX+Hu5m1POk9Kl+veNkyth5t19hRlN6tNY1sjbA==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "0.208.0", + "@opentelemetry/core": "2.2.0", + "@opentelemetry/resources": "2.2.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.4.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", + "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-metrics": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.2.0.tgz", + "integrity": "sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/resources": "2.2.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.9.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", + "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-trace-base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.2.0.tgz", + "integrity": "sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/resources": "2.2.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/resources": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", + "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "2.2.0", + "@opentelemetry/semantic-conventions": "^1.29.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/semantic-conventions": { + "version": "1.38.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.38.0.tgz", + "integrity": "sha512-kocjix+/sSggfJhwXqClZ3i9Y/MI0fp7b+g7kCRm6psy2dsf8uApTRclwG18h8Avm7C9+fnt+O36PspJ/OzoWg==", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + } + }, "node_modules/@parcel/watcher": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", @@ -4225,9 +4471,9 @@ } }, "node_modules/@posthog/types": { - "version": "1.318.2", - "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.318.2.tgz", - "integrity": "sha512-/4m1DStpyaZStTJJ4b7RyftnFoSM/IWmVBTiWvdm2e2I8A8W3D4+YY7YkTpPtTinRZEhDQEZFjhlHdDgNCiNuA==", + "version": "1.319.0", + "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.319.0.tgz", + "integrity": "sha512-jHvs5PhDfPjqDToecgtBWADW+sVox4ezD9LIYbcP72CIMzHVZcKJD5upq6RDchTEvX5gV+qy2SNyPPrsuLpcMg==", "license": "MIT" }, "node_modules/@protobufjs/aspromise": { @@ -4355,9 +4601,9 @@ } }, "node_modules/@rc-component/collapse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@rc-component/collapse/-/collapse-1.1.2.tgz", - "integrity": "sha512-ilBYk1dLLJHu5Q74dF28vwtKUYQ42ZXIIDmqTuVy4rD8JQVvkXOs+KixVNbweyuIEtJYJ7+t+9GVD9dPc6N02w==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@rc-component/collapse/-/collapse-1.2.0.tgz", + "integrity": "sha512-ZRYSKSS39qsFx93p26bde7JUZJshsUBEQRlRXPuJYlAiNX0vyYlF5TsAm8JZN3LcF8XvKikdzPbgAtXSbkLUkw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.10.1", @@ -4417,14 +4663,14 @@ } }, "node_modules/@rc-component/dialog": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@rc-component/dialog/-/dialog-1.5.1.tgz", - "integrity": "sha512-by4Sf/a3azcb89WayWuwG19/Y312xtu8N81HoVQQtnsBDylfs+dog98fTAvLinnpeoWG52m/M7QLRW6fXR3l1g==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@rc-component/dialog/-/dialog-1.8.0.tgz", + "integrity": "sha512-zGksezfULKixYCIWctIhUC2M3zUJrc81JKWbi9dJrQdPaM7J+8vSOrhLoOHHkZFpBpb2Ri6JqnSuGYb2N+FrRA==", "license": "MIT", "dependencies": { "@rc-component/motion": "^1.1.3", - "@rc-component/portal": "^2.0.0", - "@rc-component/util": "^1.0.1", + "@rc-component/portal": "^2.1.0", + "@rc-component/util": "^1.5.0", "clsx": "^2.1.1" }, "peerDependencies": { @@ -4442,13 +4688,13 @@ } }, "node_modules/@rc-component/drawer": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@rc-component/drawer/-/drawer-1.3.0.tgz", - "integrity": "sha512-rE+sdXEmv2W25VBQ9daGbnb4J4hBIEKmdbj0b3xpY+K7TUmLXDIlSnoXraIbFZdGyek9WxxGKK887uRnFgI+pQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@rc-component/drawer/-/drawer-1.4.0.tgz", + "integrity": "sha512-Zr1j1LRLDauz4a5JXHEmeYQfvEzfh4CddNa7tszyJnfd5GySYdZ5qLO63Tt2tgG4k+qi6tkFDKmcT46ikZfzbQ==", "license": "MIT", "dependencies": { "@rc-component/motion": "^1.1.4", - "@rc-component/portal": "^2.0.0", + "@rc-component/portal": "^2.1.3", "@rc-component/util": "^1.2.1", "clsx": "^2.1.1" }, @@ -4518,13 +4764,13 @@ } }, "node_modules/@rc-component/image": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@rc-component/image/-/image-1.5.3.tgz", - "integrity": "sha512-/NR7QW9uCN8Ugar+xsHZOPvzPySfEhcW2/vLcr7VPRM+THZMrllMRv7LAUgW7ikR+Z67Ab67cgPp5K5YftpJsQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@rc-component/image/-/image-1.6.0.tgz", + "integrity": "sha512-tSfn2ZE/oP082g4QIOxeehkmgnXB7R+5AFj/lIFr4k7pEuxHBdyGIq9axoCY9qea8NN0DY6p4IB/F07tLqaT5A==", "license": "MIT", "dependencies": { "@rc-component/motion": "^1.0.0", - "@rc-component/portal": "^2.0.0", + "@rc-component/portal": "^2.1.2", "@rc-component/util": "^1.3.0", "clsx": "^2.1.1" }, @@ -5157,14 +5403,14 @@ } }, "node_modules/@rc-component/tour": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@rc-component/tour/-/tour-2.2.1.tgz", - "integrity": "sha512-BUCrVikGJsXli38qlJ+h2WyDD6dYxzDA9dV3o0ij6gYhAq6ooT08SUMWOikva9v4KZ2BEuluGl5bPcsjrSoBgQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@rc-component/tour/-/tour-2.3.0.tgz", + "integrity": "sha512-K04K9r32kUC+auBSQfr+Fss4SpSIS9JGe56oq/ALAX0p+i2ylYOI1MgR83yBY7v96eO6ZFXcM/igCQmubps0Ow==", "license": "MIT", "dependencies": { - "@rc-component/portal": "^2.0.0", + "@rc-component/portal": "^2.2.0", "@rc-component/trigger": "^3.0.0", - "@rc-component/util": "^1.3.0", + "@rc-component/util": "^1.7.0", "clsx": "^2.1.1" }, "engines": { @@ -5238,9 +5484,9 @@ } }, "node_modules/@rc-component/trigger": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-3.8.1.tgz", - "integrity": "sha512-walnDJnKq+OcPQFHBMN+YZmdHV8+6z75+Rgpc0dW1c+Dmy6O7tRueDs4LdbwjlryQfTdsw84PIkNPzcx5yQ7qQ==", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-3.8.2.tgz", + "integrity": "sha512-I6idYAk8YY3Ly6v5hB7ONqxfdTYTcVNUmV1ZjtSsGH6N/k5tss9+OAtusr+7zdlIcD7TwnlsoB5etfB14ORtMw==", "license": "MIT", "dependencies": { "@rc-component/motion": "^1.1.4", @@ -7149,12 +7395,12 @@ } }, "node_modules/antd": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/antd/-/antd-6.1.4.tgz", - "integrity": "sha512-ZSafdq6pZ94GvaCjNx2yS+zeTbL1DRukc6uuarMu1K7ptx6MSZbjyFUO4rHIRNhi5a8Zp2frxFBIxYViiTgecQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/antd/-/antd-6.2.0.tgz", + "integrity": "sha512-fwETatwHYExjfzKcV41fBtgPo4kp+g+9gp5YOSSGxwnJHljps8TbXef8WP7ZnaOn5dkcA9xIC0TyUecIybBG7w==", "license": "MIT", "dependencies": { - "@ant-design/colors": "^8.0.0", + "@ant-design/colors": "^8.0.1", "@ant-design/cssinjs": "^2.0.1", "@ant-design/cssinjs-utils": "^2.0.2", "@ant-design/fast-color": "^3.0.0", @@ -7163,13 +7409,13 @@ "@babel/runtime": "^7.28.4", "@rc-component/cascader": "~1.11.0", "@rc-component/checkbox": "~1.0.1", - "@rc-component/collapse": "~1.1.2", + "@rc-component/collapse": "~1.2.0", "@rc-component/color-picker": "~3.0.3", - "@rc-component/dialog": "~1.5.1", - "@rc-component/drawer": "~1.3.0", + "@rc-component/dialog": "~1.8.0", + "@rc-component/drawer": "~1.4.0", "@rc-component/dropdown": "~1.0.2", - "@rc-component/form": "~1.6.0", - "@rc-component/image": "~1.5.3", + "@rc-component/form": "~1.6.2", + "@rc-component/image": "~1.6.0", "@rc-component/input": "~1.1.2", "@rc-component/input-number": "~1.6.2", "@rc-component/mentions": "~1.6.0", @@ -7192,10 +7438,10 @@ "@rc-component/tabs": "~1.7.0", "@rc-component/textarea": "~1.1.2", "@rc-component/tooltip": "~1.4.0", - "@rc-component/tour": "~2.2.1", + "@rc-component/tour": "~2.3.0", "@rc-component/tree": "~1.1.0", "@rc-component/tree-select": "~1.6.0", - "@rc-component/trigger": "^3.8.1", + "@rc-component/trigger": "^3.8.2", "@rc-component/upload": "~1.1.0", "@rc-component/util": "^1.7.0", "clsx": "^2.1.1", @@ -7266,33 +7512,16 @@ } }, "node_modules/apollo-link-logger": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/apollo-link-logger/-/apollo-link-logger-2.0.1.tgz", - "integrity": "sha512-4KkdwCqWtlOc0vx0W/5o+UfotyZtcJZicraKNyo2KTaCmAGSJ8vDnNRyDlv6o5XtSgdv4NA36cSe6dt49OkGWA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/apollo-link-logger/-/apollo-link-logger-3.0.0.tgz", + "integrity": "sha512-7j557AndpQXqmOg6MLERh9eCGrKdQSoIzHPSU+9Umw8EnkwU+CphCXb4p22Zx6yRnYxVV7fOrqbB+4lsfloATQ==", "license": "MIT", "engines": { "node": ">= 10", "npm": "> 3" }, "peerDependencies": { - "@apollo/client": "^3.0.0" - } - }, - "node_modules/apollo-link-sentry": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-4.4.0.tgz", - "integrity": "sha512-ugGi+DXNcZsYiYUPwVhdOgycgbuEO/oD69YJn9ZRtAUY84b84gDADPLba1umOczzBaV6rIqtl/HUlTlaq1qrKg==", - "license": "MIT", - "dependencies": { - "deepmerge": "^4.2.2", - "dot-prop": "^6", - "tslib": "^2.0.3", - "zen-observable-ts": "^1.2.5" - }, - "peerDependencies": { - "@apollo/client": "^3.2.3", - "@sentry/core": "^8.33 || ^9 || ^10", - "graphql": "^15 || ^16" + "@apollo/client": "^4.0.0" } }, "node_modules/argparse": { @@ -7628,12 +7857,6 @@ "regenerator-runtime": "^0.11.0" } }, - "node_modules/backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==", - "license": "MIT" - }, "node_modules/bail": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz", @@ -8978,6 +9201,7 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -9176,21 +9400,6 @@ "tslib": "^2.0.3" } }, - "node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/dotenv": { "version": "17.2.3", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", @@ -10586,6 +10795,36 @@ "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, + "node_modules/graphql-ws": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-6.0.6.tgz", + "integrity": "sha512-zgfER9s+ftkGKUZgc0xbx8T7/HMO4AV5/YuYiFc+AtgcO5T0v8AxYYNQ+ltzuzDZgNkYJaFspm5MMYLjQzrkmw==", + "license": "MIT", + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "@fastify/websocket": "^10 || ^11", + "crossws": "~0.3", + "graphql": "^15.10.1 || ^16", + "uWebSockets.js": "^20", + "ws": "^8" + }, + "peerDependenciesMeta": { + "@fastify/websocket": { + "optional": true + }, + "crossws": { + "optional": true + }, + "uWebSockets.js": { + "optional": true + }, + "ws": { + "optional": true + } + } + }, "node_modules/gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", @@ -11524,15 +11763,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", @@ -11760,12 +11990,6 @@ "node": ">=10" } }, - "node_modules/iterall": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz", - "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==", - "license": "MIT" - }, "node_modules/iterator.prototype": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", @@ -12053,9 +12277,9 @@ } }, "node_modules/libphonenumber-js": { - "version": "1.12.33", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.33.tgz", - "integrity": "sha512-r9kw4OA6oDO4dPXkOrXTkArQAafIKAU71hChInV4FxZ69dxCfbwQGDPzqR5/vea94wU705/3AZroEbSoeVWrQw==", + "version": "1.12.34", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.34.tgz", + "integrity": "sha512-v/Ip8k8eYdp7bINpzqDh46V/PaQ8sK+qi97nMQgjZzFlb166YFqlR/HVI+MzsI9JqcyyVWCOipmmretiaSyQyw==", "license": "MIT" }, "node_modules/lightningcss": { @@ -14198,13 +14422,18 @@ "license": "MIT" }, "node_modules/posthog-js": { - "version": "1.318.2", - "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.318.2.tgz", - "integrity": "sha512-M5C/3HYlyNaqmCIwgGkmJLcGt5MREwsllwGLAOO3nMYhrWSjEuJnEzenplHxa/4UgwvhR4121ErzRHgK67qq1A==", + "version": "1.319.0", + "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.319.0.tgz", + "integrity": "sha512-0LFqLEhZzA8s1TrhYxsKsKmYV0n3FpNrWaT8rMjL87TRXtpy3XtsvbZKa97X6MFly5CK9CdhgKSNNyX7j12MrQ==", "license": "SEE LICENSE IN LICENSE", "dependencies": { + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/api-logs": "^0.208.0", + "@opentelemetry/exporter-logs-otlp-http": "^0.208.0", + "@opentelemetry/resources": "^2.2.0", + "@opentelemetry/sdk-logs": "^0.208.0", "@posthog/core": "1.9.1", - "@posthog/types": "1.318.2", + "@posthog/types": "1.319.0", "core-js": "^3.38.1", "dompurify": "^3.3.1", "fflate": "^0.4.8", @@ -15266,24 +15495,6 @@ "regjsparser": "bin/parser" } }, - "node_modules/rehackt": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.1.0.tgz", - "integrity": "sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "*" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "react": { - "optional": true - } - } - }, "node_modules/remark-parse": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz", @@ -16560,9 +16771,9 @@ } }, "node_modules/styled-components": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.5.tgz", - "integrity": "sha512-f8jAunVw/r41o17+JlWVlMTsyBKyghCdQ84YCKPxgKSMOZJbK3CKPxeIhotz6hlXvHb0w62zG4yyOdGY0kaB3g==", + "version": "6.3.6", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.6.tgz", + "integrity": "sha512-eRtK6PXWk3juH+8X9cyfItRk6a0JM+0Cw2gSr9jM3T3WeErb+UPObTRkVCHAv9maYfvPof77h1wq3325I0iI7w==", "license": "MIT", "dependencies": { "@emotion/is-prop-valid": "1.4.0", @@ -16599,59 +16810,6 @@ "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==", "license": "MIT" }, - "node_modules/subscriptions-transport-ws": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz", - "integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==", - "deprecated": "The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md", - "license": "MIT", - "dependencies": { - "backo2": "^1.0.2", - "eventemitter3": "^3.1.0", - "iterall": "^1.2.1", - "symbol-observable": "^1.0.4", - "ws": "^5.2.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependencies": { - "graphql": "^15.7.2 || ^16.0.0" - } - }, - "node_modules/subscriptions-transport-ws/node_modules/eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", - "license": "MIT" - }, - "node_modules/subscriptions-transport-ws/node_modules/symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/subscriptions-transport-ws/node_modules/ws": { - "version": "7.5.10", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", - "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", - "license": "MIT", - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -16691,15 +16849,6 @@ "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, - "node_modules/symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -17034,18 +17183,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/ts-invariant": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.10.3.tgz", - "integrity": "sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.1.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -17786,9 +17923,9 @@ "license": "MIT" }, "node_modules/vite-plugin-babel": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/vite-plugin-babel/-/vite-plugin-babel-1.3.2.tgz", - "integrity": "sha512-mEld4OVyuNs5+ISN+U5XyTnNcDwln/s2oER2m0PQ32YYPqPR25E3mfnhAA/RkZJxPuwFkprKWV405aZArE6kzA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/vite-plugin-babel/-/vite-plugin-babel-1.4.1.tgz", + "integrity": "sha512-quO+viHGSv1cjbfhbeiMZ7SZpo8P29NiUh9LJfKhpmIDwy0THRiTRUbanBbkNcZcSyHFgp1n7TByd1C2kanqLQ==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/client/package.json b/client/package.json index f20203a00..b8a3fd17a 100644 --- a/client/package.json +++ b/client/package.json @@ -10,7 +10,7 @@ "dependencies": { "@amplitude/analytics-browser": "^2.33.1", "@ant-design/pro-layout": "^7.22.6", - "@apollo/client": "^3.13.9", + "@apollo/client": "^4.0.12", "@emotion/is-prop-valid": "^1.4.0", "@fingerprintjs/fingerprintjs": "^4.6.1", "@firebase/analytics": "^0.10.19", @@ -25,9 +25,8 @@ "@sentry/vite-plugin": "^4.6.1", "@splitsoftware/splitio-react": "^2.6.1", "@tanem/react-nprogress": "^5.0.56", - "antd": "^6.1.4", - "apollo-link-logger": "^2.0.1", - "apollo-link-sentry": "^4.4.0", + "antd": "^6.2.0", + "apollo-link-logger": "^3.0.0", "autosize": "^6.0.1", "axios": "^1.13.2", "classnames": "^2.5.1", @@ -39,10 +38,11 @@ "env-cmd": "^10.1.0", "exifr": "^7.1.3", "graphql": "^16.12.0", + "graphql-ws": "^6.0.6", "i18next": "^25.7.4", "i18next-browser-languagedetector": "^8.2.0", "immutability-helper": "^3.1.1", - "libphonenumber-js": "^1.12.33", + "libphonenumber-js": "^1.12.34", "lightningcss": "^1.30.2", "logrocket": "^9.0.2", "markerjs2": "^2.32.7", @@ -50,7 +50,7 @@ "normalize-url": "^8.1.1", "object-hash": "^3.0.0", "phone": "^3.1.69", - "posthog-js": "^1.318.2", + "posthog-js": "^1.319.0", "prop-types": "^15.8.1", "query-string": "^9.3.1", "raf-schd": "^4.0.3", @@ -81,10 +81,10 @@ "redux-saga": "^1.4.2", "redux-state-sync": "^3.1.4", "reselect": "^5.1.1", + "rxjs": "^7.8.2", "sass": "^1.97.2", "socket.io-client": "^4.8.3", - "styled-components": "^6.3.5", - "subscriptions-transport-ws": "^0.11.0", + "styled-components": "^6.3.6", "use-memo-one": "^1.1.3", "vite-plugin-ejs": "^1.7.0", "web-vitals": "^3.5.2" @@ -160,7 +160,7 @@ "redux-logger": "^3.0.6", "source-map-explorer": "^2.5.3", "vite": "^7.3.1", - "vite-plugin-babel": "^1.3.2", + "vite-plugin-babel": "^1.4.1", "vite-plugin-eslint": "^1.8.1", "vite-plugin-node-polyfills": "^0.24.0", "vite-plugin-pwa": "^1.2.0", diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx index 9566e0626..2437979b3 100644 --- a/client/src/App/App.container.jsx +++ b/client/src/App/App.container.jsx @@ -1,4 +1,4 @@ -import { ApolloProvider } from "@apollo/client"; +import { ApolloProvider } from "@apollo/client/react"; import * as Sentry from "@sentry/react"; import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react"; import { ConfigProvider } from "antd"; diff --git a/client/src/components/allocations-assignment/allocations-assignment.container.jsx b/client/src/components/allocations-assignment/allocations-assignment.container.jsx index 262a70226..761f97961 100644 --- a/client/src/components/allocations-assignment/allocations-assignment.container.jsx +++ b/client/src/components/allocations-assignment/allocations-assignment.container.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; import AllocationsAssignmentComponent from "./allocations-assignment.component"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { INSERT_ALLOCATION } from "../../graphql/allocations.queries"; import { useTranslation } from "react-i18next"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx b/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx index a82058644..ca2607485 100644 --- a/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx +++ b/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; import AllocationsBulkAssignment from "./allocations-bulk-assignment.component"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { INSERT_ALLOCATION } from "../../graphql/allocations.queries"; import { useTranslation } from "react-i18next"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/allocations-employee-label/allocations-employee-label.container.jsx b/client/src/components/allocations-employee-label/allocations-employee-label.container.jsx index 0599d268d..26bc67411 100644 --- a/client/src/components/allocations-employee-label/allocations-employee-label.container.jsx +++ b/client/src/components/allocations-employee-label/allocations-employee-label.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { DELETE_ALLOCATION } from "../../graphql/allocations.queries"; import AllocationsLabelComponent from "./allocations-employee-label.component"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/audit-trail-list/audit-trail-list.container.jsx b/client/src/components/audit-trail-list/audit-trail-list.container.jsx index 2ee71b97c..64cfbe9a8 100644 --- a/client/src/components/audit-trail-list/audit-trail-list.container.jsx +++ b/client/src/components/audit-trail-list/audit-trail-list.container.jsx @@ -1,5 +1,5 @@ import AuditTrailListComponent from "./audit-trail-list.component"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries"; import AlertComponent from "../alert/alert.component"; import { logImEXEvent } from "../../firebase/firebase.utils"; diff --git a/client/src/components/bill-delete-button/bill-delete-button.component.jsx b/client/src/components/bill-delete-button/bill-delete-button.component.jsx index c3403e935..9be567caa 100644 --- a/client/src/components/bill-delete-button/bill-delete-button.component.jsx +++ b/client/src/components/bill-delete-button/bill-delete-button.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx index 3fa676862..9fdb915e5 100644 --- a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx +++ b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx @@ -1,5 +1,5 @@ import { PageHeader } from "@ant-design/pro-layout"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Divider, Form, Popconfirm, Space } from "antd"; import queryString from "query-string"; import { useState } from "react"; diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx index 9ce7928f6..571a7e85d 100644 --- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx +++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx @@ -1,4 +1,4 @@ -import { useApolloClient, useMutation } from "@apollo/client"; +import { useApolloClient, useMutation } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Checkbox, Form, Modal, Space } from "antd"; import _ from "lodash"; diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx index 73c5d4f3b..d733f5431 100644 --- a/client/src/components/bill-form/bill-form.component.jsx +++ b/client/src/components/bill-form/bill-form.component.jsx @@ -1,5 +1,5 @@ import Icon, { UploadOutlined } from "@ant-design/icons"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Alert, Divider, Form, Input, Select, Space, Statistic, Switch, Upload } from "antd"; import { useEffect, useState } from "react"; @@ -98,13 +98,11 @@ export function BillFormComponent({ } const jobId = form.getFieldValue("jobid"); if (jobId) { - loadLines({ variables: { id: jobId } }); + loadLines({ id: jobId }); if (form.getFieldValue("is_credit_memo") && vendorId && !billEdit) { loadOutstandingReturns({ - variables: { - jobId: jobId, - vendorId: vendorId - } + jobId: jobId, + vendorId: vendorId }); } } @@ -146,13 +144,11 @@ export function BillFormComponent({ notExported={false} onBlur={() => { if (form.getFieldValue("jobid") !== null && form.getFieldValue("jobid") !== undefined) { - loadLines({ variables: { id: form.getFieldValue("jobid") } }); + loadLines({ id: form.getFieldValue("jobid") }); if (form.getFieldValue("vendorid") !== null && form.getFieldValue("vendorid") !== undefined) { loadOutstandingReturns({ - variables: { - jobId: form.getFieldValue("jobid"), - vendorId: form.getFieldValue("vendorid") - } + jobId: form.getFieldValue("jobid"), + vendorId: form.getFieldValue("vendorid") }); } } diff --git a/client/src/components/bill-form/bill-form.container.jsx b/client/src/components/bill-form/bill-form.container.jsx index b09830179..c1175c94f 100644 --- a/client/src/components/bill-form/bill-form.container.jsx +++ b/client/src/components/bill-form/bill-form.container.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery, useQuery } from "@apollo/client"; +import { useLazyQuery, useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx b/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx index 2acb47766..f5ea41268 100644 --- a/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx +++ b/client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx @@ -1,4 +1,6 @@ -import { gql, useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; +import { gql } from "@apollo/client"; + import { Button } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/bill-reexport-button/bill-reexport-button.component.jsx b/client/src/components/bill-reexport-button/bill-reexport-button.component.jsx index 5db76ca62..817dc1c9c 100644 --- a/client/src/components/bill-reexport-button/bill-reexport-button.component.jsx +++ b/client/src/components/bill-reexport-button/bill-reexport-button.component.jsx @@ -1,4 +1,5 @@ -import { gql, useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; +import { gql } from "@apollo/client"; import { Button } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/billline-add-inventory/billline-add-inventory.component.jsx b/client/src/components/billline-add-inventory/billline-add-inventory.component.jsx index 583da81b7..5d48f5db4 100644 --- a/client/src/components/billline-add-inventory/billline-add-inventory.component.jsx +++ b/client/src/components/billline-add-inventory/billline-add-inventory.component.jsx @@ -1,5 +1,5 @@ import { FileAddFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Tooltip } from "antd"; import { t } from "i18next"; import dayjs from "./../../utils/day"; diff --git a/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx b/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx index 1d4c4f293..f08db420e 100644 --- a/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx +++ b/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useLocation, useNavigate } from "react-router-dom"; import { Input, Table } from "antd"; diff --git a/client/src/components/card-payment-modal/card-payment-modal.component.jsx b/client/src/components/card-payment-modal/card-payment-modal.component.jsx index cf40c9c50..1c44a3d4e 100644 --- a/client/src/components/card-payment-modal/card-payment-modal.component.jsx +++ b/client/src/components/card-payment-modal/card-payment-modal.component.jsx @@ -1,5 +1,5 @@ import { CopyFilled, DeleteFilled } from "@ant-design/icons"; -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Button, Card, Col, Form, Input, message, Row, Space, Spin, Statistic } from "antd"; import axios from "axios"; import { useState } from "react"; @@ -52,7 +52,6 @@ const CardPaymentModalComponent = ({ const notification = useNotification(); const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, { - variables: { jobids: [context.jobid] }, skip: !context?.jobid }); @@ -258,7 +257,7 @@ const CardPaymentModalComponent = ({ //If all of the job ids have been fileld in, then query and update the IP field. const { payments } = form.getFieldsValue(); if (payments?.length > 0 && payments?.filter((p) => p?.jobid).length === payments?.length) { - refetch({ jobids: payments.map((p) => p.jobid) }); + refetch({ variables: { jobids: payments.map((p) => p.jobid) } }); } return ( <> diff --git a/client/src/components/chat-affix/chat-affix.container.jsx b/client/src/components/chat-affix/chat-affix.container.jsx index 253fb7027..af99d4719 100644 --- a/client/src/components/chat-affix/chat-affix.container.jsx +++ b/client/src/components/chat-affix/chat-affix.container.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { getToken } from "@firebase/messaging"; import axios from "axios"; import { useEffect } from "react"; diff --git a/client/src/components/chat-archive-button/chat-archive-button.component.jsx b/client/src/components/chat-archive-button/chat-archive-button.component.jsx index 5b055c3a6..c3e78287a 100644 --- a/client/src/components/chat-archive-button/chat-archive-button.component.jsx +++ b/client/src/components/chat-archive-button/chat-archive-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx index ef420a2c9..0fe9221a6 100644 --- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx +++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx @@ -11,7 +11,7 @@ import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-displ import _ from "lodash"; import { ExclamationCircleOutlined } from "@ant-design/icons"; import "./chat-conversation-list.styles.scss"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../../graphql/phone-number-opt-out.queries.js"; import { phone } from "phone"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx b/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx index 2aeb16573..7408124ad 100644 --- a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx +++ b/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Tag } from "antd"; import { Link } from "react-router-dom"; import { logImEXEvent } from "../../firebase/firebase.utils"; diff --git a/client/src/components/chat-conversation/chat-conversation.container.jsx b/client/src/components/chat-conversation/chat-conversation.container.jsx index ed90b9053..3cf8023d0 100644 --- a/client/src/components/chat-conversation/chat-conversation.container.jsx +++ b/client/src/components/chat-conversation/chat-conversation.container.jsx @@ -1,4 +1,5 @@ -import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client"; +import { useApolloClient, useQuery, useSubscription } from "@apollo/client/react"; +import { gql } from "@apollo/client"; import axios from "axios"; import { useCallback, useEffect, useMemo, useState } from "react"; import { connect } from "react-redux"; diff --git a/client/src/components/chat-label/chat-label.component.jsx b/client/src/components/chat-label/chat-label.component.jsx index 5fc4274d6..b3b81af91 100644 --- a/client/src/components/chat-label/chat-label.component.jsx +++ b/client/src/components/chat-label/chat-label.component.jsx @@ -1,5 +1,5 @@ import { PlusOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Input, Spin, Tag, Tooltip } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/chat-media-selector/chat-media-selector.component.jsx b/client/src/components/chat-media-selector/chat-media-selector.component.jsx index 9d8c43651..e2fb74e03 100644 --- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx +++ b/client/src/components/chat-media-selector/chat-media-selector.component.jsx @@ -1,5 +1,5 @@ import { PictureFilled } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Badge, Popover } from "antd"; import { useEffect, useState } from "react"; diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx index 0e04bf217..1ce052b11 100644 --- a/client/src/components/chat-popup/chat-popup.component.jsx +++ b/client/src/components/chat-popup/chat-popup.component.jsx @@ -1,5 +1,5 @@ import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons"; -import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client"; +import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client/react"; import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd"; import { useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -105,9 +105,7 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh hasLoadedConversationsOnceRef.current = true; - getConversations({ - variables: { offset: 0 } - }).catch((err) => { + getConversations({ offset: 0 }).catch((err) => { console.error(`Error fetching conversations: ${err?.message || ""}`, err); }); }, [getConversations]); @@ -115,9 +113,9 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh const handleManualRefresh = async () => { try { if (called && typeof refetch === "function") { - await refetch({ offset: 0 }); + await refetch({ variables: { offset: 0 } }); } else { - await getConversations({ variables: { offset: 0 } }); + await getConversations({ offset: 0 }); } } catch (err) { console.error(`Error refreshing conversations: ${err?.message || ""}`, err); diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx index b0ced2028..83098d1f9 100644 --- a/client/src/components/chat-send-message/chat-send-message.component.jsx +++ b/client/src/components/chat-send-message/chat-send-message.component.jsx @@ -10,7 +10,7 @@ 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 { useQuery } from "@apollo/client/react"; import { phone } from "phone"; import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries"; diff --git a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx index d6c5bef4c..2ef8bc63b 100644 --- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx +++ b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx @@ -1,5 +1,5 @@ import { PlusOutlined } from "@ant-design/icons"; -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Tag } from "antd"; import _ from "lodash"; import { useState } from "react"; @@ -34,7 +34,7 @@ export function ChatTagRoContainer({ conversation, bodyshop }) { const debouncedExecuteSearch = _.debounce(executeSearch, 500); const handleSearch = (value) => { - debouncedExecuteSearch({ variables: { search: value } }); + debouncedExecuteSearch({ search: value }); }; const [insertTag] = useMutation(INSERT_CONVERSATION_TAG, { diff --git a/client/src/components/contract-cars/contract-cars.container.jsx b/client/src/components/contract-cars/contract-cars.container.jsx index 1aeb0a983..d1ae047d2 100644 --- a/client/src/components/contract-cars/contract-cars.container.jsx +++ b/client/src/components/contract-cars/contract-cars.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import dayjs from "../../utils/day"; import { QUERY_AVAILABLE_CC } from "../../graphql/courtesy-car.queries"; import AlertComponent from "../alert/alert.component"; diff --git a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx index f4ecd3636..15bff2e15 100644 --- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx +++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, InputNumber, Popover, Radio, Select, Space } from "antd"; import axios from "axios"; import dayjs from "../../utils/day"; diff --git a/client/src/components/contract-form/contract-form-job-prefill.component.jsx b/client/src/components/contract-form/contract-form-job-prefill.component.jsx index 68977a3d1..ccc6623c7 100644 --- a/client/src/components/contract-form/contract-form-job-prefill.component.jsx +++ b/client/src/components/contract-form/contract-form-job-prefill.component.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Button } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; @@ -11,7 +11,7 @@ export default function ContractCreateJobPrefillComponent({ jobId, form }) { const notification = useNotification(); const handleClick = () => { - call({ variables: { id: jobId } }); + call({ id: jobId }); }; useEffect(() => { diff --git a/client/src/components/contract-jobs/contract-jobs.container.jsx b/client/src/components/contract-jobs/contract-jobs.container.jsx index 8d8e7384b..9d14ad7d2 100644 --- a/client/src/components/contract-jobs/contract-jobs.container.jsx +++ b/client/src/components/contract-jobs/contract-jobs.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries"; diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx index 788ead5da..dbee8103e 100644 --- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx +++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Button, Form, Modal, Table } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; @@ -35,10 +35,8 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi //Execute contract find callSearch({ - variables: { - plate: (values.plate && values.plate !== "" && values.plate) || undefined, - time: values.time - } + plate: (values.plate && values.plate !== "" && values.plate) || undefined, + time: values.time }); }; diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx index 37e1285d2..2036576c1 100644 --- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx +++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx @@ -1,5 +1,5 @@ import { WarningFilled } from "@ant-design/icons"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Form, Input, InputNumber, Space } from "antd"; import { PageHeader } from "@ant-design/pro-layout"; import dayjs from "../../utils/day"; diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx index 98a8cbbf1..aa9ebd817 100644 --- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx +++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx @@ -8,7 +8,7 @@ import { selectCourtesyCarReturn } from "../../redux/modals/modals.selectors"; import CourtesyCarReturnModalComponent from "./courtesy-car-return-modal.component"; import dayjs from "../../utils/day"; import { RETURN_CONTRACT } from "../../graphql/cccontracts.queries"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; const mapStateToProps = createStructuredSelector({ diff --git a/client/src/components/csi-response-form/csi-response-form.container.jsx b/client/src/components/csi-response-form/csi-response-form.container.jsx index 6d032e676..2a0a8663e 100644 --- a/client/src/components/csi-response-form/csi-response-form.container.jsx +++ b/client/src/components/csi-response-form/csi-response-form.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Form, Result } from "antd"; import queryString from "query-string"; import { useEffect } from "react"; diff --git a/client/src/components/dashboard-grid/dashboard-grid.component.jsx b/client/src/components/dashboard-grid/dashboard-grid.component.jsx index a6e5ca4e9..79f613b02 100644 --- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx +++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx @@ -1,5 +1,5 @@ import Icon, { SyncOutlined } from "@ant-design/icons"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Dropdown, Space } from "antd"; import { PageHeader } from "@ant-design/pro-layout"; import { useEffect, useMemo, useState } from "react"; diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx index edd62746d..1d1ec3d11 100644 --- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx +++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Button, Input, Modal, Table } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; @@ -60,7 +60,7 @@ export function DmsCdkVehicles({ form, job }) { ( callSearch({ variables: { search: val } })} + onSearch={(val) => callSearch({ search: val })} placeholder={t("general.labels.search")} /> )} @@ -87,9 +87,7 @@ export function DmsCdkVehicles({ form, job }) { onClick={() => { setOpen(true); callSearch({ - variables: { - search: job?.v_model_desc && job.v_model_desc.substr(0, 3) - } + search: job?.v_model_desc && job.v_model_desc.substr(0, 3) }); }} > diff --git a/client/src/components/document-editor/document-editor.container.jsx b/client/src/components/document-editor/document-editor.container.jsx index 5e03c262f..6e0669bbe 100644 --- a/client/src/components/document-editor/document-editor.container.jsx +++ b/client/src/components/document-editor/document-editor.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Result } from "antd"; import queryString from "query-string"; import { useEffect } from "react"; diff --git a/client/src/components/email-documents/email-documents.component.jsx b/client/src/components/email-documents/email-documents.component.jsx index 5318d8d5b..6ba22e241 100644 --- a/client/src/components/email-documents/email-documents.component.jsx +++ b/client/src/components/email-documents/email-documents.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/employee-team-search-select/employee-team-search-select.component.jsx b/client/src/components/employee-team-search-select/employee-team-search-select.component.jsx index 4d1f939bb..3005b0534 100644 --- a/client/src/components/employee-team-search-select/employee-team-search-select.component.jsx +++ b/client/src/components/employee-team-search-select/employee-team-search-select.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Select } from "antd"; import { forwardRef } from "react"; import { QUERY_TEAMS } from "../../graphql/employee_teams.queries"; diff --git a/client/src/components/eula/eula.component.jsx b/client/src/components/eula/eula.component.jsx index f5d6ea8fc..b82623bff 100644 --- a/client/src/components/eula/eula.component.jsx +++ b/client/src/components/eula/eula.component.jsx @@ -5,7 +5,7 @@ import { createStructuredSelector } from "reselect"; import { selectCurrentEula, selectCurrentUser } from "../../redux/user/user.selectors"; import { connect } from "react-redux"; import { INSERT_EULA_ACCEPTANCE } from "../../graphql/user.queries"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { acceptEula } from "../../redux/user/user.actions"; import { useTranslation } from "react-i18next"; import dayjs from "../../utils/day"; diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx index d0a895485..9cdafaf04 100644 --- a/client/src/components/global-search/global-search.component.jsx +++ b/client/src/components/global-search/global-search.component.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { AutoComplete, Divider, Input, Space } from "antd"; import _ from "lodash"; import { useTranslation } from "react-i18next"; @@ -20,7 +20,7 @@ export default function GlobalSearch() { const debouncedExecuteSearch = _.debounce(executeSearch, 750); const handleSearch = (value) => { - debouncedExecuteSearch({ variables: { search: value } }); + debouncedExecuteSearch({ search: value }); }; const renderTitle = (title) => { diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index cf19f585f..59befa6d7 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -1,7 +1,7 @@ // noinspection RegExpAnonymousGroup import { BellFilled } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Badge, Layout, Menu, Spin, Tooltip } from "antd"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; diff --git a/client/src/components/inventory-line-delete/inventory-line-delete.component.jsx b/client/src/components/inventory-line-delete/inventory-line-delete.component.jsx index 60cf5e5b5..05bf55179 100644 --- a/client/src/components/inventory-line-delete/inventory-line-delete.component.jsx +++ b/client/src/components/inventory-line-delete/inventory-line-delete.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/inventory-list/inventory-list.container.jsx b/client/src/components/inventory-list/inventory-list.container.jsx index 91d7829f7..c1754d131 100644 --- a/client/src/components/inventory-list/inventory-list.container.jsx +++ b/client/src/components/inventory-list/inventory-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { connect } from "react-redux"; import { useLocation } from "react-router-dom"; diff --git a/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx b/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx index e53823db5..4d9369acc 100644 --- a/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx +++ b/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Form, Modal } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx index aba3361a5..02b82e436 100644 --- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx +++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Form, Input, InputNumber, Modal, Radio, Select } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-at-change/job-at-change.component.jsx b/client/src/components/job-at-change/job-at-change.component.jsx index 68a53004f..5c1344430 100644 --- a/client/src/components/job-at-change/job-at-change.component.jsx +++ b/client/src/components/job-at-change/job-at-change.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-at-change/schedule-event.color.component.jsx b/client/src/components/job-at-change/schedule-event.color.component.jsx index 17c9f24d2..5cdb3444a 100644 --- a/client/src/components/job-at-change/schedule-event.color.component.jsx +++ b/client/src/components/job-at-change/schedule-event.color.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx index 1023e5f71..af5c842db 100644 --- a/client/src/components/job-at-change/schedule-event.component.jsx +++ b/client/src/components/job-at-change/schedule-event.component.jsx @@ -1,5 +1,5 @@ import { AlertFilled } from "@ant-design/icons"; -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Button, Divider, Dropdown, Form, Input, Popover, Select, Space } from "antd"; import parsePhoneNumber from "libphonenumber-js"; import queryString from "query-string"; @@ -66,7 +66,6 @@ export function ScheduleEventComponent({ const [form] = Form.useForm(); const [popOverVisible, setPopOverVisible] = useState(false); const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, { - variables: { id: event.job?.id }, onCompleted: (data) => { if (data?.jobs_by_pk) { const totalHours = @@ -412,7 +411,7 @@ export function ScheduleEventComponent({ onClick={(e) => { if (event.job?.id) { e.stopPropagation(); - getJobDetails(); + getJobDetails({ id: event.job.id }); } }} getPopupContainer={(trigger) => trigger.parentNode} diff --git a/client/src/components/job-at-change/schedule-event.container.jsx b/client/src/components/job-at-change/schedule-event.container.jsx index 23c38b8cb..4354fa4bd 100644 --- a/client/src/components/job-at-change/schedule-event.container.jsx +++ b/client/src/components/job-at-change/schedule-event.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { useDispatch } from "react-redux"; import { logImEXEvent } from "../../firebase/firebase.utils"; diff --git a/client/src/components/job-at-change/schedule-event.note.component.jsx b/client/src/components/job-at-change/schedule-event.note.component.jsx index 57cdbd07d..975cdb4af 100644 --- a/client/src/components/job-at-change/schedule-event.note.component.jsx +++ b/client/src/components/job-at-change/schedule-event.note.component.jsx @@ -1,5 +1,5 @@ import { EditFilled, SaveFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Input, Space } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx index dcf4ccb9e..9ad6a6b3c 100644 --- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx +++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Col, Row, Table, Tag } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx index 013562906..e5a8480af 100644 --- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx +++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Form, Input, Switch } from "antd"; import queryString from "query-string"; import { useState } from "react"; diff --git a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx index 06050a3d8..e856bf240 100644 --- a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx +++ b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx index c3f733714..6f8319e5d 100644 --- a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries"; diff --git a/client/src/components/job-create-iou/job-create-iou.component.jsx b/client/src/components/job-create-iou/job-create-iou.component.jsx index 60e0eed3b..18a66c4f9 100644 --- a/client/src/components/job-create-iou/job-create-iou.component.jsx +++ b/client/src/components/job-create-iou/job-create-iou.component.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx index 97be24a21..801b0b6e2 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx @@ -1,5 +1,5 @@ import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Card, Col, Divider, Drawer, Grid, Row, Space } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx index dcd97a7d1..76bd050b6 100644 --- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx +++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Col, Row, Skeleton, Space, Timeline, Typography } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx b/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx index 152ca7c56..39c49a7d3 100644 --- a/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx +++ b/client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popover, Tooltip } from "antd"; import axios from "axios"; import { t } from "i18next"; diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx index 64d5a4252..d58f592e7 100644 --- a/client/src/components/job-detail-lines/job-lines.component.jsx +++ b/client/src/components/job-detail-lines/job-lines.component.jsx @@ -9,7 +9,8 @@ import { WarningFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { gql, useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; +import { gql } from "@apollo/client"; import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd"; import axios from "axios"; import { useMemo, useState } from "react"; diff --git a/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx b/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx index a13b4f7d7..88d94c0fa 100644 --- a/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx +++ b/client/src/components/job-detail-lines/jobs-lines-expander-simple.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Col, Row, Skeleton, Timeline, Typography } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx index 3b1758d54..bc207b8f3 100644 --- a/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx +++ b/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useState } from "react"; import { useTranslation } from "react-i18next"; import { logImEXEvent } from "../../firebase/firebase.utils"; diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx index 0b6b549d3..53e8ae5ab 100644 --- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx +++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx @@ -1,4 +1,5 @@ -import { gql, useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; +import { gql } from "@apollo/client"; import { Badge, Card, Space, Table, Tag } from "antd"; import axios from "axios"; import { isEmpty } from "lodash"; diff --git a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx index 963b28bab..2b5d0d624 100644 --- a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx +++ b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popover, Select, Space } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx index ba84020c9..d0e3b7485 100644 --- a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx +++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx @@ -1,5 +1,5 @@ import { ClockCircleOutlined } from "@ant-design/icons"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Card, Form, Popover, Select, Space, Tooltip } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx index 3d22b69c8..5279c27d7 100644 --- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx +++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popover, Select, Space } from "antd"; import dayjs from "../../utils/day"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx index 5f6bbd8df..5b60dc414 100644 --- a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx +++ b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Select, Space, Tag } from "antd"; import { useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx b/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx index cdc7273d6..47476f428 100644 --- a/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx +++ b/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx @@ -1,5 +1,5 @@ import { FieldTimeOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Input } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx b/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx index 3cfc0935f..27b21e80a 100644 --- a/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx +++ b/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx @@ -1,6 +1,6 @@ import { Select } from "antd"; import { useEffect, useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx b/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx index 0ba4c75a9..bbac5dd6e 100644 --- a/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx +++ b/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx @@ -1,6 +1,6 @@ import { Select } from "antd"; import { useEffect, useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx index cf9b88269..929743c2d 100644 --- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx +++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import Axios from "axios"; import Dinero from "dinero.js"; diff --git a/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx b/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx index 7d503c89d..ee1ff8e31 100644 --- a/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx +++ b/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx @@ -1,5 +1,5 @@ import { PushpinFilled, PushpinOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { UPDATE_NOTE } from "../../graphql/notes.queries"; function JobNotesPinToggle({ note }) { diff --git a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx index b55e30aaf..149789c12 100644 --- a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx +++ b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Modal } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx index c07ab0a6f..02645ad51 100644 --- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx +++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Checkbox, Space, Spin } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx index 583b79b1a..f29860917 100644 --- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx +++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx @@ -1,5 +1,5 @@ import { CheckCircleOutlined } from "@ant-design/icons"; -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Button, Card, Form, InputNumber, Popover, Space } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -38,7 +38,7 @@ export function ScoreboardAddButton({ bodyshop, job, disabled, ...otherBtnProps useEffect(() => { if (visibility) { - callQuery({ variables: { jobid: job.id } }); + callQuery({ jobid: job.id }); } }, [visibility, job.id, callQuery]); diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx index 2b6f883dc..0a425f9b9 100644 --- a/client/src/components/job-search-select/job-search-select.component.jsx +++ b/client/src/components/job-search-select/job-search-select.component.jsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from "@ant-design/icons"; -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Select, Space, Spin, Tag } from "antd"; import _ from "lodash"; import { forwardRef, useEffect, useState } from "react"; @@ -29,22 +29,20 @@ const JobSearchSelect = ( const handleSearch = (value) => { debouncedExecuteSearch({ - variables: { - search: value, - ...(convertedOnly || notExported - ? { - ...(convertedOnly ? { isConverted: true } : {}), - ...(notExported ? { notExported: true } : {}), - ...(notInvoiced ? { notInvoiced: true } : {}) - } - : {}) - } + search: value, + ...(convertedOnly || notExported + ? { + ...(convertedOnly ? { isConverted: true } : {}), + ...(notExported ? { notExported: true } : {}), + ...(notInvoiced ? { notInvoiced: true } : {}) + } + : {}) }); }; useEffect(() => { if (restProps.value) { - callIdSearch({ variables: { id: restProps.value } }); // Sometimes results in a no-op. Not sure how to fix. + callIdSearch({ id: restProps.value }); // Sometimes results in a no-op. Not sure how to fix. } }, [restProps.value, callIdSearch]); diff --git a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx index 5d366bacf..61a007c65 100644 --- a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx +++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from "react"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { ADD_JOB_WATCHER, GET_JOB_WATCHERS, REMOVE_JOB_WATCHER } from "../../graphql/jobs.queries.js"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx index b8881f6cc..d6e6f91da 100644 --- a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx +++ b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx @@ -1,5 +1,5 @@ import { DownCircleFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Dropdown } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx index ba6d115b3..bc99535a5 100644 --- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx +++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popconfirm, Select } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx index 7d2f40b41..dcb51be24 100644 --- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx +++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx index 74c6cd984..7a20c06b4 100644 --- a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx +++ b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Space } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx index 52087ef74..f1650d201 100644 --- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx +++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Space } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx index 813d7f45a..c3459d7b6 100644 --- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx +++ b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx b/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx index 904972a87..129ff9fb2 100644 --- a/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx +++ b/client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Switch } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx index d722c6418..3194f8b46 100644 --- a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx +++ b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx index 982ba49c0..30b322dce 100644 --- a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx +++ b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-available-table/jobs-available-table.component.jsx b/client/src/components/jobs-available-table/jobs-available-table.component.jsx index d5b23235d..e0ea356a4 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled, DownloadOutlined, PlusCircleFilled, SyncOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Alert, Button, Card, Input, Space, Table } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx index 91e63ba83..e3380b197 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx @@ -1,4 +1,5 @@ -import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client"; +import { useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client/react"; +import { gql } from "@apollo/client"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Col, Row } from "antd"; import Axios from "axios"; @@ -368,12 +369,12 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail }; const addJobAsNew = (record) => { - loadEstData({ variables: { id: record.id } }); + loadEstData({ id: record.id }); setOwnerModalVisible(true); }; const addJobAsSupp = useCallback((record) => { - loadEstData({ variables: { id: record.id } }); + loadEstData({ id: record.id }); modalSearchState[1](record.clm_no); setJobModalVisible(true); }, []); diff --git a/client/src/components/jobs-change-status/jobs-change-status.component.jsx b/client/src/components/jobs-change-status/jobs-change-status.component.jsx index ad04ee980..4d8676b2a 100644 --- a/client/src/components/jobs-change-status/jobs-change-status.component.jsx +++ b/client/src/components/jobs-change-status/jobs-change-status.component.jsx @@ -1,5 +1,5 @@ import { DownCircleFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Dropdown } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx index e811a9544..e7751b345 100644 --- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx +++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import { useState } from "react"; diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index 9b5efe06c..e3f856697 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Input, Popover, Select, Space, Switch } from "antd"; import axios from "axios"; import { some } from "lodash"; diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.container.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.container.jsx index 36b5f6a77..22ea57671 100644 --- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.container.jsx +++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useContext } from "react"; import { QUERY_SEARCH_OWNER_BY_IDX } from "../../graphql/owners.queries"; import JobCreateContext from "../../pages/jobs-create/jobs-create.context"; diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx index 3ed08d199..e52647804 100644 --- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx +++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useContext } from "react"; import { SEARCH_VEHICLES } from "../../graphql/vehicles.queries"; import JobCreateContext from "../../pages/jobs-create/jobs-create.context"; diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx index c035000bd..dd1f27667 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx @@ -1,5 +1,5 @@ import { DownCircleFilled } from "@ant-design/icons"; -import { useApolloClient, useMutation } from "@apollo/client"; +import { useApolloClient, useMutation } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Card, Dropdown, Form, Input, Modal, Popconfirm, Popover, Select, Space } from "antd"; import axios from "axios"; diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx index 6e89cf316..1fdf9084d 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Button, Form, Popover, Space } from "antd"; import dayjs from "dayjs"; import { useEffect, useState } from "react"; @@ -42,7 +42,6 @@ export function JobsDetailHeaderActionsToggleProduction({ const notification = useNotification(); const [getJobDetails, { loading: jobDetailsLoading }] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, { - variables: { id: job.id }, onCompleted: (data) => { if (data?.jobs_by_pk) { const totalHours = @@ -204,7 +203,7 @@ export function JobsDetailHeaderActionsToggleProduction({ open={popOverVisible} onOpenChange={setPopOverVisible} onClick={(e) => { - getJobDetails(); + getJobDetails({ id: job.id }); e.stopPropagation(); }} getPopupContainer={(trigger) => trigger.parentNode} diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx index d5802f2d7..806f6c473 100644 --- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx +++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx @@ -1,5 +1,5 @@ import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Card, Checkbox, Col, Divider, Row, Space, Tag, Tooltip } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; @@ -139,7 +139,10 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is ) : null} - + {!isPartsEntry && {job.ins_co_nm}} @@ -281,7 +284,10 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is {job.owner?.tax_number || ""} )} - + {job.owner?.note || ""} diff --git a/client/src/components/jobs-detail-labor/jobs-detail-labor.container.jsx b/client/src/components/jobs-detail-labor/jobs-detail-labor.container.jsx index 9b816319c..95d2ca219 100644 --- a/client/src/components/jobs-detail-labor/jobs-detail-labor.container.jsx +++ b/client/src/components/jobs-detail-labor/jobs-detail-labor.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries"; import AlertComponent from "../alert/alert.component"; import JobsDetailLaborComponent from "./jobs-detail-labor.component"; diff --git a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx index ee7c114ed..4db21ae27 100644 --- a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx +++ b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Form, Popover, Space } from "antd"; import axios from "axios"; import { useMemo, useState } from "react"; diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx index e8c879ddb..123e68ab7 100644 --- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx +++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries"; import AlertComponent from "../alert/alert.component"; import JobDocumentsImgProxy from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component"; diff --git a/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.reassign.component.jsx b/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.reassign.component.jsx index 2b9fd681d..7126bc456 100644 --- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.reassign.component.jsx +++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.reassign.component.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Form, Popover, Space } from "antd"; import axios from "axios"; import { useMemo, useState } from "react"; diff --git a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.container.jsx b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.container.jsx index 7b6db9c87..7dd3d632a 100644 --- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.container.jsx +++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries"; import AlertComponent from "../alert/alert.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component"; diff --git a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx index 0ac960955..5869358dd 100644 --- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx +++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import _ from "lodash"; diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx index 8d1ec3c97..141364ff1 100644 --- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx +++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Modal } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 4d4431bca..e53fae10c 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -1,5 +1,5 @@ import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd"; import queryString from "query-string"; import { useState } from "react"; diff --git a/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx b/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx index a36f8f1e5..b1e8a27ee 100644 --- a/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx +++ b/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/jobs-notes/jobs-notes.container.jsx b/client/src/components/jobs-notes/jobs-notes.container.jsx index e80d7fc53..024d4fc01 100644 --- a/client/src/components/jobs-notes/jobs-notes.container.jsx +++ b/client/src/components/jobs-notes/jobs-notes.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx index 078c22177..fa0ab18d5 100644 --- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx +++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx @@ -1,5 +1,5 @@ import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd"; import queryString from "query-string"; import { useMemo, useState } from "react"; diff --git a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx index e87a459a0..23b8acbb4 100644 --- a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx +++ b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Form, InputNumber, Popover, Select } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx index 6c8472667..0c62f9c8d 100644 --- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx +++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Form, Modal } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/notification-center/notification-center.container.jsx b/client/src/components/notification-center/notification-center.container.jsx index e534375f6..617bf1569 100644 --- a/client/src/components/notification-center/notification-center.container.jsx +++ b/client/src/components/notification-center/notification-center.container.jsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import NotificationCenterComponent from "./notification-center.component"; import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries"; diff --git a/client/src/components/notification-settings/notification-settings-form.component.jsx b/client/src/components/notification-settings/notification-settings-form.component.jsx index b1b33703e..8d1ee9c0c 100644 --- a/client/src/components/notification-settings/notification-settings-form.component.jsx +++ b/client/src/components/notification-settings/notification-settings-form.component.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { useEffect, useState } from "react"; import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx index 30ab80874..c9cd3bc8b 100644 --- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx +++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx @@ -1,5 +1,5 @@ import { PageHeader } from "@ant-design/pro-layout"; -import { useApolloClient, useMutation } from "@apollo/client"; +import { useApolloClient, useMutation } from "@apollo/client/react"; import { Button, Form, Popconfirm } from "antd"; import { phone } from "phone"; // Import phone utility for formatting import { useEffect, useState } from "react"; diff --git a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx index 78ab8454d..14a011b89 100644 --- a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx +++ b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx @@ -1,6 +1,6 @@ import { Button } from "antd"; import { useTranslation } from "react-i18next"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { UPDATE_JOBS } from "../../graphql/jobs.queries"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx index 580466c82..188f43dfa 100644 --- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx +++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Input, Modal } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -22,18 +22,14 @@ export default function OwnerFindModalContainer({ const { t } = useTranslation(); const [searchText, setSearchText] = useState(null); - const [callSearchowners, ownersList] = useLazyQuery(QUERY_SEARCH_OWNER_BY_IDX, { - variables: { - search: searchText - } - }); + const [callSearchowners, ownersList] = useLazyQuery(QUERY_SEARCH_OWNER_BY_IDX); useEffect(() => { if (modalProps.open && owner) { const s = OwnerNameDisplayFunction(owner, true); setSearchText(s.trim()); - callSearchowners({ variables: { search: s.trim() } }); + callSearchowners({ search: s.trim() }); } }, [callSearchowners, modalProps.open, owner]); @@ -51,7 +47,7 @@ export default function OwnerFindModalContainer({ setSearchText(e.target.value)} - onSearch={(val) => callSearchowners({ variables: { search: val.trim() } })} + onSearch={(val) => callSearchowners({ search: val.trim() })} /> { const debouncedExecuteSearch = _.debounce(executeSearch, 500); const handleSearch = (value) => { - debouncedExecuteSearch({ variables: { search: value } }); + debouncedExecuteSearch({ search: value }); }; const [option, setOption] = useState(value); useEffect(() => { if (value === option && value) { - callIdSearch({ variables: { id: value } }); + callIdSearch({ id: value }); } }, [value, option, callIdSearch]); diff --git a/client/src/components/owners-list/owners-list.container.jsx b/client/src/components/owners-list/owners-list.container.jsx index 51778e350..8014c9504 100644 --- a/client/src/components/owners-list/owners-list.container.jsx +++ b/client/src/components/owners-list/owners-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { QUERY_ALL_OWNERS_PAGINATED } from "../../graphql/owners.queries"; import AlertComponent from "../alert/alert.component"; import OwnersListComponent from "./owners-list.component"; diff --git a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx index 091adb5ed..fbdfd8b32 100644 --- a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx +++ b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Col, Row, Table } from "antd"; import dayjs from "../../utils/day"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx index 1abf9e910..2029ab90e 100644 --- a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx +++ b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popover, Spin } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-order-cm-received/parts-order-cm-received.component.jsx b/client/src/components/parts-order-cm-received/parts-order-cm-received.component.jsx index 1bf9abb64..e1a2fceb3 100644 --- a/client/src/components/parts-order-cm-received/parts-order-cm-received.component.jsx +++ b/client/src/components/parts-order-cm-received/parts-order-cm-received.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Checkbox, Space, Spin } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-order-delete-line/parts-order-delete-line.component.jsx b/client/src/components/parts-order-delete-line/parts-order-delete-line.component.jsx index a1ae16bdf..fe5070782 100644 --- a/client/src/components/parts-order-delete-line/parts-order-delete-line.component.jsx +++ b/client/src/components/parts-order-delete-line/parts-order-delete-line.component.jsx @@ -2,7 +2,7 @@ import { Button, Popconfirm } from "antd"; import { DeleteFilled } from "@ant-design/icons"; import { useTranslation } from "react-i18next"; import { DELETE_PARTS_ORDER_LINE } from "../../graphql/parts-orders.queries"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; export default function PartsOrderDeleteLine({ disabled, partsLineId, partsOrderId }) { const { t } = useTranslation(); diff --git a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx index 4a4972e61..790c19c8a 100644 --- a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx +++ b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popover } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx index 521f95aa3..547c9e13c 100644 --- a/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx +++ b/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx @@ -1,6 +1,6 @@ import { DeleteFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Button, Drawer, Grid, Popconfirm, Space, Table } from "antd"; import queryString from "query-string"; import { useEffect, useState } from "react"; @@ -101,7 +101,7 @@ export function PartsOrderListTableDrawerComponent({ if (selectedPartsOrderRecord?.returnfrombill) { try { const { data } = await billQuery({ - variables: { billid: selectedPartsOrderRecord.returnfrombill } + billid: selectedPartsOrderRecord.returnfrombill }); setBillData(data); } catch (error) { diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx index f5a3c9de0..0def7afd4 100644 --- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx +++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Checkbox, Input, Popconfirm, Space, Table } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx index 3e5fcccaf..b1434cfa7 100644 --- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx +++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx @@ -1,4 +1,4 @@ -import { useApolloClient, useMutation, useQuery } from "@apollo/client"; +import { useApolloClient, useMutation, useQuery } from "@apollo/client/react"; import { Form, Modal } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/components/parts-queue-card/parts-queue-card.component.jsx b/client/src/components/parts-queue-card/parts-queue-card.component.jsx index 6ad18d930..6b5e18751 100644 --- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx +++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Divider, Drawer, Grid } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-queue-list/parts-queue.list.component.jsx b/client/src/components/parts-queue-list/parts-queue.list.component.jsx index 9a416c475..1889131fb 100644 --- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx +++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Input, Space, Table } from "antd"; import _ from "lodash"; import queryString from "query-string"; diff --git a/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx b/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx index 7c8835a3e..40b8279ef 100644 --- a/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx +++ b/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Form, Modal } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/parts-shop-info/parts-shop-info.container.jsx b/client/src/components/parts-shop-info/parts-shop-info.container.jsx index 2c9247e1e..1cafb8d44 100644 --- a/client/src/components/parts-shop-info/parts-shop-info.container.jsx +++ b/client/src/components/parts-shop-info/parts-shop-info.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx index 227e6da5a..814256857 100644 --- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx +++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import _ from "lodash"; diff --git a/client/src/components/payable-export-button/payable-export-button.component.jsx b/client/src/components/payable-export-button/payable-export-button.component.jsx index ed945fdc7..6bb56c1b9 100644 --- a/client/src/components/payable-export-button/payable-export-button.component.jsx +++ b/client/src/components/payable-export-button/payable-export-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import { useState } from "react"; diff --git a/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx b/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx index fb4f08162..098e91852 100644 --- a/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx +++ b/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx @@ -1,4 +1,5 @@ -import { gql, useMutation } from "@apollo/client"; +import { gql } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx index 9abe488d7..638ef03b3 100644 --- a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx +++ b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Descriptions, InputNumber, Modal, Space } from "antd"; import axios from "axios"; import dayjs from "../../utils/day"; diff --git a/client/src/components/payment-export-button/payment-export-button.component.jsx b/client/src/components/payment-export-button/payment-export-button.component.jsx index 861697421..450d6066e 100644 --- a/client/src/components/payment-export-button/payment-export-button.component.jsx +++ b/client/src/components/payment-export-button/payment-export-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import { useState } from "react"; diff --git a/client/src/components/payment-form/payment-form.totalpayments.component.jsx b/client/src/components/payment-form/payment-form.totalpayments.component.jsx index 156c454b5..b413158fe 100644 --- a/client/src/components/payment-form/payment-form.totalpayments.component.jsx +++ b/client/src/components/payment-form/payment-form.totalpayments.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Statistic } from "antd"; import Dinero from "dinero.js"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx index cbeb7df1e..5b406a41b 100644 --- a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx +++ b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx b/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx index 062f62972..98f71cd21 100644 --- a/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx +++ b/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx @@ -1,4 +1,5 @@ -import { gql, useMutation } from "@apollo/client"; +import { gql } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx index 81e5dcff6..38175e6f3 100644 --- a/client/src/components/payment-modal/payment-modal.container.jsx +++ b/client/src/components/payment-modal/payment-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx index 58ebdc0a0..0456ab875 100644 --- a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx +++ b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx index ae2dde4c7..bed32cbc5 100644 --- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx +++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import axios from "axios"; import _ from "lodash"; diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx index 3b1db89f5..f5f1642f0 100644 --- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx +++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx @@ -1,5 +1,5 @@ import { EditFilled, SyncOutlined } from "@ant-design/icons"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Card, Input, Space, Table, Typography } from "antd"; import axios from "axios"; import queryString from "query-string"; diff --git a/client/src/components/phone-number-consent/phone-number-consent.component.jsx b/client/src/components/phone-number-consent/phone-number-consent.component.jsx index ed1038795..cba56a12a 100644 --- a/client/src/components/phone-number-consent/phone-number-consent.component.jsx +++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Input, Table, Typography } from "antd"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/phonebook-form/phonebook-form.container.jsx b/client/src/components/phonebook-form/phonebook-form.container.jsx index 579f0d5d5..1ffc6529b 100644 --- a/client/src/components/phonebook-form/phonebook-form.container.jsx +++ b/client/src/components/phonebook-form/phonebook-form.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form } from "antd"; import queryString from "query-string"; import { useEffect, useState } from "react"; diff --git a/client/src/components/production-board-kanban/production-board-kanban.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.component.jsx index d8315f576..4fc7d3264 100644 --- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx @@ -1,6 +1,6 @@ import { SyncOutlined } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button, Skeleton, Space } from "antd"; import cloneDeep from "lodash/cloneDeep"; import isEqual from "lodash/isEqual"; diff --git a/client/src/components/production-board-kanban/production-board-kanban.container.jsx b/client/src/components/production-board-kanban/production-board-kanban.container.jsx index 50ab4083d..d23c72ab6 100644 --- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useRef } from "react"; -import { useApolloClient, useQuery, useSubscription } from "@apollo/client"; +import { useApolloClient, useQuery, useSubscription } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { diff --git a/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx b/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx index 3ddf000f6..58156bd3b 100644 --- a/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx +++ b/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx @@ -1,5 +1,5 @@ import { SettingOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Col, Form, Popover, Row, Tabs } from "antd"; import { isFunction } from "lodash"; import PropTypes from "prop-types"; diff --git a/client/src/components/production-list-columns/production-list-columns.alert.component.jsx b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx index 8eb175257..d6309810e 100644 --- a/client/src/components/production-list-columns/production-list-columns.alert.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx @@ -1,5 +1,5 @@ import { ExclamationCircleFilled, PlusCircleFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import { useCallback } from "react"; import { connect } from "react-redux"; diff --git a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx index 3d613fb68..e26a74f3e 100644 --- a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown } from "antd"; import { useTranslation } from "react-i18next"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; diff --git a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx b/client/src/components/production-list-columns/production-list-columns.comment.component.jsx index 084555ea2..c9b14fc0a 100644 --- a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.comment.component.jsx @@ -1,5 +1,5 @@ import Icon from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Input, Popover, Tooltip } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-columns/production-list-columns.date.component.jsx b/client/src/components/production-list-columns/production-list-columns.date.component.jsx index 6c9b2dcbd..f69d26491 100644 --- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Dropdown, Space } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx index 412e70f12..92abb982a 100644 --- a/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown } from "antd"; import { useTranslation } from "react-i18next"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; diff --git a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx index 33e000a1f..6b867c032 100644 --- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled, PlusCircleFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Col, Popover, Row, Select, Space, Spin } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx index 96a1e1a29..950006164 100644 --- a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Dropdown, Form, Input, Space } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx index e698e2831..8381b08b5 100644 --- a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown } from "antd"; import { useTranslation } from "react-i18next"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; diff --git a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx index b4cc01133..aa7c11914 100644 --- a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx @@ -1,5 +1,5 @@ import Icon from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Input, Popover, Space } from "antd"; import { useCallback, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-columns/production-list-columns.status.category.jsx b/client/src/components/production-list-columns/production-list-columns.status.category.jsx index e60a4fa0e..2ada39dc3 100644 --- a/client/src/components/production-list-columns/production-list-columns.status.category.jsx +++ b/client/src/components/production-list-columns/production-list-columns.status.category.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown, Spin } from "antd"; import { useState } from "react"; import { connect } from "react-redux"; diff --git a/client/src/components/production-list-columns/production-list-columns.status.component.jsx b/client/src/components/production-list-columns/production-list-columns.status.component.jsx index c30d86859..00aad9efb 100644 --- a/client/src/components/production-list-columns/production-list-columns.status.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.status.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown, Spin } from "antd"; import { useState } from "react"; import { connect } from "react-redux"; diff --git a/client/src/components/production-list-detail/production-list-detail.component.jsx b/client/src/components/production-list-detail/production-list-detail.component.jsx index 06d4ea871..5a4f2dd18 100644 --- a/client/src/components/production-list-detail/production-list-detail.component.jsx +++ b/client/src/components/production-list-detail/production-list-detail.component.jsx @@ -1,6 +1,6 @@ import { PauseCircleOutlined, PlayCircleOutlined, PrinterFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Descriptions, Drawer, Space } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-table/production-list-config-manager.component.jsx b/client/src/components/production-list-table/production-list-config-manager.component.jsx index af920a4bc..297d8845b 100644 --- a/client/src/components/production-list-table/production-list-config-manager.component.jsx +++ b/client/src/components/production-list-table/production-list-config-manager.component.jsx @@ -1,5 +1,5 @@ import { DeleteOutlined, ExclamationCircleOutlined, PlusOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Input, Modal, Popconfirm, Popover, Select, Space } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-list-table/production-list-table.container.jsx b/client/src/components/production-list-table/production-list-table.container.jsx index bb89d20b6..9a2a24243 100644 --- a/client/src/components/production-list-table/production-list-table.container.jsx +++ b/client/src/components/production-list-table/production-list-table.container.jsx @@ -1,4 +1,4 @@ -import { useApolloClient, useQuery, useSubscription } from "@apollo/client"; +import { useApolloClient, useQuery, useSubscription } from "@apollo/client/react"; import { useEffect, useRef, useState } from "react"; import { QUERY_EXACT_JOB_IN_PRODUCTION, diff --git a/client/src/components/production-remove-button/production-remove-button.component.jsx b/client/src/components/production-remove-button/production-remove-button.component.jsx index 94bebb393..75246e00f 100644 --- a/client/src/components/production-remove-button/production-remove-button.component.jsx +++ b/client/src/components/production-remove-button/production-remove-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx b/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx index 51b72141b..42724e1e0 100644 --- a/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx +++ b/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx @@ -1,7 +1,7 @@ import { CheckCircleFilled, EyeInvisibleFilled } from "@ant-design/icons"; import { Button, List, Popover } from "antd"; import { useCallback, useMemo, useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { UPDATE_JOB_LINE_SUBLET } from "../../graphql/jobs-lines.queries"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/profile-my/profile-my.component.jsx b/client/src/components/profile-my/profile-my.component.jsx index e9c944c11..2bf8c6322 100644 --- a/client/src/components/profile-my/profile-my.component.jsx +++ b/client/src/components/profile-my/profile-my.component.jsx @@ -10,7 +10,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; import { useSocket } from "../../contexts/SocketIO/useSocket.js"; import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { QUERY_ACTIVE_ASSOCIATION_SOUND, UPDATE_NEW_MESSAGE_SOUND } from "../../graphql/user.queries.js"; const mapStateToProps = createStructuredSelector({ diff --git a/client/src/components/profile-shops/profile-shops.container.jsx b/client/src/components/profile-shops/profile-shops.container.jsx index 037e5a078..6d587444a 100644 --- a/client/src/components/profile-shops/profile-shops.container.jsx +++ b/client/src/components/profile-shops/profile-shops.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { logImEXEvent, messaging } from "../../firebase/firebase.utils"; import { QUERY_ALL_ASSOCIATIONS, UPDATE_ACTIVE_ASSOCIATION } from "../../graphql/associations.queries"; import AlertComponent from "../alert/alert.component"; diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx index 30b06a658..91f603e03 100644 --- a/client/src/components/report-center-modal/report-center-modal.component.jsx +++ b/client/src/components/report-center-modal/report-center-modal.component.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Card, Col, DatePicker, Form, Input, Radio, Row, Typography } from "antd"; import _ from "lodash"; diff --git a/client/src/components/schedule-block-day/schedule-block-day.component.jsx b/client/src/components/schedule-block-day/schedule-block-day.component.jsx index 1d7990061..ccc3e8eb4 100644 --- a/client/src/components/schedule-block-day/schedule-block-day.component.jsx +++ b/client/src/components/schedule-block-day/schedule-block-day.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown } from "antd"; import dayjs from "../../utils/day"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/schedule-calendar/schedule-calendar.container.jsx b/client/src/components/schedule-calendar/schedule-calendar.container.jsx index f4497b305..ef299c2a0 100644 --- a/client/src/components/schedule-calendar/schedule-calendar.container.jsx +++ b/client/src/components/schedule-calendar/schedule-calendar.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useEffect, useMemo } from "react"; import { useLocation } from "react-router-dom"; diff --git a/client/src/components/schedule-day-view/schedule-day-view.container.jsx b/client/src/components/schedule-day-view/schedule-day-view.container.jsx index 8f93798cf..21d4633c9 100644 --- a/client/src/components/schedule-day-view/schedule-day-view.container.jsx +++ b/client/src/components/schedule-day-view/schedule-day-view.container.jsx @@ -1,5 +1,5 @@ import ScheduleDayViewComponent from "./schedule-day-view.component"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { QUERY_APPOINTMENT_BY_DATE } from "../../graphql/appointments.queries"; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; import dayjs from "../../utils/day"; diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx index ac089d986..c10eb9a47 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form, Modal } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx b/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx index d16e2d835..3294126dc 100644 --- a/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx +++ b/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Form, Input, Popover, Select, Space } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/components/schedule-production-list/schedule-production-list.component.jsx b/client/src/components/schedule-production-list/schedule-production-list.component.jsx index 854317255..c23e78afa 100644 --- a/client/src/components/schedule-production-list/schedule-production-list.component.jsx +++ b/client/src/components/schedule-production-list/schedule-production-list.component.jsx @@ -1,6 +1,6 @@ import { DownOutlined } from "@ant-design/icons"; import { Button, Card, Popover } from "antd"; -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; import { QUERY_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries"; diff --git a/client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx b/client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx index 0ef5c7110..73e722772 100644 --- a/client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx +++ b/client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button } from "antd"; import dayjs from "../../utils/day"; import { useState } from "react"; diff --git a/client/src/components/scoreboard-display/scoreboard-display.component.jsx b/client/src/components/scoreboard-display/scoreboard-display.component.jsx index 053aef778..1364b22f5 100644 --- a/client/src/components/scoreboard-display/scoreboard-display.component.jsx +++ b/client/src/components/scoreboard-display/scoreboard-display.component.jsx @@ -3,7 +3,7 @@ import { useEffect, useState } from "react"; import ScoreboardChart from "../scoreboard-chart/scoreboard-chart.component"; import ScoreboardLastDays from "../scoreboard-last-days/scoreboard-last-days.component"; import ScoreboardTargetsTable from "../scoreboard-targets-table/scoreboard-targets-table.component"; -import { useApolloClient, useQuery } from "@apollo/client"; +import { useApolloClient, useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { GET_BLOCKED_DAYS, QUERY_SCOREBOARD } from "../../graphql/scoreboard.queries"; diff --git a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx index e8cde45fd..0b8f81d6a 100644 --- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx +++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Dropdown, Form, InputNumber, Space } from "antd"; import dayjs from "../../utils/day"; import { useState } from "react"; diff --git a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx index ba618ae13..d946bac22 100644 --- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx +++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Input, Modal, Space, Table, Typography } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/scoreboard-remove-button/scorebard-remove-button.component.jsx b/client/src/components/scoreboard-remove-button/scorebard-remove-button.component.jsx index bc5dc660a..7e7e73ccc 100644 --- a/client/src/components/scoreboard-remove-button/scorebard-remove-button.component.jsx +++ b/client/src/components/scoreboard-remove-button/scorebard-remove-button.component.jsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Button } from "antd"; import { DeleteFilled } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { DELETE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx index 3b024b82a..86ea41299 100644 --- a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Col, Row } from "antd"; import _ from "lodash"; import { useMemo } from "react"; diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index 439be97e3..d4b8b5ae3 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Col, Row } from "antd"; import _ from "lodash"; import queryString from "query-string"; diff --git a/client/src/components/shop-csi-config/shop-csi-config.component.jsx b/client/src/components/shop-csi-config/shop-csi-config.component.jsx index cf8ad7fd8..c0b5801fb 100644 --- a/client/src/components/shop-csi-config/shop-csi-config.component.jsx +++ b/client/src/components/shop-csi-config/shop-csi-config.component.jsx @@ -1,5 +1,5 @@ import { CheckCircleFilled } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Col, List, Row } from "antd"; import { useState } from "react"; diff --git a/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx b/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx index 72b193196..cff71847c 100644 --- a/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx +++ b/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Form, Popover, Space } from "antd"; import dayjs from "../../utils/day"; import { useState } from "react"; diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx index 340b1a4d7..7bb5abed5 100644 --- a/client/src/components/shop-employees/shop-employees-form.component.jsx +++ b/client/src/components/shop-employees/shop-employees-form.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { useApolloClient, useMutation, useQuery } from "@apollo/client"; +import { useApolloClient, useMutation, useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Card, Form, Input, InputNumber, Select, Switch, Table } from "antd"; import { useForm } from "antd/es/form/Form"; diff --git a/client/src/components/shop-employees/shop-employees.container.jsx b/client/src/components/shop-employees/shop-employees.container.jsx index 8e51dc4c3..8b22b87a4 100644 --- a/client/src/components/shop-employees/shop-employees.container.jsx +++ b/client/src/components/shop-employees/shop-employees.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { QUERY_EMPLOYEES } from "../../graphql/employees.queries"; diff --git a/client/src/components/shop-info/shop-info.container.jsx b/client/src/components/shop-info/shop-info.container.jsx index e4252eab5..ff6ea3c5d 100644 --- a/client/src/components/shop-info/shop-info.container.jsx +++ b/client/src/components/shop-info/shop-info.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/shop-teams/shop-employee-teams.form.component.jsx b/client/src/components/shop-teams/shop-employee-teams.form.component.jsx index 1b9a75ffe..67d76a0d6 100644 --- a/client/src/components/shop-teams/shop-employee-teams.form.component.jsx +++ b/client/src/components/shop-teams/shop-employee-teams.form.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Card, Form, Input, InputNumber, Space, Switch } from "antd"; import querystring from "query-string"; diff --git a/client/src/components/shop-teams/shop-teams.container.jsx b/client/src/components/shop-teams/shop-teams.container.jsx index 03c194d18..9f5211f59 100644 --- a/client/src/components/shop-teams/shop-teams.container.jsx +++ b/client/src/components/shop-teams/shop-teams.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { QUERY_TEAMS } from "../../graphql/employee_teams.queries"; diff --git a/client/src/components/shop-template-add/shop-template-add.component.jsx b/client/src/components/shop-template-add/shop-template-add.component.jsx index a5d2ec267..55ff5c8b4 100644 --- a/client/src/components/shop-template-add/shop-template-add.component.jsx +++ b/client/src/components/shop-template-add/shop-template-add.component.jsx @@ -1,5 +1,5 @@ import { DownOutlined } from "@ant-design/icons"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Dropdown } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/shop-template-delete/shop-template-delete.component.jsx b/client/src/components/shop-template-delete/shop-template-delete.component.jsx index bc1889586..888104ed7 100644 --- a/client/src/components/shop-template-delete/shop-template-delete.component.jsx +++ b/client/src/components/shop-template-delete/shop-template-delete.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Popconfirm } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/shop-template-editor-save-button/shop-template-editor-save-button.component.jsx b/client/src/components/shop-template-editor-save-button/shop-template-editor-save-button.component.jsx index de60c9a56..a63702da4 100644 --- a/client/src/components/shop-template-editor-save-button/shop-template-editor-save-button.component.jsx +++ b/client/src/components/shop-template-editor-save-button/shop-template-editor-save-button.component.jsx @@ -1,6 +1,6 @@ import { useState } from "react"; import { Button } from "antd"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { UPDATE_TEMPLATE } from "../../graphql/templates.queries"; import { logImEXEvent } from "../../firebase/firebase.utils"; diff --git a/client/src/components/shop-template-editor/shop-template-editor.container.jsx b/client/src/components/shop-template-editor/shop-template-editor.container.jsx index 063970b3a..4d69ff922 100644 --- a/client/src/components/shop-template-editor/shop-template-editor.container.jsx +++ b/client/src/components/shop-template-editor/shop-template-editor.container.jsx @@ -1,4 +1,4 @@ -// import { useQuery } from "@apollo/client"; +// import { useQuery } from "@apollo/client/react"; // import queryString from "query-string"; // import React, { useState } from "react"; // import { useLocation } from "react-router-dom"; diff --git a/client/src/components/shop-templates-list/shop-templates-list.container.jsx b/client/src/components/shop-templates-list/shop-templates-list.container.jsx index 1610d0595..fb53168d2 100644 --- a/client/src/components/shop-templates-list/shop-templates-list.container.jsx +++ b/client/src/components/shop-templates-list/shop-templates-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Drawer, List } from "antd"; import { QUERY_CUSTOM_TEMPLATES } from "../../graphql/templates.queries"; import AlertComponent from "../alert/alert.component"; diff --git a/client/src/components/shop-users-auth-edit/shop-users-auth-edit.component.jsx b/client/src/components/shop-users-auth-edit/shop-users-auth-edit.component.jsx index cd6f47d25..62fac0a19 100644 --- a/client/src/components/shop-users-auth-edit/shop-users-auth-edit.component.jsx +++ b/client/src/components/shop-users-auth-edit/shop-users-auth-edit.component.jsx @@ -1,6 +1,6 @@ import { InputNumber } from "antd"; import { useState } from "react"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { UPDATE_ASSOCIATION } from "../../graphql/user.queries"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/shop-users/shop-users.component.jsx b/client/src/components/shop-users/shop-users.component.jsx index 60089701a..b625e7060 100644 --- a/client/src/components/shop-users/shop-users.component.jsx +++ b/client/src/components/shop-users/shop-users.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Table } from "antd"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx index bba8ce4c1..5958dfc38 100644 --- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx +++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { connect } from "react-redux"; import { useLocation } from "react-router-dom"; diff --git a/client/src/components/task-center/task-center.container.jsx b/client/src/components/task-center/task-center.container.jsx index 9291b600d..5dd04b340 100644 --- a/client/src/components/task-center/task-center.container.jsx +++ b/client/src/components/task-center/task-center.container.jsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from "react"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors"; diff --git a/client/src/components/task-list/task-list.container.jsx b/client/src/components/task-list/task-list.container.jsx index cc7575977..2d47e0456 100644 --- a/client/src/components/task-list/task-list.container.jsx +++ b/client/src/components/task-list/task-list.container.jsx @@ -1,6 +1,6 @@ import queryString from "query-string"; import { useLocation } from "react-router-dom"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { MUTATION_TOGGLE_TASK_COMPLETED, MUTATION_TOGGLE_TASK_DELETED } from "../../graphql/tasks.queries.js"; import { pageLimit } from "../../utils/config.js"; import AlertComponent from "../alert/alert.component.jsx"; diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx index 1bb64b240..c9afb742c 100644 --- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx +++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form, Modal } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx index b8ef08531..bb45bf6be 100644 --- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx +++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Card, Form, Space } from "antd"; import axios from "axios"; import dayjs from "../../utils/day"; diff --git a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx index 902af611d..b0b73627c 100644 --- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx +++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd"; import axios from "axios"; import { useState } from "react"; diff --git a/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx b/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx index f8316ae2a..b73d1070d 100644 --- a/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx +++ b/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx @@ -2,7 +2,7 @@ import { Popconfirm } from "antd"; import { DeleteFilled } from "@ant-design/icons"; import { DELETE_TIME_TICKET } from "../../graphql/timetickets.queries"; import { useTranslation } from "react-i18next"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx b/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx index c28a03009..2e6feeb45 100644 --- a/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx +++ b/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx @@ -1,5 +1,5 @@ import { Card, List, Typography } from "antd"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; diff --git a/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx b/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx index 29d3fc765..dd5d77631 100644 --- a/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx +++ b/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Col, Space, Statistic, Typography } from "antd"; import dayjs from "../../utils/day"; import { useMemo } from "react"; diff --git a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx index c3fc3c10f..d0e1dfc0b 100644 --- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx +++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx @@ -1,5 +1,5 @@ import { PrinterFilled } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Divider, Drawer, Grid, Tabs } from "antd"; import { PageHeader } from "@ant-design/pro-layout"; import queryString from "query-string"; diff --git a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx index 1893457f2..b4c4785b5 100644 --- a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx +++ b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Input, Space, Table } from "antd"; import queryString from "query-string"; import { useState } from "react"; diff --git a/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx index 0e96dd796..8e4dc1362 100644 --- a/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx +++ b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx @@ -2,7 +2,7 @@ import { DownOutlined } from "@ant-design/icons"; import { Button, Checkbox, Col, Form, InputNumber, Popover, Radio, Row, Space, Spin } from "antd"; import { useState } from "react"; import { GET_JOB_INFO_DRAW_CALCULATIONS } from "../../graphql/jobs-lines.queries"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; export default function TimeTicketCalculatorComponent({ setProductiveHours, diff --git a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx index 19de9356a..4aa25d687 100644 --- a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Form, InputNumber, Modal, Radio, Select, Space, Table, Typography } from "antd"; import Dinero from "dinero.js"; import { useState } from "react"; diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 918d210be..9f7e5b8e4 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Card, Form, Input, InputNumber, Select, Space, Switch } from "antd"; import { useEffect } from "react"; @@ -61,7 +61,7 @@ export function TimeTicketModalComponent({ if (!watchedJobId) return; if (!lineTicketRefreshKey) return; - loadLineTicketData({ variables: { id: watchedJobId } }); + loadLineTicketData({ id: watchedJobId }); }, [lineTicketRefreshKey, watchedJobId, isOpen]); const CostCenterSelect = ({ emps, value, ...props }) => { @@ -327,7 +327,7 @@ export function TimeTicketModalComponent({ {() => { const jobid = form.getFieldValue("jobid"); if ((!called && jobid) || (jobid && lineTicketData?.jobs_by_pk?.id !== jobid && !loading)) { - loadLineTicketData({ variables: { id: jobid } }); + loadLineTicketData({ id: jobid }); } return ; }} diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx index 14d4f24f6..55ec19120 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx @@ -1,5 +1,5 @@ import { PageHeader } from "@ant-design/pro-layout"; -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Form, Modal, Space } from "antd"; import { useEffect, useState } from "react"; diff --git a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx index 0287b668d..328014960 100644 --- a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx +++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Space } from "antd"; import axios from "axios"; import dayjs from "../../utils/day"; diff --git a/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx b/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx index 0b8c7959e..2296df8ad 100644 --- a/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx +++ b/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Result } from "antd"; import { useMemo } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx index 30eb0364d..9782998c7 100644 --- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx +++ b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx @@ -9,7 +9,7 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { selectTimeTicketTasks } from "../../redux/modals/modals.selectors"; import { selectCurrentUser } from "../../redux/user/user.selectors"; import TimeTicketTaskModalComponent from "./time-ticket-task-modal.component"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { QUERY_COMPLETED_TASKS } from "../../graphql/jobs.queries"; import "./time-ticket-task-modal.styles.scss"; import { selectTechnician } from "../../redux/tech/tech.selectors"; diff --git a/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx b/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx index 3ccf82cc5..5884c6b1b 100644 --- a/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx +++ b/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import dayjs from "../../utils/day"; import { useState } from "react"; diff --git a/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx b/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx index b926547e7..e06feb7c4 100644 --- a/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx +++ b/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button } from "antd"; import dayjs from "../../utils/day"; import { useState } from "react"; diff --git a/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx b/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx index 07e02cf95..3b911db6d 100644 --- a/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx +++ b/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { connect } from "react-redux"; import { useLocation } from "react-router-dom"; diff --git a/client/src/components/tt-approve-button/tt-approve-button.component.jsx b/client/src/components/tt-approve-button/tt-approve-button.component.jsx index 997860943..99cc7f8ff 100644 --- a/client/src/components/tt-approve-button/tt-approve-button.component.jsx +++ b/client/src/components/tt-approve-button/tt-approve-button.component.jsx @@ -1,4 +1,4 @@ -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { Button } from "antd"; import _ from "lodash"; import dayjs from "../../utils/day"; diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx index 911b12e66..9314f90fc 100644 --- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx +++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx @@ -1,5 +1,5 @@ import { PageHeader } from "@ant-design/pro-layout"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Button, Form, Popconfirm } from "antd"; import { useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/vehicle-detail-update-jobs/vehicle-detail-update-jobs.component.jsx b/client/src/components/vehicle-detail-update-jobs/vehicle-detail-update-jobs.component.jsx index f0460bfa2..404118ba8 100644 --- a/client/src/components/vehicle-detail-update-jobs/vehicle-detail-update-jobs.component.jsx +++ b/client/src/components/vehicle-detail-update-jobs/vehicle-detail-update-jobs.component.jsx @@ -1,6 +1,6 @@ import { Button } from "antd"; import { useTranslation } from "react-i18next"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { UPDATE_JOBS } from "../../graphql/jobs.queries"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx index d4b0b1f35..698ad3807 100644 --- a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx +++ b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from "@ant-design/icons"; -import { useLazyQuery } from "@apollo/client"; +import { useLazyQuery } from "@apollo/client/react"; import { Empty, Select } from "antd"; import _ from "lodash"; import { forwardRef, useEffect, useState } from "react"; @@ -24,14 +24,14 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => { const debouncedExecuteSearch = _.debounce(executeSearch, 500); const handleSearch = (value) => { - debouncedExecuteSearch({ variables: { search: value } }); + debouncedExecuteSearch({ search: value }); }; const [option, setOption] = useState(value); useEffect(() => { if (value === option && value) { - callIdSearch({ variables: { id: value } }); + callIdSearch({ id: value }); } }, [value, option, callIdSearch]); diff --git a/client/src/components/vehicles-list/vehicles-list.container.jsx b/client/src/components/vehicles-list/vehicles-list.container.jsx index 7546c5741..cad7024af 100644 --- a/client/src/components/vehicles-list/vehicles-list.container.jsx +++ b/client/src/components/vehicles-list/vehicles-list.container.jsx @@ -1,5 +1,5 @@ import VehiclesListComponent from "./vehicles-list.component"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import AlertComponent from "../alert/alert.component"; import { QUERY_ALL_VEHICLES_PAGINATED } from "../../graphql/vehicles.queries"; import queryString from "query-string"; diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx index 0e3769a11..547ff9a2a 100644 --- a/client/src/components/vendors-form/vendors-form.component.jsx +++ b/client/src/components/vendors-form/vendors-form.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { useApolloClient } from "@apollo/client"; +import { useApolloClient } from "@apollo/client/react"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { Button, Divider, Form, Input, InputNumber, Select, Space, Switch } from "antd"; import { PageHeader } from "@ant-design/pro-layout"; diff --git a/client/src/components/vendors-form/vendors-form.container.jsx b/client/src/components/vendors-form/vendors-form.container.jsx index 612ca03b3..39919b731 100644 --- a/client/src/components/vendors-form/vendors-form.container.jsx +++ b/client/src/components/vendors-form/vendors-form.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form } from "antd"; import queryString from "query-string"; import { useEffect, useState } from "react"; diff --git a/client/src/components/vendors-list/vendors-list.container.jsx b/client/src/components/vendors-list/vendors-list.container.jsx index 66d2f277b..e2689fe2c 100644 --- a/client/src/components/vendors-list/vendors-list.container.jsx +++ b/client/src/components/vendors-list/vendors-list.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useLocation, useNavigate } from "react-router-dom"; import AlertComponent from "../../components/alert/alert.component"; diff --git a/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx b/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx index 62921985e..c20e7ef8f 100644 --- a/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx +++ b/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx @@ -4,7 +4,7 @@ import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { selectBodyshop } from "../../redux/user/user.selectors"; import { useTranslation } from "react-i18next"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { INSERT_NEW_PHONEBOOK } from "../../graphql/phonebook.queries"; import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; diff --git a/client/src/contexts/SocketIO/socketProvider.jsx b/client/src/contexts/SocketIO/socketProvider.jsx index 576d59b3d..c7de27618 100644 --- a/client/src/contexts/SocketIO/socketProvider.jsx +++ b/client/src/contexts/SocketIO/socketProvider.jsx @@ -12,7 +12,7 @@ import { MARK_NOTIFICATION_READ, UPDATE_NOTIFICATIONS_READ_FRAGMENT } from "../../graphql/notifications.queries.js"; -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { useTranslation } from "react-i18next"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { INITIAL_NOTIFICATIONS, SocketContext } from "./useSocket.js"; diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js index 3fdaa929c..62cbeaeb3 100644 --- a/client/src/graphql/apollo-error-handling.js +++ b/client/src/graphql/apollo-error-handling.js @@ -1,14 +1,44 @@ +import * as Sentry from "@sentry/react"; import { onError } from "@apollo/client/link/error"; -//https://stackoverflow.com/questions/57163454/refreshing-a-token-with-apollo-client-firebase-auth const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => { - if (graphQLErrors) { + const operationName = operation?.operationName || "anonymous"; + + if (graphQLErrors?.length) { graphQLErrors.forEach(({ message, locations, path }) => { console.log(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`); }); + + Sentry.withScope((scope) => { + scope.setLevel("error"); + scope.setTag("graphql.operationName", operationName); + scope.setContext("graphql", { + operationName + // variables can contain PII; include only if you’re comfortable with it + // variables: operation.variables + }); + + graphQLErrors.forEach((err) => { + scope.setContext("graphql.error", { + message: err.message, + path: err.path, + locations: err.locations + }); + Sentry.captureMessage(`[GraphQL] ${err.message}`); + }); + }); } - if (networkError) console.log(`[Network error]: ${JSON.stringify(networkError)}`); - console.log(operation.getContext()); + + if (networkError) { + console.log(`[Network error]: ${JSON.stringify(networkError)}`); + + Sentry.withScope((scope) => { + scope.setLevel("error"); + scope.setTag("graphql.operationName", operationName); + Sentry.captureException(networkError); + }); + } + return forward(operation); }); diff --git a/client/src/pages/accounting-payables/accounting-payables.container.jsx b/client/src/pages/accounting-payables/accounting-payables.container.jsx index 928466b85..3bbccb935 100644 --- a/client/src/pages/accounting-payables/accounting-payables.container.jsx +++ b/client/src/pages/accounting-payables/accounting-payables.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/accounting-payments/accounting-payments.container.jsx b/client/src/pages/accounting-payments/accounting-payments.container.jsx index c2428d9c8..2766cb891 100644 --- a/client/src/pages/accounting-payments/accounting-payments.container.jsx +++ b/client/src/pages/accounting-payments/accounting-payments.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/accounting-receivables/accounting-receivables.container.jsx b/client/src/pages/accounting-receivables/accounting-receivables.container.jsx index 0e0ae28d4..09c6c3422 100644 --- a/client/src/pages/accounting-receivables/accounting-receivables.container.jsx +++ b/client/src/pages/accounting-receivables/accounting-receivables.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx index 0fb17a978..d10c891b7 100644 --- a/client/src/pages/bills/bills.page.component.jsx +++ b/client/src/pages/bills/bills.page.component.jsx @@ -1,6 +1,6 @@ import { EditFilled, SyncOutlined } from "@ant-design/icons"; import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import axios from "axios"; import queryString from "query-string"; import { useEffect, useState } from "react"; diff --git a/client/src/pages/bills/bills.page.container.jsx b/client/src/pages/bills/bills.page.container.jsx index 9aba8b0cc..3f23ec36b 100644 --- a/client/src/pages/bills/bills.page.container.jsx +++ b/client/src/pages/bills/bills.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/contract-create/contract-create.page.container.jsx b/client/src/pages/contract-create/contract-create.page.container.jsx index f1fc543ae..647b4aefa 100644 --- a/client/src/pages/contract-create/contract-create.page.container.jsx +++ b/client/src/pages/contract-create/contract-create.page.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Card, Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/contract-detail/contract-detail.page.container.jsx b/client/src/pages/contract-detail/contract-detail.page.container.jsx index afcb98481..f2553ca6e 100644 --- a/client/src/pages/contract-detail/contract-detail.page.container.jsx +++ b/client/src/pages/contract-detail/contract-detail.page.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Card, Form } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/pages/contracts/contracts.page.container.jsx b/client/src/pages/contracts/contracts.page.container.jsx index a8336a4ad..a7bbbaa84 100644 --- a/client/src/pages/contracts/contracts.page.container.jsx +++ b/client/src/pages/contracts/contracts.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx index e1cfa9250..84325504d 100644 --- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx +++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx @@ -1,4 +1,4 @@ -import { useMutation } from "@apollo/client"; +import { useMutation } from "@apollo/client/react"; import { Card, Form } from "antd"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx index e9dbd0b03..1134102c3 100644 --- a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx +++ b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { Form } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; diff --git a/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx b/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx index 1f5ed6dc1..2e8648ab5 100644 --- a/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx +++ b/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx index 846731079..0467e03a5 100644 --- a/client/src/pages/dms/dms.container.jsx +++ b/client/src/pages/dms/dms.container.jsx @@ -4,7 +4,7 @@ import { connect } from "react-redux"; import { useTranslation } from "react-i18next"; import { createStructuredSelector } from "reselect"; import queryString from "query-string"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Col, Result, Row, Select, Space, Switch } from "antd"; import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react"; import { useSocket } from "../../contexts/SocketIO/useSocket.js"; diff --git a/client/src/pages/export-logs/export-logs.page.component.jsx b/client/src/pages/export-logs/export-logs.page.component.jsx index 65be0a17d..7dc283d36 100644 --- a/client/src/pages/export-logs/export-logs.page.component.jsx +++ b/client/src/pages/export-logs/export-logs.page.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd"; import _ from "lodash"; import queryString from "query-string"; diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx index 163b7e61a..2199fe30b 100644 --- a/client/src/pages/jobs-admin/jobs-admin.page.jsx +++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Col, Result, Row, Space, Typography } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/jobs-all/jobs-all.container.jsx b/client/src/pages/jobs-all/jobs-all.container.jsx index be6469aeb..eb38bb888 100644 --- a/client/src/pages/jobs-all/jobs-all.container.jsx +++ b/client/src/pages/jobs-all/jobs-all.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/jobs-checklist-view/jobs-checklist-view.page.jsx b/client/src/pages/jobs-checklist-view/jobs-checklist-view.page.jsx index 616c72b7e..de92805c0 100644 --- a/client/src/pages/jobs-checklist-view/jobs-checklist-view.page.jsx +++ b/client/src/pages/jobs-checklist-view/jobs-checklist-view.page.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Col, Row, Typography } from "antd"; import dayjs from "../../utils/day"; import { useEffect } from "react"; diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx index 60ddce5bf..191be22df 100644 --- a/client/src/pages/jobs-close/jobs-close.component.jsx +++ b/client/src/pages/jobs-close/jobs-close.component.jsx @@ -1,6 +1,6 @@ import { DeleteFilled, PrinterFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useApolloClient, useMutation } from "@apollo/client"; +import { useApolloClient, useMutation } from "@apollo/client/react"; import { Alert, Button, diff --git a/client/src/pages/jobs-close/jobs-close.container.jsx b/client/src/pages/jobs-close/jobs-close.container.jsx index 496d96acb..72edfa374 100644 --- a/client/src/pages/jobs-close/jobs-close.container.jsx +++ b/client/src/pages/jobs-close/jobs-close.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Result } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/jobs-create/jobs-create.container.jsx b/client/src/pages/jobs-create/jobs-create.container.jsx index cc3aa888d..a0f5f6584 100644 --- a/client/src/pages/jobs-create/jobs-create.container.jsx +++ b/client/src/pages/jobs-create/jobs-create.container.jsx @@ -1,4 +1,4 @@ -import { useLazyQuery, useMutation } from "@apollo/client"; +import { useLazyQuery, useMutation } from "@apollo/client/react"; import { Form } from "antd"; import _ from "lodash"; import { useEffect, useState } from "react"; @@ -51,9 +51,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr useEffect(() => { if (state.owner.selectedid) { - loadOwner({ - variables: { id: state.owner.selectedid } - }); + loadOwner({ id: state.owner.selectedid }); } }, [state.owner.selectedid, loadOwner]); diff --git a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx index 389c92113..3cb083a3a 100644 --- a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx +++ b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx index 7a77754bd..8823ed528 100644 --- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx +++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx @@ -9,7 +9,7 @@ import Icon, { ToolFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Badge, Button, Divider, Form, Space, Tabs } from "antd"; import Axios from "axios"; import _ from "lodash"; diff --git a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx index 1b8c02ac8..137506969 100644 --- a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx +++ b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx @@ -1,4 +1,4 @@ -import { useMutation, useQuery } from "@apollo/client"; +import { useMutation, useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx index ea378e49d..51e122c37 100644 --- a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx +++ b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/manage/manage.page.container.jsx b/client/src/pages/manage/manage.page.container.jsx index 87bedcc3e..620e4f2e0 100644 --- a/client/src/pages/manage/manage.page.container.jsx +++ b/client/src/pages/manage/manage.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/owners-detail/owners-detail.page.container.jsx b/client/src/pages/owners-detail/owners-detail.page.container.jsx index 1c43558c4..f282e6541 100644 --- a/client/src/pages/owners-detail/owners-detail.page.container.jsx +++ b/client/src/pages/owners-detail/owners-detail.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/payments-all/payments-all.container.page.jsx b/client/src/pages/payments-all/payments-all.container.page.jsx index 7ca941710..4052fe852 100644 --- a/client/src/pages/payments-all/payments-all.container.page.jsx +++ b/client/src/pages/payments-all/payments-all.container.page.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import queryString from "query-string"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/phonebook/phonebook.page.component.jsx b/client/src/pages/phonebook/phonebook.page.component.jsx index 442ea72b2..035324c80 100644 --- a/client/src/pages/phonebook/phonebook.page.component.jsx +++ b/client/src/pages/phonebook/phonebook.page.component.jsx @@ -1,5 +1,5 @@ import { SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Input, Space, Table, Typography } from "antd"; import _ from "lodash"; import queryString from "query-string"; diff --git a/client/src/pages/shop-csi/shop-csi.container.page.jsx b/client/src/pages/shop-csi/shop-csi.container.page.jsx index 43e38dfb2..c0b101cf9 100644 --- a/client/src/pages/shop-csi/shop-csi.container.page.jsx +++ b/client/src/pages/shop-csi/shop-csi.container.page.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Col, Row } from "antd"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx index ebed0b054..1a5c010c0 100644 --- a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx +++ b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx @@ -1,6 +1,6 @@ import { BarsOutlined, PrinterFilled, SyncOutlined, ToolFilled } from "@ant-design/icons"; import { PageHeader } from "@ant-design/pro-layout"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Divider, Form, Space, Tabs } from "antd"; import queryString from "query-string"; import { useEffect, useState } from "react"; diff --git a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx index b094a4082..c5295f830 100644 --- a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx +++ b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/simplified-parts/simplified-parts.page.container.jsx b/client/src/pages/simplified-parts/simplified-parts.page.container.jsx index 6ee8bb0c1..db86e31d7 100644 --- a/client/src/pages/simplified-parts/simplified-parts.page.container.jsx +++ b/client/src/pages/simplified-parts/simplified-parts.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx index fee680727..2aa8db204 100644 --- a/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx +++ b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useState } from "react"; import { Button, Card, Input, Space, Table } from "antd"; import { connect } from "react-redux"; diff --git a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx index 0e7ee2c06..9dd795a35 100644 --- a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx +++ b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx @@ -1,5 +1,5 @@ import { MinusCircleTwoTone, PlusCircleTwoTone, SyncOutlined } from "@ant-design/icons"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Button, Card, Space, Table } from "antd"; import queryString from "query-string"; import { useTranslation } from "react-i18next"; diff --git a/client/src/pages/tech/tech.page.container.jsx b/client/src/pages/tech/tech.page.container.jsx index f740e71c2..6fb2086ec 100644 --- a/client/src/pages/tech/tech.page.container.jsx +++ b/client/src/pages/tech/tech.page.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useEffect } from "react"; import { connect } from "react-redux"; import AlertComponent from "../../components/alert/alert.component"; diff --git a/client/src/pages/temporary-docs/temporary-docs.component.jsx b/client/src/pages/temporary-docs/temporary-docs.component.jsx index da675d0b1..131a0df6b 100644 --- a/client/src/pages/temporary-docs/temporary-docs.component.jsx +++ b/client/src/pages/temporary-docs/temporary-docs.component.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import AlertComponent from "../../components/alert/alert.component"; import JobsDocumentsContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; diff --git a/client/src/pages/time-tickets/time-tickets.container.jsx b/client/src/pages/time-tickets/time-tickets.container.jsx index 53afef8f9..23608e38b 100644 --- a/client/src/pages/time-tickets/time-tickets.container.jsx +++ b/client/src/pages/time-tickets/time-tickets.container.jsx @@ -1,4 +1,4 @@ -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Card, Col, Row, Space } from "antd"; import dayjs from "../../utils/day"; import { useEffect } from "react"; diff --git a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx index 3d133fcbc..833650557 100644 --- a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx +++ b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx @@ -1,6 +1,6 @@ import { useEffect } from "react"; import VehicleDetailComponent from "./vehicles-detail.page.component"; -import { useQuery } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { useParams } from "react-router-dom"; import { QUERY_VEHICLE_BY_ID } from "../../graphql/vehicles.queries"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js index 6efc55cde..621aee673 100644 --- a/client/src/utils/GraphQLClient.js +++ b/client/src/utils/GraphQLClient.js @@ -1,131 +1,88 @@ +// file: client/src/utils/GraphQLClient.js import { ApolloClient, ApolloLink, InMemoryCache, split } from "@apollo/client"; import { setContext } from "@apollo/client/link/context"; -import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http"; +import { HttpLink } from "@apollo/client/link/http"; import { RetryLink } from "@apollo/client/link/retry"; -import { WebSocketLink } from "@apollo/client/link/ws"; +import { GraphQLWsLink } from "@apollo/client/link/subscriptions"; import { getMainDefinition } from "@apollo/client/utilities"; -//import { split } from "apollo-link"; + import apolloLogger from "apollo-link-logger"; -//import axios from "axios"; -import { SentryLink } from "apollo-link-sentry"; +import { createClient } from "graphql-ws"; +import { map } from "rxjs/operators"; + import { auth } from "../firebase/firebase.utils"; import errorLink from "../graphql/apollo-error-handling"; -//import { store } from "../redux/store"; const httpLink = new HttpLink({ uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT }); -const wsLink = new WebSocketLink({ - uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT_WS, - options: { +const wsLink = new GraphQLWsLink( + createClient({ + url: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT_WS, lazy: true, - reconnect: true, connectionParams: async () => { const token = auth.currentUser && (await auth.currentUser.getIdToken()); - if (token) { - return { - headers: { - authorization: token ? `Bearer ${token}` : "" - } - }; - } + return { + headers: { + authorization: token ? `Bearer ${token}` : "" + } + }; } - } -}); + }) +); -const roundTripLink = new ApolloLink((operation, forward) => { - // Called before operation is sent to server - operation.setContext({ start: new Date() }); - - return forward(operation).map((data) => { - // Called after server responds - const time = new Date() - operation.getContext().start; - // console.log( - // `Operation ${operation.operationName} took ${time} to complete` - // ); - TrackExecutionTime(operation.operationName, time); - return data; - }); -}); - -const TrackExecutionTime = async () => { - // if (process.env.NODE_ENV === "development") return; - // const rdxStore = store.getState(); - // try { - // axios.post("/ioevent", { - // operationName, - // time, - // dbevent: true, - // user: - // rdxStore.user && - // rdxStore.user.currentUser && - // rdxStore.user.currentUser.email, - // imexshopid: - // rdxStore.user && - // rdxStore.user.bodyshop && - // rdxStore.user.bodyshop.imexshopid, - // }); - // } catch (error) { - // console.log("IOEvent Error", error); - // } -}; - -const subscriptionMiddleware = { - applyMiddleware: async (options, next) => { - options.authToken = auth.currentUser && (await auth.currentUser.getIdToken()); - next(); - } -}; -wsLink.subscriptionClient.use([subscriptionMiddleware]); - -const link = split( - // split based on operation type +// Split based on operation type (subscription -> ws, everything else -> http) +const terminatingLink = split( ({ query }) => { const definition = getMainDefinition(query); - // console.log( - // "##Intercepted GQL Transaction : " + - // definition.operation + - // "|" + - // definition.name.value + - // "##", - // query - // ); return definition.kind === "OperationDefinition" && definition.operation === "subscription"; }, wsLink, httpLink ); -const authLink = setContext((_, { headers }) => { - return ( - auth.currentUser && - auth.currentUser - .getIdToken() - .then((token) => { - if (token) { - return { - headers: { - ...headers, - authorization: token ? `Bearer ${token}` : "" - } - }; - } else { - console.error("Authentication error. Unable to add authorization token because it was empty."); - return { headers }; - } - }) - .catch((error) => { - console.error("Authentication error. Unable to add authorization token.", error.message); - return { headers }; - }) +// function TrackExecutionTime(operationName, timeMs) { +// keep your existing implementation/commented code here +// This signature now matches the call site. +// } + +// Apollo Client 4 uses RxJS under the hood; use pipe(map(...)) instead of .map(...) +const roundTripLink = new ApolloLink((operation, forward) => { + operation.setContext({ start: Date.now() }); + + return forward(operation).pipe( + map((result) => { + // const start = operation.getContext().start; + // const timeMs = Date.now() - start; + // TrackExecutionTime(operation.operationName, timeMs); + return result; + }) ); }); +const authLink = setContext(async (_, { headers }) => { + try { + const token = auth.currentUser && (await auth.currentUser.getIdToken()); + if (!token) return { headers }; + + return { + headers: { + ...headers, + authorization: `Bearer ${token}` + } + }; + } catch (error) { + console.error("Authentication error. Unable to add authorization token.", error?.message || error); + return { headers }; + } +}); + const retryLink = new RetryLink({ delay: { initial: 500, - max: 5, + // Keeping your intent (a cap), but make it milliseconds (5ms is almost certainly not intended). + max: 5000, jitter: true }, attempts: { @@ -134,22 +91,21 @@ const retryLink = new RetryLink({ } }); -const middlewares = []; +const links = []; + if (import.meta.env.DEV) { - middlewares.push(apolloLogger); + links.push(apolloLogger); } -middlewares.push( - new SentryLink().concat(roundTripLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link))))) -); +// Order: timing -> retry -> error -> auth -> network split +links.push(roundTripLink, retryLink, errorLink, authLink, terminatingLink); const cache = new InMemoryCache({ typePolicies: { Query: { fields: { - // Note: This is required because we switch from a read to an unread state with a toggle, conversations: { - keyArgs: ["where", "order_by"], // keep separate caches for archived/unarchived + sort + keyArgs: ["where", "order_by"], merge(existing = [], incoming = [], { args, readField }) { const offset = args?.offset ?? 0; const merged = existing ? existing.slice(0) : []; @@ -158,7 +114,6 @@ const cache = new InMemoryCache({ merged[offset + i] = incoming[i]; } - // Deduplicate by id (important when you also upsert via sockets) const seen = new Set(); return merged.filter((ref) => { const id = readField("id", ref); @@ -168,28 +123,21 @@ const cache = new InMemoryCache({ }); } }, + notifications: { merge(existing = [], incoming = [], { readField }) { - // Create a map to deduplicate by __ref const merged = new Map(); - // Add existing items to retain cached data existing.forEach((item) => { const ref = readField("__ref", item); - if (ref) { - merged.set(ref, item); - } + if (ref) merged.set(ref, item); }); - // Add incoming items, overwriting duplicates incoming.forEach((item) => { const ref = readField("__ref", item); - if (ref) { - merged.set(ref, item); - } + if (ref) merged.set(ref, item); }); - // Return incoming to respect the current query’s filter (e.g., unread-only or all) return incoming; } } @@ -199,7 +147,7 @@ const cache = new InMemoryCache({ }); const client = new ApolloClient({ - link: ApolloLink.from(middlewares), + link: ApolloLink.from(links), cache, devtools: { name: "Imex Client", diff --git a/client/src/utils/sentry.js b/client/src/utils/sentry.js index 2850a066b..2e06a8e42 100644 --- a/client/src/utils/sentry.js +++ b/client/src/utils/sentry.js @@ -1,5 +1,4 @@ import * as Sentry from "@sentry/react"; -import { excludeGraphQLFetch } from "apollo-link-sentry"; import { useEffect } from "react"; import { createRoutesFromChildren, matchRoutes, useLocation, useNavigationType } from "react-router-dom"; import InstanceRenderManager from "./instanceRenderMgr"; @@ -14,8 +13,16 @@ const currentDatePST = new Date() .split("/") .reverse() .join("-"); -const sentryRelease = - `${import.meta.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}`.trim(); + +const sentryRelease = `${import.meta.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}`.trim(); + +const isLikelyGraphQLFetchBreadcrumb = (breadcrumb) => { + if (breadcrumb?.category !== "fetch") return false; + const url = breadcrumb?.data?.url || ""; + + // Common Hasura / GraphQL patterns; add/adjust as needed. + return url.includes("/v1/graphql") || url.includes(import.meta.env.VITE_APP_GRAPHQL_ENDPOINT); +}; if (!import.meta.env.DEV) { Sentry.init({ @@ -59,6 +66,9 @@ if (!import.meta.env.DEV) { tracesSampleRate: 1.0, replaysOnErrorSampleRate: 1.0, environment: import.meta.env.MODE, - beforeBreadcrumb: excludeGraphQLFetch + beforeBreadcrumb: (breadcrumb) => { + if (isLikelyGraphQLFetchBreadcrumb(breadcrumb)) return null; + return breadcrumb; + } }); }