feat: handle note restored event on plain mode

Signed-off-by: Luka Trovic <[email protected]>

Author: luka-nextcloud

lib/Controller/PageController.php

@@ -10,6 +10,7 @@
 
 use OCA\Notes\Service\SettingsService;
 use OCA\Text\Event\LoadEditor;
+use OCA\Viewer\Event\LoadViewer;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
@@ -71,6 +72,10 @@ public function index() : TemplateResponse {
 			$this->eventDispatcher->dispatchTyped(new LoadSidebar());
 		}
 
+		if (\OCP\Server::get(IAppManager::class)->isEnabledForUser('viewer') && class_exists(LoadViewer::class)) {
+			$this->eventDispatcher->dispatchTyped(new LoadViewer());
+		}
+
 		$this->initialState->provideInitialState(
 			'config',
 			(array)\OCP\Server::get(SettingsService::class)->getPublic($this->userSession->getUser()->getUID())

src/NotesService.js

@@ -150,6 +150,7 @@ export const refreshNote = (noteId, lastETag) => {
 				return response.headers.etag
 			}
 			const currentContent = store.getters.getNote(noteId).content
+			store.commit('setNoteAttribute', { noteId, attribute: 'internalPath', value: response.data.internalPath })
 			// only update if local content has not changed
 			if (oldContent === currentContent) {
 				_updateLocalNote(response.data)
@@ -290,6 +291,7 @@ export const autotitleNote = noteId => {
 		.put(url('/notes/' + noteId + '/autotitle'))
 		.then((response) => {
 			store.commit('setNoteAttribute', { noteId, attribute: 'title', value: response.data })
+			refreshNote(noteId)
 		})
 		.catch(err => {
 			console.error(err)

src/components/NoteItem.vue

@@ -62,7 +62,7 @@ import { showError } from '@nextcloud/dialogs'
 import store from '../store.js'
 import { setFavorite, setTitle, fetchNote, deleteNote } from '../NotesService.js'
 import ShareVariantIcon from 'vue-material-design-icons/ShareVariant.vue'
-import { emit, subscribe } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 export default {
 	name: 'NoteItem',
@@ -131,6 +131,10 @@ export default {
 		subscribe('files_sharing:share:created', this.onShareCreated)
 	},
 
+	destroyed() {
+		unsubscribe('files_sharing:share:created', this.onShareCreated)
+	},
+
 	methods: {
 		onNoteSelected(noteId) {
 			this.$emit('note-selected', noteId)

src/components/NotePlain.vue

@@ -103,7 +103,7 @@ import {
 	isMobile,
 } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
-import { emit } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 import EditIcon from 'vue-material-design-icons/LeadPencil.vue'
 import EyeIcon from 'vue-material-design-icons/Eye.vue'
@@ -205,6 +205,8 @@ export default {
 		document.addEventListener('fullscreenchange', this.onDetectFullscreen)
 		document.addEventListener('keydown', this.onKeyPress)
 		document.addEventListener('visibilitychange', this.onVisibilityChange)
+		subscribe('files_versions:restore:requested', this.onFileRestoreRequested)
+		subscribe('files_versions:restore:restored', this.onFileRestored)
 	},
 
 	destroyed() {
@@ -215,6 +217,8 @@ export default {
 		document.removeEventListener('keydown', this.onKeyPress)
 		document.removeEventListener('visibilitychange', this.onVisibilityChange)
 		this.onUpdateTitle(null)
+		unsubscribe('files_versions:restore:requested', this.onFileRestoreRequested)
+		unsubscribe('files_versions:restore:restored', this.onFileRestored)
 	},
 
 	methods: {
@@ -409,6 +413,25 @@ export default {
 			conflictSolutionRemote(this.note)
 			this.showConflict = false
 		},
+
+		async onFileRestoreRequested(event) {
+			const { fileInfo } = event
+
+			if (fileInfo.id !== this.note.id) {
+				return
+			}
+
+			this.loading = true
+		},
+
+		async onFileRestored(version) {
+			if (version.fileId !== this.note.id) {
+				return
+			}
+
+			this.refreshNote()
+			this.loading = false
+		},
 	},
 }
 </script>

src/components/NoteRich.vue

@@ -10,7 +10,7 @@ import {
 } from '@nextcloud/vue'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import { queueCommand } from '../NotesService.js'
+import { queueCommand, refreshNote } from '../NotesService.js'
 import { routeIsNewNote } from '../Util.js'
 import store from '../store.js'
 
@@ -58,12 +58,15 @@ export default {
 	created() {
 		this.fetchData()
 		subscribe('files:file:updated', this.fileUpdated)
-
+		subscribe('files_versions:restore:requested', this.onFileRestoreRequested)
+		subscribe('files_versions:restore:restored', this.onFileRestored)
 	},
 
 	destroyed() {
 		this?.editor?.destroy()
 		unsubscribe('files:file:updated', this.fileUpdated)
+		unsubscribe('files_versions:restore:requested', this.onFileRestoreRequested)
+		unsubscribe('files_versions:restore:restored', this.onFileRestored)
 	},
 
 	methods: {
@@ -144,6 +147,38 @@ export default {
 				.replaceAll(/\s/gmu, ' ')
 			return title.length > 0 ? title : t('notes', 'New note')
 		},
+
+		async onFileRestoreRequested(event) {
+			const { fileInfo } = event
+
+			if (fileInfo.id !== this.note.id) {
+				return
+			}
+
+			this.loading = true
+		},
+
+		async onFileRestored(version) {
+			if (version.fileId !== this.note.id) {
+				return
+			}
+
+			const etag = await refreshNote(parseInt(this.noteId), this.etag)
+
+			if (etag) {
+				this.etag = etag
+			}
+
+			const autoResolve = setInterval(() => {
+				const el = document.querySelector('[data-cy="resolveServerVersion"]')
+
+				if (el) {
+					el.click()
+					clearInterval(autoResolve)
+				}
+			}, 200)
+			this.loading = false
+		},
 	},
 }
 </script>