From 1852e11554b7ef169e29012af793833fb75d2e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 6 Sep 2023 17:37:33 +0200
Subject: [PATCH 1/4] fix: Avoid layout jump with rich workspace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/files.js                |  5 ++++-
 src/helpers/files.js        |  6 ++++++
 src/views/RichWorkspace.vue | 36 +++++++++++++++++++++++-------------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/files.js b/src/files.js
index eadbb7b7119..9dcb93108ab 100644
--- a/src/files.js
+++ b/src/files.js
@@ -21,7 +21,7 @@
  */
 import { linkTo } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
-import { registerFileListHeaders } from '@nextcloud/files'
+import { registerFileListHeaders, registerDavProperty } from '@nextcloud/files'
 import Vue from 'vue'
 
 import { logger } from './helpers/logger.js'
@@ -35,6 +35,9 @@ __webpack_public_path__ = linkTo('text', 'js/') // eslint-disable-line
 const workspaceAvailable = loadState('text', 'workspace_available')
 const workspaceEnabled = loadState('text', 'workspace_enabled')
 
+registerDavProperty('nc:rich-workspace', { nc: 'http://nextcloud.org/ns' })
+registerDavProperty('nc:rich-workspace-file', { nc: 'http://nextcloud.org/ns' })
+
 document.addEventListener('DOMContentLoaded', () => {
 	if (typeof OCA.Viewer === 'undefined') {
 		logger.error('Viewer app is not installed')
diff --git a/src/helpers/files.js b/src/helpers/files.js
index 58263b01bb2..f2fbb840aa0 100644
--- a/src/helpers/files.js
+++ b/src/helpers/files.js
@@ -187,6 +187,7 @@ export const FilesWorkspaceHeader = new Header({
 
 	render(el, folder, view) {
 		addMenuRichWorkspace()
+		const hasRichWorkspace = !!folder.attributes['rich-workspace-file']
 
 		import('vue').then((module) => {
 			el.id = 'files-workspace-wrapper'
@@ -201,6 +202,8 @@ export const FilesWorkspaceHeader = new Header({
 			vm = new View({
 				propsData: {
 					path: folder.path,
+					hasRichWorkspace,
+					content: folder.attributes['rich-workspace'],
 				},
 				store,
 			}).$mount(el)
@@ -208,7 +211,10 @@ export const FilesWorkspaceHeader = new Header({
 	},
 
 	updated(folder, view) {
+		const hasRichWorkspace = !!folder.attributes['rich-workspace-file']
 		vm.path = folder.path
+		vm.hasRichWorkspace = hasRichWorkspace
+		vm.content = folder.attributes['rich-workspace']
 	},
 })
 
diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
index 1aa82528ef0..44c9acb1e29 100644
--- a/src/views/RichWorkspace.vue
+++ b/src/views/RichWorkspace.vue
@@ -22,10 +22,10 @@
 
 <template>
 	<div v-if="enabled"
-		v-show="file"
+		v-show="hasRichWorkspace"
 		id="rich-workspace"
-		:class="{'focus': focus, 'dark': darkTheme, 'creatable': canCreate }">
-		<SkeletonLoading v-if="!loaded || !ready" />
+		:class="{'focus': focus, 'dark': darkTheme }">
+		<RichTextReader v-if="!loaded || !ready" :content="content" class="rich-workspace--preview" />
 		<Editor v-if="file"
 			v-show="ready"
 			:key="file.path"
@@ -48,8 +48,8 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import SkeletonLoading from '../components/SkeletonLoading.vue'
 import getEditorInstance from '../components/Editor.singleton.js'
+import RichTextReader from '../components/RichTextReader.vue'
 
 const IS_PUBLIC = !!(document.getElementById('isPublic'))
 const WORKSPACE_URL = generateOcsUrl('apps/text' + (IS_PUBLIC ? '/public' : '') + '/workspace', 2)
@@ -57,10 +57,14 @@ const WORKSPACE_URL = generateOcsUrl('apps/text' + (IS_PUBLIC ? '/public' : '')
 export default {
 	name: 'RichWorkspace',
 	components: {
-		SkeletonLoading,
+		RichTextReader,
 		Editor: getEditorInstance,
 	},
 	props: {
+		content: {
+			type: String,
+			default: '',
+		},
 		path: {
 			type: String,
 			required: true,
@@ -69,6 +73,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		hasRichWorkspace: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -87,9 +95,6 @@ export default {
 		shareToken() {
 			return document.getElementById('sharingToken')?.value
 		},
-		canCreate() {
-			return !!(this.folder && (this.folder.permissions & OC.PERMISSION_CREATE))
-		},
 	},
 	watch: {
 		path() {
@@ -134,9 +139,12 @@ export default {
 			})
 		},
 		getFileInfo(autofocus) {
-			this.loaded = false
-			this.autofocus = false
+			if (!this.hasRichWorkspace) {
+				return
+			}
 			this.ready = false
+			this.loaded = true
+			this.autofocus = false
 			const params = { path: this.path }
 			if (IS_PUBLIC) {
 				params.shareToken = this.shareToken
@@ -209,9 +217,11 @@ export default {
 		transition: max-height 0.5s cubic-bezier(0, 1, 0, 1);
 		z-index: 61;
 		position: relative;
-		&.creatable {
-			min-height: 100px;
-		}
+		min-height: 30vh;
+	}
+
+	.rich-workspace--preview {
+		margin-top: 44px;
 	}
 
 	/* For subfolders, where there are no Recommendations */

From bbd5d6d79719ab7b217ebba5d6a938810a5d41ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Wed, 6 Sep 2023 18:46:28 +0200
Subject: [PATCH 2/4] fix: move to addInitScript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 lib/Listeners/FilesLoadAdditionalScriptsListener.php |  1 +
 src/files.js                                         |  9 +--------
 src/init.js                                          | 12 ++++++++++++
 webpack.config.js                                    |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 src/init.js

diff --git a/lib/Listeners/FilesLoadAdditionalScriptsListener.php b/lib/Listeners/FilesLoadAdditionalScriptsListener.php
index ae822cb817a..1f4ca3d84e5 100644
--- a/lib/Listeners/FilesLoadAdditionalScriptsListener.php
+++ b/lib/Listeners/FilesLoadAdditionalScriptsListener.php
@@ -45,6 +45,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		\OCP\Util::addInitScript('text', 'text-init');
 		\OCP\Util::addScript('text', 'text-files');
 
 		$this->initialStateProvider->provideState();
diff --git a/src/files.js b/src/files.js
index 9dcb93108ab..0b156bd0504 100644
--- a/src/files.js
+++ b/src/files.js
@@ -21,11 +21,10 @@
  */
 import { linkTo } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
-import { registerFileListHeaders, registerDavProperty } from '@nextcloud/files'
 import Vue from 'vue'
 
 import { logger } from './helpers/logger.js'
-import { registerFileActionFallback, FilesWorkspaceHeader } from './helpers/files.js'
+import { registerFileActionFallback } from './helpers/files.js'
 import FilesSettings from './views/FilesSettings.vue'
 import store from './store/index.js'
 
@@ -35,9 +34,6 @@ __webpack_public_path__ = linkTo('text', 'js/') // eslint-disable-line
 const workspaceAvailable = loadState('text', 'workspace_available')
 const workspaceEnabled = loadState('text', 'workspace_enabled')
 
-registerDavProperty('nc:rich-workspace', { nc: 'http://nextcloud.org/ns' })
-registerDavProperty('nc:rich-workspace-file', { nc: 'http://nextcloud.org/ns' })
-
 document.addEventListener('DOMContentLoaded', () => {
 	if (typeof OCA.Viewer === 'undefined') {
 		logger.error('Viewer app is not installed')
@@ -59,9 +55,6 @@ document.addEventListener('DOMContentLoaded', () => {
 	}
 
 })
-if (workspaceAvailable) {
-	registerFileListHeaders(FilesWorkspaceHeader)
-}
 
 OCA.Text = {
 	RichWorkspaceEnabled: workspaceEnabled,
diff --git a/src/init.js b/src/init.js
new file mode 100644
index 00000000000..47f61c03124
--- /dev/null
+++ b/src/init.js
@@ -0,0 +1,12 @@
+import { registerFileListHeaders, registerDavProperty } from '@nextcloud/files'
+import { loadState } from '@nextcloud/initial-state'
+import { FilesWorkspaceHeader } from './helpers/files.js'
+
+const workspaceAvailable = loadState('text', 'workspace_available')
+
+registerDavProperty('nc:rich-workspace', { nc: 'http://nextcloud.org/ns' })
+registerDavProperty('nc:rich-workspace-file', { nc: 'http://nextcloud.org/ns' })
+
+if (workspaceAvailable) {
+	registerFileListHeaders(FilesWorkspaceHeader)
+}
diff --git a/webpack.config.js b/webpack.config.js
index d63b690377f..9334e526d0c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,6 +8,7 @@ webpackConfig.entry = {
 	public: path.join(__dirname, 'src', 'public.js'),
 	viewer: path.join(__dirname, 'src', 'viewer.js'),
 	editors: path.join(__dirname, 'src', 'editor.js'),
+	init: path.join(__dirname, 'src', 'init.js'),
 }
 
 webpackConfig.output.chunkFilename = '[id].js?v=[contenthash]'

From e1658029be839e8e1e79912fcfe84518526baca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 8 Sep 2023 14:27:32 +0200
Subject: [PATCH 3/4] chore(deps): Bump nextcloud/ocp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 517fad326c1..1466e46a483 100644
--- a/composer.lock
+++ b/composer.lock
@@ -183,12 +183,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "cb36d570c3b7aae1735599cc4b3614b9ce5c9c79"
+                "reference": "671134b6035f3aa5cd8b51c9e4e1cebf32aafacb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/cb36d570c3b7aae1735599cc4b3614b9ce5c9c79",
-                "reference": "cb36d570c3b7aae1735599cc4b3614b9ce5c9c79",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/671134b6035f3aa5cd8b51c9e4e1cebf32aafacb",
+                "reference": "671134b6035f3aa5cd8b51c9e4e1cebf32aafacb",
                 "shasum": ""
             },
             "require": {
@@ -220,7 +220,7 @@
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
                 "source": "https://github.com/nextcloud-deps/ocp/tree/master"
             },
-            "time": "2023-08-26T00:28:49+00:00"
+            "time": "2023-09-08T12:52:53+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2574,5 +2574,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }

From ce0efd6f002a8108e3f88d61f86b86c737b97ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 8 Sep 2023 14:40:15 +0200
Subject: [PATCH 4/4] tests: Make conflict dialog selector unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 cypress/e2e/conflict.spec.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/conflict.spec.js b/cypress/e2e/conflict.spec.js
index a52b84c6f8b..9e5021dc6c1 100644
--- a/cypress/e2e/conflict.spec.js
+++ b/cypress/e2e/conflict.spec.js
@@ -32,7 +32,7 @@ const variants = [
 variants.forEach(function({ fixture, mime }) {
 	const fileName = fixture
 	describe(`${mime} (${fileName})`, function() {
-		const getWrapper = () => cy.get('.text-editor__wrapper.has-conflicts')
+		const getWrapper = () => cy.get('.viewer__content .text-editor__wrapper.has-conflicts')
 
 		before(() => {
 			initUserAndFiles(user, fileName)
@@ -56,13 +56,13 @@ variants.forEach(function({ fixture, mime }) {
 			cy.openFile(fileName)
 			cy.get('.text-editor .document-status .icon-error')
 			getWrapper()
-				.get('#read-only-editor')
+				.find('#read-only-editor')
 				.should('contain', 'Hello world')
 			getWrapper()
-				.get('.text-editor__main')
+				.find('.text-editor__main')
 				.should('contain', 'Hello world')
 			getWrapper()
-				.get('.text-editor__main')
+				.find('.text-editor__main')
 				.should('contain', 'cruel conflicting')
 		})
 
@@ -81,7 +81,6 @@ variants.forEach(function({ fixture, mime }) {
 			cy.get('[data-cy="resolveThisVersion"]').click()
 
 			getWrapper()
-				.get('#read-only-editor')
 				.should('not.exist')
 
 			cy.get('[data-cy="resolveThisVersion"]')
@@ -105,12 +104,10 @@ variants.forEach(function({ fixture, mime }) {
 			cy.get('#viewer').should('not.exist')
 			cy.openFile(fileName)
 
-			getWrapper()
-				.get('[data-cy="resolveServerVersion"]')
+			cy.get('[data-cy="resolveServerVersion"]')
 				.click()
 
 			getWrapper()
-				.get('#read-only-editor')
 				.should('not.exist')
 			cy.get('[data-cy="resolveThisVersion"]')
 				.should('not.exist')