diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx index 0c716b4dd..e21c188df 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx @@ -230,7 +230,7 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => { <> {notes.length === 1 && ( <> - + Note history {historyShortcut && } diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalDialogContent.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalDialogContent.tsx index c61be1d82..444830a69 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalDialogContent.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalDialogContent.tsx @@ -12,6 +12,7 @@ import MobileModalAction from '../Modal/MobileModalAction' import Popover from '../Popover/Popover' import MobileModalHeader from '../Modal/MobileModalHeader' import { useApplication } from '../ApplicationProvider' +import { useItemVaultInfo } from '@/Hooks/useItemVaultInfo' const HistoryModalDialogContent = ({ dismissModal, note }: RevisionHistoryModalContentProps) => { const application = useApplication() @@ -40,6 +41,9 @@ const HistoryModalDialogContent = ({ dismissModal, note }: RevisionHistoryModalC const [showTabMenu, setShowTabMenu] = useState(false) const toggleTabMenu = () => setShowTabMenu((show) => !show) + const { vault } = useItemVaultInfo(note) + const isReadonly = vault ? application.vaultUsers.isCurrentUserReadonlyVaultMember(vault) : false + return ( <> @@ -104,7 +108,11 @@ const HistoryModalDialogContent = ({ dismissModal, note }: RevisionHistoryModalC - + ) } diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx index ff3b10ce8..aaf070164 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx @@ -8,9 +8,10 @@ import Spinner from '@/Components/Spinner/Spinner' type Props = { dismissModal: () => void noteHistoryController: NoteHistoryController + readonly?: boolean } -const HistoryModalFooter = ({ dismissModal, noteHistoryController }: Props) => { +const HistoryModalFooter = ({ dismissModal, noteHistoryController, readonly = false }: Props) => { const { selectedRevision, restoreRevision, restoreRevisionAsCopy, selectedEntry, deleteRemoteRevision } = noteHistoryController @@ -43,7 +44,7 @@ const HistoryModalFooter = ({ dismissModal, noteHistoryController }: Props) => { return (