diff --git a/app/components/Sharing/PublicAccess.tsx b/app/components/Sharing/PublicAccess.tsx index 7327d81e6..301a52f95 100644 --- a/app/components/Sharing/PublicAccess.tsx +++ b/app/components/Sharing/PublicAccess.tsx @@ -2,7 +2,7 @@ import invariant from "invariant"; import debounce from "lodash/debounce"; import isEmpty from "lodash/isEmpty"; import { observer } from "mobx-react"; -import { CopyIcon, GlobeIcon } from "outline-icons"; +import { CopyIcon, GlobeIcon, InfoIcon } from "outline-icons"; import * as React from "react"; import { Trans, useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; @@ -22,6 +22,7 @@ import CopyToClipboard from "../CopyToClipboard"; import NudeButton from "../NudeButton"; import { ResizingHeightContainer } from "../ResizingHeightContainer"; import Squircle from "../Squircle"; +import Text from "../Text"; import Tooltip from "../Tooltip"; import { StyledListItem } from "./MemberListItem"; @@ -132,14 +133,7 @@ function PublicAccess({ document, share, sharedParent }: Props) { , is shared ) : ( - <> - {t("Allow anyone with the link to access")} - {share?.published && !share.includeChildDocuments - ? `. ${t( - "Child documents are not shared, toggling sharing to enable" - )}.` - : ""} - + t("Allow anyone with the link to access") )} } @@ -186,11 +180,28 @@ function PublicAccess({ document, share, sharedParent }: Props) { {copyButton} ) : null} + + {share?.published && !share.includeChildDocuments ? ( + + + + {t( + "Nested documents are not shared on the web. Toggle sharing to enable access, this will be the default behavior in the future" + )} + . + + + ) : null} ); } +const StyledInfoIcon = styled(InfoIcon)` + vertical-align: bottom; + margin-right: 2px; +`; + const Wrapper = styled.div` margin-bottom: 8px; `; @@ -211,6 +222,7 @@ const ShareLinkInput = styled(Input)` ${NativeInput} { padding: 4px 8px; + flex: 1; } `; diff --git a/app/components/Sharing/SharePopover.tsx b/app/components/Sharing/SharePopover.tsx index 5764c060a..6026cac51 100644 --- a/app/components/Sharing/SharePopover.tsx +++ b/app/components/Sharing/SharePopover.tsx @@ -323,7 +323,9 @@ const Picker = observer( const suggestions = React.useMemo( () => - users.notInDocument(document.id, query).filter((u) => u.id !== user.id), + users + .notInDocument(document.id, query) + .filter((u) => u.id !== user.id && !user.isSuspended), [users, users.orderedData, document.id, document.members, user.id, query] ); @@ -340,17 +342,7 @@ const Picker = observer( key={suggestion.id} onClick={() => onInvite(suggestion)} title={suggestion.name} - subtitle={ - suggestion.isSuspended - ? t("Suspended") - : suggestion.isInvited - ? t("Invited") - : suggestion.isViewer - ? t("Viewer") - : suggestion.email - ? suggestion.email - : t("Member") - } + subtitle={suggestion.isViewer ? t("Viewer") : t("Editor")} image={ {{documentTitle}}, is shared": "Anyone with the link can access because the parent document, <2>{{documentTitle}}, is shared", "Allow anyone with the link to access": "Allow anyone with the link to access", - "Child documents are not shared, toggling sharing to enable": "Child documents are not shared, toggling sharing to enable", "Publish to internet": "Publish to internet", + "Nested documents are not shared on the web. Toggle sharing to enable access, this will be the default behavior in the future": "Nested documents are not shared on the web. Toggle sharing to enable access, this will be the default behavior in the future", "{{ userName }} was invited to the document": "{{ userName }} was invited to the document", "Done": "Done", "Invite by name": "Invite by name",