aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/design-system/package.json8
-rw-r--r--server/sonar-web/package.json7
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/inputs/PrimitiveInput.tsx27
-rw-r--r--server/sonar-web/yarn.lock103
5 files changed, 65 insertions, 82 deletions
diff --git a/server/sonar-web/design-system/package.json b/server/sonar-web/design-system/package.json
index d213b9eb73c..946792594f2 100644
--- a/server/sonar-web/design-system/package.json
+++ b/server/sonar-web/design-system/package.json
@@ -22,10 +22,10 @@
"@babel/preset-typescript": "7.23.3",
"@emotion/babel-plugin": "11.11.0",
"@emotion/babel-plugin-jsx-pragmatic": "0.2.1",
- "@testing-library/dom": "9.3.3",
- "@testing-library/jest-dom": "6.1.4",
- "@testing-library/react": "14.1.0",
- "@testing-library/user-event": "14.5.1",
+ "@testing-library/dom": "9.3.4",
+ "@testing-library/jest-dom": "6.4.2",
+ "@testing-library/react": "14.2.1",
+ "@testing-library/user-event": "14.5.2",
"@types/d3-array": "3.2.1",
"@types/d3-zoom": "3.0.8",
"@types/lodash": "4.14.202",
diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 46748a5f41a..ae06e2b088f 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -50,9 +50,10 @@
"@emotion/jest": "11.11.0",
"@swc/core": "1.4.0",
"@swc/jest": "0.2.36",
- "@testing-library/jest-dom": "6.1.4",
- "@testing-library/react": "14.1.0",
- "@testing-library/user-event": "14.5.1",
+ "@testing-library/dom": "9.3.4",
+ "@testing-library/jest-dom": "6.4.2",
+ "@testing-library/react": "14.2.1",
+ "@testing-library/user-event": "14.5.2",
"@types/cheerio": "0.22.35",
"@types/classnames": "2.3.1",
"@types/d3-array": "3.2.1",
diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx
index d254da39a79..a2f52364899 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx
@@ -43,7 +43,7 @@ export default class InputForSingleSelectList extends React.PureComponent<Props>
onChange={this.handleInputChange}
aria-label={getPropertyName(setting.definition)}
options={options}
- value={options.find((option) => option.value === value)}
+ value={options.find((option) => option.value === value) ?? null}
/>
);
}
diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/PrimitiveInput.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/PrimitiveInput.tsx
index eee75abee66..e9c8ec6ac38 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/inputs/PrimitiveInput.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/PrimitiveInput.tsx
@@ -44,18 +44,21 @@ export default function PrimitiveInput(props: DefaultSpecializedInputProps) {
[type in SettingType]?: React.ComponentType<
React.PropsWithChildren<DefaultSpecializedInputProps>
>;
- } = {
- STRING: InputForString,
- TEXT: InputForText,
- JSON: InputForJSON,
- PASSWORD: InputForPassword,
- BOOLEAN: InputForBoolean,
- INTEGER: InputForNumber,
- LONG: InputForNumber,
- FLOAT: InputForNumber,
- SINGLE_SELECT_LIST: withOptions(definition.options),
- FORMATTED_TEXT: InputForFormattedText,
- };
+ } = React.useMemo(
+ () => ({
+ STRING: InputForString,
+ TEXT: InputForText,
+ JSON: InputForJSON,
+ PASSWORD: InputForPassword,
+ BOOLEAN: InputForBoolean,
+ INTEGER: InputForNumber,
+ LONG: InputForNumber,
+ FLOAT: InputForNumber,
+ SINGLE_SELECT_LIST: withOptions(definition.options),
+ FORMATTED_TEXT: InputForFormattedText,
+ }),
+ [definition.options],
+ );
const InputComponent = (definition.type && typeMapping[definition.type]) || InputForString;
diff --git a/server/sonar-web/yarn.lock b/server/sonar-web/yarn.lock
index 76b1fee69d8..324fa4d5331 100644
--- a/server/sonar-web/yarn.lock
+++ b/server/sonar-web/yarn.lock
@@ -12,10 +12,10 @@ __metadata:
languageName: node
linkType: hard
-"@adobe/css-tools@npm:^4.3.1":
- version: 4.3.1
- resolution: "@adobe/css-tools@npm:4.3.1"
- checksum: 10/039a42ffdd41ecf3abcaf09c9fef0ffd634ccbe81c04002fc989e74564eba99bb19169a8f48dadf6442aa2c5c9f0925a7b27ec5c36a1ed1a3515fe77d6930996
+"@adobe/css-tools@npm:^4.3.2":
+ version: 4.3.3
+ resolution: "@adobe/css-tools@npm:4.3.3"
+ checksum: 10/0e77057efb4e18182560855503066b75edca98671be327d3f8a7ae89ec3da6821e693114b55225909fca00d7e7ed8422f3d79d71fe95dd4d5df1f2026a9fda02
languageName: node
linkType: hard
@@ -4190,9 +4190,9 @@ __metadata:
languageName: node
linkType: hard
-"@testing-library/dom@npm:9.3.3, @testing-library/dom@npm:^9.0.0":
- version: 9.3.3
- resolution: "@testing-library/dom@npm:9.3.3"
+"@testing-library/dom@npm:9.3.4, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^9.0.0":
+ version: 9.3.4
+ resolution: "@testing-library/dom@npm:9.3.4"
dependencies:
"@babel/code-frame": "npm:^7.10.4"
"@babel/runtime": "npm:^7.12.5"
@@ -4202,59 +4202,46 @@ __metadata:
dom-accessibility-api: "npm:^0.5.9"
lz-string: "npm:^1.5.0"
pretty-format: "npm:^27.0.2"
- checksum: 10/1ebd1672226600049ce16509d6964bdad8ee71b10f7e68f98126e00638c08ebefb6b7c729a0f2a41cffc77902c3081a95fc2bc1a097cae442ed4a5c481f348b7
+ checksum: 10/510da752ea76f4a10a0a4e3a77917b0302cf03effe576cd3534cab7e796533ee2b0e9fb6fb11b911a1ebd7c70a0bb6f235bf4f816c9b82b95b8fe0cddfd10975
languageName: node
linkType: hard
-"@testing-library/dom@npm:>=7":
- version: 8.12.0
- resolution: "@testing-library/dom@npm:8.12.0"
+"@testing-library/jest-dom@npm:6.4.2":
+ version: 6.4.2
+ resolution: "@testing-library/jest-dom@npm:6.4.2"
dependencies:
- "@babel/code-frame": "npm:^7.10.4"
- "@babel/runtime": "npm:^7.12.5"
- "@types/aria-query": "npm:^4.2.0"
- aria-query: "npm:^5.0.0"
- chalk: "npm:^4.1.0"
- dom-accessibility-api: "npm:^0.5.9"
- lz-string: "npm:^1.4.4"
- pretty-format: "npm:^27.0.2"
- checksum: 10/a05d4e280452804a2ddce4e29131f185ce82617e97fcf6888efa4efabd87a44b0371ef9457d1faf21a170fe8df62f5c7227151a591a78c131816e1bef1e46180
- languageName: node
- linkType: hard
-
-"@testing-library/jest-dom@npm:6.1.4":
- version: 6.1.4
- resolution: "@testing-library/jest-dom@npm:6.1.4"
- dependencies:
- "@adobe/css-tools": "npm:^4.3.1"
+ "@adobe/css-tools": "npm:^4.3.2"
"@babel/runtime": "npm:^7.9.2"
aria-query: "npm:^5.0.0"
chalk: "npm:^3.0.0"
css.escape: "npm:^1.5.1"
- dom-accessibility-api: "npm:^0.5.6"
+ dom-accessibility-api: "npm:^0.6.3"
lodash: "npm:^4.17.15"
redent: "npm:^3.0.0"
peerDependencies:
"@jest/globals": ">= 28"
+ "@types/bun": "*"
"@types/jest": ">= 28"
jest: ">= 28"
vitest: ">= 0.32"
peerDependenciesMeta:
"@jest/globals":
optional: true
+ "@types/bun":
+ optional: true
"@types/jest":
optional: true
jest:
optional: true
vitest:
optional: true
- checksum: 10/e5a0cdb96eec509c0c85f2b7a0d08fc1c9f6c10aa49bba0d738bf4bb114c3472b92ace5067aedfaaf848ae13b38ba9296047c219aa24b66c87aa16de33341fdb
+ checksum: 10/7ee1e51caffad032734a4a43a00bf72d49080cf1bbf53021b443e91c7fa3762a66f55ce68f1c6643590fe66fbc4df92142659b8cf17c92166a3fb22691987e0d
languageName: node
linkType: hard
-"@testing-library/react@npm:14.1.0":
- version: 14.1.0
- resolution: "@testing-library/react@npm:14.1.0"
+"@testing-library/react@npm:14.2.1":
+ version: 14.2.1
+ resolution: "@testing-library/react@npm:14.2.1"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@testing-library/dom": "npm:^9.0.0"
@@ -4262,16 +4249,16 @@ __metadata:
peerDependencies:
react: ^18.0.0
react-dom: ^18.0.0
- checksum: 10/d181f13cc684515dfe7ca0a961c75e5f506ffde897e5c96628bab71ddc264e67d1477ad7ad0615a1add1f82a6437143843c33c05292783ff0dc72d1a009c512f
+ checksum: 10/e02b2f32ae79665a79fc4d8ee053fd3832bfcd4753aa1dba05cdece1a9f59c72a0fae91e0a9387597dcb686d631a722729f2878e38dc95e6f23b291ad8d09b6c
languageName: node
linkType: hard
-"@testing-library/user-event@npm:14.5.1":
- version: 14.5.1
- resolution: "@testing-library/user-event@npm:14.5.1"
+"@testing-library/user-event@npm:14.5.2":
+ version: 14.5.2
+ resolution: "@testing-library/user-event@npm:14.5.2"
peerDependencies:
"@testing-library/dom": ">=7.21.4"
- checksum: 10/696e1328c230b0a7063a41d82b5350c6be926696106809a4d79d446d190ff56bebb850fe564ff0952cb74ae81e59a6f10534a88ecbb3792083271a249e04e728
+ checksum: 10/49821459d81c6bc435d97128d6386ca24f1e4b3ba8e46cb5a96fe3643efa6e002d88c1b02b7f2ec58da593e805c59b78d7fdf0db565c1f02ba782f63ee984040
languageName: node
linkType: hard
@@ -4296,13 +4283,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/aria-query@npm:^4.2.0":
- version: 4.2.2
- resolution: "@types/aria-query@npm:4.2.2"
- checksum: 10/3ab0476e1d90a83350f75b7df57edf955c142d4e270fb0d41ab1cf0f1d032ce26dc78d2a12fb4f4c317dba39f0776fb262f5bcff2a9796605f40ba853c407c11
- languageName: node
- linkType: hard
-
"@types/aria-query@npm:^5.0.1":
version: 5.0.1
resolution: "@types/aria-query@npm:5.0.1"
@@ -5233,9 +5213,10 @@ __metadata:
"@swc/core": "npm:1.4.0"
"@swc/jest": "npm:0.2.36"
"@tanstack/react-query": "npm:5.18.1"
- "@testing-library/jest-dom": "npm:6.1.4"
- "@testing-library/react": "npm:14.1.0"
- "@testing-library/user-event": "npm:14.5.1"
+ "@testing-library/dom": "npm:9.3.4"
+ "@testing-library/jest-dom": "npm:6.4.2"
+ "@testing-library/react": "npm:14.2.1"
+ "@testing-library/user-event": "npm:14.5.2"
"@types/cheerio": "npm:0.22.35"
"@types/classnames": "npm:2.3.1"
"@types/d3-array": "npm:3.2.1"
@@ -6929,10 +6910,10 @@ __metadata:
"@babel/preset-typescript": "npm:7.23.3"
"@emotion/babel-plugin": "npm:11.11.0"
"@emotion/babel-plugin-jsx-pragmatic": "npm:0.2.1"
- "@testing-library/dom": "npm:9.3.3"
- "@testing-library/jest-dom": "npm:6.1.4"
- "@testing-library/react": "npm:14.1.0"
- "@testing-library/user-event": "npm:14.5.1"
+ "@testing-library/dom": "npm:9.3.4"
+ "@testing-library/jest-dom": "npm:6.4.2"
+ "@testing-library/react": "npm:14.2.1"
+ "@testing-library/user-event": "npm:14.5.2"
"@types/d3-array": "npm:3.2.1"
"@types/d3-zoom": "npm:3.0.8"
"@types/lodash": "npm:4.14.202"
@@ -7076,13 +7057,20 @@ __metadata:
languageName: node
linkType: hard
-"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.9":
version: 0.5.11
resolution: "dom-accessibility-api@npm:0.5.11"
checksum: 10/b5b47e0c9bebe78b4f16247bad8445ccbb53472098c5759224488a9d0586b1da4b123de1941d2110ec72ff00217800332a350771d662f7f40ae1d958e1fd3946
languageName: node
linkType: hard
+"dom-accessibility-api@npm:^0.6.3":
+ version: 0.6.3
+ resolution: "dom-accessibility-api@npm:0.6.3"
+ checksum: 10/83d3371f8226487fbad36e160d44f1d9017fb26d46faba6a06fcad15f34633fc827b8c3e99d49f71d5f3253d866e2131826866fd0a3c86626f8eccfc361881ff
+ languageName: node
+ linkType: hard
+
"dom-helpers@npm:^5.0.1, dom-helpers@npm:^5.1.3":
version: 5.2.1
resolution: "dom-helpers@npm:5.2.1"
@@ -10627,15 +10615,6 @@ __metadata:
languageName: node
linkType: hard
-"lz-string@npm:^1.4.4":
- version: 1.4.4
- resolution: "lz-string@npm:1.4.4"
- bin:
- lz-string: bin/bin.js
- checksum: 10/da3abc3c15b3f91ab0fba0fe8ea3bb53d3c758d5c50d88d97b759e52d9b5224f8b05edc0e6423bfd448e6bcbe30f79236b7f2e6e7f8a321be62ae77b88092581
- languageName: node
- linkType: hard
-
"lz-string@npm:^1.5.0":
version: 1.5.0
resolution: "lz-string@npm:1.5.0"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 19:20:28 +0000