diff --git a/package.json b/package.json index 2c03135f5d..40b8d46bf6 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "redux-first-history": "5.2.0", "redux-saga": "1.3.0", "typed-redux-saga": "1.5.0", - "typescript": "5.6.3", + "typescript": "5.7.3", "vanilla-framework": "4.16.0", "vite": "5.4.13", "vite-plugin-svgr": "4.2.0", @@ -136,7 +136,7 @@ "cypress-axe": "1.5.0", "cypress-wait-until": "3.0.2", "dotenv-flow": "4.1.0", - "eslint": "8.57.0", + "eslint": "8.57.1", "eslint-config-prettier": "9.1.0", "eslint-config-react-app": "7.0.1", "eslint-import-resolver-typescript": "3.6.1", @@ -155,10 +155,10 @@ "mockdate": "3.0.5", "msw": "2.3.1", "nanoid": "5.0.9", - "nodemon": "3.1.3", + "nodemon": "3.1.9", "npm-package-json-lint": "8.0.0", "postcss-normalize": "10.0.1", - "prettier": "3.3.2", + "prettier": "3.5.0", "redux-mock-store": "1.5.4", "redux-saga-test-plan": "4.0.6", "sass": "1.77.2", diff --git a/src/app/base/components/node/DeleteForm/DeleteForm.tsx b/src/app/base/components/node/DeleteForm/DeleteForm.tsx index 35b34cc78f..bb98fcab5e 100644 --- a/src/app/base/components/node/DeleteForm/DeleteForm.tsx +++ b/src/app/base/components/node/DeleteForm/DeleteForm.tsx @@ -50,13 +50,13 @@ export const DeleteForm = ({ }} processingCount={processingCount} savedRedirect={viewingDetails ? redirectURL : undefined} - selectedCount={nodes ? nodes.length : selectedCount ?? 0} + selectedCount={nodes ? nodes.length : (selectedCount ?? 0)} submitAppearance="negative" > ); diff --git a/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx b/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx index 688e46d683..28a2bb25fb 100644 --- a/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx +++ b/src/app/base/components/node/FieldlessForm/FieldlessForm.tsx @@ -78,7 +78,7 @@ export const FieldlessForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={nodes ? nodes.length : selectedCount ?? 0} + selectedCount={nodes ? nodes.length : (selectedCount ?? 0)} {...actionProps} /> ); diff --git a/src/app/base/components/node/SetZoneForm/SetZoneForm.tsx b/src/app/base/components/node/SetZoneForm/SetZoneForm.tsx index 71644c3878..7b7acdf489 100644 --- a/src/app/base/components/node/SetZoneForm/SetZoneForm.tsx +++ b/src/app/base/components/node/SetZoneForm/SetZoneForm.tsx @@ -70,7 +70,7 @@ export const SetZoneForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={nodes ? nodes.length : selectedCount ?? 0} + selectedCount={nodes ? nodes.length : (selectedCount ?? 0)} validationSchema={SetZoneSchema} > diff --git a/src/app/base/components/node/TestForm/TestForm.tsx b/src/app/base/components/node/TestForm/TestForm.tsx index 456a2f4a47..6c9fcec50b 100644 --- a/src/app/base/components/node/TestForm/TestForm.tsx +++ b/src/app/base/components/node/TestForm/TestForm.tsx @@ -161,7 +161,7 @@ export const TestForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={nodes ? nodes.length : selectedCount ?? 0} + selectedCount={nodes ? nodes.length : (selectedCount ?? 0)} validationSchema={TestFormSchema} > diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx index 12a1ef1718..1e397dfaa9 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/DeployForm/DeployForm.tsx @@ -182,7 +182,7 @@ export const DeployForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={machines ? machines.length : selectedCount ?? 0} + selectedCount={machines ? machines.length : (selectedCount ?? 0)} showProcessingCount={false} validationSchema={DeploySchema} > diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx index ec42b636be..7d99083445 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/MarkBrokenForm/MarkBrokenForm.tsx @@ -78,12 +78,12 @@ export const MarkBrokenForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={machines ? machines.length : selectedCount ?? 0} + selectedCount={machines ? machines.length : (selectedCount ?? 0)} validationSchema={MarkBrokenSchema} {...actionProps} > ); diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx index e386f68823..d525d487ff 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/ReleaseForm/ReleaseForm.tsx @@ -97,7 +97,7 @@ export const ReleaseForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={machines ? machines.length : selectedCount ?? 0} + selectedCount={machines ? machines.length : (selectedCount ?? 0)} validationSchema={ReleaseSchema} {...actionProps} > diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx index fb003df752..d5613dde45 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/SetPoolForm/SetPoolForm.tsx @@ -115,7 +115,7 @@ export const SetPoolForm = ({ }} onSuccess={clearSidePanelContent} processingCount={processingCount} - selectedCount={machines ? machines.length : selectedCount ?? 0} + selectedCount={machines ? machines.length : (selectedCount ?? 0)} validationSchema={SetPoolSchema} {...actionProps} > diff --git a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx index a9d221ddd0..87e228ee46 100644 --- a/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx +++ b/src/app/machines/components/MachineForms/MachineActionFormWrapper/TagForm/TagForm.tsx @@ -175,7 +175,7 @@ export const TagForm = ({ ); }} processingCount={processingCount} - selectedCount={machines ? machines.length : selectedCount ?? 0} + selectedCount={machines ? machines.length : (selectedCount ?? 0)} showProcessingCount={!viewingMachineConfig} submitLabel="Save tag changes" validationSchema={TagFormSchema} diff --git a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/utils.ts b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/utils.ts index 9d85610a03..20cff971b0 100644 --- a/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/utils.ts +++ b/src/app/machines/views/MachineList/MachineListTable/AllCheckbox/utils.ts @@ -38,7 +38,7 @@ export const generateSelectedOnCurrentPage = ({ let newSelected = !selected || "filter" in selected ? { groups: [] } - : cloneDeep(selected) ?? {}; + : (cloneDeep(selected) ?? {}); newSelected.groups = newSelected.groups ?? []; newSelected.items = newSelected.items ?? []; groups?.forEach((group) => { diff --git a/src/app/preferences/views/APIKeys/APIKeyAdd/APIKeyAdd.test.tsx b/src/app/preferences/views/APIKeys/APIKeyAdd/APIKeyAdd.test.tsx index ecdf43a189..24da962518 100644 --- a/src/app/preferences/views/APIKeys/APIKeyAdd/APIKeyAdd.test.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyAdd/APIKeyAdd.test.tsx @@ -3,11 +3,16 @@ import { Label as APIKeyFormLabels } from "../APIKeyForm/APIKeyForm"; import { APIKeyAdd } from "./APIKeyAdd"; import type { RootState } from "@/app/store/root/types"; +import * as factory from "@/testing/factories"; import { screen, renderWithBrowserRouter } from "@/testing/utils"; describe("APIKeyAdd", () => { let state: RootState; + beforeEach(() => { + state = factory.rootState(); + }); + it("can render", () => { renderWithBrowserRouter(, { route: "/", diff --git a/src/app/preferences/views/APIKeys/APIKeyDelete/APIKeyDelete.test.tsx b/src/app/preferences/views/APIKeys/APIKeyDelete/APIKeyDelete.test.tsx index 4dc5ce628f..a4472e9552 100644 --- a/src/app/preferences/views/APIKeys/APIKeyDelete/APIKeyDelete.test.tsx +++ b/src/app/preferences/views/APIKeys/APIKeyDelete/APIKeyDelete.test.tsx @@ -5,7 +5,7 @@ import * as factory from "@/testing/factories"; import { renderWithBrowserRouter, screen } from "@/testing/utils"; let state: RootState; -factory.rootState({ +state = factory.rootState({ token: factory.tokenState({ items: [ factory.token({ diff --git a/yarn.lock b/yarn.lock index 3944f515bf..7ce0e3b99e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2487,10 +2487,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.57.0": - version "8.57.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" - integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== +"@eslint/js@8.57.1": + version "8.57.1" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" + integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q== "@fal-works/esbuild-plugin-global-externals@^2.1.2": version "2.1.2" @@ -2565,12 +2565,12 @@ commander "13.0.0" handlebars "4.7.8" -"@humanwhocodes/config-array@^0.11.14": - version "0.11.14" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" - integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== +"@humanwhocodes/config-array@^0.13.0": + version "0.13.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748" + integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw== dependencies: - "@humanwhocodes/object-schema" "^2.0.2" + "@humanwhocodes/object-schema" "^2.0.3" debug "^4.3.1" minimatch "^3.0.5" @@ -2579,7 +2579,7 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.2": +"@humanwhocodes/object-schema@^2.0.3": version "2.0.3" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== @@ -8092,16 +8092,16 @@ eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.57.0: - version "8.57.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" - integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== +eslint@8.57.1: + version "8.57.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9" + integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.57.0" - "@humanwhocodes/config-array" "^0.11.14" + "@eslint/js" "8.57.1" + "@humanwhocodes/config-array" "^0.13.0" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -10968,10 +10968,10 @@ node-releases@^2.0.14: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== -nodemon@3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.1.3.tgz#dcce9ee0aa7d19cd4dcd576ae9a0456d9078b286" - integrity sha512-m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w== +nodemon@3.1.9: + version "3.1.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.1.9.tgz#df502cdc3b120e1c3c0c6e4152349019efa7387b" + integrity sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg== dependencies: chokidar "^3.5.2" debug "^4" @@ -11710,10 +11710,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a" - integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA== +prettier@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.0.tgz#50325a28887c6dfdf2ca3f8eaba02b66a8429ca7" + integrity sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA== prettier@^2.8.0: version "2.8.8" @@ -13751,10 +13751,10 @@ typescript-tuple@^2.2.1: dependencies: typescript-compare "^0.0.2" -typescript@5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== +typescript@5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e" + integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw== ufo@^1.3.0: version "1.3.1"