Skip to content

Commit 4518a4e

Browse files
MartinSchoelerRocket.Chat
authored and
Rocket.Chat
committed
fix(fuselage): fix duplicated values on paginated multi select (#456)
1 parent 53d44c0 commit 4518a4e

File tree

4 files changed

+136
-14
lines changed

4 files changed

+136
-14
lines changed

packages/fuselage/src/components/SelectPaginated/PaginatedMultiSelect.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ export const PaginatedMultiSelect = ({
3939
const option = options.find((option) => option.value === currentValue);
4040

4141
const internalChanged = ([value]) => {
42-
if (currentValue.includes(value)) {
43-
const newValue = currentValue.filter((item) => item !== value);
42+
if (currentValue.some((item) => item.value === value.value)) {
43+
const newValue = currentValue.filter(
44+
(item) => item.value !== value.value
45+
);
4446
setInternalValue(newValue);
4547
return onChange(newValue);
4648
}

packages/message-parser/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
"@babel/core": "^7.14.0",
5656
"@babel/eslint-parser": "^7.13.14",
5757
"@babel/preset-env": "^7.14.1",
58-
"@rocket.chat/eslint-config-alt": "workspace:packages/eslint-config-alt",
59-
"@rocket.chat/peggy-loader": "workspace:packages/peggy-loader",
60-
"@rocket.chat/prettier-config": "workspace:packages/prettier-config",
58+
"@rocket.chat/eslint-config-alt": "^0.24.0",
59+
"@rocket.chat/peggy-loader": "^0.24.0",
60+
"@rocket.chat/prettier-config": "^0.24.0",
6161
"@types/jest": "^26.0.23",
6262
"@types/node": "^14.14.44",
6363
"@typescript-eslint/parser": "^4.22.1",

packages/string-helpers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"url": "https://github.com/RocketChat/Rocket.Chat.Fuselage/issues"
5050
},
5151
"devDependencies": {
52-
"@rocket.chat/eslint-config-alt": "workspace:packages/eslint-config-alt",
53-
"@rocket.chat/prettier-config": "workspace:packages/prettier-config",
52+
"@rocket.chat/eslint-config-alt": "^0.24.0",
53+
"@rocket.chat/prettier-config": "^0.24.0",
5454
"@types/jest": "^26.0.23",
5555
"downlevel-dts": "^0.7.0",
5656
"eslint": "^7.26.0",

yarn.lock

+127-7
Original file line numberDiff line numberDiff line change
@@ -4288,10 +4288,12 @@ __metadata:
42884288
"@storybook/react": ^6.2.9
42894289
"@storybook/source-loader": ^6.2.9
42904290
"@storybook/theming": ^6.2.9
4291+
"@types/invariant": ^2.2.34
42914292
"@types/jest": ^26.0.23
42924293
autoprefixer: ^10.2.5
42934294
babel-loader: ^8.2.2
42944295
caniuse-lite: ^1.0.30001223
4296+
copy-webpack-plugin: ^8.1.1
42954297
cross-env: ^7.0.3
42964298
css-loader: ^5.2.4
42974299
cssnano: ^5.0.2
@@ -4317,6 +4319,7 @@ __metadata:
43174319
react-dom: ^17.0.2
43184320
react-keyed-flatten-children: ^1.3.0
43194321
react-live: ^2.2.3
4322+
react-virtuoso: 1.2.4
43204323
rimraf: ^3.0.2
43214324
sass: ^1.32.12
43224325
sass-loader: ^11.0.1
@@ -4337,6 +4340,7 @@ __metadata:
43374340
"@rocket.chat/icons": "*"
43384341
react: ^17.0.2
43394342
react-dom: ^17.0.2
4343+
react-virtuoso: 1.2.4
43404344
languageName: unknown
43414345
linkType: soft
43424346

@@ -4388,9 +4392,9 @@ __metadata:
43884392
"@babel/core": ^7.14.0
43894393
"@babel/eslint-parser": ^7.13.14
43904394
"@babel/preset-env": ^7.14.1
4391-
"@rocket.chat/eslint-config-alt": "workspace:packages/eslint-config-alt"
4392-
"@rocket.chat/peggy-loader": "workspace:packages/peggy-loader"
4393-
"@rocket.chat/prettier-config": "workspace:packages/prettier-config"
4395+
"@rocket.chat/eslint-config-alt": ^0.24.0
4396+
"@rocket.chat/peggy-loader": ^0.24.0
4397+
"@rocket.chat/prettier-config": ^0.24.0
43944398
"@types/jest": ^26.0.23
43954399
"@types/node": ^14.14.44
43964400
"@typescript-eslint/parser": ^4.22.1
@@ -4437,7 +4441,7 @@ __metadata:
44374441
languageName: unknown
44384442
linkType: soft
44394443

4440-
"@rocket.chat/peggy-loader@workspace:packages/peggy-loader":
4444+
"@rocket.chat/peggy-loader@^0.24.0, @rocket.chat/peggy-loader@workspace:packages/peggy-loader":
44414445
version: 0.0.0-use.local
44424446
resolution: "@rocket.chat/peggy-loader@workspace:packages/peggy-loader"
44434447
dependencies:
@@ -4483,8 +4487,8 @@ __metadata:
44834487
version: 0.0.0-use.local
44844488
resolution: "@rocket.chat/string-helpers@workspace:packages/string-helpers"
44854489
dependencies:
4486-
"@rocket.chat/eslint-config-alt": "workspace:packages/eslint-config-alt"
4487-
"@rocket.chat/prettier-config": "workspace:packages/prettier-config"
4490+
"@rocket.chat/eslint-config-alt": ^0.24.0
4491+
"@rocket.chat/prettier-config": ^0.24.0
44884492
"@types/jest": ^26.0.23
44894493
downlevel-dts: ^0.7.0
44904494
eslint: ^7.26.0
@@ -5828,6 +5832,13 @@ __metadata:
58285832
languageName: node
58295833
linkType: hard
58305834

5835+
"@types/invariant@npm:^2.2.34":
5836+
version: 2.2.34
5837+
resolution: "@types/invariant@npm:2.2.34"
5838+
checksum: d0ecc665e5c95abf1ad7263c8cc32604d6b3444cfbc97657fede7e63f3751554a4f35f72ae565d70c28184dfb8b0cd4c058eaec1af972999edfd0a81b365f74b
5839+
languageName: node
5840+
linkType: hard
5841+
58315842
"@types/is-function@npm:^1.0.0":
58325843
version: 1.0.0
58335844
resolution: "@types/is-function@npm:1.0.0"
@@ -6348,6 +6359,24 @@ __metadata:
63486359
languageName: node
63496360
linkType: hard
63506361

6362+
"@virtuoso.dev/react-urx@npm:^0.2.3":
6363+
version: 0.2.6
6364+
resolution: "@virtuoso.dev/react-urx@npm:0.2.6"
6365+
dependencies:
6366+
"@virtuoso.dev/urx": ^0.2.6
6367+
peerDependencies:
6368+
react: ">=16"
6369+
checksum: 6c1901bf34f022315d8a7b1df23c8419ad244aedfc9d10491ecf48ee7574aff667950381cf4ce2471badee9a54e4115fad7dc9460d261702e176c3d9ca4732ca
6370+
languageName: node
6371+
linkType: hard
6372+
6373+
"@virtuoso.dev/urx@npm:^0.2.3, @virtuoso.dev/urx@npm:^0.2.6":
6374+
version: 0.2.6
6375+
resolution: "@virtuoso.dev/urx@npm:0.2.6"
6376+
checksum: 23875af5ec7ea1f5ccb65437d3c31fff10d79326977b2c1372d48a850c8c20cab83c79cf20b7c68673fda5ab792ccaa4ccb935141ba07c7892399887b3bbd8de
6377+
languageName: node
6378+
linkType: hard
6379+
63516380
"@webassemblyjs/ast@npm:1.11.0":
63526381
version: 1.11.0
63536382
resolution: "@webassemblyjs/ast@npm:1.11.0"
@@ -7308,7 +7337,7 @@ __metadata:
73087337
languageName: node
73097338
linkType: hard
73107339

7311-
"asap@npm:^2.0.0":
7340+
"asap@npm:^2.0.0, asap@npm:~2.0.6":
73127341
version: 2.0.6
73137342
resolution: "asap@npm:2.0.6"
73147343
checksum: 3d314f8c598b625a98347bacdba609d4c889c616ca5d8ea65acaae8050ab8b7aa6630df2cfe9856c20b260b432adf2ee7a65a1021f268ef70408c70f809e3a39
@@ -9357,6 +9386,23 @@ __metadata:
93579386
languageName: node
93589387
linkType: hard
93599388

9389+
"copy-webpack-plugin@npm:^8.1.1":
9390+
version: 8.1.1
9391+
resolution: "copy-webpack-plugin@npm:8.1.1"
9392+
dependencies:
9393+
fast-glob: ^3.2.5
9394+
glob-parent: ^5.1.1
9395+
globby: ^11.0.3
9396+
normalize-path: ^3.0.0
9397+
p-limit: ^3.1.0
9398+
schema-utils: ^3.0.0
9399+
serialize-javascript: ^5.0.1
9400+
peerDependencies:
9401+
webpack: ^5.1.0
9402+
checksum: b06d77fa66b83b331831c74a8a2e29a66d79f0ad732dc90e4508e7301c832900fc7ee74a92766526f8853e28dfbab9bc71065b5164f14f373d88152e4a2858c0
9403+
languageName: node
9404+
linkType: hard
9405+
93609406
"core-js-compat@npm:^3.8.1":
93619407
version: 3.12.0
93629408
resolution: "core-js-compat@npm:3.12.0"
@@ -9398,6 +9444,13 @@ __metadata:
93989444
languageName: node
93999445
linkType: hard
94009446

9447+
"core-js@npm:^3.5.0":
9448+
version: 3.12.1
9449+
resolution: "core-js@npm:3.12.1"
9450+
checksum: 8b1d05579e7ddeafcd390001cc893540275fa3e658a00ae57f88954411a25bdfe583debb1929c6a50e40631cc07f2092490ea2284b35ffb922b23d7677060f28
9451+
languageName: node
9452+
linkType: hard
9453+
94019454
"core-js@npm:^3.8.2":
94029455
version: 3.12.0
94039456
resolution: "core-js@npm:3.12.0"
@@ -19167,6 +19220,15 @@ fsevents@~2.3.1:
1916719220
languageName: node
1916819221
linkType: hard
1916919222

19223+
"promise@npm:^8.0.3":
19224+
version: 8.1.0
19225+
resolution: "promise@npm:8.1.0"
19226+
dependencies:
19227+
asap: ~2.0.6
19228+
checksum: ec94008d8a673c276dbc7722c215f583026b8d2588fb83f40e69908c553801eac7fbe3034c9bca853d5c422af20826abdfb9391b982a888868d9c88281dc59fb
19229+
languageName: node
19230+
linkType: hard
19231+
1917019232
"prompts@npm:2.4.0, prompts@npm:^2.0.1":
1917119233
version: 2.4.0
1917219234
resolution: "prompts@npm:2.4.0"
@@ -19378,6 +19440,15 @@ fsevents@~2.3.1:
1937819440
languageName: node
1937919441
linkType: hard
1938019442

19443+
"raf@npm:^3.4.1":
19444+
version: 3.4.1
19445+
resolution: "raf@npm:3.4.1"
19446+
dependencies:
19447+
performance-now: ^2.1.0
19448+
checksum: 567b0160be46ed20b124a05ace6e653f4ad3c047c48d02ac76161e9ac624488c0fdf622b2f4fb9c35c0c828a13dfa549044ad1db89c7af075cb0f99403b88c4b
19449+
languageName: node
19450+
linkType: hard
19451+
1938119452
"ramda@npm:^0.21.0":
1938219453
version: 0.21.0
1938319454
resolution: "ramda@npm:0.21.0"
@@ -19442,6 +19513,20 @@ fsevents@~2.3.1:
1944219513
languageName: node
1944319514
linkType: hard
1944419515

19516+
"react-app-polyfill@npm:^1.0.6":
19517+
version: 1.0.6
19518+
resolution: "react-app-polyfill@npm:1.0.6"
19519+
dependencies:
19520+
core-js: ^3.5.0
19521+
object-assign: ^4.1.1
19522+
promise: ^8.0.3
19523+
raf: ^3.4.1
19524+
regenerator-runtime: ^0.13.3
19525+
whatwg-fetch: ^3.0.0
19526+
checksum: 94d24bf1d69a0cbb26d8adbb14ba600b29c7c5adc06c9f9c8337d0f8ee7358ee2c443d806f8ca96fdf002d7f37c1a5fae6a796f63164df44a4fc3996aeb2d71f
19527+
languageName: node
19528+
linkType: hard
19529+
1944519530
"react-colorful@npm:^5.0.1":
1944619531
version: 5.1.4
1944719532
resolution: "react-colorful@npm:5.1.4"
@@ -19770,6 +19855,20 @@ fsevents@~2.3.1:
1977019855
languageName: node
1977119856
linkType: hard
1977219857

19858+
"react-virtuoso@npm:1.2.4":
19859+
version: 1.2.4
19860+
resolution: "react-virtuoso@npm:1.2.4"
19861+
dependencies:
19862+
"@virtuoso.dev/react-urx": ^0.2.3
19863+
"@virtuoso.dev/urx": ^0.2.3
19864+
react-app-polyfill: ^1.0.6
19865+
resize-observer-polyfill: ^1.5.1
19866+
peerDependencies:
19867+
react: ">=16"
19868+
checksum: b892e4a85d7e2c98278df255d234b4c7b2b5fc0fa99e10e31bfe9db010d0fb3e8b1cf4659c0e22febe38e751d01cadeae537cc1cc8f553d0b46d6ed27f96e9bc
19869+
languageName: node
19870+
linkType: hard
19871+
1977319872
"react@npm:^16.14.0":
1977419873
version: 16.14.0
1977519874
resolution: "react@npm:16.14.0"
@@ -20082,6 +20181,13 @@ fsevents@~2.3.1:
2008220181
languageName: node
2008320182
linkType: hard
2008420183

20184+
"regenerator-runtime@npm:^0.13.3":
20185+
version: 0.13.8
20186+
resolution: "regenerator-runtime@npm:0.13.8"
20187+
checksum: 20178f5753f181d59691e5c3b4c59a2769987f75c7ccf325777673b5478acca61a553b10e895585086c222f72f5ee428090acf50320264de4b79f630f7388653
20188+
languageName: node
20189+
linkType: hard
20190+
2008520191
"regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7":
2008620192
version: 0.13.7
2008720193
resolution: "regenerator-runtime@npm:0.13.7"
@@ -20451,6 +20557,13 @@ fsevents@~2.3.1:
2045120557
languageName: node
2045220558
linkType: hard
2045320559

20560+
"resize-observer-polyfill@npm:^1.5.1":
20561+
version: 1.5.1
20562+
resolution: "resize-observer-polyfill@npm:1.5.1"
20563+
checksum: ba14bfaf584eda299eafd6a06233a65c76586bc2bab3cdfdd1edd25fc6479f4270788ddd082e65390049b3ed542558f02bdf1f123bd912624de5b11d48857ac8
20564+
languageName: node
20565+
linkType: hard
20566+
2045420567
"resolve-cwd@npm:^3.0.0":
2045520568
version: 3.0.0
2045620569
resolution: "resolve-cwd@npm:3.0.0"
@@ -24355,6 +24468,13 @@ resolve@^2.0.0-next.3:
2435524468
languageName: node
2435624469
linkType: hard
2435724470

24471+
"whatwg-fetch@npm:^3.0.0":
24472+
version: 3.6.2
24473+
resolution: "whatwg-fetch@npm:3.6.2"
24474+
checksum: eaa370015f81fbf7fc69d5410a13c2200d3342fa783397e9a7e64215498276459993c05e826ed736d28a8abe4e7cc3f97e9b2ffadbc58129a55f443abdfea494
24475+
languageName: node
24476+
linkType: hard
24477+
2435824478
"whatwg-mimetype@npm:^2.3.0":
2435924479
version: 2.3.0
2436024480
resolution: "whatwg-mimetype@npm:2.3.0"

0 commit comments

Comments
 (0)