error handling: send errorType

Author: korelstar

lib/Service/Note.php

@@ -108,7 +108,7 @@ public function getData(array $exclude = []) : array {
 			$data['readonly'] = $this->getReadOnly();
 		}
 		$data['error'] = false;
-		$data['errorMessage'] = '';
+		$data['errorType'] = '';
 		if (!in_array('content', $exclude)) {
 			try {
 				$data['content'] = $this->getContent();
@@ -117,10 +117,11 @@ public function getData(array $exclude = []) : array {
 					'Could not read content for file: '.$this->file->getPath(),
 					[ 'exception' => $e ]
 				);
-				$message = $this->util->l10n->t('Error').': ('.$this->file->getName().') '.$e->getMessage();
+				$message = $this->util->l10n->t('Error').': '.get_class($e);
 				$data['content'] = $message;
 				$data['error'] = true;
-				$data['errorMessage'] = $message;
+				$data['errorType'] = get_class($e);
+				$data['readonly'] = true;
 			}
 		}
 		return $data;

src/NotesService.js

@@ -77,8 +77,8 @@ export const fetchNotes = () => {
 			if (response.data.noteIds !== null) {
 				store.dispatch('updateNotes', { noteIds: response.data.noteIds, notes: response.data.notesData })
 			}
-			if (response.data.errorMessage) {
-				showError(t('notes', 'Error from Nextcloud server: {msg}', { msg: response.data.errorMessage }))
+			if (response.data.error) {
+				showError(t('notes', 'Error from Nextcloud server: {msg}', { msg: response.data.errorType }))
 			} else {
 				store.commit('setSyncETag', response.headers.etag)
 				store.commit('setSyncLastModified', response.headers['last-modified'])
@@ -115,7 +115,7 @@ export const fetchNote = noteId => {
 				console.error(err)
 				const msg = t('notes', 'Fetching note {id} has failed.', { id: noteId })
 				store.commit('setNoteAttribute', { noteId, attribute: 'error', value: true })
-				store.commit('setNoteAttribute', { noteId, attribute: 'errorMessage', value: msg })
+				store.commit('setNoteAttribute', { noteId, attribute: 'errorType', value: msg })
 				return store.getter.getNote(noteId)
 			}
 		})

src/components/Note.vue

@@ -215,8 +215,8 @@ export default {
 			this.preview = false
 			fetchNote(parseInt(this.noteId))
 				.then((note) => {
-					if (note.errorMessage) {
-						showError(note.errorMessage)
+					if (note.error) {
+						showError(t('notes', 'Error from Nextcloud server: {msg}', { msg: note.errorType }))
 					}
 					this.startRefreshTimer()
 				})

src/store/notes.js

@@ -84,7 +84,7 @@ const mutations = {
 				note.etag = updated.etag
 				Vue.set(note, 'unsaved', updated.unsaved)
 				Vue.set(note, 'error', updated.error)
-				Vue.set(note, 'errorMessage', updated.errorMessage)
+				Vue.set(note, 'errorType', updated.errorType)
 			}
 		} else {
 			state.notes.push(updated)