From a88e2e2350faea224a2e220a2fa80152f4328936 Mon Sep 17 00:00:00 2001 From: Frank Niessink Date: Fri, 21 Feb 2025 23:54:08 +0100 Subject: [PATCH] Fix eslint config to check *.jsx. --- components/frontend/eslint.config.mjs | 17 +- components/frontend/package-lock.json | 245 +++--------------- components/frontend/package.json | 1 - components/frontend/src/PageContent.test.jsx | 1 + .../header_footer/buttons/CollapseButton.jsx | 1 - .../buttons/DownloadAsPDFButton.jsx | 1 - .../buttons/ResetSettingsButton.jsx | 1 - .../frontend/src/issue/IssuesRows.test.jsx | 2 +- .../src/subject/SubjectTableFooter.test.jsx | 2 +- components/frontend/src/utils.test.jsx | 2 +- 10 files changed, 47 insertions(+), 226 deletions(-) diff --git a/components/frontend/eslint.config.mjs b/components/frontend/eslint.config.mjs index 688dd613a8..3f844b50d7 100644 --- a/components/frontend/eslint.config.mjs +++ b/components/frontend/eslint.config.mjs @@ -1,7 +1,6 @@ import { fixupConfigRules } from "@eslint/compat" import pluginJs from "@eslint/js" import pluginJest from "eslint-plugin-jest" -import pluginNode from "eslint-plugin-n" import pluginPrettierConfigRecommended from "eslint-plugin-prettier/recommended" import pluginPromise from "eslint-plugin-promise" import pluginReactJSXRuntime from "eslint-plugin-react/configs/jsx-runtime.js" @@ -10,13 +9,20 @@ import pluginSimpleImportSort from "eslint-plugin-simple-import-sort" import globals from "globals" export default [ + { + settings: { + react: { + version: "detect", + }, + }, + }, pluginJs.configs.recommended, pluginJest.configs["flat/recommended"], - pluginNode.configs["flat/recommended-module"], ...fixupConfigRules(pluginReactConfigRecommended), ...fixupConfigRules(pluginReactJSXRuntime), pluginPrettierConfigRecommended, { + files: ["**/*.js", "**/*.jsx"], plugins: { "simple-import-sort": pluginSimpleImportSort, promise: pluginPromise, @@ -47,14 +53,9 @@ export default [ "simple-import-sort/imports": "error", "simple-import-sort/exports": "error", }, - settings: { - react: { - version: "detect", - }, - }, }, { - files: ["**/*.test.js"], + files: ["**/*.test.js", "**/*.test.jsx"], rules: { "no-import-assign": "off", "jest/expect-expect": ["error", { assertFunctionNames: ["expect*"] }], diff --git a/components/frontend/package-lock.json b/components/frontend/package-lock.json index 3046ca28eb..0f2b9e0606 100644 --- a/components/frontend/package-lock.json +++ b/components/frontend/package-lock.json @@ -38,7 +38,6 @@ "eslint": "^9.20.1", "eslint-config-prettier": "^10.0.1", "eslint-plugin-jest": "^28.11.0", - "eslint-plugin-n": "^17.15.1", "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-promise": "^7.2.1", "eslint-plugin-react": "^7.37.4", @@ -1366,9 +1365,9 @@ } }, "node_modules/@eslint/compat": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.6.tgz", - "integrity": "sha512-k7HNCqApoDHM6XzT30zGoETj+D+uUcZUb+IVAJmar3u6bvHf7hhHJcWx09QHj4/a2qrKZMWU0E16tvkiAdv06Q==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.7.tgz", + "integrity": "sha512-xvv7hJE32yhegJ8xNAnb62ggiAwTYHBpUCWhRxEj/ksvgDJuSXfoDkBcRYaYNFiJ+jH0IE3K16hd+xXzhBgNbg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1399,9 +1398,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", - "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", + "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1412,9 +1411,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz", + "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1449,9 +1448,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", - "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", + "version": "9.21.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.21.0.tgz", + "integrity": "sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==", "dev": true, "license": "MIT", "engines": { @@ -1469,13 +1468,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.6.tgz", - "integrity": "sha512-+0TjwR1eAUdZtvv/ir1mGX+v0tUoR3VEPB8Up0LLJC+whRW0GgBBtpbOkg/a/U4Dxa6l5a3l9AJ1aWIQVyoWJA==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", + "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.11.0", + "@eslint/core": "^0.12.0", "levn": "^0.4.1" }, "engines": { @@ -3134,9 +3133,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz", - "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==", + "version": "22.13.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz", + "integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==", "dev": true, "license": "MIT", "dependencies": { @@ -4833,9 +4832,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.102", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz", - "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==", + "version": "1.5.103", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz", + "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA==", "dev": true, "license": "ISC" }, @@ -4859,20 +4858,6 @@ "dev": true, "license": "MIT" }, - "node_modules/enhanced-resolve": { - "version": "5.18.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", - "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -5140,22 +5125,22 @@ } }, "node_modules/eslint": { - "version": "9.20.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz", - "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==", + "version": "9.21.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz", + "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.11.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.20.0", - "@eslint/plugin-kit": "^0.2.5", + "@eslint/config-array": "^0.19.2", + "@eslint/core": "^0.12.0", + "@eslint/eslintrc": "^3.3.0", + "@eslint/js": "9.21.0", + "@eslint/plugin-kit": "^0.2.7", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -5199,35 +5184,6 @@ } } }, - "node_modules/eslint-compat-utils": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz", - "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.4" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "eslint": ">=6.0.0" - } - }, - "node_modules/eslint-compat-utils/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-config-prettier": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz", @@ -5241,28 +5197,6 @@ "eslint": ">=7.0.0" } }, - "node_modules/eslint-plugin-es-x": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz", - "integrity": "sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==", - "dev": true, - "funding": [ - "https://github.com/sponsors/ota-meshi", - "https://opencollective.com/eslint" - ], - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.1.2", - "@eslint-community/regexpp": "^4.11.0", - "eslint-compat-utils": "^0.5.1" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": ">=8" - } - }, "node_modules/eslint-plugin-jest": { "version": "28.11.0", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.11.0.tgz", @@ -5289,84 +5223,6 @@ } } }, - "node_modules/eslint-plugin-n": { - "version": "17.15.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz", - "integrity": "sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.1", - "enhanced-resolve": "^5.17.1", - "eslint-plugin-es-x": "^7.8.0", - "get-tsconfig": "^4.8.1", - "globals": "^15.11.0", - "ignore": "^5.3.2", - "minimatch": "^9.0.5", - "semver": "^7.6.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": ">=8.23.0" - } - }, - "node_modules/eslint-plugin-n/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.15.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", - "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint-plugin-n/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/eslint-plugin-n/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-plugin-prettier": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.3.tgz", @@ -6085,19 +5941,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-tsconfig": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz", - "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -9406,16 +9249,6 @@ "node": ">=4" } }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, "node_modules/resolve.exports": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", @@ -10132,16 +9965,6 @@ "url": "https://opencollective.com/unts" } }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/test-exclude": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz", @@ -11503,9 +11326,9 @@ } }, "node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", "dev": true, "license": "MIT", "engines": { diff --git a/components/frontend/package.json b/components/frontend/package.json index f3644e1261..ecdd02ece7 100644 --- a/components/frontend/package.json +++ b/components/frontend/package.json @@ -48,7 +48,6 @@ "eslint": "^9.20.1", "eslint-config-prettier": "^10.0.1", "eslint-plugin-jest": "^28.11.0", - "eslint-plugin-n": "^17.15.1", "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-promise": "^7.2.1", "eslint-plugin-react": "^7.37.4", diff --git a/components/frontend/src/PageContent.test.jsx b/components/frontend/src/PageContent.test.jsx index 494b8ea2c9..1e0fc7d273 100644 --- a/components/frontend/src/PageContent.test.jsx +++ b/components/frontend/src/PageContent.test.jsx @@ -1,6 +1,7 @@ import { act, render, screen } from "@testing-library/react" import history from "history/browser" import * as react_toastify from "react-toastify" +import { vi } from "vitest" import { createTestableSettings } from "./__fixtures__/fixtures" import * as fetch_server_api from "./api/fetch_server_api" diff --git a/components/frontend/src/header_footer/buttons/CollapseButton.jsx b/components/frontend/src/header_footer/buttons/CollapseButton.jsx index 631f4e99fa..c3166088f7 100644 --- a/components/frontend/src/header_footer/buttons/CollapseButton.jsx +++ b/components/frontend/src/header_footer/buttons/CollapseButton.jsx @@ -1,7 +1,6 @@ import UnfoldLessIcon from "@mui/icons-material/UnfoldLess" import { stringsURLSearchQueryPropType } from "../../sharedPropTypes" - import { AppBarButton } from "./AppBarbutton" export function CollapseButton({ expandedItems }) { diff --git a/components/frontend/src/header_footer/buttons/DownloadAsPDFButton.jsx b/components/frontend/src/header_footer/buttons/DownloadAsPDFButton.jsx index 8285405988..9e47a2f47e 100644 --- a/components/frontend/src/header_footer/buttons/DownloadAsPDFButton.jsx +++ b/components/frontend/src/header_footer/buttons/DownloadAsPDFButton.jsx @@ -5,7 +5,6 @@ import { useState } from "react" import { get_report_pdf } from "../../api/report" import { registeredURLSearchParams } from "../../hooks/url_search_query" import { showMessage } from "../../widgets/toast" - import { AppBarButton } from "./AppBarbutton" function downloadPDF(report_uuid, queryString, callback) { diff --git a/components/frontend/src/header_footer/buttons/ResetSettingsButton.jsx b/components/frontend/src/header_footer/buttons/ResetSettingsButton.jsx index 94327580e5..322e2c2c80 100644 --- a/components/frontend/src/header_footer/buttons/ResetSettingsButton.jsx +++ b/components/frontend/src/header_footer/buttons/ResetSettingsButton.jsx @@ -2,7 +2,6 @@ import SettingsBackupRestoreIcon from "@mui/icons-material/SettingsBackupRestore import { bool, func } from "prop-types" import { optionalDatePropType, settingsPropType } from "../../sharedPropTypes" - import { AppBarButton } from "./AppBarbutton" export function ResetSettingsButton({ atReportsOverview, handleDateChange, reportDate, settings }) { diff --git a/components/frontend/src/issue/IssuesRows.test.jsx b/components/frontend/src/issue/IssuesRows.test.jsx index 6a2c972221..c4c8578c9f 100644 --- a/components/frontend/src/issue/IssuesRows.test.jsx +++ b/components/frontend/src/issue/IssuesRows.test.jsx @@ -5,8 +5,8 @@ import { vi } from "vitest" import * as fetch_server_api from "../api/fetch_server_api" import { EDIT_REPORT_PERMISSION, Permissions } from "../context/Permissions" import { expectNoAccessibilityViolations } from "../testUtils" -import { IssuesRows } from "./IssuesRows" import * as toast from "../widgets/toast" +import { IssuesRows } from "./IssuesRows" vi.mock("../api/fetch_server_api.js") vi.mock("../widgets/toast.jsx") diff --git a/components/frontend/src/subject/SubjectTableFooter.test.jsx b/components/frontend/src/subject/SubjectTableFooter.test.jsx index 38c77ede6e..f1e32d1c8d 100644 --- a/components/frontend/src/subject/SubjectTableFooter.test.jsx +++ b/components/frontend/src/subject/SubjectTableFooter.test.jsx @@ -1,5 +1,6 @@ import { Table } from "@mui/material" import { act, fireEvent, render, screen } from "@testing-library/react" +import { vi } from "vitest" import { dataModel, report } from "../__fixtures__/fixtures" import * as fetch_server_api from "../api/fetch_server_api" @@ -7,7 +8,6 @@ import { DataModel } from "../context/DataModel" import { EDIT_REPORT_PERMISSION, Permissions } from "../context/Permissions" import { expectNoAccessibilityViolations } from "../testUtils" import { SubjectTableFooter } from "./SubjectTableFooter" -import { vi } from "vitest" const stopFilteringAndSorting = vi.fn() diff --git a/components/frontend/src/utils.test.jsx b/components/frontend/src/utils.test.jsx index a625459563..58d2af5132 100644 --- a/components/frontend/src/utils.test.jsx +++ b/components/frontend/src/utils.test.jsx @@ -1,9 +1,9 @@ import { EDIT_ENTITY_PERMISSION, EDIT_REPORT_PERMISSION } from "./context/Permissions" import { defaultDesiredResponseTimes } from "./defaults" import { - DOCUMENTATION_URL, addCounts, capitalize, + DOCUMENTATION_URL, getMetricResponseDeadline, getMetricResponseOverrun, getMetricTags,