From 93bb242978413bb9e89c574aec5966c5b138fe1d Mon Sep 17 00:00:00 2001 From: Sebastian Ecker Date: Thu, 29 Oct 2026 21:25:00 +0100 Subject: [PATCH] feat(overview): let the user choose the folder for new files New files were always created in the user's root folder, so anyone who keeps documents in folders, project folders or team folders had to move every file afterwards. The create dialog now shows the target folder with a "Change" button that opens the Nextcloud file picker. Only folders the user may create files in can be picked, so team folders and shares work through their own permissions. The last used folder is remembered per user in Nextcloud's scoped browser storage, which the server clears on logout, and is re-checked when the dialog opens; if it is gone or no longer writable, the dialog says so and falls back to the root folder. The dialog still opens at once, and a late check never overrides a folder the user picked or a create already sent. @nextcloud/dialogs is imported on demand together with its stylesheet, so the file picker is only downloaded when the folder is changed. Folder names go into labels as plain text, without escaping or sanitizing. The tests now run against the real translate() instead of a stand-in that skipped its escaping and sanitizing. Closes #205 Assisted-by: ClaudeCode:claude-opus-5-5 Co-Authored-By: Claude Signed-off-by: Sebastian Ecker --- package-lock.json | 228 +++++++++++++++------- package.json | 2 + src/components/TargetFolderPicker.spec.ts | 174 +++++++++++++++++ src/components/TargetFolderPicker.vue | 135 +++++++++++++ src/services/config.spec.ts | 64 +++++- src/services/config.ts | 29 +++ src/services/folders.spec.ts | 67 +++++++ src/services/folders.ts | 29 +++ src/views/OfficeOverview.spec.ts | 222 +++++++++++++++++++++ src/views/OfficeOverview.vue | 82 +++++++- vitest.setup.ts | 16 +- 11 files changed, 962 insertions(+), 86 deletions(-) create mode 100644 src/components/TargetFolderPicker.spec.ts create mode 100644 src/components/TargetFolderPicker.vue create mode 100644 src/services/folders.spec.ts create mode 100644 src/services/folders.ts diff --git a/package-lock.json b/package-lock.json index e62532df..7a03922c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,8 @@ "@mdi/js": "^7.4.47", "@nextcloud/auth": "^2.6.0", "@nextcloud/axios": "^2.6.0", + "@nextcloud/browser-storage": "^0.5.0", + "@nextcloud/dialogs": "^7.6.0", "@nextcloud/files": "^4.0.0", "@nextcloud/initial-state": "^3.0.0", "@nextcloud/l10n": "^3.4.1", @@ -254,9 +256,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.11.tgz", + "integrity": "sha512-snZbO7MEDOof+hvNa97EjEY7qD7h2kwvQr5AJC3ZhQudKW5dnej6k3kP9NQV88hJwaS8vDqRLFo9rivLEhle2g==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -298,12 +300,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz", - "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz", + "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==", "license": "MIT", "dependencies": { - "@babel/types": "^7.29.8" + "@babel/types": "^7.29.11" }, "bin": { "parser": "bin/babel-parser.js" @@ -358,12 +360,12 @@ } }, "node_modules/@babel/types": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", - "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.11.tgz", + "integrity": "sha512-WCsemW40Cpc6gouC1SrY6PBaZ+oLRlEVY9XBvZBI7il/HyUrb2nJ505wE1MHEFyDZNnrWDEuy4jL50WVHfTTSQ==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-string-parser": "^7.29.11", "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { @@ -1662,6 +1664,82 @@ "node": "^20.0.0 || ^22.0.0 || ^24.0.0" } }, + "node_modules/@nextcloud/dialogs": { + "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/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.2.0", + "@nextcloud/sharing": "^0.4.0", + "@nextcloud/vue": "^9.13.1", + "@types/toastify-js": "^1.12.4", + "@vueuse/core": "^15.0.0", + "p-queue": "^9.3.3", + "toastify-js": "^1.12.0", + "vue": "^3.5.44", + "webdav": "^5.11.0" + }, + "engines": { + "node": "^22.18 || ^24 || >=26" + } + }, + "node_modules/@nextcloud/dialogs/node_modules/@vueuse/core": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-15.0.0.tgz", + "integrity": "sha512-Zv67h5mrk7YHDJsRObx+DXaCBz6RKBUpxqLesJ+3xZNPG6yuQs7ja7kg3veFrrouYLWAqydQ7CwGEbLVxB43Ng==", + "license": "MIT", + "dependencies": { + "@types/web-bluetooth": "^0.0.21", + "@vueuse/metadata": "15.0.0", + "@vueuse/shared": "15.0.0" + }, + "engines": { + "node": ">=22" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "vue": "^3.5.0" + } + }, + "node_modules/@nextcloud/dialogs/node_modules/@vueuse/metadata": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-15.0.0.tgz", + "integrity": "sha512-sfWE5LADAKJ0KnjtGliMdSN8Ij/L7uP6rXIZlgPloAI4zvvefbw6H5Lt7KJA6RqQOYgVqWF5Guj50HHMIzygBg==", + "license": "MIT", + "engines": { + "node": ">=22" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/@nextcloud/dialogs/node_modules/@vueuse/shared": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-15.0.0.tgz", + "integrity": "sha512-vbNXhGrbV53xPOMSyOzMHQRvhMgZf7oNDw2RChUetVxwTIEkInQ1joZ9JbT0G3z2n2AJNjvmCWeM9ySYrnvogA==", + "license": "MIT", + "engines": { + "node": ">=22" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "vue": "^3.5.0" + } + }, "node_modules/@nextcloud/eslint-config": { "version": "8.4.2", "resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.4.2.tgz", @@ -3137,6 +3215,12 @@ "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==", "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/trusted-types": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", @@ -3923,16 +4007,16 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.43.tgz", - "integrity": "sha512-zdiLhnbe1QQqgDT8xZMpNmyqZ3qlI+/Q/FHQco57Kwl/b05HhCzN6eVGN9QU9rbga4CrS0H5SYY8VGHZCt/1Hg==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.44.tgz", + "integrity": "sha512-k34nCytbK8PQ1gR2mGROYOw6Pnv/mumqIdrZ3x2tbyXZDWm7ViKGLTfdB+DRrWqEQsLgGJvn0WN9jBif5zCTLQ==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.8", - "@vue/shared": "3.5.43", + "@babel/parser": "^7.29.9", + "@vue/shared": "3.5.44", "entities": "^7.0.1", "estree-walker": "^2.0.2", - "source-map-js": "^1.2.1" + "source-map-js": "^1.2.2" } }, "node_modules/@vue/compiler-core/node_modules/entities": { @@ -3948,40 +4032,40 @@ } }, "node_modules/@vue/compiler-dom": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.43.tgz", - "integrity": "sha512-PEZoAk3NQmsn/ejMzSOCyTYqwGqczrWm70PuhBKjjv1+TCoQAaO/zOqNwjV+honlNstT5ILxtc+8r8UUfj+iEQ==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.44.tgz", + "integrity": "sha512-W5AoBFWdw1lQAKiHowkfgFKFab82oSRT6sGsPfw/q1GRjsy/ZJFLHGhJyBRIFN9APLTUduDH9U2JAiPOIyKuYg==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.5.43", - "@vue/shared": "3.5.43" + "@vue/compiler-core": "3.5.44", + "@vue/shared": "3.5.44" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.43.tgz", - "integrity": "sha512-FCbrG3XNCRl+js3huuKx4IVHBLTvMkJhVepjbxSPu1gn4yWLaYtGNQdjJGZaMytXB6qb76qQDDmDSLy/vkmleQ==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.44.tgz", + "integrity": "sha512-dzHmQ4jXTpdr5FjIQUeykVakN/uzqFbUo9/C5ikBFg3a3PeM6uRxeczx1ZbXBML0/zJstEh3ygYipzR5Z7b2Pw==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.8", - "@vue/compiler-core": "3.5.43", - "@vue/compiler-dom": "3.5.43", - "@vue/compiler-ssr": "3.5.43", - "@vue/shared": "3.5.43", + "@babel/parser": "^7.29.9", + "@vue/compiler-core": "3.5.44", + "@vue/compiler-dom": "3.5.44", + "@vue/compiler-ssr": "3.5.44", + "@vue/shared": "3.5.44", "estree-walker": "^2.0.2", "magic-string": "^0.30.21", - "postcss": "^8.5.28", - "source-map-js": "^1.2.1" + "postcss": "^8.5.29", + "source-map-js": "^1.2.2" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.43.tgz", - "integrity": "sha512-GF62orf7KiJX9RqrHNGrYBudsQGD0OhJ5nDs90O8UiDuS40+YMYomiXu6w6EuvtXuRDc3MSNis3EaaSKAVSWpg==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.44.tgz", + "integrity": "sha512-xr5gb1JVHlfXJwSlRz1FeP6uxoazdzHuMTVLE7up+4Vrqxk219CvxLPxD9NXBt47yvZW7+p4DXfyp4O1fkByIA==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.43", - "@vue/shared": "3.5.43" + "@vue/compiler-dom": "3.5.44", + "@vue/shared": "3.5.44" } }, "node_modules/@vue/compiler-vue2": { @@ -4074,51 +4158,51 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.43.tgz", - "integrity": "sha512-G/c9GyOZNI2jVaaS6OX1EF1SSFSv7H0ERqNTl4+DTFMlZmB5eVAB53aLQNam/7NL2NPtaDD7RdVrzf8uJzMuOA==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.44.tgz", + "integrity": "sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==", "license": "MIT", "dependencies": { - "@vue/shared": "3.5.43" + "@vue/shared": "3.5.44" } }, "node_modules/@vue/runtime-core": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.43.tgz", - "integrity": "sha512-hU6U6VnVhBGQDpvlnnDlIB8ZGJBiOcgk2lh/0InltHiz3D8oSkluvuvY+do1G2H3+udeKFsmaBlgVYP7gXQzEw==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.44.tgz", + "integrity": "sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.43", - "@vue/shared": "3.5.43" + "@vue/reactivity": "3.5.44", + "@vue/shared": "3.5.44" } }, "node_modules/@vue/runtime-dom": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.43.tgz", - "integrity": "sha512-Bb2Jc0YjjJdMt1SJmb9b2L/IWd3I8lIT9x9eS/xvvP9CiVgna0ffua74xKRmt4/uSJ+0r4iN8ex1jrqkhQGWQw==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.44.tgz", + "integrity": "sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.43", - "@vue/runtime-core": "3.5.43", - "@vue/shared": "3.5.43", + "@vue/reactivity": "3.5.44", + "@vue/runtime-core": "3.5.44", + "@vue/shared": "3.5.44", "csstype": "^3.2.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.43.tgz", - "integrity": "sha512-l2Ygjv9NehV94PSBxNWsAHC0j/eIIKbn92mBuWXAPGLnn6HfJ6MH5ubsd+Nk0YoZ5FRuxWI1P2VSoh+dbPQhCQ==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.44.tgz", + "integrity": "sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.5.43", - "@vue/runtime-dom": "3.5.43", - "@vue/shared": "3.5.43" + "@vue/compiler-ssr": "3.5.44", + "@vue/runtime-dom": "3.5.44", + "@vue/shared": "3.5.44" } }, "node_modules/@vue/shared": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.43.tgz", - "integrity": "sha512-uksS7YGMR5NZyr4JNq0Rp+QyLns0ueaz20KwzIPW9R0LH1Vnt4E+XUM29PNseEbf1www2gOuhuDi5AKOIXag9Q==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.44.tgz", + "integrity": "sha512-H82XLH0DjmSOdbEwO15x3QTo1f5PWEtv237eLpYKc0mqLu+B8hnq16lFWmuBmNurkeiG3wr+oM1FhOll/YVFRg==", "license": "MIT" }, "node_modules/@vue/test-utils": { @@ -13641,6 +13725,12 @@ "node": ">=8.0" } }, + "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": "6.0.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.2.tgz", @@ -14995,16 +15085,16 @@ "license": "MIT" }, "node_modules/vue": { - "version": "3.5.43", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.43.tgz", - "integrity": "sha512-o5qZoksdnjIKvW1srZ3ab7pcDNYAerBjRe54D0LBLfRdCYFrSgBHVXokMas35czQc0//lmx4/tuY4ZNQ+Rf2Ng==", + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.44.tgz", + "integrity": "sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.43", - "@vue/compiler-sfc": "3.5.43", - "@vue/runtime-dom": "3.5.43", - "@vue/server-renderer": "3.5.43", - "@vue/shared": "3.5.43" + "@vue/compiler-dom": "3.5.44", + "@vue/compiler-sfc": "3.5.44", + "@vue/runtime-dom": "3.5.44", + "@vue/server-renderer": "3.5.44", + "@vue/shared": "3.5.44" }, "peerDependencies": { "typescript": "*" diff --git a/package.json b/package.json index 2126f6e1..79379df1 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "@mdi/js": "^7.4.47", "@nextcloud/auth": "^2.6.0", "@nextcloud/axios": "^2.6.0", + "@nextcloud/browser-storage": "^0.5.0", + "@nextcloud/dialogs": "^7.6.0", "@nextcloud/files": "^4.0.0", "@nextcloud/initial-state": "^3.0.0", "@nextcloud/l10n": "^3.4.1", diff --git a/src/components/TargetFolderPicker.spec.ts b/src/components/TargetFolderPicker.spec.ts new file mode 100644 index 00000000..c0eecca3 --- /dev/null +++ b/src/components/TargetFolderPicker.spec.ts @@ -0,0 +1,174 @@ +/** + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +import { flushPromises, mount } from '@vue/test-utils' +import { Permission } from '@nextcloud/files' +import type { INode } from '@nextcloud/files' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +class FilePickerClosedMock extends Error {} + +const pickNodesMock = vi.fn() +const builder = { + canPick: null as ((node: INode) => boolean) | null, + buttonFactory: null as ((nodes: INode[]) => { label: string, disabled?: boolean }[]) | null, + startAt: '', + mimeTypes: [] as string[], +} + +vi.mock('@nextcloud/dialogs', () => ({ + FilePickerClosed: FilePickerClosedMock, + getFilePickerBuilder: vi.fn(() => { + const chain = { + setMultiSelect: () => chain, + allowDirectories: () => chain, + setMimeTypeFilter: (mimes: string[]) => { builder.mimeTypes = mimes; return chain }, + setCanPick: (fn: (node: INode) => boolean) => { builder.canPick = fn; return chain }, + startAt: (path: string) => { builder.startAt = path; return chain }, + setButtonFactory: (fn: (nodes: INode[]) => { label: string }[]) => { builder.buttonFactory = fn; return chain }, + build: () => ({ pickNodes: pickNodesMock }), + } + return chain + }), +})) + +vi.mock('@nextcloud/dialogs/style.css', () => ({})) + +const { default: TargetFolderPicker } = await import('./TargetFolderPicker.vue') + +function folder(path: string, permissions: number): INode { + return { path, displayname: path.split('/').pop(), permissions } as unknown as INode +} + +async function clickChange(wrapper: ReturnType) { + await wrapper.findComponent({ name: 'NcButton' }).vm.$emit('click') + await flushPromises() +} + +beforeEach(() => { + pickNodesMock.mockReset() + builder.canPick = null + builder.buttonFactory = null + builder.startAt = '' + builder.mimeTypes = [] +}) + +describe('TargetFolderPicker', () => { + it('names the root folder "All files"', () => { + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + expect(wrapper.find('.target-folder-picker__path').text()).toBe('All files') + }) + + it('shows the full path of a nested folder, so equal folder names stay distinguishable', () => { + const wrapper = mount(TargetFolderPicker, { props: { path: '/Team folder/Reports' } }) + + expect(wrapper.find('.target-folder-picker__path').text()).toBe('Team folder/Reports') + }) + + it('gives the change button an accessible name that includes the current folder', () => { + const wrapper = mount(TargetFolderPicker, { props: { path: '/Documents' } }) + + expect(wrapper.findComponent({ name: 'NcButton' }).attributes('aria-label')) + .toBe('Change folder, currently Documents') + }) + + it('opens a folder-only picker at the current folder', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/Documents' } }) + + await clickChange(wrapper) + + expect(builder.startAt).toBe('/Documents') + expect(builder.mimeTypes).toEqual(['httpd/unix-directory']) + }) + + it('only lets folders with create permission be picked, team folders included', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + await clickChange(wrapper) + + expect(builder.canPick!(folder('/Team folder', Permission.READ | Permission.CREATE))).toBe(true) + expect(builder.canPick!(folder('/Read-only share', Permission.READ))).toBe(false) + }) + + it('disables the choose button when nothing can be picked', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + await clickChange(wrapper) + + expect(builder.buttonFactory!([])[0].disabled).toBe(true) + const [button] = builder.buttonFactory!([folder('/Documents', Permission.ALL)]) + expect(button.disabled).toBe(false) + expect(button.label).toBe('Choose Documents') + }) + + it('calls the root folder "All files" on the choose button, not by the user id', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + await clickChange(wrapper) + + const root = { path: '/', displayname: 'alice', permissions: Permission.ALL } as unknown as INode + expect(builder.buttonFactory!([root])[0].label).toBe('Choose All files') + }) + + it('emits the picked folder path', async () => { + pickNodesMock.mockResolvedValue([folder('/Team folder/Reports', Permission.ALL)]) + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + await clickChange(wrapper) + + expect(wrapper.emitted('update:path')).toEqual([['/Team folder/Reports']]) + }) + + it('shows folder names with special characters as they are, not HTML-escaped', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/R&D <2026>' } }) + + expect(wrapper.find('.target-folder-picker__path').text()).toBe('R&D <2026>') + expect(wrapper.findComponent({ name: 'NcButton' }).attributes('aria-label')) + .toBe('Change folder, currently R&D <2026>') + + await clickChange(wrapper) + + const [button] = builder.buttonFactory!([folder('/R&D <2026>', Permission.ALL)]) + expect(button.label).toBe('Choose R&D <2026>') + }) + + it('announces a changed folder to screen readers', () => { + const wrapper = mount(TargetFolderPicker, { props: { path: '/Documents' } }) + + expect(wrapper.find('.target-folder-picker__path').attributes('aria-live')).toBe('polite') + }) + + it('disables the change button while disabled', () => { + const wrapper = mount(TargetFolderPicker, { props: { path: '/', disabled: true } }) + + expect(wrapper.findComponent({ name: 'NcButton' }).props('disabled')).toBe(true) + }) + + it('reports a picker failure other than closing, instead of throwing', async () => { + pickNodesMock.mockRejectedValue(new Error('Dialog was unmounted without close event')) + const wrapper = mount(TargetFolderPicker, { props: { path: '/' } }) + + await clickChange(wrapper) + + expect(wrapper.emitted('error')).toHaveLength(1) + expect(wrapper.emitted('update:path')).toBeUndefined() + }) + + it('keeps the current folder when the picker is closed without choosing', async () => { + pickNodesMock.mockRejectedValue(new FilePickerClosedMock()) + const wrapper = mount(TargetFolderPicker, { props: { path: '/Documents' } }) + + await clickChange(wrapper) + + expect(wrapper.emitted('update:path')).toBeUndefined() + expect(wrapper.emitted('error')).toBeUndefined() + }) +}) diff --git a/src/components/TargetFolderPicker.vue b/src/components/TargetFolderPicker.vue new file mode 100644 index 00000000..bf319fd9 --- /dev/null +++ b/src/components/TargetFolderPicker.vue @@ -0,0 +1,135 @@ + + + + + + + diff --git a/src/services/config.spec.ts b/src/services/config.spec.ts index be1788f3..7a161a0d 100644 --- a/src/services/config.spec.ts +++ b/src/services/config.spec.ts @@ -1,5 +1,6 @@ -import { beforeEach, describe, expect, it } from 'vitest' -import { getOverviewGridView, setOverviewGridView } from './config.ts' +import { getCurrentUser } from '@nextcloud/auth' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { getLastTargetFolder, getOverviewGridView, setLastTargetFolder, setOverviewGridView } from './config.ts' beforeEach(() => { localStorage.clear() @@ -33,3 +34,62 @@ describe('setOverviewGridView', () => { expect(localStorage.getItem('office.overview.gridView')).toBe('false') }) }) + +describe('getLastTargetFolder', () => { + it('defaults to the root folder when unset', () => { + expect(getLastTargetFolder()).toBe('/') + }) + + it('round-trips an absolute path, team folders included', () => { + setLastTargetFolder('/Team folder/Reports') + expect(getLastTargetFolder()).toBe('/Team folder/Reports') + }) + + it('keeps the root folder', () => { + setLastTargetFolder('/') + expect(getLastTargetFolder()).toBe('/') + }) + + it.each([ + ['a relative path', 'garbage'], + ['a parent segment', '/Documents/../../other'], + ['an empty segment', '//Documents'], + ['a trailing slash', '/Documents/'], + ['a current-folder segment', '/./Documents'], + ])('falls back to the root folder for %s', (_, path) => { + setLastTargetFolder(path) + expect(getLastTargetFolder()).toBe('/') + }) +}) + +describe('remembered folder per user', () => { + afterEach(() => { + vi.mocked(getCurrentUser).mockReturnValue(null) + }) + + function loginAs(uid: string) { + vi.mocked(getCurrentUser).mockReturnValue({ uid } as ReturnType) + } + + it('does not show one user the folder another user picked in the same browser', () => { + loginAs('alice') + setLastTargetFolder('/Projects/Confidential') + + loginAs('bob') + expect(getLastTargetFolder()).toBe('/') + + loginAs('alice') + expect(getLastTargetFolder()).toBe('/Projects/Confidential') + }) +}) + +describe('setLastTargetFolder', () => { + it('stores the folder in the scope the server clears on logout, not under a plain key', () => { + setLastTargetFolder('/Documents') + + const keys = Object.keys(localStorage) + expect(keys).toHaveLength(1) + expect(keys[0].startsWith('nextcloud_vol_')).toBe(true) + expect(localStorage.getItem(keys[0])).toBe('/Documents') + }) +}) diff --git a/src/services/config.ts b/src/services/config.ts index 2f27fbea..a6197e8a 100644 --- a/src/services/config.ts +++ b/src/services/config.ts @@ -3,6 +3,9 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ +import { getCurrentUser } from '@nextcloud/auth' +import { getBuilder } from '@nextcloud/browser-storage' + const GRID_VIEW_KEY = 'office.overview.gridView' export function getOverviewGridView(): boolean { @@ -12,3 +15,29 @@ export function getOverviewGridView(): boolean { export function setOverviewGridView(enabled: boolean): void { localStorage.setItem(GRID_VIEW_KEY, String(enabled)) } + +// The folder new files were last created in, as a path relative to the user's +// Files root. A folder path is the user's data: it lives in Nextcloud's scoped +// storage, which the server clears on logout, and is keyed by user id so the +// next user of the same browser never sees it, even if nobody logged out. +// Callers must re-check that the folder still exists and is writable. +const targetFolderStorage = getBuilder('office').persist().clearOnLogout().build() + +function targetFolderKey(): string { + return 'create.targetFolder.' + (getCurrentUser()?.uid ?? '') +} + +// Anything but a plain absolute path ("/", "/Documents") falls back to the +// root folder; ".." and empty segments never reach a request. +function isPlainAbsolutePath(path: string): boolean { + return path === '/' || (path.startsWith('/') && path.slice(1).split('/').every(segment => segment !== '' && segment !== '.' && segment !== '..')) +} + +export function getLastTargetFolder(): string { + const path = targetFolderStorage.getItem(targetFolderKey()) + return path !== null && isPlainAbsolutePath(path) ? path : '/' +} + +export function setLastTargetFolder(path: string): void { + targetFolderStorage.setItem(targetFolderKey(), path) +} diff --git a/src/services/folders.spec.ts b/src/services/folders.spec.ts new file mode 100644 index 00000000..ba53e40d --- /dev/null +++ b/src/services/folders.spec.ts @@ -0,0 +1,67 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest' + +const statMock = vi.fn() + +vi.mock('@nextcloud/files/dav', async () => ({ + getClient: vi.fn(() => ({ stat: statMock })), + getDefaultPropfind: vi.fn(() => ''), + getRootPath: vi.fn(() => '/files/alice'), + parsePermissions: (await vi.importActual('@nextcloud/files/dav')).parsePermissions, +})) + +const { canCreateIn } = await import('./folders.ts') + +beforeEach(() => { + statMock.mockReset() +}) + +// Shaped like the webdav client's detailed stat result for a PROPFIND answer. +function statResult(type: 'directory' | 'file', permissions: string) { + return { data: { filename: '/files/alice/x', basename: 'x', type, props: { permissions } } } +} + +describe('canCreateIn', () => { + it('stats the folder itself with the default propfind', async () => { + statMock.mockResolvedValue(statResult('directory', 'RGDNVCK')) + + await canCreateIn('/Documents') + + expect(statMock).toHaveBeenCalledWith('/files/alice/Documents/', { details: true, data: '' }) + }) + + it('is true for a folder the user may create in', async () => { + statMock.mockResolvedValue(statResult('directory', 'RGDNVCK')) + + await expect(canCreateIn('/Documents')).resolves.toBe(true) + }) + + it('is true for a team folder mount with create permission but without delete/rename', async () => { + statMock.mockResolvedValue(statResult('directory', 'MGCK')) + + await expect(canCreateIn('/Team Folders/Project')).resolves.toBe(true) + }) + + it('is false for a read-only folder, e.g. a read-only share or team folder', async () => { + statMock.mockResolvedValue(statResult('directory', 'RG')) + + await expect(canCreateIn('/Read-only share')).resolves.toBe(false) + }) + + it('is false for a file, even with full permissions', async () => { + statMock.mockResolvedValue(statResult('file', 'RGDNVW')) + + await expect(canCreateIn('/Notes.md')).resolves.toBe(false) + }) + + it('is false when the server sends no permissions', async () => { + statMock.mockResolvedValue({ data: { type: 'directory', props: {} } }) + + await expect(canCreateIn('/Odd')).resolves.toBe(false) + }) + + it('propagates a failed stat, e.g. a deleted folder', async () => { + statMock.mockRejectedValue(new Error('404 Not Found')) + + await expect(canCreateIn('/Gone')).rejects.toThrow('404 Not Found') + }) +}) diff --git a/src/services/folders.ts b/src/services/folders.ts new file mode 100644 index 00000000..3ccd1d0e --- /dev/null +++ b/src/services/folders.ts @@ -0,0 +1,29 @@ +/** + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +import { Permission } from '@nextcloud/files' +import { getClient, getDefaultPropfind, getRootPath, parsePermissions } from '@nextcloud/files/dav' + +// Folder paths here are relative to the user's Files root ("/", "/Documents", +// "/Team folder/Reports"), the same form Node.path and the templates/create +// endpoint use. Team folders are mounted into that tree, so they need no +// special handling. +function davPath(folder: string): string { + return getRootPath() + folder.replace(/\/$/, '') + '/' +} + +// Whether the folder still exists and the user may create files in it. Used to +// re-check a remembered folder, which may have been deleted, unshared or had +// its permissions reduced since it was picked. +export async function canCreateIn(folder: string): Promise { + const response = await getClient().stat(davPath(folder), { + details: true, + data: getDefaultPropfind(), + }) as { data: { type: string, props?: { permissions?: unknown } } } + const { type, props } = response.data + // oc:permissions, e.g. "RGDNVCK"; team folders and shares report their own, + // including groupfolder ACLs. + return type === 'directory' && (parsePermissions(String(props?.permissions ?? '')) & Permission.CREATE) !== 0 +} diff --git a/src/views/OfficeOverview.spec.ts b/src/views/OfficeOverview.spec.ts index 0a655e63..7c494f60 100644 --- a/src/views/OfficeOverview.spec.ts +++ b/src/views/OfficeOverview.spec.ts @@ -4,6 +4,7 @@ import { getCurrentUser } from '@nextcloud/auth' import { loadState } from '@nextcloud/initial-state' import { createMemoryHistory, createRouter } from 'vue-router' import { CREATOR_CATEGORIES, fakeLoadState, makeCreator, makeNode } from '../test-utils/fixtures.ts' +import { getLastTargetFolder, setLastTargetFolder } from '../services/config.ts' import type { Node } from '@nextcloud/files' import type { Router } from 'vue-router' @@ -11,12 +12,17 @@ const getTemplatesMock = vi.fn() const createFromTemplateMock = vi.fn() const getAllOfficeFilesMock = vi.fn() const invalidateOfficeFilesCacheMock = vi.fn() +const canCreateInMock = vi.fn() vi.mock('../services/templates.ts', () => ({ getTemplates: getTemplatesMock, createFromTemplate: createFromTemplateMock, })) +vi.mock('../services/folders.ts', () => ({ + canCreateIn: canCreateInMock, +})) + vi.mock('../services/officeFiles.ts', async (importOriginal) => { const actual = await importOriginal() return { @@ -127,6 +133,8 @@ beforeEach(() => { createFromTemplateMock.mockReset() getAllOfficeFilesMock.mockReset() invalidateOfficeFilesCacheMock.mockReset() + canCreateInMock.mockReset() + canCreateInMock.mockResolvedValue(true) localStorage.clear() // jsdom's real Location.href setter attempts actual navigation, logs @@ -595,6 +603,220 @@ describe('OfficeOverview > toggleViewMode', () => { }) }) +describe('OfficeOverview > target folder', () => { + async function openDialog() { + const creator = makeCreator() + getTemplatesMock.mockResolvedValue([creator]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([])) + const wrapper = await mountOverview() + + await wrapper.findComponent({ name: 'TemplateSection' }).vm.$emit('select', creator, null) + await flushPromises() + + return wrapper + } + + function targetFolderPicker(wrapper: Awaited>) { + return wrapper.findComponent({ name: 'TargetFolderPicker' }) + } + + async function pickFolder(wrapper: Awaited>, folder: string) { + await targetFolderPicker(wrapper).vm.$emit('update:path', folder) + await flushPromises() + } + + async function create(wrapper: Awaited>) { + createFromTemplateMock.mockResolvedValue({ fileid: 99, basename: 'x.odt', filename: '/x.odt' }) + await findButtonByText(wrapper, 'Create').vm.$emit('click') + await flushPromises() + } + + it('starts in the root folder when no folder was used before, without a folder check', async () => { + const wrapper = await openDialog() + + expect(targetFolderPicker(wrapper).props('path')).toBe('/') + expect(canCreateInMock).not.toHaveBeenCalled() + }) + + it('starts in the last used folder when it is still usable', async () => { + setLastTargetFolder('/Team folder/Reports') + + const wrapper = await openDialog() + + expect(canCreateInMock).toHaveBeenCalledWith('/Team folder/Reports') + expect(targetFolderPicker(wrapper).props('path')).toBe('/Team folder/Reports') + }) + + it('falls back to the root folder when the last used folder is no longer writable', async () => { + setLastTargetFolder('/Read-only share') + canCreateInMock.mockResolvedValue(false) + + const wrapper = await openDialog() + + expect(targetFolderPicker(wrapper).props('path')).toBe('/') + }) + + it('falls back to the root folder when the last used folder is gone', async () => { + setLastTargetFolder('/Deleted') + canCreateInMock.mockRejectedValue(new Error('404 Not Found')) + + const wrapper = await openDialog() + + expect(targetFolderPicker(wrapper).props('path')).toBe('/') + }) + + it('keeps a folder picked while the remembered folder was still being checked', async () => { + setLastTargetFolder('/Old project') + let answerCheck: (writable: boolean) => void = () => {} + canCreateInMock.mockReturnValue(new Promise((resolve) => { answerCheck = resolve })) + const creator = makeCreator() + getTemplatesMock.mockResolvedValue([creator]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([])) + const wrapper = await mountOverview() + await wrapper.findComponent({ name: 'TemplateSection' }).vm.$emit('select', creator, null) + + await pickFolder(wrapper, '/Team folder') + answerCheck(false) + await flushPromises() + + expect(targetFolderPicker(wrapper).props('path')).toBe('/Team folder') + }) + + it('creates the file in the picked folder and remembers that folder', async () => { + const wrapper = await openDialog() + + await pickFolder(wrapper, '/Team folder') + await create(wrapper) + + expect(createFromTemplateMock).toHaveBeenCalledWith('/Team folder/Document.odt', '', 'user_system') + expect(getLastTargetFolder()).toBe('/Team folder') + }) + + it('creates the file in the root folder without a double slash', async () => { + const wrapper = await openDialog() + + await create(wrapper) + + expect(createFromTemplateMock).toHaveBeenCalledWith('/Document.odt', '', 'user_system') + }) + + it('does not remember the folder when creating fails', async () => { + const wrapper = await openDialog() + await pickFolder(wrapper, '/Team folder') + + createFromTemplateMock.mockRejectedValue(new Error('network down')) + await findButtonByText(wrapper, 'Create').vm.$emit('click') + await flushPromises() + + expect(getLastTargetFolder()).toBe('/') + }) + + it('tells the user when the remembered folder could not be used, and clears that after picking', async () => { + setLastTargetFolder('/Deleted') + canCreateInMock.mockResolvedValue(false) + + const wrapper = await openDialog() + + expect(wrapper.findComponent({ name: 'NcNoteCard' }).props('text')) + .toBe('The last used folder is no longer available. The file will be saved in All files.') + + await pickFolder(wrapper, '/Team folder') + + expect(wrapper.findComponent({ name: 'NcNoteCard' }).exists()).toBe(false) + }) + + it('shows no notice when the remembered folder is still usable', async () => { + setLastTargetFolder('/Team folder') + + const wrapper = await openDialog() + + expect(wrapper.findComponent({ name: 'NcNoteCard' }).exists()).toBe(false) + }) + + it('keeps the folder button disabled while the remembered folder is being checked', async () => { + setLastTargetFolder('/Team folder') + let answerCheck: (writable: boolean) => void = () => {} + canCreateInMock.mockReturnValue(new Promise((resolve) => { answerCheck = resolve })) + const creator = makeCreator() + getTemplatesMock.mockResolvedValue([creator]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([])) + const wrapper = await mountOverview() + await wrapper.findComponent({ name: 'TemplateSection' }).vm.$emit('select', creator, null) + await flushPromises() + + expect(targetFolderPicker(wrapper).props('disabled')).toBe(true) + + answerCheck(true) + await flushPromises() + + expect(targetFolderPicker(wrapper).props('disabled')).toBe(false) + }) + + it('shows a picker failure below the folder, not on the filename field', async () => { + const wrapper = await openDialog() + + await targetFolderPicker(wrapper).vm.$emit('error') + await flushPromises() + + const note = wrapper.findComponent({ name: 'NcNoteCard' }) + expect(note.props('type')).toBe('error') + expect(note.props('text')).toBe('The folder picker could not be opened. Please try again.') + expect(wrapper.findComponent({ name: 'NcTextField' }).props('helperText')).toBe('') + }) + + it('clears a picker failure when another folder is picked', async () => { + const wrapper = await openDialog() + await targetFolderPicker(wrapper).vm.$emit('error') + await flushPromises() + + await pickFolder(wrapper, '/Team folder') + + expect(wrapper.findComponent({ name: 'NcNoteCard' }).exists()).toBe(false) + }) + + it('keeps the folder button disabled when an older folder check answers during a newer one', async () => { + setLastTargetFolder('/Team folder') + const answers: ((writable: boolean) => void)[] = [] + canCreateInMock.mockImplementation(() => new Promise((resolve) => { answers.push(resolve) })) + const creator = makeCreator() + getTemplatesMock.mockResolvedValue([creator]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([])) + const wrapper = await mountOverview() + const select = () => wrapper.findComponent({ name: 'TemplateSection' }).vm.$emit('select', creator, null) + + await select() + await select() + answers[0](true) + await flushPromises() + + expect(targetFolderPicker(wrapper).props('disabled')).toBe(true) + + answers[1](true) + await flushPromises() + + expect(targetFolderPicker(wrapper).props('disabled')).toBe(false) + }) + + it('does not switch folder under a create that was started during the folder check', async () => { + setLastTargetFolder('/Old project') + let answerCheck: (writable: boolean) => void = () => {} + canCreateInMock.mockReturnValue(new Promise((resolve) => { answerCheck = resolve })) + createFromTemplateMock.mockReturnValue(new Promise(() => {})) + const creator = makeCreator() + getTemplatesMock.mockResolvedValue([creator]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([])) + const wrapper = await mountOverview() + await wrapper.findComponent({ name: 'TemplateSection' }).vm.$emit('select', creator, null) + + await findButtonByText(wrapper, 'Create').vm.$emit('click') + answerCheck(false) + await flushPromises() + + expect(createFromTemplateMock).toHaveBeenCalledWith('/Old project/Document.odt', '', 'user_system') + expect(targetFolderPicker(wrapper).props('path')).toBe('/Old project') + }) +}) + describe('OfficeOverview > doCreateFromTemplate', () => { async function mountWithDialogOpen() { const creator = makeCreator() diff --git a/src/views/OfficeOverview.vue b/src/views/OfficeOverview.vue index 38304615..dcde167d 100644 --- a/src/views/OfficeOverview.vue +++ b/src/views/OfficeOverview.vue @@ -22,6 +22,7 @@ import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent' import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper' import NcListItem from '@nextcloud/vue/components/NcListItem' import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon' +import NcNoteCard from '@nextcloud/vue/components/NcNoteCard' import NcTextField from '@nextcloud/vue/components/NcTextField' import { mdiAlertCircleOutline, @@ -34,10 +35,12 @@ import { import FileCard from '../components/FileCard.vue' import FilePreview from '../components/FilePreview.vue' import ShareIndicator from '../components/ShareIndicator.vue' +import TargetFolderPicker from '../components/TargetFolderPicker.vue' import TemplateSection from '../components/TemplateSection.vue' import { getAllOfficeFiles, invalidateOfficeFilesCache, MAX_DISPLAY_FILES } from '../services/officeFiles.ts' +import { canCreateIn } from '../services/folders.ts' import { getTemplates, createFromTemplate } from '../services/templates.ts' -import { getOverviewGridView, setOverviewGridView } from '../services/config.ts' +import { getLastTargetFolder, getOverviewGridView, setLastTargetFolder, setOverviewGridView } from '../services/config.ts' import { categoryId, categoryName, categoryMimes, creatorById, allOfficeMimes } from '../utils/fileCategories.ts' import { previewAspectRatio } from '../utils/creatorTheme.ts' import { validateFilename } from '../utils/validateFilename.ts' @@ -69,6 +72,20 @@ const pendingTemplate = ref(null) const creating = ref(false) const createError = ref('') const createInput = ref | null>(null) +// Folder the new file is created in, relative to the user's Files root. +const targetFolder = ref('/') +// True while the remembered folder is being re-checked; the picker stays +// closed meanwhile, as it would start in a folder that may be gone. +const checkingFolder = ref(false) +// Bumped per folder check, so only the latest check may end checkingFolder. +let folderCheck = 0 +// Bumped whenever the target folder is decided — a new dialog, a picked +// folder, a started create — so a slow check never overrides that decision. +let folderRequest = 0 +// Shown when the remembered folder could not be used. +const folderNotice = ref('') +// Shown when the folder picker could not be opened; the filename is fine then. +const folderPickerError = ref('') const routeCreatorId = computed(() => { const param = route.params.creatorId @@ -190,11 +207,29 @@ function openInFiles() { } } -function onTemplateSelect(creator: TemplateCreator, template: TemplateFile | null) { +// The remembered folder may have been deleted or lost its create permission +// since it was picked; then fall back to the root folder. +async function usableFolder(folder: string): Promise { + if (folder === '/') { + return folder + } + try { + return await canCreateIn(folder) ? folder : '/' + } catch { + return '/' + } +} + +// The dialog opens at once in the last used folder; the check whether that +// folder is still usable follows, so a slow connection never delays it. +async function onTemplateSelect(creator: TemplateCreator, template: TemplateFile | null) { pendingCreator.value = creator pendingTemplate.value = template newFileName.value = creator.label + creator.extension createError.value = '' + targetFolder.value = getLastTargetFolder() + folderNotice.value = '' + folderPickerError.value = '' showCreateDialog.value = true nextTick(() => { const component = createInput.value as { focus?: () => void; $el?: HTMLElement } | null @@ -207,6 +242,37 @@ function onTemplateSelect(creator: TemplateCreator, template: TemplateFile | nul component?.$el?.querySelector('input') ?.setSelectionRange(0, newFileName.value.length - creator.extension.length) }) + + const request = ++folderRequest + const check = ++folderCheck + const rememberedFolder = targetFolder.value + checkingFolder.value = rememberedFolder !== '/' + const folder = await usableFolder(rememberedFolder) + // An older check, e.g. from a dialog closed and reopened meanwhile, must not + // re-enable the picker while the current one is still running. + if (check === folderCheck) { + checkingFolder.value = false + } + // Another dialog, a picked folder or a started create wins over this check. + if (request !== folderRequest) { + return + } + if (folder !== rememberedFolder) { + folderNotice.value = t('office', 'The last used folder is no longer available. The file will be saved in All files.') + } + targetFolder.value = folder +} + +function onTargetFolderChange(folder: string) { + folderRequest++ + targetFolder.value = folder + folderNotice.value = '' + folderPickerError.value = '' + createError.value = '' +} + +function onFolderPickerError() { + folderPickerError.value = t('office', 'The folder picker could not be opened. Please try again.') } async function doCreateFromTemplate() { @@ -218,11 +284,15 @@ async function doCreateFromTemplate() { } creating.value = true createError.value = '' + // Drop a folder check still in flight: the dialog must not change folder + // under a create that has already been sent. + folderRequest++ try { - const filePath = '/' + newFileName.value.trim() + const filePath = targetFolder.value.replace(/\/$/, '') + '/' + newFileName.value.trim() const templatePath = pendingTemplate.value?.templateId ?? '' const templateType = pendingTemplate.value?.templateType ?? 'user_system' const newFile: CreatedFile = await createFromTemplate(filePath, templatePath, templateType) + setLastTargetFolder(targetFolder.value) showCreateDialog.value = false invalidateOfficeFilesCache() window.location.href = generateUrl('/f/{fileid}', { fileid: newFile.fileid }) @@ -463,6 +533,12 @@ fetchAll() :error="!!createError" :helper-text="createError" :disabled="creating" /> + + + diff --git a/vitest.setup.ts b/vitest.setup.ts index 9d452dd0..1508e62d 100644 --- a/vitest.setup.ts +++ b/vitest.setup.ts @@ -1,6 +1,5 @@ import { config } from '@vue/test-utils' import { vi } from 'vitest' -import escapeHTML from 'escape-html' // shallowMount()'s auto-stubs render nothing by default, including slot // content passed to them — without this, any content nested inside a @@ -21,17 +20,10 @@ function substitutePlaceholders(text: string, vars?: Record): s }) } -// Real translate() escapes every placeholder value by default (escape-html) — -// match that here, or a component relying on the default silently ships -// double-escaped output that only breaks against the real implementation. -vi.mock('@nextcloud/l10n', async (importOriginal) => ({ - ...(await importOriginal()), - translate: (app: string, text: string, placeholders?: Record) => - text.replace(/{([^{}]*)}/g, (match: string, key: string) => { - const value = placeholders?.[key] - return value !== undefined ? escapeHTML(String(value)) : match - }), -})) +// @nextcloud/l10n is deliberately NOT mocked: the real translate() escapes and +// sanitizes placeholder values (escape-html + DOMPurify, which runs on jsdom), +// and a stand-in that skips either step lets labels pass here that render +// mangled in a browser. vi.mock('@nextcloud/auth', () => ({ getCurrentUser: vi.fn(() => null),