Allows you to turn off announcements only if already on

This commit is contained in:
Josh Perez 2021-08-05 13:23:50 -04:00 committed by GitHub
parent 4e4fed2563
commit db0c9f0f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 1 deletions

View file

@ -46,3 +46,34 @@ story.add('Basic', () => {
return <GroupV2Permissions {...props} />; return <GroupV2Permissions {...props} />;
}); });
story.add('Not admin', () => (
<GroupV2Permissions
{...createProps()}
conversation={getDefaultConversation({
announcementsOnly: true,
areWeAdmin: false,
})}
/>
));
story.add('Admin but not announcement ready', () => (
<GroupV2Permissions
{...createProps()}
conversation={getDefaultConversation({
announcementsOnlyReady: false,
areWeAdmin: true,
})}
/>
));
story.add('Admin, not announcement ready, but it was on', () => (
<GroupV2Permissions
{...createProps()}
conversation={getDefaultConversation({
announcementsOnly: true,
announcementsOnlyReady: false,
areWeAdmin: true,
})}
/>
));

View file

@ -48,6 +48,10 @@ export const GroupV2Permissions = ({
: AccessControlEnum.MEMBER : AccessControlEnum.MEMBER
); );
const showAnnouncementsOnlyPermission =
conversation.areWeAdmin &&
(conversation.announcementsOnly || conversation.announcementsOnlyReady);
return ( return (
<PanelSection> <PanelSection>
<PanelRow <PanelRow
@ -72,7 +76,7 @@ export const GroupV2Permissions = ({
/> />
} }
/> />
{conversation.areWeAdmin && conversation.announcementsOnlyReady && ( {showAnnouncementsOnlyPermission && (
<PanelRow <PanelRow
label={i18n('ConversationDetails--announcement-label')} label={i18n('ConversationDetails--announcement-label')}
info={i18n('ConversationDetails--announcement-info')} info={i18n('ConversationDetails--announcement-info')}