Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Remove toastr package #25787

Merged
merged 3 commits into from
Jun 7, 2022
Merged

Chore: Remove toastr package #25787

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1745f
chore: remove toastr
dougfabris Jun 7, 2022
5868990
..
ggazzo Jun 7, 2022
5c7cd71
fix: lint
dougfabris Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions apps/meteor/client/lib/utils/handleError.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { escapeHTML } from '@rocket.chat/string-helpers';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
// import toastr from 'toastr';

import { dispatchToastMessage } from '../toast';

Expand Down Expand Up @@ -41,11 +40,6 @@ export const handleError = (error: {}, useToastr = true): JQuery<HTMLElement> |
type: 'error',
message: i18message,
});

// return toastr.error(
// TAPi18n.__(message, Object.fromEntries(Object.entries(details).map(([key, value]) => [key, escapeHTML(TAPi18n.__(value))]))),
// hasErrorTitle(details) ? TAPi18n.__(details.errorTitle) : undefined,
// );
}

return escapeHTML(TAPi18n.__(message, Object.fromEntries(Object.entries(details).map(([key, value]) => [key, TAPi18n.__(value)]))));
Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/client/providers/ToastMessagesProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ToastBarProvider, useToastBarDispatch } from '@rocket.chat/fuselage-toastbar';
import { ToastMessagesContext } from '@rocket.chat/ui-contexts';
import React, { FC, useEffect } from 'react';
// import toastr from 'toastr';

import { dispatchToastMessage, subscribeToToastMessages } from '../lib/toast';
import { handleError } from '../lib/utils/handleError';
Expand Down Expand Up @@ -29,7 +28,6 @@ const ToastMessageInnerProvider: FC = ({ children }) => {
return;
}

// toastr[type](message, title, options);
dispatchToastBar({ type, message: title + message });
}),
[dispatchToastBar],
Expand Down
6 changes: 2 additions & 4 deletions apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
"@types/sinon": "^10.0.11",
"@types/string-strip-html": "^5.0.0",
"@types/supertest": "^2.0.11",
"@types/toastr": "^2.1.39",
"@types/ua-parser-js": "^0.7.36",
"@types/underscore.string": "0.0.38",
"@types/use-subscription": "^1.0.0",
Expand Down Expand Up @@ -194,9 +193,9 @@
"@rocket.chat/fuselage": "0.31.13",
"@rocket.chat/fuselage-hooks": "~0.31.12",
"@rocket.chat/fuselage-polyfills": "~0.31.12",
"@rocket.chat/fuselage-toastbar": "next",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.22",
"@rocket.chat/fuselage-tokens": "~0.31.12",
"@rocket.chat/fuselage-ui-kit": "~0.31.12",
"@rocket.chat/fuselage-ui-kit": "~0.31.14-dev.1",
"@rocket.chat/icons": "~0.31.12",
"@rocket.chat/logo": "~0.31.12",
"@rocket.chat/memo": "~0.31.12",
Expand Down Expand Up @@ -337,7 +336,6 @@
"string-strip-html": "^7.0.3",
"tar-stream": "^1.6.2",
"tinykeys": "^1.4.0",
"toastr": "^2.1.4",
"turndown": "^7.1.1",
"twilio": "^3.76.1",
"twit": "^2.2.11",
Expand Down
131 changes: 59 additions & 72 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4292,16 +4292,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/css-in-js@npm:0.31.12-dev.10"
"@rocket.chat/css-in-js@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/css-in-js@npm:0.31.14-dev.1"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.12-dev.10
"@rocket.chat/memo": ~0.31.12-dev.10
"@rocket.chat/stylis-logical-props-middleware": ~0.31.12-dev.10
"@rocket.chat/css-supports": ~0.31.14-dev.1
"@rocket.chat/memo": ~0.31.14-dev.1
"@rocket.chat/stylis-logical-props-middleware": ~0.31.14-dev.1
stylis: ~4.0.13
checksum: d87f70c358150f502f12abd5bcb572de23534211c9a43aaded1d6f88940b9804161143dfbc897fe730d9d9ab429e2988013a9e8325793ec10866fccd6a5b75ca
checksum: 536ef1a0a462ac00810a05231dffdc78c0d3dbc951e3b4fffdcfe1a5c02b1209fefb542a24f172b7dc52b716a975aede5fd634dbdd86fcd9c3bd82288bcdda0c
languageName: node
linkType: hard

Expand All @@ -4323,12 +4323,12 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/css-supports@npm:0.31.12-dev.10"
"@rocket.chat/css-supports@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/css-supports@npm:0.31.14-dev.1"
dependencies:
"@rocket.chat/memo": ~0.31.12-dev.10
checksum: 7cc090f9627d53fd63c9bfaceffdcf4e3acf491ddf6d6fffd1d96e518ada71193b386bb9b4ea6010db8e3e368c081263dcaf50f9810a42d727c7ff7654f07109
"@rocket.chat/memo": ~0.31.14-dev.1
checksum: 90dc00bf41dd2bb95e7674591f64f58b8a4b02229d792492628e41220ee7fb85d8c4e7ad96f9a61c65a5cb810d30dadb1ef6a0bd8c9091e0d294e03ff47bd0c0
languageName: node
linkType: hard

Expand Down Expand Up @@ -4497,16 +4497,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-hooks@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/fuselage-hooks@npm:0.31.12-dev.10"
"@rocket.chat/fuselage-hooks@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/fuselage-hooks@npm:0.31.14-dev.1"
dependencies:
"@testing-library/user-event": ^13.5.0
peerDependencies:
"@rocket.chat/fuselage-tokens": "*"
react: ^17.0.2
use-subscription: ^1.5.1
checksum: 0e77609116843b2730afee5675475b3c2a265ea9a4f81c161be3ccf3efe51a459612d8e1622bb696b027ca0457df729685b3f376f7b0c9916e93448758952b12
checksum: 2c4fb22824400e3742a3c2fc0e2152db55d7125bb8653f6f467d6314217a83e58ed9cf3b59613348552fbe50de38a77169b7b8f4343b5903a935b8f090cd9521
languageName: node
linkType: hard

Expand All @@ -4524,18 +4524,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-toastbar@npm:next":
version: 0.32.0-dev.9
resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.9"
"@rocket.chat/fuselage-toastbar@npm:^0.32.0-dev.22":
version: 0.32.0-dev.22
resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.22"
dependencies:
"@rocket.chat/fuselage-hooks": ~0.31.12-dev.10
"@rocket.chat/styled": ~0.31.12-dev.10
"@rocket.chat/fuselage-hooks": ~0.31.14-dev.1
"@rocket.chat/styled": ~0.31.14-dev.1
peerDependencies:
"@rocket.chat/fuselage": "*"
"@rocket.chat/fuselage-polyfills": "*"
react: ^17.0.2
react-dom: ^17.0.2
checksum: 2e3b37d10125d529e099941e974222ce48b3fdbfb384dfc2d11db0ebe5f4299edd314edcc93b92d857b47e38baf4fe8dedcdd02de46ad455f06de251d7f5499d
checksum: 50ef252f689f63ffb02e1f6ffd4580e8aaf253b765e607c77f52d783b5fc7695361965d906ec3aa18547283b140033c596d6f169bbfbb5d884a7b35cdb8270aa
languageName: node
linkType: hard

Expand All @@ -4553,21 +4553,21 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:~0.31.12":
version: 0.31.13
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.13"
"@rocket.chat/fuselage-ui-kit@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.14-dev.1"
dependencies:
"@rocket.chat/fuselage": ^0.31.13
"@rocket.chat/fuselage-hooks": ^0.31.13
"@rocket.chat/styled": ^0.31.13
"@rocket.chat/ui-kit": ^0.31.13
"@rocket.chat/ui-kit": ~0.31.14-dev.1
tslib: ^2.3.1
peerDependencies:
"@rocket.chat/fuselage": ~0.32.0-dev.48
"@rocket.chat/fuselage-hooks": ~0.31.14-dev.1
"@rocket.chat/fuselage-polyfills": "*"
"@rocket.chat/icons": "*"
"@rocket.chat/styled": ~0.31.14-dev.1
react: ^17.0.2
react-dom: ^17.0.2
checksum: 5c42d76f07ba1e1a5638e76bb23fefc8a4e28a940c121cc8468c89dc9e3f06d87c7da87b867818364b42dad73c409fbf095d63065452d817d85d00317792e774
checksum: 3be924851a2ebe90a5ff61349fc9c02ebcb98035a9a33f42f6f16be282b1687a847845e59523789153ae5476f9b0640885c21827018c5e1d722460e81e15b058
languageName: node
linkType: hard

Expand Down Expand Up @@ -4731,10 +4731,10 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/memo@npm:0.31.12-dev.10"
checksum: 2f6da36ecc8117d32de5a664b3f2e32b6c37b63622d9a0b3f75b47db69aa677a3103cf871b72245a73b074341c3d5bfbb22b3cc1629d06f9617e1b690f84ae1a
"@rocket.chat/memo@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/memo@npm:0.31.14-dev.1"
checksum: f4d83b6e08b5dda2c86b676576679d837435a5a7c366962ee2c3499ddb2484123bbb4c5209701c8ac940445dc62557de7e90cfb981f93bb4c0bfa52ce4478d7c
languageName: node
linkType: hard

Expand Down Expand Up @@ -4782,9 +4782,9 @@ __metadata:
"@rocket.chat/fuselage": 0.31.13
"@rocket.chat/fuselage-hooks": ~0.31.12
"@rocket.chat/fuselage-polyfills": ~0.31.12
"@rocket.chat/fuselage-toastbar": next
"@rocket.chat/fuselage-toastbar": ^0.32.0-dev.22
"@rocket.chat/fuselage-tokens": ~0.31.12
"@rocket.chat/fuselage-ui-kit": ~0.31.12
"@rocket.chat/fuselage-ui-kit": ~0.31.14-dev.1
"@rocket.chat/icons": ~0.31.12
"@rocket.chat/livechat": "workspace:^"
"@rocket.chat/logo": ~0.31.12
Expand Down Expand Up @@ -4859,7 +4859,6 @@ __metadata:
"@types/speakeasy": ^2.0.7
"@types/string-strip-html": ^5.0.0
"@types/supertest": ^2.0.11
"@types/toastr": ^2.1.39
"@types/ua-parser-js": ^0.7.36
"@types/underscore.string": 0.0.38
"@types/use-subscription": ^1.0.0
Expand Down Expand Up @@ -5028,7 +5027,6 @@ __metadata:
tar-stream: ^1.6.2
template-file: ^6.0.1
tinykeys: ^1.4.0
toastr: ^2.1.4
ts-node: ^10.7.0
turndown: ^7.1.1
twilio: ^3.76.1
Expand Down Expand Up @@ -5152,13 +5150,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/styled@npm:0.31.12-dev.10"
"@rocket.chat/styled@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/styled@npm:0.31.14-dev.1"
dependencies:
"@rocket.chat/css-in-js": ~0.31.12-dev.10
"@rocket.chat/css-in-js": ~0.31.14-dev.1
tslib: ^2.3.1
checksum: 17b35ffdde4bb2a61a1f5e54e34f720e197fbbe863f917a827f923e74cefce5b5514140bbf7a5b14c1687d841c99aacac27712297d859fe9697b70bcdc075786
checksum: acab9cc3c904383884025809de7ef189f76cb11971f3c0a2ba4b32077d1f3fdac9bb41948f6c1d9717a6f643a72c97499664b299f33551842656d4f84dfb2a86
languageName: node
linkType: hard

Expand Down Expand Up @@ -5186,15 +5184,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.12-dev.10":
version: 0.31.12-dev.10
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.12-dev.10"
"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.14-dev.1"
dependencies:
"@rocket.chat/css-supports": ~0.31.12-dev.10
"@rocket.chat/css-supports": ~0.31.14-dev.1
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 792bbe7b221855f084f6121b3d00c80abf8d7a4daabcb2363d83e54f7ab86eec477c391cdb51ac5178d26e52747bea97e67d8a1b261d1d63e8403920a9926f5d
checksum: 6afa245f653637eca01f64fc2139ed8e4133f66bef4e50b3598e98a1258cc1f07b788b3db9dbb73333eaa90ed15a2220a665bac14cc412571cdd73a6e0e146e8
languageName: node
linkType: hard

Expand Down Expand Up @@ -5233,17 +5231,24 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/ui-kit@npm:^0.31.13, @rocket.chat/ui-kit@npm:~0.31.12":
"@rocket.chat/ui-kit@npm:^0.31.6, @rocket.chat/ui-kit@npm:~0.31.9":
version: 0.31.11
resolution: "@rocket.chat/ui-kit@npm:0.31.11"
checksum: 976ed0a00ec3b886667a1bc59429c9d4867e62cb04c4e762bd41320f602ae35560393b4d36b2460e0ea621f73fb71b4cc869fa17ad4c78da9c862df70b84d0e1
languageName: node
linkType: hard

"@rocket.chat/ui-kit@npm:~0.31.12":
version: 0.31.13
resolution: "@rocket.chat/ui-kit@npm:0.31.13"
checksum: 94926dee4687e69b2a51a3570d09ba051b0638b3364499daed864e36480b56c538a20e3b66b02563492c7c2fe15b101ab03850d86bdac46f3fab442a9f93ef10
languageName: node
linkType: hard

"@rocket.chat/ui-kit@npm:^0.31.6, @rocket.chat/ui-kit@npm:~0.31.9":
version: 0.31.11
resolution: "@rocket.chat/ui-kit@npm:0.31.11"
checksum: 976ed0a00ec3b886667a1bc59429c9d4867e62cb04c4e762bd41320f602ae35560393b4d36b2460e0ea621f73fb71b4cc869fa17ad4c78da9c862df70b84d0e1
"@rocket.chat/ui-kit@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/ui-kit@npm:0.31.14-dev.1"
checksum: 9f807601eb6b90a975e61c78fc1af2663fe42998b931f825e694e5843a0bc048f679dfe7c264e772819824a7b57e5c7f6df30048d88bbc797dceab8d6e766e2a
languageName: node
linkType: hard

Expand Down Expand Up @@ -7960,15 +7965,6 @@ __metadata:
languageName: node
linkType: hard

"@types/toastr@npm:^2.1.39":
version: 2.1.39
resolution: "@types/toastr@npm:2.1.39"
dependencies:
"@types/jquery": "*"
checksum: a8b3c3630d9fb2b14f170337d1c860ff43f8526672c25a0c342330527a20d1698eb53182ca1ce0398d0195568f09303fe1534d7c3a51a25adb7e4e8486df5ed6
languageName: node
linkType: hard

"@types/tough-cookie@npm:*":
version: 4.0.1
resolution: "@types/tough-cookie@npm:4.0.1"
Expand Down Expand Up @@ -21022,7 +21018,7 @@ __metadata:
languageName: node
linkType: hard

"jquery@npm:>=1.12.0, jquery@npm:^3.6.0":
"jquery@npm:^3.6.0":
version: 3.6.0
resolution: "jquery@npm:3.6.0"
checksum: 8fd5fef4aa48fd374ec716dd1c1df1af407814a228e15c1260ca140de3a697c2a77c30c54ff1d238b6a3ab4ddc445ddeef9adce6c6d28e4869d85eb9d3951c0e
Expand Down Expand Up @@ -32238,15 +32234,6 @@ __metadata:
languageName: node
linkType: hard

"toastr@npm:^2.1.4":
version: 2.1.4
resolution: "toastr@npm:2.1.4"
dependencies:
jquery: ">=1.12.0"
checksum: 54e67385cfcdd88cce656c986a4894fd9484824d42549b646ce82b8780621ee1eccc0fb2ec89668dc67de4ae54de8f34a1c8b6f0f217940060d040d3fdb4491f
languageName: node
linkType: hard

"toggle-selection@npm:^1.0.6":
version: 1.0.6
resolution: "toggle-selection@npm:1.0.6"
Expand Down