Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Feb 24, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00c0b94
Use resource-icon for All Files navItem
pascalwengerter Feb 15, 2022
c35de98
Fix usage of external app icon/image in contextMenu
pascalwengerter Feb 15, 2022
4b1faca
Separate 'create new file/folder' and 'upload files/folder' actions i…
pascalwengerter Feb 15, 2022
2ebe252
Fix #5530: Upsert new files into files list
dschmidt Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-update-file-list-on-new-file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions changelog/unreleased/enhancement-redesign-create-upload-buttons
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-draw-io/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const appInfo = {
routeName: 'draw-io',
newFileMenu: {
menuTitle($gettext) {
return $gettext('New draw.io document…')
return $gettext('Draw.io document')
}
}
},
Expand Down
11 changes: 11 additions & 0 deletions packages/web-app-files/src/components/ActionMenuItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -90,6 +97,10 @@ export default {
return {
click: callback
}
},

hasExternalImageIcon(action) {
return action.icon && /^https?:\/\//i.test(action.icon)
}
}
}
Expand Down
Loading