From 2004d448cde695fa923f3f78cee1bc68ab18612c Mon Sep 17 00:00:00 2001 From: AYUSHKUMAR_21JE0209 <103947228+AyushKumar123456789@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:36:52 +0530 Subject: [PATCH] feat : added icon to show Update ChannelHeader and RoomInfo UI for (Channels Converted to Teams). (#926) * feat : added icon to show channel is team now * Fixed prettier --------- Co-authored-by: Zishan Ahmad --- packages/react/src/store/channelStore.js | 2 ++ packages/react/src/views/ChatHeader/ChatHeader.js | 11 ++++++++++- .../src/views/RoomInformation/RoomInformation.js | 8 +++++--- .../ui-elements/src/components/Icon/icons/Team.js | 15 +++++++++++++++ .../src/components/Icon/icons/index.js | 2 ++ packages/ui-elements/tools/icons-generator.js | 1 + 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 packages/ui-elements/src/components/Icon/icons/Team.js diff --git a/packages/react/src/store/channelStore.js b/packages/react/src/store/channelStore.js index 2ba08bddb4..f3acbb914f 100644 --- a/packages/react/src/store/channelStore.js +++ b/packages/react/src/store/channelStore.js @@ -4,10 +4,12 @@ const useChannelStore = create((set) => ({ showChannelinfo: false, isChannelPrivate: false, isChannelReadOnly: false, + isRoomTeam: false, setShowChannelinfo: (showChannelinfo) => set(() => ({ showChannelinfo })), channelInfo: {}, setChannelInfo: (channelInfo) => set(() => ({ channelInfo })), setIsChannelPrivate: (isChannelPrivate) => set(() => ({ isChannelPrivate })), + setIsRoomTeam: (isRoomTeam) => set(() => ({ isRoomTeam })), setIsChannelReadOnly: (isChannelReadOnly) => set(() => ({ isChannelReadOnly })), })); diff --git a/packages/react/src/views/ChatHeader/ChatHeader.js b/packages/react/src/views/ChatHeader/ChatHeader.js index 5f2dbf43ee..0971ce7c77 100644 --- a/packages/react/src/views/ChatHeader/ChatHeader.js +++ b/packages/react/src/views/ChatHeader/ChatHeader.js @@ -73,6 +73,8 @@ const ChatHeader = ({ const setIsChannelPrivate = useChannelStore( (state) => state.setIsChannelPrivate ); + const isRoomTeam = useChannelStore((state) => state.isRoomTeam); + const setIsRoomTeam = useChannelStore((state) => state.setIsRoomTeam); const setIsChannelReadOnly = useChannelStore( (state) => state.setIsChannelReadOnly ); @@ -177,6 +179,7 @@ const ChatHeader = ({ if (res.success) { setChannelInfo(res.room); if (res.room.t === 'p') setIsChannelPrivate(true); + if (res.room?.teamMain) setIsRoomTeam(true); if (res.room.ro) { setIsChannelReadOnly(true); setMessageAllowed(); @@ -377,7 +380,13 @@ const ChatHeader = ({ onClick={() => setExclusiveState(setShowChannelinfo)} >
{ const styles = getRoomInformationStyles(); const channelInfo = useChannelStore((state) => state.channelInfo); const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate); + const isRoomTeam = useChannelStore((state) => state.isRoomTeam); const { variantOverrides } = useComponentOverrides('RoomMember'); const viewType = variantOverrides.viewType || 'Sidebar'; const setExclusiveState = useSetExclusiveState(); @@ -30,7 +31,7 @@ const Roominfo = () => { return ( setExclusiveState(null)} style={{ width: '400px', zIndex: window.innerWidth <= 780 ? 1 : null }} @@ -59,12 +60,13 @@ const Roominfo = () => { {channelInfo.name} diff --git a/packages/ui-elements/src/components/Icon/icons/Team.js b/packages/ui-elements/src/components/Icon/icons/Team.js new file mode 100644 index 0000000000..4602e9703c --- /dev/null +++ b/packages/ui-elements/src/components/Icon/icons/Team.js @@ -0,0 +1,15 @@ +import React from 'react'; + +const Team = (props) => ( + + + +); + +export default Team; diff --git a/packages/ui-elements/src/components/Icon/icons/index.js b/packages/ui-elements/src/components/Icon/icons/index.js index 3e23f0667d..234251edab 100644 --- a/packages/ui-elements/src/components/Icon/icons/index.js +++ b/packages/ui-elements/src/components/Icon/icons/index.js @@ -63,6 +63,7 @@ import Arc from './Arc'; import Avatar from './Avatar'; import FormatText from './FormatText'; import Cog from './Cog'; +import Team from './Team'; const icons = { file: File, @@ -76,6 +77,7 @@ const icons = { computer: Computer, cross: Cross, copy: Copy, + team: Team, mic: Mic, 'video-recorder': VideoRecorder, 'disabled-recorder': DisabledRecorder, diff --git a/packages/ui-elements/tools/icons-generator.js b/packages/ui-elements/tools/icons-generator.js index 4b2b2e6ca1..d12396c2b1 100644 --- a/packages/ui-elements/tools/icons-generator.js +++ b/packages/ui-elements/tools/icons-generator.js @@ -13,6 +13,7 @@ const iconsList = [ 'computer', 'cross', 'mic', + 'team', 'circle-cross', 'circle-check', 'send',