luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adding confirmation modal when setting the board to public with Editor or Commenter role (#3913)

Browse source 
* Adding confirmation modal when setting the board to public with Editor or Commenter role

* Applying suggested text changes

* Update webapp/i18n/en.json

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Update webapp/i18n/en.json

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Update webapp/src/components/shareBoard/teamPermissionsRow.tsx

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* update text to match

Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>
This commit is contained in:
Jesús Espino 2022-10-05 20:57:32 +02:00 committed by GitHub
parent 1511691d26
commit 9e861a62a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/i18n/en.json
View file

@ -401,6 +401,9 @@
"share-board.publish": "Publish",
"share-board.share": "Share",
"shareBoard.channels-select-group": "Channels",
"shareBoard.confirm-change-team-role.body": "Everyone on this board with a lower permission than the \"{role}\" role will <b>now be promoted to {role}</b>. Are you sure you want to change the minimum role for the board?",
"shareBoard.confirm-change-team-role.confirmBtnText": "Change minimum board role",
"shareBoard.confirm-change-team-role.title": "Change minimum board role",
"shareBoard.confirm-link-channel": "Link board to channel",
"shareBoard.confirm-link-channel-button": "Link channel",
"shareBoard.confirm-link-channel-button-with-other-channel": "Unlink and link here",

44
webapp/src/components/shareBoard/teamPermissionsRow.tsx
View file

@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import React from 'react'
import React, {useState} from 'react'
import {useIntl} from 'react-intl'
import MenuWrapper from '../../widgets/menuWrapper'
@ -18,10 +18,11 @@ import {Permission} from '../../constants'
import {Utils} from '../../utils'
import BoardPermissionGate from '../permissions/boardPermissionGate'
import ConfirmationDialogBox from '../confirmationDialogBox'
import mutator from '../../mutator'
function updateBoardType(board: Board, newType: string, newMinimumRole: MemberRole) {
async function updateBoardType(board: Board, newType: string, newMinimumRole: MemberRole) {
if (board.type === newType && board.minimumRole === newMinimumRole) {
return
}
@ -30,13 +31,21 @@ function updateBoardType(board: Board, newType: string, newMinimumRole: MemberRo
newBoard.type = newType
newBoard.minimumRole = newMinimumRole
mutator.updateBoard(newBoard, board, 'update board type')
await mutator.updateBoard(newBoard, board, 'update board type')
}
const TeamPermissionsRow = (): JSX.Element => {
const intl = useIntl()
const team = useAppSelector(getCurrentTeam)
const board = useAppSelector(getCurrentBoard)
const [changeRoleConfirmation, setChangeRoleConfirmation] = useState<MemberRole|null>(null)
const onChangeRole = async () => {
if (changeRoleConfirmation !== null) {
await updateBoardType(board, BoardTypeOpen, changeRoleConfirmation)
setChangeRoleConfirmation(null)
}
}
let currentRoleName = intl.formatMessage({id: 'BoardMember.schemeNone', defaultMessage: 'None'})
if (board.type === BoardTypeOpen && board.minimumRole === MemberRole.Admin) {
@ -53,8 +62,33 @@ const TeamPermissionsRow = (): JSX.Element => {
currentRoleName = intl.formatMessage({id: 'BoardMember.schemeViewer', defaultMessage: 'Viewer'})
}
const confirmationDialog = (
<ConfirmationDialogBox
dialogBox={{
heading: intl.formatMessage({
id: 'shareBoard.confirm-change-team-role.title',
defaultMessage: 'Change minimum board role',
}),
subText: intl.formatMessage({
id: 'shareBoard.confirm-change-team-role.body',
defaultMessage: 'Everyone on this board with a lower permission than the "{role}" role will <b>now be promoted to {role}</b>. Are you sure you want to change the minimum role for the board?',
}, {
b: (...chunks) => <b>{chunks}</b>,
role: changeRoleConfirmation === MemberRole.Editor ? intl.formatMessage({id: 'BoardMember.schemeEditor', defaultMessage: 'Editor'}) : intl.formatMessage({id: 'BoardMember.schemeCommenter', defaultMessage: 'Commenter'}),
}),
confirmButtonText: intl.formatMessage({
id: 'shareBoard.confirm-change-team-role.confirmBtnText',
defaultMessage: 'Change minimum board role',
}),
onConfirm: onChangeRole,
onClose: () => setChangeRoleConfirmation(null),
}}
/>
)
return (
<div className='user-item'>
{changeRoleConfirmation && confirmationDialog}
<div className='user-item__content'>
{Utils.isFocalboardPlugin() &&
<CompassIcon
@ -81,7 +115,7 @@ const TeamPermissionsRow = (): JSX.Element => {
check={board.minimumRole === undefined || board.minimumRole === MemberRole.Editor}
icon={board.type === BoardTypeOpen && board.minimumRole === MemberRole.Editor ? <CheckIcon/> : <div className='empty-icon'/>}
name={intl.formatMessage({id: 'BoardMember.schemeEditor', defaultMessage: 'Editor'})}
onClick={() => updateBoardType(board, BoardTypeOpen, MemberRole.Editor)}
onClick={() => setChangeRoleConfirmation(MemberRole.Editor)}
/>}
{!board.isTemplate &&
<Menu.Text
@ -89,7 +123,7 @@ const TeamPermissionsRow = (): JSX.Element => {
check={board.minimumRole === MemberRole.Commenter}
icon={board.type === BoardTypeOpen && board.minimumRole === MemberRole.Commenter ? <CheckIcon/> : <div className='empty-icon'/>}
name={intl.formatMessage({id: 'BoardMember.schemeCommenter', defaultMessage: 'Commenter'})}
onClick={() => updateBoardType(board, BoardTypeOpen, MemberRole.Commenter)}
onClick={() => setChangeRoleConfirmation(MemberRole.Commenter)}
/>}
<Menu.Text
id={MemberRole.Viewer}