Merge pull request #1221 from nextcloud/backport/stable20/1202

nextcloud · Dec 17, 2020 · c748b7f · c748b7f
2 parents 45a37fe + 72746fc
commit c748b7f
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 32 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files.js b/js/files.js
diff --git a/js/files.js.map b/js/files.js.map
diff --git a/js/public.js b/js/public.js
diff --git a/js/public.js.map b/js/public.js.map
diff --git a/js/text.js b/js/text.js
diff --git a/js/text.js.map b/js/text.js.map
diff --git a/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/viewer.js.map
diff --git a/lib/Service/ApiService.php b/lib/Service/ApiService.php
@@ -32,6 +32,7 @@
 use OCA\Text\DocumentHasUnsavedChangesException;
 use OCA\Text\DocumentSaveConflictException;
 use OCA\Text\VersionMismatchException;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
@@ -161,20 +162,25 @@ public function sync($documentId, $sessionId, $sessionToken, $version = 0, $auto
 			return new DataResponse(['steps' => []]);
 		}
 
-		$result = [
-			'steps' => $this->documentService->getSteps($documentId, $version),
-			'sessions' => $this->sessionService->getActiveSessions($documentId),
-			'document' => $this->documentService->get($documentId)
-		];
-
-		$session = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);
 		try {
+			$result = [
+				'steps' => $this->documentService->getSteps($documentId, $version),
+				'sessions' => $this->sessionService->getActiveSessions($documentId),
+				'document' => $this->documentService->get($documentId)
+			];
+
+			$session = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);
 			$file = $this->documentService->getFileForSession($session, $token);
 		} catch (NotFoundException $e) {
 			$this->logger->logException($e, ['level' => ILogger::INFO]);
 			return new DataResponse([
 				'message' => 'File not found'
 			], 404);
+		} catch (DoesNotExistException $e) {
+			$this->logger->logException($e, ['level' => ILogger::INFO]);
+			return new DataResponse([
+				'message' => 'Document no longer exists'
+			], 404);
 		}
 
 		try {

diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
@@ -27,6 +27,7 @@
 
 use \InvalidArgumentException;
 use OCA\Text\Db\Session;
+use OCA\Text\Db\SessionMapper;
 use OCP\DirectEditing\IManager;
 use OCP\IRequest;
 use OCP\Lock\ILockingProvider;
@@ -73,6 +74,10 @@ class DocumentService {
 	 * @var DocumentMapper
 	 */
 	private $documentMapper;
+	/**
+	 * @var SessionMapper
+	 */
+	private $sessionMapper;
 	/**
 	 * @var ILogger
 	 */
@@ -98,9 +103,10 @@ class DocumentService {
 	 */
 	private $appData;
 
-	public function __construct(DocumentMapper $documentMapper, StepMapper $stepMapper, IAppData $appData, $userId, IRootFolder $rootFolder, ICacheFactory $cacheFactory, ILogger $logger, ShareManager $shareManager, IRequest $request, IManager $directManager, ILockingProvider $lockingProvider) {
+	public function __construct(DocumentMapper $documentMapper, StepMapper $stepMapper, SessionMapper $sessionMapper, IAppData $appData, $userId, IRootFolder $rootFolder, ICacheFactory $cacheFactory, ILogger $logger, ShareManager $shareManager, IRequest $request, IManager $directManager, ILockingProvider $lockingProvider) {
 		$this->documentMapper = $documentMapper;
 		$this->stepMapper = $stepMapper;
+		$this->sessionMapper = $sessionMapper;
 		$this->userId = $userId;
 		$this->appData = $appData;
 		$this->rootFolder = $rootFolder;
@@ -342,6 +348,7 @@ public function resetDocument($documentId, $force = false): void {
 
 			if ($force || !$this->hasUnsavedChanges($document)) {
 				$this->stepMapper->deleteAll($documentId);
+				$this->sessionMapper->deleteByDocumentId($documentId);
 				$this->documentMapper->delete($document);
 
 				try {

diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
@@ -26,11 +26,11 @@
 			<p v-if="hasSyncCollission" class="msg icon-error">
 				{{ t('text', 'The document has been changed outside of the editor. The changes cannot be applied.') }}
 			</p>
-			<p v-if="hasConnectionIssue" class="msg icon-info">
+			<p v-else-if="hasConnectionIssue" class="msg icon-info">
 				{{ t('text', 'File could not be loaded. Please check your internet connection.') }} <a class="button primary" @click="reconnect">{{ t('text', 'Retry') }}</a>
 			</p>
 		</div>
-		<div v-if="currentSession && active" id="editor-wrapper" :class="{'has-conflicts': hasSyncCollission, 'icon-loading': !initialLoading || hasConnectionIssue, 'richEditor': isRichEditor}">
+		<div v-if="currentSession && active" id="editor-wrapper" :class="{'has-conflicts': hasSyncCollission, 'icon-loading': !initialLoading && !hasConnectionIssue, 'richEditor': isRichEditor}">
 			<div id="editor">
 				<MenuBar v-if="!syncError && !readOnly"
 					ref="menubar"
@@ -52,7 +52,7 @@
 				<div>
 					<MenuBubble v-if="!readOnly && isRichEditor"
 						:editor="tiptap"
-						:filePath="relativePath" />
+						:file-path="relativePath" />
 					<EditorContent v-show="initialLoading"
 						class="editor__content"
 						:editor="tiptap" />
@@ -375,10 +375,9 @@ export default {
 						}
 					}
 					if (error === ERROR_TYPE.SOURCE_NOT_FOUND) {
-						this.initialLoading = false
-						this.$emit('close')
-						this.$emit('error')
+						this.hasConnectionIssue = true
 					}
+					this.$emit('ready')
 				})
 				.on('stateChange', (state) => {
 					if (state.initialLoading && !this.initialLoading) {
@@ -421,6 +420,8 @@ export default {
 		},
 
 		reconnect() {
+			this.initialLoading = false
+			this.hasConnectionIssue = false
 			if (this.syncService) {
 				this.syncService.close().then(() => {
 					this.syncService = null

diff --git a/src/services/PollingBackend.js b/src/services/PollingBackend.js
@@ -145,7 +145,7 @@ class PollingBackend {
 			if (!e.response || e.code === 'ECONNABORTED') {
 				if (this.fetchRetryCounter++ >= MAX_RETRY_FETCH_COUNT) {
 					console.error('[PollingBackend:fetchSteps] Network error when fetching steps, emitting CONNECTION_FAILED')
-					this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, {})
+					this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, { retry: false })
 
 				} else {
 					console.error(`[PollingBackend:fetchSteps] Network error when fetching steps, retry ${this.fetchRetryCounter}`)
@@ -158,14 +158,16 @@ class PollingBackend {
 				})
 			} else if (e.response.status === 403) {
 				this._authority.emit('error', ERROR_TYPE.SOURCE_NOT_FOUND, {})
+				this.disconnect()
 			} else if (e.response.status === 404) {
 				this._authority.emit('error', ERROR_TYPE.SOURCE_NOT_FOUND, {})
+				this.disconnect()
 			} else if (e.response.status === 503) {
 				this.increaseRefetchTimer()
-				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, { retry: true })
+				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, { retry: false })
 				console.error('Failed to fetch steps due to unavailable service', e)
 			} else {
-				this.increaseRefetchTimer()
+				this.disconnect()
 				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, { retry: false })
 				console.error('Failed to fetch steps due to other reason', e)
 			}