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.

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

Move create new button #3622

Merged
merged 1 commit into from
Jun 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/files/src/components/FileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
key="files-list-results-existence"
gutter="small"
flex
class="uk-padding-small"
class="uk-padding-small uk-padding-remove-top uk-padding-remove-bottom uk-margin-xsmall-bottom"
>
<div>
<oc-checkbox
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/FilesAppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@progress="onFileProgress"
/>
<oc-grid flex gutter="small">
<div class="uk-flex-1">
<div>
<div class="uk-flex">
<oc-breadcrumb
v-if="showBreadcrumb"
Expand Down
5 changes: 5 additions & 0 deletions changelog/unreleased/move-create-button
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Change: Move create new button

We've moved the create new button in the files app bar to the left directly next to breadcrumbs.

https://github.com/owncloud/phoenix/pull/3622
10 changes: 6 additions & 4 deletions tests/acceptance/pageObjects/filesPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,9 @@ module.exports = {
return (
this.waitForElementVisible('@dialog')
.waitForAnimationToFinish()
// clicking file overwrite dialog overlay to remove file upload
// popup, as we upload the file directly using `setValue`. The overwrite
// dialog is too fast and does not give time to close the dropdown beforehand
.clickElementAt(this.elements.dialog.selector, 0, 0)
// clicking new resource dropdown to hide it, as we upload the file directly using `setValue`.
// The overwrite dialog is too fast and does not give time to close the dropdown beforehand
.clickElementAt(this.elements.newResourceDropdown.selector, 0, 0)
.waitForElementNotVisible('@newFolderButton')
.click('@dialogConfirmBtn')
.waitForElementNotPresent('@dialog')
Expand Down Expand Up @@ -288,6 +287,9 @@ module.exports = {
deleteSelectedButton: {
selector: '#delete-selected-btn'
},
newResourceDropdown: {
selector: '#new-file-menu-drop'
},
newFolderButton: {
selector: '#new-folder-btn'
},
Expand Down