From 56b3c9b4a00149cc2af024936e5c77f30633c653 Mon Sep 17 00:00:00 2001 From: silver Date: Tue, 27 Oct 2026 16:57:55 +0100 Subject: [PATCH 1/4] fix(dev): bump nextcloud/dialogs to 7.6.0 Signed-off-by: silver Assisted-by: ClaudeCode:claude-opus-5.5 --- package-lock.json | 75 +++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 25 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index caff82761ba..f683784faa1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@nextcloud/auth": "^2.6.0", "@nextcloud/axios": "^2.6.0", "@nextcloud/browser-storage": "^0.5.0", - "@nextcloud/dialogs": "^7.5.0", + "@nextcloud/dialogs": "^7.6.0", "@nextcloud/event-bus": "^3.3.3", "@nextcloud/files": "^4.1.1", "@nextcloud/initial-state": "^3.0.0", @@ -4044,69 +4044,32 @@ } }, "node_modules/@nextcloud/dialogs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-7.5.0.tgz", - "integrity": "sha512-2gmv0V3ObphxRd7ZvXwTsPvn/XSf2vummdXb2LRFpkoSamWbk+41SWv7cnDQPC+Ve9p46WebDuqyG+wbefkhEw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-7.6.0.tgz", + "integrity": "sha512-s6PZDNioK+iWbVm/Y2utlpWDCKqlxfh0oUaOkiQWaxZq8j5UQsh1iI1bKAnhCRFlNc/yKmj1EOVBMRQ2EDGkNQ==", "license": "AGPL-3.0-or-later", "dependencies": { "@mdi/js": "^7.4.47", "@nextcloud/auth": "^2.6.0", "@nextcloud/axios": "^2.6.0", "@nextcloud/browser-storage": "^0.5.0", - "@nextcloud/capabilities": "^1.2.1", "@nextcloud/event-bus": "^3.3.3", "@nextcloud/files": "^4.0.0", "@nextcloud/initial-state": "^3.0.0", "@nextcloud/l10n": "^3.4.1", "@nextcloud/paths": "^3.1.0", - "@nextcloud/router": "^3.1.0", + "@nextcloud/router": "^3.2.0", "@nextcloud/sharing": "^0.4.0", - "@nextcloud/vue": "^9.9.0", - "@vueuse/core": "^14.4.0", + "@nextcloud/vue": "^9.13.1", + "@types/toastify-js": "^1.12.4", + "@vueuse/core": "^15.0.0", "p-queue": "^9.3.3", - "vue": "^3.5.41", - "webdav": "^5.10.0" + "toastify-js": "^1.12.0", + "vue": "^3.5.44", + "webdav": "^5.11.0" }, "engines": { - "node": "^20 || ^22 || ^24" - } - }, - "node_modules/@nextcloud/dialogs/node_modules/@vueuse/core": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.4.0.tgz", - "integrity": "sha512-X4WHz1HlCzCBoYXesUkifzzWBAcZgXG8Fi5iNPQg/epdzOB3gu8Fawj3hvuwYR1nGcXGnvxwYYcUC/71++svtQ==", - "license": "MIT", - "dependencies": { - "@types/web-bluetooth": "^0.0.21", - "@vueuse/metadata": "14.4.0", - "@vueuse/shared": "14.4.0" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "vue": "^3.5.0" - } - }, - "node_modules/@nextcloud/dialogs/node_modules/@vueuse/metadata": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.4.0.tgz", - "integrity": "sha512-swx/255R6JyHZFJhx845iz5CRWDZdCfvkZOpACWc5+c5WHcG24mv8gUT1WIdFQaHt6dq79rvILd9QnCWiyVm9g==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/@nextcloud/dialogs/node_modules/@vueuse/shared": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.4.0.tgz", - "integrity": "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "vue": "^3.5.0" + "node": "^22.18 || ^24 || >=26" } }, "node_modules/@nextcloud/e2e-test-server": { @@ -6646,6 +6609,12 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/toastify-js": { + "version": "1.12.4", + "resolved": "https://registry.npmjs.org/@types/toastify-js/-/toastify-js-1.12.4.tgz", + "integrity": "sha512-zfZHU4tKffPCnZRe7pjv/eFKzTVHozKewFCKaCjZ4gFinKgJRz/t0bkZiMCXJxPhv/ZoeDGNOeRD09R0kQZ/nw==", + "license": "MIT" + }, "node_modules/@types/tough-cookie": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", @@ -7622,7 +7591,6 @@ "version": "15.0.0", "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-15.0.0.tgz", "integrity": "sha512-Zv67h5mrk7YHDJsRObx+DXaCBz6RKBUpxqLesJ+3xZNPG6yuQs7ja7kg3veFrrouYLWAqydQ7CwGEbLVxB43Ng==", - "dev": true, "license": "MIT", "dependencies": { "@types/web-bluetooth": "^0.0.21", @@ -7643,7 +7611,6 @@ "version": "15.0.0", "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-15.0.0.tgz", "integrity": "sha512-sfWE5LADAKJ0KnjtGliMdSN8Ij/L7uP6rXIZlgPloAI4zvvefbw6H5Lt7KJA6RqQOYgVqWF5Guj50HHMIzygBg==", - "dev": true, "license": "MIT", "engines": { "node": ">=22" @@ -19819,6 +19786,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/toastify-js": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz", + "integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ==", + "license": "MIT" + }, "node_modules/tough-cookie": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", diff --git a/package.json b/package.json index 220c2adf003..60f74c0ce0e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@nextcloud/auth": "^2.6.0", "@nextcloud/axios": "^2.6.0", "@nextcloud/browser-storage": "^0.5.0", - "@nextcloud/dialogs": "^7.5.0", + "@nextcloud/dialogs": "^7.6.0", "@nextcloud/event-bus": "^3.3.3", "@nextcloud/files": "^4.1.1", "@nextcloud/initial-state": "^3.0.0", From 7ddc7355d423e3aa2018a13642a103946ff8a6ca Mon Sep 17 00:00:00 2001 From: silver Date: Tue, 27 Oct 2026 17:03:04 +0100 Subject: [PATCH 2/4] fix(test): retry renaming file while it is locked Preview generation after saving can briefly lock the file, so the WebDAV MOVE fails with a 500 LockedException. The response was not checked, so the test only failed later when opening the renamed file. Check for 201 and retry for up to 10 seconds. Signed-off-by: silver Assisted-by: ClaudeCode:claude-opus-5.5 --- playwright/support/fixtures/Node.ts | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/playwright/support/fixtures/Node.ts b/playwright/support/fixtures/Node.ts index f53ea4737ec..1fccf2e8bfb 100644 --- a/playwright/support/fixtures/Node.ts +++ b/playwright/support/fixtures/Node.ts @@ -32,15 +32,19 @@ export class Node { } async move(newName: string) { - await this.page.request.fetch( - `/remote.php/webdav/${this.name}`, - { - headers: { - Destination: `/remote.php/webdav/${newName}`, + // retry while the file is locked, e.g. by preview generation after saving + await expect(async () => { + const response = await this.page.request.fetch( + `/remote.php/webdav/${this.name}`, + { + headers: { + Destination: `/remote.php/webdav/${newName}`, + }, + method: 'MOVE', }, - method: 'MOVE', - }, - ) + ) + expect(response.status()).toBe(201) + }).toPass({ timeout: 10_000 }) return new Node({ ...this, page: this.page, name: newName }) } From 40b20ff719b6be9e2316f8e94fd68934ceb3b391 Mon Sep 17 00:00:00 2001 From: silver Date: Tue, 27 Oct 2026 17:08:06 +0100 Subject: [PATCH 3/4] fix(a11y): hide collaborator carets from screen readers The caret label with the user name is rendered inline in the text, so screen readers read it as part of the content, e.g. a heading "Hello world" became "Hello wo alice rld". Signed-off-by: silver Assisted-by: ClaudeCode:claude-opus-5.5 --- src/extensions/CollaborationCaret.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/extensions/CollaborationCaret.ts b/src/extensions/CollaborationCaret.ts index 47f7afa22fe..d9286e00553 100644 --- a/src/extensions/CollaborationCaret.ts +++ b/src/extensions/CollaborationCaret.ts @@ -47,6 +47,9 @@ function render(user: AwarenessUser, clientId?: number): HTMLElement { cursor.classList.add('collaboration-carets__caret') cursor.setAttribute('style', `border-color: ${user.color}`) + // The caret sits inside the document text. Hide it from screen readers + // so they don't read the user name in the middle of the text. + cursor.setAttribute('aria-hidden', 'true') const label = document.createElement('div') label.id = `collaboration-carets__label__${clientId}` From 2ea22d311c8ca788eed0025f1490854771173f3b Mon Sep 17 00:00:00 2001 From: silver Date: Tue, 27 Oct 2026 17:09:36 +0100 Subject: [PATCH 4/4] fix(autosave): keep retrying after a failed autosave When the pending autosave timer fired, pendingAutosave was not reset. If that save failed (e.g. while offline), no new retry was scheduled and autosave stopped until the user typed again. Also log the retry delay in seconds instead of milliseconds. Signed-off-by: silver Assisted-by: ClaudeCode:claude-opus-5.5 --- src/services/SaveService.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/services/SaveService.ts b/src/services/SaveService.ts index 99fcef1644d..d6a9ea436de 100644 --- a/src/services/SaveService.ts +++ b/src/services/SaveService.ts @@ -127,8 +127,12 @@ class SaveService { if (now < nextSaveAttempt) { if (!this.pendingAutosave) { const wait = nextSaveAttempt - now - logger.debug(`Just saved, will try again in ${Math.ceil(wait)} seconds.`) - this.pendingAutosave = window.setTimeout(this.autosave, wait) + logger.debug(`Just saved, will try again in ${Math.ceil(wait / 1000)} seconds.`) + this.pendingAutosave = window.setTimeout(() => { + // Reset so a failing save can schedule the next attempt + this.pendingAutosave = 0 + this.autosave() + }, wait) } return }