From accb8992e0bf7a4e54d553907941aed60cfd4cb9 Mon Sep 17 00:00:00 2001 From: amolghode Date: Fri, 13 May 2022 13:08:29 +0530 Subject: [PATCH 1/3] Clickup Task: https://app.clickup.com/t/29wgna9 Description: Added a new icon for network disconnection. This icon will show up whenever there is network disconnection. --- .../components/OmnichannelCallToggleReady.tsx | 18 +++- apps/meteor/package.json | 4 +- yarn.lock | 95 ++++++++++++++++++- 3 files changed, 109 insertions(+), 8 deletions(-) diff --git a/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx index 0b1da0fccb50..ec094f04501e 100644 --- a/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx +++ b/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx @@ -31,10 +31,24 @@ export const OmnichannelCallToggleReady = (): ReactElement => { return t('Cannot_disable_while_on_call'); }; + const getIcon = (): 'phone-issue' | 'phone' | 'phone-disabled' => { + if (networkStatus === 'offline') { + return 'phone-issue'; + } + return registered ? 'phone' : 'phone-disabled'; + }; + + const getColor = (): string | undefined => { + if (networkStatus === 'offline') { + return 'warning'; + } + return registered ? 'success' : undefined; + }; + const voipCallIcon = { title: getTooltip(), - color: registered ? 'success' : undefined, - icon: registered ? 'phone' : 'phone-disabled', + color: getColor(), + icon: getIcon(), } as const; useEffect(() => { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 7f3ade827db7..1bb8250bc84a 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -195,12 +195,12 @@ "@rocket.chat/emitter": "~0.31.11", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", - "@rocket.chat/fuselage": "~0.31.11", + "@rocket.chat/fuselage": "next", "@rocket.chat/fuselage-hooks": "~0.31.11", "@rocket.chat/fuselage-polyfills": "~0.31.11", "@rocket.chat/fuselage-tokens": "~0.31.11", "@rocket.chat/fuselage-ui-kit": "~0.31.11", - "@rocket.chat/icons": "~0.31.11", + "@rocket.chat/icons": "next", "@rocket.chat/logo": "~0.31.11", "@rocket.chat/memo": "~0.31.11", "@rocket.chat/message-parser": "~0.31.11", diff --git a/yarn.lock b/yarn.lock index 5276084b95bb..1470cdb4dbdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3629,6 +3629,19 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/css-in-js@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/css-in-js@npm:0.31.12-dev.8" + dependencies: + "@emotion/hash": ^0.8.0 + "@rocket.chat/css-supports": ~0.31.12-dev.8 + "@rocket.chat/memo": ~0.31.12-dev.8 + "@rocket.chat/stylis-logical-props-middleware": ~0.31.12-dev.8 + stylis: ~4.0.13 + checksum: ddf7d1e8d08a60c46cf206bd2e2c070c8d58bc4550b6dcf3d7b77d72649f17342832361a7be5ebd57d23b0339febd7382bb229f757948749848ce05f6811fad9 + languageName: node + linkType: hard + "@rocket.chat/css-supports@npm:^0.31.11": version: 0.31.11 resolution: "@rocket.chat/css-supports@npm:0.31.11" @@ -3638,6 +3651,15 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/css-supports@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/css-supports@npm:0.31.12-dev.8" + dependencies: + "@rocket.chat/memo": ~0.31.12-dev.8 + checksum: b7ae5df5a9c5678dd026130b1d6e028e48219489818edbba7c59ce89e6f50fc1d18008480ba658621285dc27b7de42f8de6ced6436fe3fad4e43f896470b24a6 + languageName: node + linkType: hard + "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer": version: 0.0.0-use.local resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer" @@ -3804,6 +3826,13 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/fuselage-tokens@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/fuselage-tokens@npm:0.31.12-dev.8" + checksum: b85afe0688a94037f1a7b70043592776eaff0bd0a98bbdf82a092711d646c32d79b9fad6e0e8267f41a764495f4178d4fd4821eba785338d4389e9993ee68c70 + languageName: node + linkType: hard + "@rocket.chat/fuselage-ui-kit@npm:~0.31.11": version: 0.31.11 resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.11" @@ -3822,7 +3851,7 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage@npm:^0.31.11, @rocket.chat/fuselage@npm:~0.31.11": +"@rocket.chat/fuselage@npm:^0.31.11": version: 0.31.11 resolution: "@rocket.chat/fuselage@npm:0.31.11" dependencies: @@ -3843,6 +3872,28 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/fuselage@npm:next": + version: 0.32.0-dev.33 + resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.33" + dependencies: + "@rocket.chat/css-in-js": ~0.31.12-dev.8 + "@rocket.chat/css-supports": ~0.31.12-dev.8 + "@rocket.chat/fuselage-tokens": ~0.31.12-dev.8 + "@rocket.chat/memo": ~0.31.12-dev.8 + "@rocket.chat/styled": ~0.31.12-dev.8 + invariant: ^2.2.4 + react-keyed-flatten-children: ^1.3.0 + peerDependencies: + "@rocket.chat/fuselage-hooks": "*" + "@rocket.chat/fuselage-polyfills": "*" + "@rocket.chat/icons": "*" + react: ^17.0.2 + react-dom: ^17.0.2 + react-virtuoso: 1.2.4 + checksum: be1f74f25a959b8368cd616ca7c88571714b86b42476947011a1591e81fe2e59f9df06d32ab5f2be3d82de4b73cab617b762252bfb10676c61a863d702fa7a8f + languageName: node + linkType: hard + "@rocket.chat/icons@npm:^0.31.0, @rocket.chat/icons@npm:^0.31.9": version: 0.31.9 resolution: "@rocket.chat/icons@npm:0.31.9" @@ -3850,13 +3901,20 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/icons@npm:^0.31.11, @rocket.chat/icons@npm:~0.31.11": +"@rocket.chat/icons@npm:^0.31.11": version: 0.31.11 resolution: "@rocket.chat/icons@npm:0.31.11" checksum: efb022b0854a4f987c81742988d255ed585903dac0fdaa68695c541917f39d520891355916df44513d97c01e089558fe6463bd81c9d142297e28358ea0e00e90 languageName: node linkType: hard +"@rocket.chat/icons@npm:next": + version: 0.32.0-dev.15 + resolution: "@rocket.chat/icons@npm:0.32.0-dev.15" + checksum: 85080ec996e43e322d4c3fb07d7b77d98652c29f8c4d13f5883677632ad41a47cbf29047c9341e9370c94651f462c9c76c93f2ae079ba2dbdbf782b81e5d7bce + languageName: node + linkType: hard + "@rocket.chat/livechat@workspace:^, @rocket.chat/livechat@workspace:packages/livechat": version: 0.0.0-use.local resolution: "@rocket.chat/livechat@workspace:packages/livechat" @@ -3958,6 +4016,13 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/memo@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/memo@npm:0.31.12-dev.8" + checksum: 0d79c741b58fa169462e1a7a3552fbaeb75a8bca6b1d45f3f636f8439eb3fd59f798c629a84114b3a798c1537fdd16743634cb8e0d88f8b254f7f6e74bc258fe + languageName: node + linkType: hard + "@rocket.chat/message-parser@npm:^0.31.6, @rocket.chat/message-parser@npm:~0.31.9": version: 0.31.9 resolution: "@rocket.chat/message-parser@npm:0.31.9" @@ -4000,12 +4065,12 @@ __metadata: "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2 - "@rocket.chat/fuselage": ~0.31.11 + "@rocket.chat/fuselage": next "@rocket.chat/fuselage-hooks": ~0.31.11 "@rocket.chat/fuselage-polyfills": ~0.31.11 "@rocket.chat/fuselage-tokens": ~0.31.11 "@rocket.chat/fuselage-ui-kit": ~0.31.11 - "@rocket.chat/icons": ~0.31.11 + "@rocket.chat/icons": next "@rocket.chat/livechat": "workspace:^" "@rocket.chat/logo": ~0.31.11 "@rocket.chat/memo": ~0.31.11 @@ -4359,6 +4424,16 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/styled@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/styled@npm:0.31.12-dev.8" + dependencies: + "@rocket.chat/css-in-js": ~0.31.12-dev.8 + tslib: ^2.3.1 + checksum: de90eff68ef5cd193008a6b86cf283787eedea719d3b3e2cbf2e97f4691413c108cadcb3beabbc55f25414b4ee13d68f6c69bb5f6a142a0f94bb949cd52ef72d + languageName: node + linkType: hard + "@rocket.chat/stylis-logical-props-middleware@npm:^0.31.11": version: 0.31.11 resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11" @@ -4371,6 +4446,18 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.12-dev.8": + version: 0.31.12-dev.8 + resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.12-dev.8" + dependencies: + "@rocket.chat/css-supports": ~0.31.12-dev.8 + tslib: ^2.3.1 + peerDependencies: + stylis: 4.0.10 + checksum: 43741e78c2f731b1090db36c421f2d2c6577a5b48869336a31c5e491b77519c9e4952e4121115dc7a68da84c123d5c784b856259ef96f6f74de5916a5b2d7de8 + languageName: node + linkType: hard + "@rocket.chat/ui-contexts@workspace:^, @rocket.chat/ui-contexts@workspace:packages/ui-contexts": version: 0.0.0-use.local resolution: "@rocket.chat/ui-contexts@workspace:packages/ui-contexts" From 0c671d81051c5d300973ba9023f2c82d0ed6feae Mon Sep 17 00:00:00 2001 From: amolghode Date: Fri, 13 May 2022 19:44:06 +0530 Subject: [PATCH 2/3] Clickup Task: https://app.clickup.com/t/29wgna9 Description: Adding exact versions for fuselage and icons. --- apps/meteor/package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 1bb8250bc84a..3f37642d2e07 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -195,12 +195,12 @@ "@rocket.chat/emitter": "~0.31.11", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", - "@rocket.chat/fuselage": "next", + "@rocket.chat/fuselage": "~0.32.0-dev.33", "@rocket.chat/fuselage-hooks": "~0.31.11", "@rocket.chat/fuselage-polyfills": "~0.31.11", "@rocket.chat/fuselage-tokens": "~0.31.11", "@rocket.chat/fuselage-ui-kit": "~0.31.11", - "@rocket.chat/icons": "next", + "@rocket.chat/icons": "~0.32.0-dev.15", "@rocket.chat/logo": "~0.31.11", "@rocket.chat/memo": "~0.31.11", "@rocket.chat/message-parser": "~0.31.11", diff --git a/yarn.lock b/yarn.lock index 1470cdb4dbdf..197b6f34c9bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3872,7 +3872,7 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage@npm:next": +"@rocket.chat/fuselage@npm:~0.32.0-dev.33": version: 0.32.0-dev.33 resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.33" dependencies: @@ -3908,7 +3908,7 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/icons@npm:next": +"@rocket.chat/icons@npm:~0.32.0-dev.15": version: 0.32.0-dev.15 resolution: "@rocket.chat/icons@npm:0.32.0-dev.15" checksum: 85080ec996e43e322d4c3fb07d7b77d98652c29f8c4d13f5883677632ad41a47cbf29047c9341e9370c94651f462c9c76c93f2ae079ba2dbdbf782b81e5d7bce @@ -4065,12 +4065,12 @@ __metadata: "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2 - "@rocket.chat/fuselage": next + "@rocket.chat/fuselage": ~0.32.0-dev.33 "@rocket.chat/fuselage-hooks": ~0.31.11 "@rocket.chat/fuselage-polyfills": ~0.31.11 "@rocket.chat/fuselage-tokens": ~0.31.11 "@rocket.chat/fuselage-ui-kit": ~0.31.11 - "@rocket.chat/icons": next + "@rocket.chat/icons": ~0.32.0-dev.15 "@rocket.chat/livechat": "workspace:^" "@rocket.chat/logo": ~0.31.11 "@rocket.chat/memo": ~0.31.11 From 019b5993b3156049282ec447e1336dc63aaa1d4d Mon Sep 17 00:00:00 2001 From: amolghode Date: Mon, 23 May 2022 20:42:36 +0530 Subject: [PATCH 3/3] Clickup Task: https://app.clickup.com/t/29wgna9 Description: Taking care of review comments. --- .../sidebar/sections/components/OmnichannelCallToggleReady.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx b/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx index ec094f04501e..97b75a42ccac 100644 --- a/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx +++ b/apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx @@ -38,7 +38,7 @@ export const OmnichannelCallToggleReady = (): ReactElement => { return registered ? 'phone' : 'phone-disabled'; }; - const getColor = (): string | undefined => { + const getColor = (): 'warning' | 'success' | undefined => { if (networkStatus === 'offline') { return 'warning'; }