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

[NEW] New button for network outage #25499

Merged
merged 5 commits into from
May 23, 2022
Merged

[NEW] New button for network outage #25499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
accb899
Clickup Task: https://app.clickup.com/t/29wgna9
amolghode1981 May 13, 2022
0c671d8
Clickup Task: https://app.clickup.com/t/29wgna9
amolghode1981 May 13, 2022
df770e1
Merge remote-tracking branch 'origin/develop' into new/network-outage-ui
amolghode1981 May 23, 2022
019b599
Clickup Task: https://app.clickup.com/t/29wgna9
amolghode1981 May 23, 2022
3b95c44
Merge remote-tracking branch 'origin/develop' into new/network-outage-ui
amolghode1981 May 23, 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
18 changes: 16 additions & 2 deletions apps/meteor/client/sidebar/sections/components/OmnichannelCallToggleReady.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
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(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
"@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",
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
"@rocket.chat/logo": "~0.31.11",
"@rocket.chat/memo": "~0.31.11",
"@rocket.chat/message-parser": "~0.31.11",
Expand Down
95 changes: 91 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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:
Expand All @@ -3843,20 +3872,49 @@ __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"
checksum: 6238ed8a85115e7f8f64b94d1b293d44a93cd14f1b0ac4d696a6126367dcdbb99d4dd78d222f1873959cd2e4b39a6cddcd20701e9ffee0ace9f001fc5c66e1dd
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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down