From 3ca616cc64bd1de45de5d126c6368de27a2a31c6 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 17 Jun 2020 10:33:07 +0200
Subject: [PATCH] Move create new button

We have moved the create new button from the right side of files app bar
to the left directly next to breadcrumbs.
---
 apps/files/src/components/FileList.vue    |  2 +-
 apps/files/src/components/FilesAppBar.vue |  2 +-
 changelog/unreleased/move-create-button   |  5 +++++
 tests/acceptance/pageObjects/filesPage.js | 10 ++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 changelog/unreleased/move-create-button

diff --git a/apps/files/src/components/FileList.vue b/apps/files/src/components/FileList.vue
index 5ac363ecd34..bb1b760c7bb 100644
--- a/apps/files/src/components/FileList.vue
+++ b/apps/files/src/components/FileList.vue
@@ -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
diff --git a/apps/files/src/components/FilesAppBar.vue b/apps/files/src/components/FilesAppBar.vue
index 162c36f6da4..ef668a5acc1 100644
--- a/apps/files/src/components/FilesAppBar.vue
+++ b/apps/files/src/components/FilesAppBar.vue
@@ -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"
diff --git a/changelog/unreleased/move-create-button b/changelog/unreleased/move-create-button
new file mode 100644
index 00000000000..6b804ba6d33
--- /dev/null
+++ b/changelog/unreleased/move-create-button
@@ -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
diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index 983af7ab73d..f853c45fdd5 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -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')
@@ -288,6 +287,9 @@ module.exports = {
     deleteSelectedButton: {
       selector: '#delete-selected-btn'
     },
+    newResourceDropdown: {
+      selector: '#new-file-menu-drop'
+    },
     newFolderButton: {
       selector: '#new-folder-btn'
     },