From 8a4dbd405b7380d9ffbd9f71324a8f39af2b7cd7 Mon Sep 17 00:00:00 2001 From: Pierre Date: Wed, 28 Aug 2024 14:47:11 -0300 Subject: [PATCH 1/4] fix: conference calls are shown as "not answered" after they end --- .changeset/five-coats-rhyme.md | 5 +++++ .../VideoConferenceBlock.tsx | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .changeset/five-coats-rhyme.md diff --git a/.changeset/five-coats-rhyme.md b/.changeset/five-coats-rhyme.md new file mode 100644 index 000000000000..c5359e3c978a --- /dev/null +++ b/.changeset/five-coats-rhyme.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/fuselage-ui-kit': patch +--- + +Fixed an error that incorrectly showed conference calls as not answered after they ended diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index 969ad0af1d7c..91f69b50022e 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -133,9 +133,11 @@ const VideoConferenceBlock = ({ {isUserCaller ? t('Call_again') : t('Call_back')} - - {t('Call_was_not_answered')} - + {data.status === 2 && ( + + {t('Call_was_not_answered')} + + )} )} {data.type !== 'direct' && @@ -151,9 +153,11 @@ const VideoConferenceBlock = ({ ) : ( - - {t('Call_was_not_answered')} - + data.status === 2 && ( + + {t('Call_was_not_answered')} + + ) ))} From 068e91b36c337683766d5dd6c5be571c1eee0810 Mon Sep 17 00:00:00 2001 From: Pierre Date: Mon, 2 Sep 2024 13:23:15 -0300 Subject: [PATCH 2/4] also consider the declines status --- .../src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index 91f69b50022e..2926554d87f3 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -133,7 +133,7 @@ const VideoConferenceBlock = ({ {isUserCaller ? t('Call_again') : t('Call_back')} - {data.status === 2 && ( + {[2, 4].includes(data.status) && ( {t('Call_was_not_answered')} @@ -153,7 +153,7 @@ const VideoConferenceBlock = ({ ) : ( - data.status === 2 && ( + [2, 4].includes(data.status) && ( {t('Call_was_not_answered')} From a1e47fd98fb4981a0552f28823518a7ff4a5fcc6 Mon Sep 17 00:00:00 2001 From: Pierre Date: Mon, 16 Sep 2024 13:33:50 -0300 Subject: [PATCH 3/4] dependencies --- .../blocks/VideoConferenceBlock/VideoConferenceBlock.tsx | 8 ++++++-- packages/uikit-playground/package.json | 1 + packages/uikit-playground/vite.config.ts | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index 2926554d87f3..a91cc27302e1 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -1,3 +1,4 @@ +import { VideoConferenceStatus } from '@rocket.chat/core-typings'; import { useGoToRoom, useTranslation, @@ -153,7 +154,10 @@ const VideoConferenceBlock = ({ ) : ( - [2, 4].includes(data.status) && ( + [ + VideoConferenceStatus.EXPIRED, + VideoConferenceStatus.DECLINED, + ].includes(data.status) && ( {t('Call_was_not_answered')} @@ -164,7 +168,7 @@ const VideoConferenceBlock = ({ ); } - if (data.type === 'direct' && data.status === 0) { + if (data.type === 'direct' && data.status === VideoConferenceStatus.CALLING) { return ( diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index f46f139a66f4..df717d0d3ae9 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -14,6 +14,7 @@ "@codemirror/lang-json": "^6.0.1", "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", + "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", diff --git a/packages/uikit-playground/vite.config.ts b/packages/uikit-playground/vite.config.ts index a18e01b590e8..4e5a9cc9ed40 100644 --- a/packages/uikit-playground/vite.config.ts +++ b/packages/uikit-playground/vite.config.ts @@ -7,11 +7,11 @@ export default defineConfig(() => ({ esbuild: {}, plugins: [react()], optimizeDeps: { - include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser'], + include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser', '@rocket.chat/core-typings'], }, build: { commonjsOptions: { - include: [/ui-contexts/, /message-parser/, /node_modules/], + include: [/ui-contexts/, /core-typings/, /message-parser/, /node_modules/], }, }, })); From b56b700a8e5587152f6257c0c9743ad23cb1bb1a Mon Sep 17 00:00:00 2001 From: Pierre Date: Mon, 16 Sep 2024 14:11:54 -0300 Subject: [PATCH 4/4] missed one ref --- .../src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index a91cc27302e1..7125dbbf1bc4 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -134,7 +134,10 @@ const VideoConferenceBlock = ({ {isUserCaller ? t('Call_again') : t('Call_back')} - {[2, 4].includes(data.status) && ( + {[ + VideoConferenceStatus.EXPIRED, + VideoConferenceStatus.DECLINED, + ].includes(data.status) && ( {t('Call_was_not_answered')}