Merge pull request #3818 from nextcloud/fix/3817-fix-direct-editing-s…

…ession

fix(DirectEditing): delay the initialSession so hooks can register

cypress/e2e/directediting.spec.js

@@ -61,22 +61,25 @@ describe('direct editing', function() {
 			})
 		const closeRequestAlias = 'closeRequest'
 		cy.intercept({ method: 'POST', url: '**/session/close' }).as(closeRequestAlias)
-
+		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }).as('sync')
 		cy.getContent()
 			.type('# This is a headline')
 			.type('{enter}')
 			.type('Some text')
 			.type('{enter}')
 
+		// ensure we have received our own steps
+		cy.wait('@sync', { timeout: 7000 })
+		cy.wait('@sync', { timeout: 7000 })
+
 		cy.get('button.icon-close').click()
 		cy.wait(`@${closeRequestAlias}`).then(() => {
 			cy.getFileContent('empty.md').then((content) => {
-				// FIXME: This currently fails due to the save not happening fast enough
-				// The best would be if we always send the markdown at least on close and perform a save if the content changed
-				// expect(content).to.equal('# This is a headline\n\nSome text');
+				expect(content).to.equal('# This is a headline\n\nSome text')
 			})
 		})
 	})
+
 	it('Create a file, edit and close it', () => {
 		createDirectEditingLinkForNewFile(user, 'newfile.md')
 			.then((token) => {
@@ -85,19 +88,22 @@ describe('direct editing', function() {
 			})
 		const closeRequestAlias = 'closeRequest'
 		cy.intercept({ method: 'POST', url: '**/session/close' }).as(closeRequestAlias)
+		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }).as('sync')
 
 		cy.getContent()
 			.type('# This is a headline')
 			.type('{enter}')
 			.type('Some text')
 			.type('{enter}')
 
+		// ensure we have received our own steps
+		cy.wait('@sync', { timeout: 7000 })
+		cy.wait('@sync', { timeout: 7000 })
+
 		cy.get('button.icon-close').click()
 		cy.wait(`@${closeRequestAlias}`).then(() => {
 			cy.getFileContent('newfile.md').then((content) => {
-				// FIXME: This currently fails due to the save not happening fast enough
-				// The best would be if we always send the markdown at least on close and perform a save if the content changed
-				// expect(content).to.equal('# This is a headline\n\nSome text');
+				expect(content).to.equal('# This is a headline\n\nSome text')
 			})
 		})
 	})
@@ -110,19 +116,22 @@ describe('direct editing', function() {
 			})
 		const closeRequestAlias = 'closeRequest'
 		cy.intercept({ method: 'POST', url: '**/session/close' }).as(closeRequestAlias)
+		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }).as('sync')
 
 		cy.getContent()
 			.type('# This is a headline')
 			.type('{enter}')
 			.type('Some text')
 			.type('{enter}')
 
+		// ensure we have received our own steps
+		cy.wait('@sync', { timeout: 7000 })
+		cy.wait('@sync', { timeout: 7000 })
+
 		cy.get('button.icon-close').click()
 		cy.wait(`@${closeRequestAlias}`).then(() => {
 			cy.getFileContent('empty.txt').then((content) => {
-				// FIXME: This currently fails due to the save not happening fast enough
-				// The best would be if we always send the markdown at least on close and perform a save if the content changed
-				// expect(content).to.equal('# This is a headline\n\nSome text');
+				expect(content).to.equal('# This is a headline\nSome text\n')
 			})
 		})
 	})

src/services/SyncService.js

@@ -91,12 +91,14 @@ class SyncService {
 			this.sessions = sessions
 		})
 
-		// TODO: Only continue if a connection was made
-		this.connection = initialSession
-			? new Connection({ data: initialSession }, {})
-			: await this._api.open({ fileId })
+		const connect = initialSession
+			? Promise.resolve(new Connection({ data: initialSession }, {}))
+			: this._api.open({ fileId })
 				.catch(error => this._emitError(error))
 
+		// TODO: Only continue if a connection was made
+		this.connection = await connect
+
 		this.version = this.connection.lastSavedVersion
 		this.emit('opened', {
 			...this.connection.state,