@@ -147,7 +177,7 @@ export default function ShareBoardDialog(props: Props): JSX.Element {
+ )}
+
+ {!publish && (
+
+
+
+
+
{intl.formatMessage({id: 'ShareBoard.ShareInternal', defaultMessage: 'Share internally'})}
+
{intl.formatMessage({id: 'ShareBoard.ShareInternalDescription', defaultMessage: 'Users who have permissions will be able to use this link'})}
+
+
+
+
+
+
+
+
+ )}
)
}
diff --git a/webapp/src/components/shareBoard/shareBoardButton.test.tsx b/webapp/src/components/shareBoard/shareBoardButton.test.tsx
index fb3027018..f095dd685 100644
--- a/webapp/src/components/shareBoard/shareBoardButton.test.tsx
+++ b/webapp/src/components/shareBoard/shareBoardButton.test.tsx
@@ -21,6 +21,7 @@ describe('src/components/shareBoard/shareBoard', () => {
wrapDNDIntl(
))
const renderer = result.container
diff --git a/webapp/src/components/shareBoard/shareBoardButton.tsx b/webapp/src/components/shareBoard/shareBoardButton.tsx
index 18f7f8aa4..39dc7834c 100644
--- a/webapp/src/components/shareBoard/shareBoardButton.tsx
+++ b/webapp/src/components/shareBoard/shareBoardButton.tsx
@@ -15,6 +15,7 @@ import ShareBoardDialog from './shareBoard'
type Props = {
boardId: string
+ enableSharedBoards: boolean
}
const ShareBoardButton = (props: Props) => {
const [showShareDialog, setShowShareDialog] = useState(false)
@@ -45,6 +46,7 @@ const ShareBoardButton = (props: Props) => {
setShowShareDialog(false)}
boardId={props.boardId}
+ enableSharedBoards={props.enableSharedBoards}
/>
}
diff --git a/webapp/src/components/viewHeader/viewHeader.tsx b/webapp/src/components/viewHeader/viewHeader.tsx
index ea390920a..9a24019db 100644
--- a/webapp/src/components/viewHeader/viewHeader.tsx
+++ b/webapp/src/components/viewHeader/viewHeader.tsx
@@ -54,14 +54,13 @@ type Props = {
editCardTemplate: (cardTemplateId: string) => void
readonly: boolean
dateDisplayProperty?: IPropertyTemplate
- showShared?: boolean
}
const ViewHeader = (props: Props) => {
const [showFilter, setShowFilter] = useState(false)
const intl = useIntl()
- const {board, activeView, views, groupByProperty, cards, dateDisplayProperty, showShared} = props
+ const {board, activeView, views, groupByProperty, cards, dateDisplayProperty} = props
const withGroupBy = activeView.fields.viewType === 'board' || activeView.fields.viewType === 'table'
const withDisplayBy = activeView.fields.viewType === 'calendar'
@@ -100,14 +99,12 @@ const ViewHeader = (props: Props) => {
}, [showTourBaseCondition])
useEffect(() => {
- if (showShared && !BoardTourSteps.SHARE_BOARD) {
+ if (!BoardTourSteps.SHARE_BOARD) {
BoardTourSteps.SHARE_BOARD = 2
- } else if (!showShared) {
- delete BoardTourSteps.SHARE_BOARD
}
TourCategoriesMapToSteps[TOUR_BOARD] = BoardTourSteps
- }, [showShared])
+ }, [])
const showAddViewTourStep = showTourBaseCondition && delayComplete
diff --git a/webapp/src/telemetry/telemetryClient.ts b/webapp/src/telemetry/telemetryClient.ts
index 4516ec04c..893deea14 100644
--- a/webapp/src/telemetry/telemetryClient.ts
+++ b/webapp/src/telemetry/telemetryClient.ts
@@ -32,6 +32,7 @@ export const TelemetryActions = {
ViewSharedBoard: 'viewSharedBoard',
ShareBoardOpenModal: 'shareBoard_openModal',
ShareLinkPublicCopy: 'shareLinkPublic_copy',
+ ShareLinkInternalCopy: 'shareLinkInternal_copy',
ImportArchive: 'settings_importArchive',
ImportTrello: 'settings_importTrello',
ImportAsana: 'settings_importAsana',