Merge pull request #6358 from owncloud/split-new-upload-btn

[full-ci] Redesign New- and Upload-Buttons

changelog/unreleased/bugfix-update-file-list-on-new-file

@@ -0,0 +1,6 @@
+Bugfix: Update file list when creating new files
+
+We update the file list now when creating a file in an editor that openes in a new tab (like draw.io).
+
+https://github.com/owncloud/web/issues/5530
+https://github.com/owncloud/web/pull/6358

changelog/unreleased/enhancement-redesign-create-upload-buttons

@@ -0,0 +1,7 @@
+Enhancement: Redesign create and upload buttons
+
+We have separated the "Create new file/folder" and "Upload" actions above the files list into two separate buttons,
+also using the new resource type icons for more consistency.
+
+https://github.com/owncloud/web/issues/6279
+https://github.com/owncloud/web/pull/6358

package.json

@@ -39,7 +39,7 @@
     "vue": "^2.6.10"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.5",
+    "@babel/core": "^7.17.5",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.16.5",
@@ -51,7 +51,7 @@
     "@playwright/test": "^1.17.2",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-html": "^0.2.0",
+    "@rollup/plugin-html": "^0.2.4",
     "@rollup/plugin-inject": "^4.0.4",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-typescript": "^8.3.0",
@@ -95,7 +95,7 @@
     "jest-serializer-vue": "^2.0.2",
     "join-path": "^1.1.1",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.7",
     "pino": "^7.6.3",
     "pino-pretty": "^7.3.0",
     "playwright": "^1.17.1",

packages/web-app-draw-io/src/index.js

@@ -24,7 +24,7 @@ const appInfo = {
       routeName: 'draw-io',
       newFileMenu: {
         menuTitle($gettext) {
-          return $gettext('New draw.io document…')
+          return $gettext('Draw.io document')
         }
       }
     },

packages/web-app-files/src/components/ActionMenuItem.vue

@@ -14,6 +14,13 @@
         alt=""
         class="oc-icon oc-icon-m"
       />
+      <oc-img
+        v-else-if="hasExternalImageIcon(action)"
+        data-testid="action-img"
+        :src="action.icon"
+        alt=""
+        class="oc-icon oc-icon-m"
+      />
       <oc-icon
         v-else-if="action.icon"
         data-testid="action-icon"
@@ -90,6 +97,10 @@ export default {
       return {
         click: callback
       }
+    },
+
+    hasExternalImageIcon(action) {
+      return action.icon && /^https?:\/\//i.test(action.icon)
     }
   }
 }