From b4e8a8a3d8c5d9646d2de4a5d57bde9b0ccc2678 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Tue, 14 Dec 2021 10:18:04 +0100 Subject: [PATCH 1/2] change icons fix share indicators, add changelog update file extension icons fix filltype in sidebar fix unittests, snapshots add owncloud theme icons move icons to general assets fix icons path missing for oc10 fix missing icons fix snapshot tests fix linting fix unittests change ods version to alpha6 fix snapshot tests change icon names for unittest Fix ResourceTable tests relying on composition API Fix integration link datepicker test, update changelog Fix link expiration unit test --- changelog/unreleased/change-use-remixicons | 7 + changelog/unreleased/enhancement-update-ods | 7 +- dev/docker/oc10.web.config.json | 2 +- docker-compose.yml | 1 + package.json | 2 +- packages/web-app-draw-io/src/index.js | 2 +- .../src/components/ErrorScreen.vue | 2 +- .../__snapshots__/ErrorScreen.spec.ts.snap | 2 +- .../src/components/AppBar/AppBar.vue | 2 +- .../components/AppBar/Upload/FileUpload.vue | 2 +- .../components/AppBar/Upload/FolderUpload.vue | 2 +- .../src/components/AppBar/ViewOptions.vue | 6 +- .../src/components/FilesList/QuickActions.vue | 2 +- .../components/FilesList/ResourceTable.vue | 2 +- .../SideBar/Details/FileDetailsMultiple.vue | 2 +- .../SideBar/Links/CopyToClipboardButton.vue | 4 +- .../SideBar/Links/PublicLinks/LinkActions.vue | 4 +- .../SideBar/Links/PublicLinks/LinkEdit.vue | 2 +- .../SideBar/Links/PublicLinks/LinkInfo.vue | 10 +- .../src/components/SideBar/NoSelection.vue | 2 +- .../components/SideBar/Shares/FileShares.vue | 2 +- .../ExpirationDatepicker.vue | 2 +- .../SideBar/Shares/RoleDropdown.vue | 2 +- .../src/components/SideBar/SideBar.vue | 4 +- .../SideBar/Versions/FileVersions.vue | 4 +- .../src/components/Upload/DetailsWidget.vue | 2 +- .../src/components/Upload/ProgressBar.vue | 6 +- packages/web-app-files/src/fileSideBars.js | 12 +- .../src/fileTypeIconMappings.json | 158 +++++++++--------- .../src/helpers/statusIndicators.js | 2 + packages/web-app-files/src/index.js | 8 +- packages/web-app-files/src/mixins.js | 2 +- .../web-app-files/src/mixins/actions/copy.js | 2 +- .../src/mixins/actions/declineShare.js | 2 +- .../src/mixins/actions/delete.js | 4 +- .../src/mixins/actions/downloadFile.js | 2 +- .../src/mixins/actions/emptyTrashBin.js | 2 +- .../web-app-files/src/mixins/actions/move.js | 2 +- .../src/mixins/actions/rename.js | 2 +- .../src/mixins/actions/restore.js | 2 +- .../src/mixins/actions/showDetails.js | 2 +- .../src/mixins/deleteResources.js | 2 +- packages/web-app-files/src/quickActions.js | 6 +- .../web-app-files/src/views/FilesDrop.vue | 6 +- .../web-app-files/src/views/SharedWithMe.vue | 9 +- .../tests/__fixtures__/fileActions.js | 18 +- .../FilesList/ContextActions.spec.js | 18 +- .../FilesList/ResourceTable.spec.js | 4 +- .../__snapshots__/ContextActions.spec.js.snap | 40 ++--- .../Search/__snapshots__/List.spec.js.snap | 14 +- .../Links/PublicLinks/LinkInfo.spec.js | 8 +- .../RecipientContainer.spec.js.snap | 10 +- .../__snapshots__/FileShares.spec.js.snap | 2 +- .../__snapshots__/RoleDropdown.spec.js.snap | 16 +- .../components/Upload/ProgressBar.spec.js | 8 +- .../__snapshots__/ProgressBar.spec.js.snap | 4 +- .../web-app-files/tests/unit/mixins.spec.js | 2 +- .../__snapshots__/FilesDrop.spec.js.snap | 16 +- .../__snapshots__/SharedViaLink.spec.js.snap | 7 +- packages/web-app-markdown-editor/src/index.js | 2 +- .../lib/Controller/FilesController.php | 2 +- packages/web-runtime/package.json | 4 +- .../__snapshots__/SidebarNav.spec.js.snap | 6 +- .../ApplicationsMenu.spec.js.snap | 6 +- .../__snapshots__/FeedbackLink.spec.js.snap | 2 +- rollup.config.js | 3 +- .../config-oc10-integration-app-oauth.json | 2 +- yarn.lock | 35 ++-- 68 files changed, 284 insertions(+), 257 deletions(-) create mode 100644 changelog/unreleased/change-use-remixicons diff --git a/changelog/unreleased/change-use-remixicons b/changelog/unreleased/change-use-remixicons new file mode 100644 index 00000000000..778b2a49e4d --- /dev/null +++ b/changelog/unreleased/change-use-remixicons @@ -0,0 +1,7 @@ +Change: Use remixicons for redesign + +We've switched the iconset to remixicons to +fit the new design. + +https://github.com/owncloud/web/pull/6142 +https://github.com/owncloud/web/issues/6100 diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/unreleased/enhancement-update-ods index 26d9e0b8d8a..0361a57f07f 100644 --- a/changelog/unreleased/enhancement-update-ods +++ b/changelog/unreleased/enhancement-update-ods @@ -1,6 +1,6 @@ -Enhancement: Update ODS to v12.0.0-alpha5 +Enhancement: Update ODS to v12.0.0-alpha6 -We updated the ownCloud Design System to version 12.0.0-alpha5. Please refer to the full changelog in the ODS release (linked) for more details. Summary: +We updated the ownCloud Design System to version 12.0.0-alpha6. Please refer to the full changelog in the ODS release (linked) for more details. Summary: - Change - Do not sort in OcTable: https://github.com/owncloud/owncloud-design-system/pull/1825 - Change - Remove OcAppSideBar component: https://github.com/owncloud/owncloud-design-system/pull/1810 @@ -14,4 +14,5 @@ We updated the ownCloud Design System to version 12.0.0-alpha5. Please refer to - Bugfix - Rename GhostElement: https://github.com/owncloud/owncloud-design-system/pull/1845 https://github.com/owncloud/web/pull/6086 -https://github.com/owncloud/owncloud-design-system/releases/tag/v12.0.0-alpha5 +https://github.com/owncloud/web/pull/6142 +https://github.com/owncloud/owncloud-design-system/releases/tag/v12.0.0-alpha6 diff --git a/dev/docker/oc10.web.config.json b/dev/docker/oc10.web.config.json index f3b3e66e556..ce80b8e3bc6 100644 --- a/dev/docker/oc10.web.config.json +++ b/dev/docker/oc10.web.config.json @@ -22,7 +22,7 @@ "fr": "Fichiers", "zh_CN": "文件" }, - "icon": "switch_ui", + "icon": "swap-box", "url": "http://host.docker.internal:8080/index.php/apps/files" }, { diff --git a/docker-compose.yml b/docker-compose.yml index 695c3fd2db9..e755ddf182b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: - ./dist/img:/mnt/data/apps/web/img - ./dist/js:/mnt/data/apps/web/js - ./dist/themes:/mnt/data/apps/web/themes + - ./dist/icons:/mnt/data/apps/web/icons - ./dist/index.html:/mnt/data/apps/web/index.html - ./dist/manifest.json:/mnt/data/apps/web/manifest.json - ./dist/oidc-callback.html:/mnt/data/apps/web/oidc-callback.html diff --git a/package.json b/package.json index 8506b58cd88..1dc458b800b 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "jest": "^26.6.3", "jest-axe": "^4.1.0", "jest-fetch-mock": "^3.0.3", - "jest-mock-axios": "^4.4.0", + "jest-mock-axios": "^4.5.0", "jest-serializer-vue": "^2.0.2", "jest-svg-transformer": "^1.0.0", "join-path": "^1.1.1", diff --git a/packages/web-app-draw-io/src/index.js b/packages/web-app-draw-io/src/index.js index 7b72babc072..c46a29895ed 100644 --- a/packages/web-app-draw-io/src/index.js +++ b/packages/web-app-draw-io/src/index.js @@ -15,7 +15,7 @@ const routes = [ const appInfo = { name: 'Draw.io', id: 'draw-io', - icon: 'grid_on', + icon: 'grid', extensions: [ { extension: 'drawio', diff --git a/packages/web-app-external/src/components/ErrorScreen.vue b/packages/web-app-external/src/components/ErrorScreen.vue index 569051bfbed..eb8742bdd68 100644 --- a/packages/web-app-external/src/components/ErrorScreen.vue +++ b/packages/web-app-external/src/components/ErrorScreen.vue @@ -1,6 +1,6 @@ diff --git a/packages/web-app-external/tests/unit/components/__snapshots__/ErrorScreen.spec.ts.snap b/packages/web-app-external/tests/unit/components/__snapshots__/ErrorScreen.spec.ts.snap index e550e41a5ac..6e09f2ea4fb 100644 --- a/packages/web-app-external/tests/unit/components/__snapshots__/ErrorScreen.spec.ts.snap +++ b/packages/web-app-external/tests/unit/components/__snapshots__/ErrorScreen.spec.ts.snap @@ -2,7 +2,7 @@ exports[`The external app error screen component displays an icon and a paragraph 1`] = `
- +

Error when loading the application

`; diff --git a/packages/web-app-files/src/components/AppBar/AppBar.vue b/packages/web-app-files/src/components/AppBar/AppBar.vue index 410599d6ed1..c218eecc8ad 100644 --- a/packages/web-app-files/src/components/AppBar/AppBar.vue +++ b/packages/web-app-files/src/components/AppBar/AppBar.vue @@ -83,7 +83,7 @@ justify-content="left" @click="showCreateResourceModal" > - + New folder… diff --git a/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue b/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue index ac98182a100..bcc266406e8 100644 --- a/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue +++ b/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue @@ -1,7 +1,7 @@ diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue index f4230c299fa..2b05dc9595c 100644 --- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue +++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue @@ -113,7 +113,7 @@ resetDropPosition(`context-menu-drop-ref-${resourceDomSelector(item)}`, $event, item) " > - +
- +

diff --git a/packages/web-app-files/src/components/SideBar/Links/CopyToClipboardButton.vue b/packages/web-app-files/src/components/SideBar/Links/CopyToClipboardButton.vue index c9f5d2e1c90..c43f7c6ba7f 100644 --- a/packages/web-app-files/src/components/SideBar/Links/CopyToClipboardButton.vue +++ b/packages/web-app-files/src/components/SideBar/Links/CopyToClipboardButton.vue @@ -8,10 +8,10 @@ - + diff --git a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkActions.vue b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkActions.vue index 2b3fec32a70..efa986e7ecf 100644 --- a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkActions.vue +++ b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkActions.vue @@ -10,7 +10,7 @@ class="oc-files-file-link-edit oc-mr-xs" @click="editLink" > - + - + diff --git a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue index a2ee5458529..5503b6ec693 100644 --- a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue @@ -63,7 +63,7 @@ > Expires %{expires} - + diff --git a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkInfo.vue b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkInfo.vue index 3a990a53930..c2473d32566 100644 --- a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkInfo.vue +++ b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkInfo.vue @@ -55,7 +55,7 @@ class="oc-files-file-link-via" :to="viaRouterParams" > - + @@ -90,16 +90,16 @@ export default { roleTagIcon() { switch (this.link.description) { case 'Viewer': - return 'remove_red_eye' + return 'eye' case 'Contributor': - return 'edit' + return 'pencil' case 'Editor': - return 'edit' + return 'pencil' case 'Uploader': - return 'file_upload' + return 'file-add' default: return 'key' diff --git a/packages/web-app-files/src/components/SideBar/NoSelection.vue b/packages/web-app-files/src/components/SideBar/NoSelection.vue index c7a47d56e63..37deea24636 100644 --- a/packages/web-app-files/src/components/SideBar/NoSelection.vue +++ b/packages/web-app-files/src/components/SideBar/NoSelection.vue @@ -1,6 +1,6 @@ diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue index e5539f5f3c6..7843101f14f 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue @@ -25,7 +25,7 @@ :is-tooltip-displayed="false" class="sharee-avatars" /> - + diff --git a/packages/web-app-files/src/components/SideBar/Shares/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/RoleDropdown.vue index 11528d3ea43..1e02aa84780 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/RoleDropdown.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/RoleDropdown.vue @@ -8,7 +8,7 @@ > {{ $gettext(selectedRole.label) }} - + - + {{ defaultPanel.component.title($gettext) }} @@ -74,7 +74,7 @@ > {{ panelSelect.component.title($gettext) }} - + diff --git a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue index ec83ecd595e..c5e9b56cb49 100644 --- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue +++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue @@ -26,7 +26,7 @@ :aria-label="$gettext('Restore older version')" @click="revertVersion(item)" > - + @@ -39,7 +39,7 @@ :aria-label="$gettext('Download older version')" @click="downloadVersion(item)" > - + diff --git a/packages/web-app-files/src/components/Upload/DetailsWidget.vue b/packages/web-app-files/src/components/Upload/DetailsWidget.vue index 1e4a98e6ad6..7570c2b913c 100644 --- a/packages/web-app-files/src/components/Upload/DetailsWidget.vue +++ b/packages/web-app-files/src/components/Upload/DetailsWidget.vue @@ -2,7 +2,7 @@
  • - +
    diff --git a/packages/web-app-files/src/components/Upload/ProgressBar.vue b/packages/web-app-files/src/components/Upload/ProgressBar.vue index ad39b268888..b5bb02058cd 100644 --- a/packages/web-app-files/src/components/Upload/ProgressBar.vue +++ b/packages/web-app-files/src/components/Upload/ProgressBar.vue @@ -19,7 +19,11 @@ :aria-label="$gettext('Click row to toggle upload progress details')" @click.native="$_toggleExpanded" > - +
    ({ app: 'no-selection-item', - icon: 'info_outline', + icon: 'questionnaire-line', component: NoSelection, default: () => true, get enabled() { @@ -21,7 +21,7 @@ export default [ }), ({ router, multipleSelection, rootFolder }) => ({ app: 'details-item', - icon: 'info_outline', + icon: 'questionnaire-line', component: FileDetails, default: !isLocationCommonActive(router, 'files-common-trash'), get enabled() { @@ -32,7 +32,7 @@ export default [ }), ({ multipleSelection, rootFolder }) => ({ app: 'details-multiple-item', - icon: 'info_outline', + icon: 'questionnaire-line', component: FileDetailsMultiple, default: () => true, get enabled() { @@ -42,7 +42,7 @@ export default [ ({ router, multipleSelection, rootFolder }) => ({ app: 'actions-item', component: FileActions, - icon: 'slideshow', + icon: 'slideshow-2', default: isLocationCommonActive(router, 'files-common-trash'), get enabled() { return !multipleSelection && !rootFolder @@ -66,7 +66,7 @@ export default [ }), ({ capabilities, router, multipleSelection, rootFolder }) => ({ app: 'links-item', - icon: 'link', + icon: 'links', component: FileLinks, get enabled() { if (multipleSelection || rootFolder) return false @@ -82,7 +82,7 @@ export default [ }), ({ capabilities, highlightedFile, router, multipleSelection, rootFolder }) => ({ app: 'versions-item', - icon: 'file_version', + icon: 'git-branch-line', component: FileVersions, get enabled() { if (multipleSelection || rootFolder) return false diff --git a/packages/web-app-files/src/fileTypeIconMappings.json b/packages/web-app-files/src/fileTypeIconMappings.json index e012e230316..b4f4633e3d6 100644 --- a/packages/web-app-files/src/fileTypeIconMappings.json +++ b/packages/web-app-files/src/fileTypeIconMappings.json @@ -1,99 +1,99 @@ { - "7z": "package-x-generic", + "7z": "file-zip", "accdb": "file", "ai": "image", - "apk": "package-x-generic", - "bash": "text-code", - "bz2": "package-x-generic", - "cb7": "text", - "cba": "text", - "cbr": "text", - "cbt": "text", - "cbtc": "text", - "cbz": "text", - "cc": "text-code", + "apk": "file-zip", + "bash": "file-code", + "bz2": "file-zip", + "cb7": "file-text", + "cba": "file-text", + "cbr": "file-text", + "cbt": "file-text", + "cbtc": "file-text", + "cbz": "file-text", + "cc": "file-code", "cdr": "image", - "cpp": "text-code", - "css": "text-code", - "csv": "x-office-spreadsheet", - "cvbdl": "text", - "c": "text-code", - "c++": "text-code", - "deb": "package-x-generic", - "doc": "x-office-document", - "docm": "x-office-document", - "docx": "x-office-document", - "dot": "x-office-document", - "dotx": "x-office-document", - "eml": "text", + "cpp": "file-code", + "css": "file-code", + "csv": "file-excel-2", + "cvbdl": "file-text", + "c": "file-code", + "c++": "file-code", + "deb": "file-zip", + "doc": "file-word-2", + "docm": "file-word-2", + "docx": "file-word-2", + "dot": "file-word-2", + "dotx": "file-word-2", + "eml": "file-text", "eot": "image", - "epub": "text", + "epub": "file-text", "eps": "image", - "gz": "package-x-generic", - "gzip": "package-x-generic", - "h": "text-code", - "hh": "text-code", - "hpp": "text-code", - "html": "text-code", - "htm": "text-code", - "java": "text-code", - "js": "text-code", - "json": "text-code", + "gz": "file-zip", + "gzip": "file-zip", + "h": "file-code", + "hh": "file-code", + "hpp": "file-code", + "html": "file-code", + "htm": "file-code", + "java": "file-code", + "js": "file-code", + "json": "file-code", "jpeg": "image", "jpg": "image", - "lwp": "x-office-document", + "lwp": "file-word-2", "mdb": "file", - "odp": "x-office-presentation", - "ods": "x-office-spreadsheet", - "odt": "x-office-document", - "one": "x-office-document", + "odp": "file-ppt-2", + "ods": "file-excel-2", + "odt": "file-word-2", + "one": "file-word-2", "otf": "image", - "pdf": "application-pdf", + "pdf": "file-pdf", "pfb": "image", - "php": "text-code", - "pl": "text-code", + "php": "file-code", + "pl": "file-code", "png": "image", - "pot": "x-office-presentation", - "potm": "x-office-presentation", - "potx": "x-office-presentation", - "ppa": "x-office-presentation", - "ppam": "x-office-presentation", - "pps": "x-office-presentation", - "ppsm": "x-office-presentation", - "ppsx": "x-office-presentation", - "ppt": "x-office-presentation", - "pptm": "x-office-presentation", - "pptx": "x-office-presentation", + "pot": "file-ppt-2", + "potm": "file-ppt-2", + "potx": "file-ppt-2", + "ppa": "file-ppt-2", + "ppam": "file-ppt-2", + "pps": "file-ppt-2", + "ppsm": "file-ppt-2", + "ppsx": "file-ppt-2", + "ppt": "file-ppt-2", + "pptm": "file-ppt-2", + "pptx": "file-ppt-2", "ps": "image", "psd": "image", - "py": "text-code", - "rar": "package-x-generic", + "py": "file-code", + "rar": "file-zip", "rss": "file", - "sh-lib": "text-code", - "sh": "text-code", + "sh-lib": "file-code", + "sh": "file-code", "swf": "file", - "tar": "package-x-generic", - "tar.bz2": "package-x-generic", - "tar.gz": "package-x-generic", - "tbz2": "package-x-generic", - "tex": "text", - "tgz": "package-x-generic", + "tar": "file-zip", + "tar.bz2": "file-zip", + "tar.gz": "file-zip", + "tbz2": "file-zip", + "tex": "file-text", + "tgz": "file-zip", "ttf": "image", - "vsd": "x-office-document", + "vsd": "file-word-2", "woff": "image", - "wpd": "x-office-document", + "wpd": "file-word-2", "xcf": "image", - "xla": "x-office-spreadsheet", - "xlam": "x-office-spreadsheet", - "xls": "x-office-spreadsheet", - "xlsb": "x-office-spreadsheet", - "xlsm": "x-office-spreadsheet", - "xlsx": "x-office-spreadsheet", - "xlt": "x-office-spreadsheet", - "xltm": "x-office-spreadsheet", - "xltx": "x-office-spreadsheet", - "xml": "text-code", - "yaml": "text-code", - "yml": "text-code", - "zip": "package-x-generic" + "xla": "file-excel-2", + "xlam": "file-excel-2", + "xls": "file-excel-2", + "xlsb": "file-excel-2", + "xlsm": "file-excel-2", + "xlsx": "file-excel-2", + "xlt": "file-excel-2", + "xltm": "file-excel-2", + "xltx": "file-excel-2", + "xml": "file-code", + "yaml": "file-code", + "yml": "file-code", + "zip": "file-zip" } diff --git a/packages/web-app-files/src/helpers/statusIndicators.js b/packages/web-app-files/src/helpers/statusIndicators.js index f46d4cdf678..5836b9cef0a 100644 --- a/packages/web-app-files/src/helpers/statusIndicators.js +++ b/packages/web-app-files/src/helpers/statusIndicators.js @@ -96,6 +96,7 @@ export const getIndicators = (resource, sharesTree) => { label: $gettext('Show invited people'), visible: isUserShare(resource, sharesTree), icon: 'group', + fillType: 'fill', target: 'sharing-item', type: isDirectUserShare(resource) ? 'user-direct' : 'user-indirect', handler: indicatorHandler @@ -106,6 +107,7 @@ export const getIndicators = (resource, sharesTree) => { label: $gettext('Show links'), visible: isLinkShare(resource, sharesTree), icon: 'link', + fillType: 'none', target: 'links-item', type: isDirectLinkShare(resource) ? 'link-direct' : 'link-indirect', handler: indicatorHandler diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js index 2296fbdbef1..6b61492a2de 100644 --- a/packages/web-app-files/src/index.js +++ b/packages/web-app-files/src/index.js @@ -37,6 +37,7 @@ const navItems = [ { name: $gettext('All files'), iconMaterial: appInfo.icon, + fillType: 'fill', route: { path: `/${appInfo.id}/spaces/` } @@ -44,6 +45,7 @@ const navItems = [ { name: $gettext('Favorites'), iconMaterial: 'star', + fillType: 'fill', route: { path: `/${appInfo.id}/favorites` }, @@ -54,6 +56,7 @@ const navItems = [ { name: $gettext('Shared with me'), iconMaterial: 'shared-with-me', + fillType: 'none', route: { path: `/${appInfo.id}/shares/with-me` } @@ -61,6 +64,7 @@ const navItems = [ { name: $gettext('Shared with others'), iconMaterial: 'shared-with-others', + fillType: 'none', route: { path: `/${appInfo.id}/shares/with-others` } @@ -68,13 +72,15 @@ const navItems = [ { name: $gettext('Shared via link'), iconMaterial: 'link', + fillType: 'none', route: { path: `/${appInfo.id}/shares/via-link` } }, { name: $gettext('Deleted files'), - iconMaterial: 'delete', + iconMaterial: 'delete-bin-5', + fillType: 'fill', route: { path: `/${appInfo.id}/trash` }, diff --git a/packages/web-app-files/src/mixins.js b/packages/web-app-files/src/mixins.js index ce1fde5fee5..422be4b7c4a 100644 --- a/packages/web-app-files/src/mixins.js +++ b/packages/web-app-files/src/mixins.js @@ -137,7 +137,7 @@ export default { const modal = { variation: isVersioningEnabled ? 'passive' : 'danger', - icon: 'cloud_upload', + icon: 'upload-cloud', title, message: isVersioningEnabled ? this.$gettext('Do you want to create a new version?') diff --git a/packages/web-app-files/src/mixins/actions/copy.js b/packages/web-app-files/src/mixins/actions/copy.js index 1bbd71fbb45..850dc2a4a34 100644 --- a/packages/web-app-files/src/mixins/actions/copy.js +++ b/packages/web-app-files/src/mixins/actions/copy.js @@ -11,7 +11,7 @@ export default { return [ { name: 'copy', - icon: 'file_copy', + icon: 'file-copy-2', handler: this.$_copy_trigger, label: () => this.$pgettext('Action in the files list row to initiate copying resources', 'Copy'), diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js index 7a72f11ac36..3bc06dbe8ed 100644 --- a/packages/web-app-files/src/mixins/actions/declineShare.js +++ b/packages/web-app-files/src/mixins/actions/declineShare.js @@ -11,7 +11,7 @@ export default { return [ { name: 'decline-share', - icon: 'not_interested', + icon: 'close', handler: this.$_declineShare_trigger, label: ({ resources }) => this.$ngettext('Decline share', 'Decline shares', resources.length), diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js index df3e8c44e42..adb96458ea9 100644 --- a/packages/web-app-files/src/mixins/actions/delete.js +++ b/packages/web-app-files/src/mixins/actions/delete.js @@ -14,7 +14,7 @@ export default { return [ { name: 'delete', - icon: 'delete', + icon: 'delete-bin-5', label: () => this.$gettext('Delete'), handler: this.$_delete_trigger, isEnabled: ({ resources }) => { @@ -39,7 +39,7 @@ export default { { // this menu item is ONLY for the trashbin (permanently delete a file/folder) name: 'delete-permanent', - icon: 'delete', + icon: 'delete-bin-5', label: () => this.$gettext('Delete'), handler: this.$_delete_trigger, isEnabled: ({ resources }) => { diff --git a/packages/web-app-files/src/mixins/actions/downloadFile.js b/packages/web-app-files/src/mixins/actions/downloadFile.js index 82caa487f48..e8aaba89d49 100644 --- a/packages/web-app-files/src/mixins/actions/downloadFile.js +++ b/packages/web-app-files/src/mixins/actions/downloadFile.js @@ -10,7 +10,7 @@ export default { return [ { name: 'delete-file', - icon: 'file_download', + icon: 'file-download', handler: this.$_downloadFile_trigger, label: () => { return this.$gettext('Download') diff --git a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js index a2ba20f1f56..bb72cde4d51 100644 --- a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js +++ b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js @@ -8,7 +8,7 @@ export default { return [ { name: 'empty-trash-bin', - icon: 'delete', + icon: 'delete-bin-5', label: () => this.$gettext('Empty trash bin'), handler: this.$_emptyTrashBin_trigger, isEnabled: ({ resources }) => { diff --git a/packages/web-app-files/src/mixins/actions/move.js b/packages/web-app-files/src/mixins/actions/move.js index 752abffb034..41f9dea4dc3 100644 --- a/packages/web-app-files/src/mixins/actions/move.js +++ b/packages/web-app-files/src/mixins/actions/move.js @@ -12,7 +12,7 @@ export default { return [ { name: 'move', - icon: 'folder-move', + icon: 'folder-shared', handler: this.$_move_trigger, label: () => this.$pgettext('Action in the files list row to initiate moving resources', 'Move'), diff --git a/packages/web-app-files/src/mixins/actions/rename.js b/packages/web-app-files/src/mixins/actions/rename.js index eafa52e34ee..2468c6d789d 100644 --- a/packages/web-app-files/src/mixins/actions/rename.js +++ b/packages/web-app-files/src/mixins/actions/rename.js @@ -13,7 +13,7 @@ export default { return [ { name: 'rename', - icon: 'edit', + icon: 'pencil', label: () => { return this.$gettext('Rename') }, diff --git a/packages/web-app-files/src/mixins/actions/restore.js b/packages/web-app-files/src/mixins/actions/restore.js index 963533e2782..05ee1193ca3 100644 --- a/packages/web-app-files/src/mixins/actions/restore.js +++ b/packages/web-app-files/src/mixins/actions/restore.js @@ -8,7 +8,7 @@ export default { return [ { name: 'restore', - icon: 'restore', + icon: 'arrow-go-back', label: () => this.$gettext('Restore'), handler: this.$_restore_trigger, isEnabled: ({ resources }) => { diff --git a/packages/web-app-files/src/mixins/actions/showDetails.js b/packages/web-app-files/src/mixins/actions/showDetails.js index 9ad80813adc..8e380582ed4 100644 --- a/packages/web-app-files/src/mixins/actions/showDetails.js +++ b/packages/web-app-files/src/mixins/actions/showDetails.js @@ -7,7 +7,7 @@ export default { return [ { name: 'show-details', - icon: 'info_outline', + icon: 'information', label: () => this.$gettext('Details'), handler: this.$_showDetails_trigger, // we don't have details in the trashbin, yet. diff --git a/packages/web-app-files/src/mixins/deleteResources.js b/packages/web-app-files/src/mixins/deleteResources.js index 3a75cde5891..068c6b0ae2c 100644 --- a/packages/web-app-files/src/mixins/deleteResources.js +++ b/packages/web-app-files/src/mixins/deleteResources.js @@ -193,7 +193,7 @@ export default { const modal = { variation: 'danger', - icon: 'warning', + icon: 'alarm-warning', title: this.$_deleteResources_dialogTitle, message: this.$_deleteResources_dialogMessage, cancelText: this.$gettext('Cancel'), diff --git a/packages/web-app-files/src/quickActions.js b/packages/web-app-files/src/quickActions.js index 905513a7b45..bd66d76b6c4 100644 --- a/packages/web-app-files/src/quickActions.js +++ b/packages/web-app-files/src/quickActions.js @@ -55,14 +55,16 @@ export default { collaborators: { id: 'collaborators', label: ($gettext) => $gettext('Add people'), - icon: 'group-add', + icon: 'group', + iconFillType: 'fill', handler: openNewCollaboratorsPanel, displayed: canShare }, publicLink: { id: 'public-link', label: ($gettext) => $gettext('Create and copy public link'), - icon: 'link-add', + icon: 'link', + iconFillType: 'none', handler: createPublicLink, displayed: canShare } diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue index 586840f72c9..fe6caddd16c 100644 --- a/packages/web-app-files/src/views/FilesDrop.vue +++ b/packages/web-app-files/src/views/FilesDrop.vue @@ -19,7 +19,7 @@ @vdropzone-file-added="dropZoneFileAdded" >
    - + Drop files here to upload or click to select file
    @@ -39,13 +39,13 @@ diff --git a/packages/web-app-files/src/views/SharedWithMe.vue b/packages/web-app-files/src/views/SharedWithMe.vue index 3e4b4d15494..b2197c13926 100644 --- a/packages/web-app-files/src/views/SharedWithMe.vue +++ b/packages/web-app-files/src/views/SharedWithMe.vue @@ -43,7 +43,7 @@ class="file-row-share-decline oc-ml-s" @click.stop="$_declineShare_trigger({ resources: [resource] })" > - + Decline
    @@ -65,7 +65,10 @@ @click="togglePendingShowMore" > {{ pendingToggleMoreLabel }} - +
    @@ -135,7 +138,7 @@ class="file-row-share-status-decline" @click.stop="$_declineShare_trigger({ resources: [resource] })" > - + Decline
    diff --git a/packages/web-app-files/tests/__fixtures__/fileActions.js b/packages/web-app-files/tests/__fixtures__/fileActions.js index 831f3b5ee17..cbc473d8a87 100644 --- a/packages/web-app-files/tests/__fixtures__/fileActions.js +++ b/packages/web-app-files/tests/__fixtures__/fileActions.js @@ -12,12 +12,12 @@ const meta = { 'draw-io': { name: 'Draw.io', id: 'draw-io', - icon: 'grid_on' + icon: 'grid' }, 'markdown-editor': { name: 'MarkdownEditor', id: 'markdown-editor', - icon: 'text' + icon: 'file-text' } } @@ -63,12 +63,12 @@ const sideBars = [ { app: 'details-item', enabled: jest.fn(), - icon: 'info_outline' + icon: 'information' }, { app: 'actions-item', enabled: jest.fn(), - icon: 'info_outline' + icon: 'information' } ] @@ -87,7 +87,7 @@ exports.apps = { const fileActions = { download: { name: 'download-file', - icon: 'file_download', + icon: 'file-download', handler: jest.fn(), label: () => 'Download', componentType: 'oc-button', @@ -96,7 +96,7 @@ const fileActions = { }, copy: { name: 'copy', - icon: 'file_copy', + icon: 'file-copy', handler: jest.fn(), label: () => 'Copy', componentType: 'oc-button', @@ -105,7 +105,7 @@ const fileActions = { }, rename: { name: 'rename', - icon: 'edit', + icon: 'pencil', handler: jest.fn(), label: () => 'Rename', componentType: 'oc-button', @@ -114,7 +114,7 @@ const fileActions = { }, move: { name: 'move', - icon: 'folder-move', + icon: 'folder-shared', handler: jest.fn(), label: () => 'Move', componentType: 'oc-button', @@ -123,7 +123,7 @@ const fileActions = { }, delete: { name: 'delete', - icon: 'delete', + icon: 'delete-bin-5', handler: jest.fn(), label: () => 'Delete', componentType: 'oc-button', diff --git a/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js b/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js index a00945bc97e..439df8e8b06 100644 --- a/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js +++ b/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js @@ -25,7 +25,7 @@ const mockMenuSections = [ name: 'context', items: [ { - icon: 'text', + icon: 'file-text', canBeDefault: true, handler: jest.fn(), label: () => 'Open in editor', @@ -45,7 +45,7 @@ const mockMenuSections = [ } }), { - icon: 'file_download', + icon: 'download', canBeDefault: true, handler: jest.fn(), label: () => 'Download', @@ -54,7 +54,7 @@ const mockMenuSections = [ class: 'oc-files-actions-download-file-trigger' }, { - icon: 'link-add', + icon: 'links', handler: jest.fn(), label: () => 'Create link', componentType: 'oc-button', @@ -62,7 +62,7 @@ const mockMenuSections = [ class: 'oc-files-actions-create-public-link-trigger' }, { - icon: 'group-add', + icon: 'group', handler: jest.fn(), label: () => 'Share', componentType: 'oc-button', @@ -75,7 +75,7 @@ const mockMenuSections = [ name: 'actions', items: [ { - icon: 'edit', + icon: 'pencil', handler: jest.fn(), label: () => 'Edit', componentType: 'oc-button', @@ -83,7 +83,7 @@ const mockMenuSections = [ class: 'oc-files-actions-rename-trigger' }, { - icon: 'folder-move', + icon: 'folder-shared', handler: jest.fn(), label: () => 'Move', componentType: 'oc-button', @@ -91,7 +91,7 @@ const mockMenuSections = [ class: 'oc-files-actions-move-trigger' }, { - icon: 'file_copy', + icon: 'file-copy', handler: jest.fn(), label: () => 'Copy', componentType: 'oc-button', @@ -99,7 +99,7 @@ const mockMenuSections = [ class: 'oc-files-actions-copy-trigger' }, { - icon: 'delete', + icon: 'delete-bin-5', handler: jest.fn(), label: () => 'Delete', componentType: 'oc-button', @@ -120,7 +120,7 @@ const mockMenuSections = [ name: 'sidebar', items: [ { - icon: 'info_outline', + icon: 'information', handler: jest.fn(), label: () => 'Details', componentType: 'oc-button', diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceTable.spec.js b/packages/web-app-files/tests/unit/components/FilesList/ResourceTable.spec.js index f5d61a870e8..1f57c9bc9d9 100644 --- a/packages/web-app-files/tests/unit/components/FilesList/ResourceTable.spec.js +++ b/packages/web-app-files/tests/unit/components/FilesList/ResourceTable.spec.js @@ -1,5 +1,6 @@ import merge from 'lodash-es/merge' import { mount, createLocalVue } from '@vue/test-utils' +import VueCompositionAPI from '@vue/composition-api' import { DateTime } from 'luxon' import DesignSystem from 'owncloud-design-system' @@ -79,7 +80,7 @@ const resourcesWithAllFields = [ id: 'notes', name: 'notes.txt', path: '/Documents/notes.txt', - icon: 'text', + icon: 'file-text', indicators, type: 'file', size: 'big', @@ -239,6 +240,7 @@ describe('ResourceTable', () => { function getMountedWrapper(options = {}) { const localVue = createLocalVue() localVue.use(DesignSystem) + localVue.use(VueCompositionAPI) localVue.prototype.$gettextInterpolate = jest.fn() localVue.prototype.$ngettext = jest.fn() diff --git a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap index 3f839b0d506..dfb8ee04ef8 100644 --- a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap @@ -4,7 +4,7 @@ exports[`ContextActions menu items renders a list of actions for a file 1`] = `
    • @@ -67,7 +67,7 @@ exports[`ContextActions menu items renders a list of actions for a folder 1`] =
    • diff --git a/packages/web-app-files/tests/unit/components/Search/__snapshots__/List.spec.js.snap b/packages/web-app-files/tests/unit/components/Search/__snapshots__/List.spec.js.snap index 50b3b6b932c..c022ad09bda 100644 --- a/packages/web-app-files/tests/unit/components/Search/__snapshots__/List.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/Search/__snapshots__/List.spec.js.snap @@ -3,10 +3,9 @@ exports[`List component when no resource is found should show no-content-message component 1`] = `
    -
    +
    + +

    No search term entered

    @@ -18,10 +17,9 @@ exports[`List component when no resource is found should show no-content-message exports[`List component when no search term is entered should show no-content-message component 1`] = `
    -
    +
    + +

    No search term entered

    diff --git a/packages/web-app-files/tests/unit/components/SideBar/Links/PublicLinks/LinkInfo.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Links/PublicLinks/LinkInfo.spec.js index 75a6c168f9b..c938adbeeb9 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Links/PublicLinks/LinkInfo.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Links/PublicLinks/LinkInfo.spec.js @@ -104,10 +104,10 @@ describe('LinkInfo', () => { describe('link role', () => { it.each([ - { role: 'Viewer', icon: 'remove_red_eye' }, - { role: 'Editor', icon: 'edit' }, - { role: 'Contributor', icon: 'edit' }, - { role: 'Uploader', icon: 'file_upload' }, + { role: 'Viewer', icon: 'eye' }, + { role: 'Editor', icon: 'pencil' }, + { role: 'Contributor', icon: 'pencil' }, + { role: 'Uploader', icon: 'file-add' }, { role: '*', icon: 'key' } ])('should set different role tag icon for different role types', (dataSet) => { const wrapper = getShallowWrapper({ diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/__snapshots__/RecipientContainer.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/__snapshots__/RecipientContainer.spec.js.snap index eb20826716e..4d05a228039 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/__snapshots__/RecipientContainer.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/__snapshots__/RecipientContainer.spec.js.snap @@ -3,15 +3,15 @@ exports[`InviteCollaborator RecipientContainer displays an avatar image if capability is present 1`] = `

    Albert Einstein

     `; -exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 1`] = `

    Albert Einstein

    `; +exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 1`] = `

    Albert Einstein

    `; -exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 2`] = `

    physics-lovers

    `; +exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 2`] = `

    physics-lovers

    `; -exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 3`] = `

    guest-user

    `; +exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 3`] = `

    guest-user

    `; -exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 4`] = `

    remote-user

    `; +exports[`InviteCollaborator RecipientContainer renders a recipient with a deselect button different recipients for different shareTypes 4`] = `

    remote-user

    `; diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.js.snap index 71c74b32276..d41f5b6f09d 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.js.snap @@ -22,7 +22,7 @@ exports[`FileShares if there are collaborators present renders sharedWithLabel a

    Shared with

    - +
    diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/RoleDropdown.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/RoleDropdown.spec.js.snap index f04ce95bfc1..d7a14500ff9 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/RoleDropdown.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/RoleDropdown.spec.js.snap @@ -2,14 +2,14 @@ exports[`RoleDropdown for file shares when an existing role is present renders a button with existing role if given for resource type file 1`] = ` Viewer - +
  • - +
  • @@ -55,14 +55,14 @@ exports[`RoleDropdown for file shares when an existing role is present renders a exports[`RoleDropdown for file shares when an existing role is present renders a button with existing role if given for resource type folder 1`] = ` Viewer - +
  • - +
  • @@ -108,14 +108,14 @@ exports[`RoleDropdown for file shares when an existing role is present renders a exports[`RoleDropdown for file shares when no existing role is present renders a button with invite text if no existing role given for resource type file 1`] = ` Invite as viewer - +
  • - +
  • @@ -155,14 +155,14 @@ exports[`RoleDropdown for file shares when no existing role is present renders a exports[`RoleDropdown for file shares when no existing role is present renders a button with invite text if no existing role given for resource type folder 1`] = ` Invite as viewer - +
  • - +
  • diff --git a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js b/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js index 8885d78147a..fe4cf219062 100644 --- a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js +++ b/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js @@ -84,10 +84,10 @@ describe('ProgressBar component', () => { store = createStore(items) wrapper = getShallowWrapper(store) }) - it('should have "expand_more" as oc-icon name', () => { + it('should have "arrow-down-s" as oc-icon name', () => { const ocIcon = wrapper.find(selectors.ocIcon) - expect(ocIcon.props().name).toEqual('expand_more') + expect(ocIcon.props().name).toEqual('arrow-down-s') }) it('should show the text "Show Details"', () => { const showDetails = wrapper.find(selectors.showDetails) @@ -117,10 +117,10 @@ describe('ProgressBar component', () => { store = createStore(items) wrapper = getShallowWrapper(store, true) }) - it('should change oc-icon name to "expand_less"', () => { + it('should change oc-icon name to "arrow-up-s"', () => { const ocIcon = wrapper.find(selectors.ocIcon) - expect(ocIcon.props().name).toEqual('expand_less') + expect(ocIcon.props().name).toEqual('arrow-up-s') }) it('should show the text "Hide Details"', () => { const showDetails = wrapper.find(selectors.showDetails) diff --git a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap b/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap index 791c382a0ca..89fe987c792 100644 --- a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap @@ -9,7 +9,7 @@ exports[`ProgressBar component when a single file is uploaded should show correc
    • - +
    @@ -34,7 +34,7 @@ exports[`ProgressBar component when multiple files are uploaded should show tota
    - +
    Uploading 2 items
    diff --git a/packages/web-app-files/tests/unit/mixins.spec.js b/packages/web-app-files/tests/unit/mixins.spec.js index 113263ac448..23a2593a48f 100644 --- a/packages/web-app-files/tests/unit/mixins.spec.js +++ b/packages/web-app-files/tests/unit/mixins.spec.js @@ -51,7 +51,7 @@ describe('mixins', () => { { type: false, extension: 'tar.bz2' }, { type: '0', extension: 'tar.bz2' } ])('should return the icon for a known file extension, regardless of the type', (inputData) => { - expect(mixins.methods.fileTypeIcon(inputData)).toEqual('package-x-generic') + expect(mixins.methods.fileTypeIcon(inputData)).toEqual('file-zip') }) }) diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/FilesDrop.spec.js.snap b/packages/web-app-files/tests/unit/views/__snapshots__/FilesDrop.spec.js.snap index bae198619e9..d9ff60cdf9f 100644 --- a/packages/web-app-files/tests/unit/views/__snapshots__/FilesDrop.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/__snapshots__/FilesDrop.spec.js.snap @@ -9,7 +9,7 @@ exports[`FilesDrop should show page title and configuration theme general slogan

    admin shared this folder with you for uploading

    - + Drop files here to upload or click to select file
    @@ -53,7 +53,7 @@ exports[`FilesDrop when "loading" is set to false should call "dropZoneFileAdded

    admin shared this folder with you for uploading

    - + Drop files here to upload or click to select file
    @@ -68,7 +68,7 @@ exports[`FilesDrop when "loading" is set to false should call "dropZoneFileAdded - + @@ -105,7 +105,7 @@ exports[`FilesDrop when "loading" is set to false should show error message if o

    admin shared this folder with you for uploading

    - + Drop files here to upload or click to select file
    @@ -137,7 +137,7 @@ exports[`FilesDrop when "loading" is set to false should show files list of uplo

    - + Drop files here to upload or click to select file
    @@ -153,7 +153,7 @@ exports[`FilesDrop when "loading" is set to false should show files list of uplo - + @@ -163,7 +163,7 @@ exports[`FilesDrop when "loading" is set to false should show files list of uplo - + @@ -216,7 +216,7 @@ exports[`FilesDrop when "loading" is set to false should show share information

    admin shared this folder with you for uploading

    - + Drop files here to upload or click to select file
    diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/SharedViaLink.spec.js.snap b/packages/web-app-files/tests/unit/views/__snapshots__/SharedViaLink.spec.js.snap index 23e7f4cc5ef..7e76d4e1222 100644 --- a/packages/web-app-files/tests/unit/views/__snapshots__/SharedViaLink.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/__snapshots__/SharedViaLink.spec.js.snap @@ -3,10 +3,9 @@ exports[`SharedViaLink view when the view is not loading anymore when there are no files to be displayed should show no-content-message component 1`] = `
    -
    +
    + +
    There are no resources with a public link at the moment
    diff --git a/packages/web-app-markdown-editor/src/index.js b/packages/web-app-markdown-editor/src/index.js index 6a52248bcdd..192647144e6 100644 --- a/packages/web-app-markdown-editor/src/index.js +++ b/packages/web-app-markdown-editor/src/index.js @@ -26,7 +26,7 @@ const fileExtensionConfig = { const appInfo = { name: 'MarkdownEditor', id: 'markdown-editor', - icon: 'text', + icon: 'file-text', isFileEditor: true, extensions: [ { diff --git a/packages/web-integration-oc10/lib/Controller/FilesController.php b/packages/web-integration-oc10/lib/Controller/FilesController.php index bf35987ef3f..5c1019c0e5e 100644 --- a/packages/web-integration-oc10/lib/Controller/FilesController.php +++ b/packages/web-integration-oc10/lib/Controller/FilesController.php @@ -78,7 +78,7 @@ public function getFile(string $path): Response { } // check if path permitted - $permittedPaths = ["css", "img", "js", "themes", "index.html", "manifest.json", "oidc-callback.html", "oidc-silent-redirect.html"]; + $permittedPaths = ["css", "img", "js", "themes", "icons", "index.html", "manifest.json", "oidc-callback.html", "oidc-silent-redirect.html"]; $found = false; foreach ($permittedPaths as $p) { if (\strpos($path, $p) === 0) { diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 237a49aa079..f10b955eb7a 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -5,7 +5,7 @@ "license": "AGPL-3.0", "dependencies": { "@popperjs/core": "^2.4.0", - "@vue/composition-api": "^1.2.4", + "@vue/composition-api": "^1.4.3", "easygettext": "^2.16.1", "filesize": "^8.0.0", "focus-trap": "^6.4.0", @@ -14,7 +14,7 @@ "lodash-es": "^4.17.21", "luxon": "^2.0.0", "oidc-client": "1.11.5", - "owncloud-design-system": "12.0.0-alpha4", + "owncloud-design-system": "12.0.0-alpha6", "owncloud-sdk": "1.0.0-2296", "p-queue": "^6.1.1", "popper-max-size-modifier": "^0.2.0", diff --git a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap index 7423dbc6753..1ecadeed625 100644 --- a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap @@ -2,7 +2,7 @@ exports[`OcSidebarNav renders navItems into a list 1`] = `