IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-56980 add shared channel icon to searchable channel list (#26388)

Browse Source 
* add shared channel icon to searchable channel list

* update css for shared channel icon

* update, so archive happens first
This commit is contained in:
Scott Bishel 2024-03-07 08:01:14 -07:00 committed by GitHub
parent 19c1165117
commit 8e99bca82b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/channels/src/components/browse_channels/browse_channels.scss
View File

@ -170,6 +170,15 @@
opacity: 1; opacity: 1;
} }
} }
.shared-channel-icon {
width: 18px;
height: 18px;
margin-right: 6px;
color: rgba(61, 60, 64, 0.75);
font-size: 18px;
line-height: 18px;
}
} }
.more-modal__actions { .more-modal__actions {

9
webapp/channels/src/components/searchable_channel_list.tsx
View File

@ -15,6 +15,7 @@ import MagnifyingGlassSVG from 'components/common/svg_images_components/magnifyi
import LoadingScreen from 'components/loading_screen'; import LoadingScreen from 'components/loading_screen';
import * as Menu from 'components/menu'; import * as Menu from 'components/menu';
import QuickInput from 'components/quick_input'; import QuickInput from 'components/quick_input';
import SharedChannelIndicator from 'components/shared_channel_indicator';
import CheckboxCheckedIcon from 'components/widgets/icons/checkbox_checked_icon'; import CheckboxCheckedIcon from 'components/widgets/icons/checkbox_checked_icon';
import LoadingWrapper from 'components/widgets/loading/loading_wrapper'; import LoadingWrapper from 'components/widgets/loading/loading_wrapper';
@ -129,6 +130,14 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
if (isArchivedChannel(channel)) { if (isArchivedChannel(channel)) {
channelTypeIcon = <ArchiveOutlineIcon size={18}/>; channelTypeIcon = <ArchiveOutlineIcon size={18}/>;
} else if (channel.shared) {
channelTypeIcon = (
<SharedChannelIndicator
className='shared-channel-icon'
channelType={channel.type}
withTooltip={true}
/>
);
} else if (isPrivateChannel(channel)) { } else if (isPrivateChannel(channel)) {
channelTypeIcon = <LockOutlineIcon size={18}/>; channelTypeIcon = <LockOutlineIcon size={18}/>;
} else { } else {