From ff004738dd817e79e48dab33bebcb0e6c4922382 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 15:15:11 +0100
Subject: [PATCH 01/24] WIP Switch to accordions in the sidebar

---
 apps/files/src/components/FileDetails.vue | 25 +++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index 2a7963d6018..800e3ef7e28 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -2,7 +2,7 @@
   <oc-app-side-bar
     id="files-sidebar"
     :key="highlightedFile.id"
-    class="oc-p-s uk-overflow-auto uk-height-1-1"
+    class="oc-p-s uk-overflow-auto uk-height-1-1 oc-border-l"
     :disable-action="false"
     @close="close()"
   >
@@ -34,18 +34,7 @@
       </div>
     </template>
     <template slot="content">
-      <div>
-        <oc-tabs>
-          <oc-tab-item
-            v-for="tab of fileSideBarsEnabled"
-            :key="tab.name"
-            :active="tab.app === currentTab"
-            @click="setCurrentTab(tab.app)"
-          >
-            {{ tab.title || tab.component.title($gettext) }} {{ tab.name }}
-          </oc-tab-item>
-        </oc-tabs>
-        <component
+      <!-- <component
           :is="activeTabComponent.component"
           v-if="fileSideBars.length > 0 && activeTabComponent"
           :component-name="
@@ -55,8 +44,14 @@
             activeTabComponent.propsData ? activeTabComponent.propsData.componentUrl : ''
           "
           @reload="$emit('reload')"
-        ></component>
-      </div>
+        ></component> -->
+      <oc-accordion class="oc-mt-m">
+        <oc-accordion-item title="Actions" />
+        <oc-accordion-item title="People">
+          <component :is="activeTabComponent.component" />
+        </oc-accordion-item>
+        <oc-accordion-item title="Links" />
+      </oc-accordion>
     </template>
   </oc-app-side-bar>
 </template>

From dc09a067c854562018432ae8d2caa9b44fe5e6b9 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 15:40:32 +0100
Subject: [PATCH 02/24] Show actual accordions

---
 apps/files/src/components/FileDetails.vue | 60 +++--------------------
 1 file changed, 7 insertions(+), 53 deletions(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index 800e3ef7e28..e6249caaec2 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -34,23 +34,14 @@
       </div>
     </template>
     <template slot="content">
-      <!-- <component
-          :is="activeTabComponent.component"
-          v-if="fileSideBars.length > 0 && activeTabComponent"
-          :component-name="
-            activeTabComponent.propsData ? activeTabComponent.propsData.componentName : ''
-          "
-          :component-url="
-            activeTabComponent.propsData ? activeTabComponent.propsData.componentUrl : ''
-          "
-          @reload="$emit('reload')"
-        ></component> -->
       <oc-accordion class="oc-mt-m">
-        <oc-accordion-item title="Actions" />
-        <oc-accordion-item title="People">
-          <component :is="activeTabComponent.component" />
+        <oc-accordion-item
+          v-for="accordion in fileSideBarsEnabled"
+          :key="accordion.app"
+          :title="accordion.component.title($gettext)"
+        >
+          <component :is="accordion.component" />
         </oc-accordion-item>
-        <oc-accordion-item title="Links" />
       </oc-accordion>
     </template>
   </oc-app-side-bar>
@@ -58,7 +49,7 @@
 
 <script>
 import Mixins from '../mixins'
-import { mapActions, mapGetters, mapState, mapMutations } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 
 export default {
   name: 'FileDetails',
@@ -66,63 +57,26 @@ export default {
   computed: {
     ...mapGetters(['getToken', 'fileSideBars', 'capabilities']),
     ...mapGetters('Files', ['highlightedFile']),
-    ...mapState('Files', ['currentSidebarTab']),
 
     fileSideBarsEnabled() {
       return this.fileSideBars.filter(
         b => b.enabled === undefined || b.enabled(this.capabilities, this.highlightedFile)
       )
     },
-    defaultTab() {
-      if (this.fileSideBarsEnabled.length < 1) return null
-
-      return this.fileSideBarsEnabled[0].app
-    },
-
-    currentTab() {
-      if (this.currentSidebarTab && this.currentSidebarTab.tab) {
-        return this.currentSidebarTab.tab
-      }
-
-      return this.defaultTab
-    },
-
-    activeTabComponent() {
-      return this.fileSideBarsEnabled.find(sidebar => sidebar.app === this.currentTab)
-    },
 
     isFavoritesEnabled() {
       return this.capabilities.files && this.capabilities.files.favorites
     }
   },
-  watch: {
-    // Switch back to default tab after selecting different file
-    highlightedFile() {
-      this.SET_CURRENT_SIDEBAR_TAB({ tab: this.defaultTab })
-    }
-  },
-
-  created() {
-    this.SET_CURRENT_SIDEBAR_TAB({ tab: this.currentTab })
-  },
-
-  beforeDestroy() {
-    this.SET_CURRENT_SIDEBAR_TAB({})
-  },
 
   methods: {
     ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_CURRENT_SIDEBAR_TAB']),
 
     close() {
       this.$emit('reset')
     },
 
-    setCurrentTab(app) {
-      this.SET_CURRENT_SIDEBAR_TAB({ tab: app })
-    },
-
     toggleFileFavorite(file) {
       this.markFavorite({
         client: this.$client,

From fb8070cef944bd235c8ddb59072b917304d62cb6 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 15:51:15 +0100
Subject: [PATCH 03/24] Fix switching of sharing sidebar panels

---
 .../src/components/FileSharingSidebar.vue     | 20 +++++++------------
 apps/files/src/store/mutations.js             |  8 ++------
 apps/files/src/store/state.js                 |  2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index f89d3be1f5c..a4ba2677c47 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -138,18 +138,12 @@ export default {
       'incomingShares',
       'incomingSharesLoading',
       'sharesTree',
-      'currentSidebarTab'
+      'currentSharingSidebarPanel'
     ]),
     ...mapState(['user']),
 
     currentPanel() {
-      const tabOptions = this.currentSidebarTab.options
-
-      if (tabOptions && tabOptions.collaboratorsCurrentPanel) {
-        return tabOptions.collaboratorsCurrentPanel
-      }
-
-      return PANEL_SHOW
+      return this.currentSharingSidebarPanel || PANEL_SHOW
     },
 
     $_transitionGroupEnter() {
@@ -330,7 +324,7 @@ export default {
   },
 
   beforeDestroy() {
-    this.SET_CURRENT_SIDEBAR_TAB_OPTIONS({ collaboratorsCurrentPanel: PANEL_SHOW })
+    this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_SHOW)
   },
 
   methods: {
@@ -342,7 +336,7 @@ export default {
       'loadIncomingShares',
       'incomingSharesClearState'
     ]),
-    ...mapMutations('Files', ['SET_CURRENT_SIDEBAR_TAB_OPTIONS']),
+    ...mapMutations('Files', ['SET_CURRENT_SHARING_SIDEBAR_TAB']),
 
     $_isCollaboratorShare(collaborator) {
       return userShareTypes.includes(collaborator.shareType)
@@ -374,11 +368,11 @@ export default {
     },
     $_ocCollaborators_addShare() {
       this.transitionGroupActive = true
-      this.SET_CURRENT_SIDEBAR_TAB_OPTIONS({ collaboratorsCurrentPanel: PANEL_NEW })
+      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_NEW)
     },
     $_ocCollaborators_editShare(share) {
       this.currentShare = share
-      this.SET_CURRENT_SIDEBAR_TAB_OPTIONS({ collaboratorsCurrentPanel: PANEL_EDIT })
+      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_EDIT)
     },
     $_ocCollaborators_deleteShare(share) {
       this.transitionGroupActive = true
@@ -388,7 +382,7 @@ export default {
       })
     },
     $_ocCollaborators_showList() {
-      this.SET_CURRENT_SIDEBAR_TAB_OPTIONS({ collaboratorsCurrentPanel: PANEL_SHOW })
+      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_SHOW)
       this.currentShare = null
     },
     $_ocCollaborators_isUser(collaborator) {
diff --git a/apps/files/src/store/mutations.js b/apps/files/src/store/mutations.js
index abf161181c5..e454482027c 100644
--- a/apps/files/src/store/mutations.js
+++ b/apps/files/src/store/mutations.js
@@ -258,11 +258,7 @@ export default {
     state.files = []
   },
 
-  SET_CURRENT_SIDEBAR_TAB(state, { tab, options }) {
-    state.currentSidebarTab = { tab, options }
-  },
-
-  SET_CURRENT_SIDEBAR_TAB_OPTIONS(state, options) {
-    state.currentSidebarTab.options = options
+  SET_CURRENT_SHARING_SIDEBAR_TAB(state, panel) {
+    state.currentSharingSidebarPanel = panel
   }
 }
diff --git a/apps/files/src/store/state.js b/apps/files/src/store/state.js
index ed4364e611c..748e3d44f39 100644
--- a/apps/files/src/store/state.js
+++ b/apps/files/src/store/state.js
@@ -55,5 +55,5 @@ export default {
   /**
    * Sidebar
    */
-  currentSidebarTab: null
+  currentSharingSidebarPanel: null
 }

From bf5f5865d8657953b9778556c1b86521b442c31f Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 15:57:09 +0100
Subject: [PATCH 04/24] Fix position of sharing sidebar panels

---
 .../src/components/FileSharingSidebar.vue     | 47 +++++--------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index a4ba2677c47..f3225cad291 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -54,37 +54,17 @@
         </section>
       </template>
     </div>
-    <div v-if="currentPanel === PANEL_NEW" :key="PANEL_NEW">
-      <transition
-        enter-active-class="uk-animation-slide-right uk-animation-fast"
-        leave-active-class="uk-animation-slide-right uk-animation-reverse uk-animation-fast"
-        name="custom-classes-transition"
-      >
-        <div class="uk-position-cover oc-default-background">
-          <new-collaborator
-            v-if="$_ocCollaborators_canShare"
-            key="new-collaborator"
-            @close="$_ocCollaborators_showList"
-          />
-        </div>
-      </transition>
-    </div>
-    <div v-if="currentPanel === PANEL_EDIT" :key="PANEL_EDIT">
-      <transition
-        enter-active-class="uk-animation-slide-right uk-animation-fast"
-        leave-active-class="uk-animation-slide-right uk-animation-reverse uk-animation-fast"
-        name="custom-classes-transition"
-      >
-        <div class="uk-position-cover oc-default-background">
-          <edit-collaborator
-            v-if="$_ocCollaborators_canShare"
-            key="edit-collaborator"
-            :collaborator="currentShare"
-            @close="$_ocCollaborators_showList"
-          />
-        </div>
-      </transition>
-    </div>
+    <new-collaborator
+      v-if="$_ocCollaborators_canShare && currentPanel === PANEL_NEW"
+      key="new-collaborator"
+      @close="$_ocCollaborators_showList"
+    />
+    <edit-collaborator
+      v-if="$_ocCollaborators_canShare && currentPanel === PANEL_EDIT"
+      key="edit-collaborator"
+      :collaborator="currentShare"
+      @close="$_ocCollaborators_showList"
+    />
   </div>
 </template>
 
@@ -435,9 +415,4 @@ export default {
 .oc-autocomplete-suggestion-selected .uk-text-meta {
   color: white;
 }
-
-/** needed to cover the container below when transitioning */
-.oc-app-side-bar .oc-default-background {
-  background-color: white;
-}
 </style>

From 41222024b65b184aa3f73fe80a8e018547831de8 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 15:58:22 +0100
Subject: [PATCH 05/24] Remove leftover log

---
 apps/files/src/helpers/collaborators.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/files/src/helpers/collaborators.js b/apps/files/src/helpers/collaborators.js
index 6b595e8c3c3..883c5809d76 100644
--- a/apps/files/src/helpers/collaborators.js
+++ b/apps/files/src/helpers/collaborators.js
@@ -33,8 +33,6 @@ export function roleToBitmask(role, additionalPermissions = []) {
     }
   }
 
-  console.log(bitmask)
-
   return bitmask
 }
 

From 7cee845a70dca2088d1cde424c02ef6006f0d690 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 27 Oct 2020 16:13:12 +0100
Subject: [PATCH 06/24] Fix quick action

---
 apps/files/src/components/FileDetails.vue     | 19 +++++++++++++++++--
 .../src/components/FileSharingSidebar.vue     | 10 +++++-----
 apps/files/src/quickActions.js                |  7 ++-----
 apps/files/src/store/mutations.js             |  6 +++++-
 apps/files/src/store/state.js                 |  3 ++-
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index e6249caaec2..056d8b3e2c2 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -36,9 +36,10 @@
     <template slot="content">
       <oc-accordion class="oc-mt-m">
         <oc-accordion-item
-          v-for="accordion in fileSideBarsEnabled"
+          v-for="(accordion, index) in fileSideBarsEnabled"
           :key="accordion.app"
           :title="accordion.component.title($gettext)"
+          :expanded-by-default="isAccordionOpened(accordion.app, index)"
         >
           <component :is="accordion.component" />
         </oc-accordion-item>
@@ -49,7 +50,7 @@
 
 <script>
 import Mixins from '../mixins'
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions, mapGetters, mapState, mapMutations } from 'vuex'
 
 export default {
   name: 'FileDetails',
@@ -57,6 +58,7 @@ export default {
   computed: {
     ...mapGetters(['getToken', 'fileSideBars', 'capabilities']),
     ...mapGetters('Files', ['highlightedFile']),
+    ...mapState('Files', ['defaultOpenedAccordion']),
 
     fileSideBarsEnabled() {
       return this.fileSideBars.filter(
@@ -69,9 +71,14 @@ export default {
     }
   },
 
+  beforeDestroy() {
+    this.SET_DEFAULT_OPENED_ACCORDION(null)
+  },
+
   methods: {
     ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
+    ...mapMutations('Files', ['SET_DEFAULT_OPENED_ACCORDION']),
 
     close() {
       this.$emit('reset')
@@ -82,6 +89,14 @@ export default {
         client: this.$client,
         file: file
       })
+    },
+
+    isAccordionOpened(accordion, index) {
+      if (this.defaultOpenedAccordion) {
+        return this.defaultOpenedAccordion === accordion
+      }
+
+      return index === 0
     }
   }
 }
diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index f3225cad291..ae056eb9033 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -304,7 +304,7 @@ export default {
   },
 
   beforeDestroy() {
-    this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_SHOW)
+    this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_SHOW)
   },
 
   methods: {
@@ -316,7 +316,7 @@ export default {
       'loadIncomingShares',
       'incomingSharesClearState'
     ]),
-    ...mapMutations('Files', ['SET_CURRENT_SHARING_SIDEBAR_TAB']),
+    ...mapMutations('Files', ['SET_CURRENT_SHARING_SIDEBAR_PANEL']),
 
     $_isCollaboratorShare(collaborator) {
       return userShareTypes.includes(collaborator.shareType)
@@ -348,11 +348,11 @@ export default {
     },
     $_ocCollaborators_addShare() {
       this.transitionGroupActive = true
-      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_NEW)
+      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_NEW)
     },
     $_ocCollaborators_editShare(share) {
       this.currentShare = share
-      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_EDIT)
+      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_EDIT)
     },
     $_ocCollaborators_deleteShare(share) {
       this.transitionGroupActive = true
@@ -362,7 +362,7 @@ export default {
       })
     },
     $_ocCollaborators_showList() {
-      this.SET_CURRENT_SHARING_SIDEBAR_TAB(PANEL_SHOW)
+      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_SHOW)
       this.currentShare = null
     },
     $_ocCollaborators_isUser(collaborator) {
diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
index 2ce47303fcc..b6178011cef 100644
--- a/apps/files/src/quickActions.js
+++ b/apps/files/src/quickActions.js
@@ -47,12 +47,9 @@ function openNewCollaboratorsPanel(ctx) {
 
   // Workaround for displaying the new collaborators panel even when one is already opened
   // Creating timeout takes care of the event loop
-  // TODO: Get rid of this after we use overlay instead of sidebar
   setTimeout(() => {
-    ctx.store.commit('Files/SET_CURRENT_SIDEBAR_TAB', {
-      tab: 'files-sharing',
-      options: { collaboratorsCurrentPanel: 'newCollaborator' }
-    })
+    ctx.store.commit('Files/SET_DEFAULT_OPENED_ACCORDION', 'files-sharing')
+    ctx.store.commit('Files/SET_CURRENT_SHARING_SIDEBAR_PANEL', 'newCollaborator')
   })
 }
 
diff --git a/apps/files/src/store/mutations.js b/apps/files/src/store/mutations.js
index e454482027c..605cca89f3d 100644
--- a/apps/files/src/store/mutations.js
+++ b/apps/files/src/store/mutations.js
@@ -258,7 +258,11 @@ export default {
     state.files = []
   },
 
-  SET_CURRENT_SHARING_SIDEBAR_TAB(state, panel) {
+  SET_CURRENT_SHARING_SIDEBAR_PANEL(state, panel) {
     state.currentSharingSidebarPanel = panel
+  },
+
+  SET_DEFAULT_OPENED_ACCORDION(state, accordion) {
+    state.defaultOpenedAccordion = accordion
   }
 }
diff --git a/apps/files/src/store/state.js b/apps/files/src/store/state.js
index 748e3d44f39..d24a34f8dd0 100644
--- a/apps/files/src/store/state.js
+++ b/apps/files/src/store/state.js
@@ -55,5 +55,6 @@ export default {
   /**
    * Sidebar
    */
-  currentSharingSidebarPanel: null
+  currentSharingSidebarPanel: null,
+  defaultOpenedAccordion: null
 }

From d76a4a5f9c8a64bdae55a53cdb2a167fa8c06239 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 27 Oct 2020 16:44:24 +0100
Subject: [PATCH 07/24] Fix sidebar panel on indicators

---
 apps/files/src/components/FilesApp.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/src/components/FilesApp.vue b/apps/files/src/components/FilesApp.vue
index c68252f3807..8aeb9e19345 100644
--- a/apps/files/src/components/FilesApp.vue
+++ b/apps/files/src/components/FilesApp.vue
@@ -112,7 +112,7 @@ export default {
   methods: {
     ...mapActions('Files', ['dragOver', 'setHighlightedFile', 'resetFileSelection']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_CURRENT_SIDEBAR_TAB']),
+    ...mapMutations('Files', ['SET_DEFAULT_OPENED_ACCORDION']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
 
     trace() {
@@ -122,7 +122,7 @@ export default {
     openSideBar(file, sideBarName) {
       this.setHighlightedFile(file)
       setTimeout(() => {
-        this.SET_CURRENT_SIDEBAR_TAB({ tab: sideBarName })
+        this.SET_DEFAULT_OPENED_ACCORDION({ tab: sideBarName })
       })
     },
 

From 3e27e93a6f26b2233509e433e132d2fcf6ea0178 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 28 Oct 2020 12:42:54 +0100
Subject: [PATCH 08/24] Update ODS

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b76ab943229..b0690c896f5 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "node-fs-extra": "^0.8.2",
     "npm-run-all": "^4.1.5",
     "oidc-client": "^1.9.1",
-    "owncloud-design-system": "^1.12.2",
+    "owncloud-design-system": "^1.13.0",
     "owncloud-sdk": "^1.0.0-740",
     "p-limit": "^2.2.1",
     "p-queue": "^6.1.1",
diff --git a/yarn.lock b/yarn.lock
index 96460031d25..dd7bd6ccacb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6906,10 +6906,10 @@ os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-owncloud-design-system@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.12.2.tgz#b5c12be2f5ea5f1b4bdf33d44fcc801b8572407d"
-  integrity sha512-Y5Axn4MX87AvzTpxYMEkEj/074Ic7jVR5uMHWFWQB+G28UlKcfLal0mw0+e4azTVt6MVnQtIZwNP1i/JMkwKrg==
+owncloud-design-system@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.13.0.tgz#c95721846ebc3576aafc85f1b54d9500940985d1"
+  integrity sha512-+cdAQ7T2R+GZE1QFkyRCXjHvTxZBXhJmYh3HVD1vMboh5QgmgoRkUjc/NEnwQsWf/JVq+KRTPRlUtAj1xM8a7g==
   dependencies:
     luxon "^1.22.0"
     mini-css-extract-plugin "^0.9.0"

From 33906cea97df66f7fe9a18104c94f6cacfeb9767 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 28 Oct 2020 13:45:22 +0100
Subject: [PATCH 09/24] Add icons to accordions

---
 apps/files/src/components/FileDetails.vue |  1 +
 apps/files/src/default.js                 | 30 ++++++++---------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index 056d8b3e2c2..14a59614a27 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -40,6 +40,7 @@
           :key="accordion.app"
           :title="accordion.component.title($gettext)"
           :expanded-by-default="isAccordionOpened(accordion.app, index)"
+          :icon="accordion.icon"
         >
           <component :is="accordion.component" />
         </oc-accordion-item>
diff --git a/apps/files/src/default.js b/apps/files/src/default.js
index 0470b5c5af0..545f8968e54 100644
--- a/apps/files/src/default.js
+++ b/apps/files/src/default.js
@@ -20,18 +20,6 @@ function $gettext(msg) {
   return msg
 }
 const filesConfig = window.phoenixConfig.files || []
-const filesSidebars = filesConfig.sidebars || []
-const sidebarsFromConfig = filesSidebars.map(s => {
-  return {
-    app: s.tabTitle,
-    component: FileSidebarWebComponent,
-    title: s.tabTitle,
-    propsData: {
-      componentName: s.componentName,
-      componentUrl: s.componentUrl
-    }
-  }
-})
 
 const appInfo = {
   name: $gettext('Files'),
@@ -41,15 +29,9 @@ const appInfo = {
   extensions: [],
   fileActions: filesConfig.actions || [],
   fileSideBars: [
-    {
-      app: 'files-version',
-      component: FileInfoVersions,
-      enabled(capabilities, highlightedFile) {
-        return !!capabilities.core && highlightedFile && highlightedFile.type !== 'folder'
-      }
-    },
     {
       app: 'files-sharing',
+      icon: 'group',
       component: FileSharingSidebar,
       enabled(capabilities) {
         if (capabilities.files_sharing) {
@@ -60,6 +42,7 @@ const appInfo = {
     },
     {
       app: 'file-link',
+      icon: 'link',
       component: FileLinkSidebar,
       enabled(capabilities) {
         if (capabilities.files_sharing) {
@@ -68,7 +51,14 @@ const appInfo = {
         return false
       }
     },
-    ...sidebarsFromConfig
+    {
+      app: 'files-version',
+      icon: 'restore',
+      component: FileInfoVersions,
+      enabled(capabilities, highlightedFile) {
+        return !!capabilities.core && highlightedFile && highlightedFile.type !== 'folder'
+      }
+    }
   ]
 }
 const navItems = [

From 27e8b02e378d0b75fc8ab19cd7272701e545d1c1 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 28 Oct 2020 13:54:29 +0100
Subject: [PATCH 10/24] Fix indicators

---
 apps/files/src/components/FilesApp.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/files/src/components/FilesApp.vue b/apps/files/src/components/FilesApp.vue
index 8aeb9e19345..dba374eb862 100644
--- a/apps/files/src/components/FilesApp.vue
+++ b/apps/files/src/components/FilesApp.vue
@@ -121,9 +121,7 @@ export default {
 
     openSideBar(file, sideBarName) {
       this.setHighlightedFile(file)
-      setTimeout(() => {
-        this.SET_DEFAULT_OPENED_ACCORDION({ tab: sideBarName })
-      })
+      this.SET_DEFAULT_OPENED_ACCORDION(sideBarName)
     },
 
     $_ocApp_dragOver() {

From d4eccc4cf992cccf1b8aecd5a9e397e7d15f11ec Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 28 Oct 2020 21:03:21 +0100
Subject: [PATCH 11/24] Use ODS 1.14.0 for new control on expanded/collapsed
 state

---
 apps/files/src/components/FileDetails.vue     | 24 ++++----
 .../src/components/FileSharingSidebar.vue     | 14 ++---
 .../components/FileSidebarWebComponent.vue    | 56 -------------------
 apps/files/src/components/FilesApp.vue        |  4 +-
 apps/files/src/default.js                     |  1 -
 apps/files/src/quickActions.js                |  4 +-
 apps/files/src/store/mutations.js             |  8 +--
 apps/files/src/store/state.js                 |  6 +-
 package.json                                  |  2 +-
 yarn.lock                                     |  8 +--
 10 files changed, 33 insertions(+), 94 deletions(-)
 delete mode 100644 apps/files/src/components/FileSidebarWebComponent.vue

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index 14a59614a27..c152f1aaafc 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -34,12 +34,16 @@
       </div>
     </template>
     <template slot="content">
-      <oc-accordion class="oc-mt-m">
+      <oc-accordion
+        class="oc-mt-m"
+        :expand-first="true"
+        :expanded-id="rightSidebarExpandedAccordion"
+      >
         <oc-accordion-item
-          v-for="(accordion, index) in fileSideBarsEnabled"
+          v-for="accordion in fileSideBarsEnabled"
+          :id="accordion.app"
           :key="accordion.app"
           :title="accordion.component.title($gettext)"
-          :expanded-by-default="isAccordionOpened(accordion.app, index)"
           :icon="accordion.icon"
         >
           <component :is="accordion.component" />
@@ -59,7 +63,7 @@ export default {
   computed: {
     ...mapGetters(['getToken', 'fileSideBars', 'capabilities']),
     ...mapGetters('Files', ['highlightedFile']),
-    ...mapState('Files', ['defaultOpenedAccordion']),
+    ...mapState('Files', ['rightSidebarExpandedAccordion']),
 
     fileSideBarsEnabled() {
       return this.fileSideBars.filter(
@@ -73,13 +77,13 @@ export default {
   },
 
   beforeDestroy() {
-    this.SET_DEFAULT_OPENED_ACCORDION(null)
+    this.SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(null)
   },
 
   methods: {
     ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_DEFAULT_OPENED_ACCORDION']),
+    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION']),
 
     close() {
       this.$emit('reset')
@@ -90,14 +94,6 @@ export default {
         client: this.$client,
         file: file
       })
-    },
-
-    isAccordionOpened(accordion, index) {
-      if (this.defaultOpenedAccordion) {
-        return this.defaultOpenedAccordion === accordion
-      }
-
-      return index === 0
     }
   }
 }
diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index ae056eb9033..b1811f87ed3 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -118,12 +118,12 @@ export default {
       'incomingShares',
       'incomingSharesLoading',
       'sharesTree',
-      'currentSharingSidebarPanel'
+      'rightSidebarAccordionContext'
     ]),
     ...mapState(['user']),
 
     currentPanel() {
-      return this.currentSharingSidebarPanel || PANEL_SHOW
+      return this.rightSidebarAccordionContext || PANEL_SHOW
     },
 
     $_transitionGroupEnter() {
@@ -304,7 +304,7 @@ export default {
   },
 
   beforeDestroy() {
-    this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_SHOW)
+    this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(null)
   },
 
   methods: {
@@ -316,7 +316,7 @@ export default {
       'loadIncomingShares',
       'incomingSharesClearState'
     ]),
-    ...mapMutations('Files', ['SET_CURRENT_SHARING_SIDEBAR_PANEL']),
+    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT']),
 
     $_isCollaboratorShare(collaborator) {
       return userShareTypes.includes(collaborator.shareType)
@@ -348,11 +348,11 @@ export default {
     },
     $_ocCollaborators_addShare() {
       this.transitionGroupActive = true
-      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_NEW)
+      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_NEW)
     },
     $_ocCollaborators_editShare(share) {
       this.currentShare = share
-      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_EDIT)
+      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_EDIT)
     },
     $_ocCollaborators_deleteShare(share) {
       this.transitionGroupActive = true
@@ -362,7 +362,7 @@ export default {
       })
     },
     $_ocCollaborators_showList() {
-      this.SET_CURRENT_SHARING_SIDEBAR_PANEL(PANEL_SHOW)
+      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_SHOW)
       this.currentShare = null
     },
     $_ocCollaborators_isUser(collaborator) {
diff --git a/apps/files/src/components/FileSidebarWebComponent.vue b/apps/files/src/components/FileSidebarWebComponent.vue
deleted file mode 100644
index 0e86f309a15..00000000000
--- a/apps/files/src/components/FileSidebarWebComponent.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <div id="oc-file-sidebar-web-component">
-    <oc-loader v-if="loading" />
-    <div v-if="!loading">
-      <!-- TODO: define all props which need to be passed into a web component -->
-      <component :is="componentName" :selected-file="highlightedFileAsJson"></component>
-    </div>
-  </div>
-</template>
-<script>
-import Mixins from '../mixins.js'
-import { mapGetters } from 'vuex'
-
-export default {
-  mixins: [Mixins],
-  title: $gettext => {
-    return null
-  },
-  props: {
-    componentName: {
-      type: String,
-      required: true
-    },
-    componentUrl: {
-      type: String,
-      required: true
-    }
-  },
-  data: () => ({
-    loading: true
-  }),
-  computed: {
-    ...mapGetters('Files', ['highlightedFile']),
-    ...mapGetters(['getToken']),
-    highlightedFileAsJson() {
-      return JSON.stringify(this.highlightedFile)
-    }
-  },
-  mounted() {
-    // tell Vue to not take care of the web component
-    window.Vue.config.ignoredElements = [this.componentName]
-
-    // load component async
-    requirejs(
-      [this.componentUrl],
-      app => {
-        this.loading = false
-      },
-      error => {
-        console.log(error)
-      }
-    )
-  },
-  methods: {}
-}
-</script>
diff --git a/apps/files/src/components/FilesApp.vue b/apps/files/src/components/FilesApp.vue
index dba374eb862..fba671b15ce 100644
--- a/apps/files/src/components/FilesApp.vue
+++ b/apps/files/src/components/FilesApp.vue
@@ -112,7 +112,7 @@ export default {
   methods: {
     ...mapActions('Files', ['dragOver', 'setHighlightedFile', 'resetFileSelection']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_DEFAULT_OPENED_ACCORDION']),
+    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
 
     trace() {
@@ -121,7 +121,7 @@ export default {
 
     openSideBar(file, sideBarName) {
       this.setHighlightedFile(file)
-      this.SET_DEFAULT_OPENED_ACCORDION(sideBarName)
+      this.SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(sideBarName)
     },
 
     $_ocApp_dragOver() {
diff --git a/apps/files/src/default.js b/apps/files/src/default.js
index 545f8968e54..0e340d2cc40 100644
--- a/apps/files/src/default.js
+++ b/apps/files/src/default.js
@@ -4,7 +4,6 @@ import 'regenerator-runtime/runtime'
 import FilesApp from './components/FilesApp.vue'
 import FileInfoVersions from './components/FileInfoVersions.vue'
 import FileSharingSidebar from './components/FileSharingSidebar.vue'
-import FileSidebarWebComponent from './components/FileSidebarWebComponent.vue'
 import FileLinkSidebar from './components/FileLinkSidebar.vue'
 import PrivateLink from './components/PrivateLink.vue'
 import PublicLink from './components/PublicLinks/PublicLink.vue'
diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
index b6178011cef..56d5d3c40e5 100644
--- a/apps/files/src/quickActions.js
+++ b/apps/files/src/quickActions.js
@@ -48,8 +48,8 @@ function openNewCollaboratorsPanel(ctx) {
   // Workaround for displaying the new collaborators panel even when one is already opened
   // Creating timeout takes care of the event loop
   setTimeout(() => {
-    ctx.store.commit('Files/SET_DEFAULT_OPENED_ACCORDION', 'files-sharing')
-    ctx.store.commit('Files/SET_CURRENT_SHARING_SIDEBAR_PANEL', 'newCollaborator')
+    ctx.store.commit('Files/SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION', 'files-sharing')
+    ctx.store.commit('Files/SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT', 'newCollaborator')
   })
 }
 
diff --git a/apps/files/src/store/mutations.js b/apps/files/src/store/mutations.js
index 605cca89f3d..8510d23e36a 100644
--- a/apps/files/src/store/mutations.js
+++ b/apps/files/src/store/mutations.js
@@ -258,11 +258,11 @@ export default {
     state.files = []
   },
 
-  SET_CURRENT_SHARING_SIDEBAR_PANEL(state, panel) {
-    state.currentSharingSidebarPanel = panel
+  SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(state, accordion) {
+    state.rightSidebarExpandedAccordion = accordion
   },
 
-  SET_DEFAULT_OPENED_ACCORDION(state, accordion) {
-    state.defaultOpenedAccordion = accordion
+  SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(state, panel) {
+    state.rightSidebarAccordionContext = panel
   }
 }
diff --git a/apps/files/src/store/state.js b/apps/files/src/store/state.js
index d24a34f8dd0..447ae292e73 100644
--- a/apps/files/src/store/state.js
+++ b/apps/files/src/store/state.js
@@ -53,8 +53,8 @@ export default {
   actionsInProgress: [],
 
   /**
-   * Sidebar
+   * Right sidebar
    */
-  currentSharingSidebarPanel: null,
-  defaultOpenedAccordion: null
+  rightSidebarExpandedAccordion: null,
+  rightSidebarAccordionContext: null
 }
diff --git a/package.json b/package.json
index b0690c896f5..a4c03f43cc0 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "node-fs-extra": "^0.8.2",
     "npm-run-all": "^4.1.5",
     "oidc-client": "^1.9.1",
-    "owncloud-design-system": "^1.13.0",
+    "owncloud-design-system": "^1.14.0",
     "owncloud-sdk": "^1.0.0-740",
     "p-limit": "^2.2.1",
     "p-queue": "^6.1.1",
diff --git a/yarn.lock b/yarn.lock
index dd7bd6ccacb..5bf9bbd5b9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6906,10 +6906,10 @@ os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-owncloud-design-system@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.13.0.tgz#c95721846ebc3576aafc85f1b54d9500940985d1"
-  integrity sha512-+cdAQ7T2R+GZE1QFkyRCXjHvTxZBXhJmYh3HVD1vMboh5QgmgoRkUjc/NEnwQsWf/JVq+KRTPRlUtAj1xM8a7g==
+owncloud-design-system@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.14.0.tgz#5addaa561c05605c0e4081bea650dfd1d3d3f857"
+  integrity sha512-sfCc7dlyX63L2SZVNdDEo6XDXkvG7/oDYASp1tIc5ohpwz0UtNnESXBJ3zcZWMzNNJfYpfFAb+KOkG1KjD8Ubw==
   dependencies:
     luxon "^1.22.0"
     mini-css-extract-plugin "^0.9.0"

From 7fea1660be8661a6f402e41482fb35e16cce1d5d Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 28 Oct 2020 21:32:38 +0100
Subject: [PATCH 12/24] Use new icon for file versions accordion item

---
 apps/files/src/default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/src/default.js b/apps/files/src/default.js
index 0e340d2cc40..2e1462cb978 100644
--- a/apps/files/src/default.js
+++ b/apps/files/src/default.js
@@ -52,7 +52,7 @@ const appInfo = {
     },
     {
       app: 'files-version',
-      icon: 'restore',
+      icon: 'file_version',
       component: FileInfoVersions,
       enabled(capabilities, highlightedFile) {
         return !!capabilities.core && highlightedFile && highlightedFile.type !== 'folder'

From 525c7341d4383ae6dbc644521e7ca111e472a3a7 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 28 Oct 2020 21:55:42 +0100
Subject: [PATCH 13/24] Rename rightSidebar to appSidebar and adjust tests

---
 apps/files/src/components/FileDetails.vue     | 22 +++++++++------
 .../src/components/FileSharingSidebar.vue     | 14 +++++-----
 apps/files/src/components/FilesApp.vue        |  4 +--
 apps/files/src/quickActions.js                |  4 +--
 apps/files/src/store/mutations.js             |  8 +++---
 apps/files/src/store/state.js                 |  4 +--
 .../FilesPageElement/appSideBar.js            | 28 ++++++-------------
 7 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index c152f1aaafc..bdf7178d653 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -34,14 +34,10 @@
       </div>
     </template>
     <template slot="content">
-      <oc-accordion
-        class="oc-mt-m"
-        :expand-first="true"
-        :expanded-id="rightSidebarExpandedAccordion"
-      >
+      <oc-accordion class="oc-mt-m" :expand-first="true" :expanded-id="appSidebarExpandedAccordion">
         <oc-accordion-item
           v-for="accordion in fileSideBarsEnabled"
-          :id="accordion.app"
+          :id="buildAppSidebarId(accordion.app)"
           :key="accordion.app"
           :title="accordion.component.title($gettext)"
           :icon="accordion.icon"
@@ -63,7 +59,7 @@ export default {
   computed: {
     ...mapGetters(['getToken', 'fileSideBars', 'capabilities']),
     ...mapGetters('Files', ['highlightedFile']),
-    ...mapState('Files', ['rightSidebarExpandedAccordion']),
+    ...mapState('Files', ['appSidebarExpandedAccordion']),
 
     fileSideBarsEnabled() {
       return this.fileSideBars.filter(
@@ -73,17 +69,21 @@ export default {
 
     isFavoritesEnabled() {
       return this.capabilities.files && this.capabilities.files.favorites
+    },
+
+    expandedAccordionId() {
+      return this.buildAppSidebarId(this.appSidebarExpandedAccordion)
     }
   },
 
   beforeDestroy() {
-    this.SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(null)
+    this.SET_APP_SIDEBAR_EXPANDED_ACCORDION(null)
   },
 
   methods: {
     ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION']),
+    ...mapMutations('Files', ['SET_APP_SIDEBAR_EXPANDED_ACCORDION']),
 
     close() {
       this.$emit('reset')
@@ -94,6 +94,10 @@ export default {
         client: this.$client,
         file: file
       })
+    },
+
+    buildAppSidebarId(accordion) {
+      return `app-sidebar-${accordion}`
     }
   }
 }
diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index b1811f87ed3..1e7d79b31d5 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -118,12 +118,12 @@ export default {
       'incomingShares',
       'incomingSharesLoading',
       'sharesTree',
-      'rightSidebarAccordionContext'
+      'appSidebarAccordionContext'
     ]),
     ...mapState(['user']),
 
     currentPanel() {
-      return this.rightSidebarAccordionContext || PANEL_SHOW
+      return this.appSidebarAccordionContext || PANEL_SHOW
     },
 
     $_transitionGroupEnter() {
@@ -304,7 +304,7 @@ export default {
   },
 
   beforeDestroy() {
-    this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(null)
+    this.SET_APP_SIDEBAR_ACCORDION_CONTEXT(null)
   },
 
   methods: {
@@ -316,7 +316,7 @@ export default {
       'loadIncomingShares',
       'incomingSharesClearState'
     ]),
-    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT']),
+    ...mapMutations('Files', ['SET_APP_SIDEBAR_ACCORDION_CONTEXT']),
 
     $_isCollaboratorShare(collaborator) {
       return userShareTypes.includes(collaborator.shareType)
@@ -348,11 +348,11 @@ export default {
     },
     $_ocCollaborators_addShare() {
       this.transitionGroupActive = true
-      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_NEW)
+      this.SET_APP_SIDEBAR_ACCORDION_CONTEXT(PANEL_NEW)
     },
     $_ocCollaborators_editShare(share) {
       this.currentShare = share
-      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_EDIT)
+      this.SET_APP_SIDEBAR_ACCORDION_CONTEXT(PANEL_EDIT)
     },
     $_ocCollaborators_deleteShare(share) {
       this.transitionGroupActive = true
@@ -362,7 +362,7 @@ export default {
       })
     },
     $_ocCollaborators_showList() {
-      this.SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(PANEL_SHOW)
+      this.SET_APP_SIDEBAR_ACCORDION_CONTEXT(PANEL_SHOW)
       this.currentShare = null
     },
     $_ocCollaborators_isUser(collaborator) {
diff --git a/apps/files/src/components/FilesApp.vue b/apps/files/src/components/FilesApp.vue
index fba671b15ce..ffb3ffd8b11 100644
--- a/apps/files/src/components/FilesApp.vue
+++ b/apps/files/src/components/FilesApp.vue
@@ -112,7 +112,7 @@ export default {
   methods: {
     ...mapActions('Files', ['dragOver', 'setHighlightedFile', 'resetFileSelection']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION']),
+    ...mapMutations('Files', ['SET_APP_SIDEBAR_EXPANDED_ACCORDION']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
 
     trace() {
@@ -121,7 +121,7 @@ export default {
 
     openSideBar(file, sideBarName) {
       this.setHighlightedFile(file)
-      this.SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(sideBarName)
+      this.SET_APP_SIDEBAR_EXPANDED_ACCORDION(sideBarName)
     },
 
     $_ocApp_dragOver() {
diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
index 56d5d3c40e5..ce2a27269e7 100644
--- a/apps/files/src/quickActions.js
+++ b/apps/files/src/quickActions.js
@@ -48,8 +48,8 @@ function openNewCollaboratorsPanel(ctx) {
   // Workaround for displaying the new collaborators panel even when one is already opened
   // Creating timeout takes care of the event loop
   setTimeout(() => {
-    ctx.store.commit('Files/SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION', 'files-sharing')
-    ctx.store.commit('Files/SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT', 'newCollaborator')
+    ctx.store.commit('Files/SET_APP_SIDEBAR_EXPANDED_ACCORDION', 'files-sharing')
+    ctx.store.commit('Files/SET_APP_SIDEBAR_ACCORDION_CONTEXT', 'newCollaborator')
   })
 }
 
diff --git a/apps/files/src/store/mutations.js b/apps/files/src/store/mutations.js
index 8510d23e36a..43b49f3652f 100644
--- a/apps/files/src/store/mutations.js
+++ b/apps/files/src/store/mutations.js
@@ -258,11 +258,11 @@ export default {
     state.files = []
   },
 
-  SET_RIGHT_SIDEBAR_EXPANDED_ACCORDION(state, accordion) {
-    state.rightSidebarExpandedAccordion = accordion
+  SET_APP_SIDEBAR_EXPANDED_ACCORDION(state, accordion) {
+    state.appSidebarExpandedAccordion = accordion
   },
 
-  SET_RIGHT_SIDEBAR_ACCORDION_CONTEXT(state, panel) {
-    state.rightSidebarAccordionContext = panel
+  SET_APP_SIDEBAR_ACCORDION_CONTEXT(state, panel) {
+    state.appSidebarAccordionContext = panel
   }
 }
diff --git a/apps/files/src/store/state.js b/apps/files/src/store/state.js
index 447ae292e73..37d662035e5 100644
--- a/apps/files/src/store/state.js
+++ b/apps/files/src/store/state.js
@@ -55,6 +55,6 @@ export default {
   /**
    * Right sidebar
    */
-  rightSidebarExpandedAccordion: null,
-  rightSidebarAccordionContext: null
+  appSidebarExpandedAccordion: null,
+  appSidebarAccordionContext: null
 }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
index 8edacde5c1d..d8e12f86daf 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
@@ -7,12 +7,6 @@ module.exports = {
         this.elements.sidebarThumbnail
       )
     },
-    /**
-     * @returns {*}
-     */
-    openVersionsTab: function() {
-      return this.waitForElementVisible('@sidebarVersionsTab').click('@sidebarVersionsTab')
-    },
     closeSidebar: function(timeout = null) {
       if (timeout === null) {
         timeout = this.api.globals.waitForConditionTimeout
@@ -73,8 +67,11 @@ module.exports = {
     openCollaboratorsTab: function() {
       return this.click('@sidebarCollaboratorsTab')
     },
+    openVersionsTab: function() {
+      return this.click('@sidebarVersionsTab')
+    },
     openLinksTab: function() {
-      return this.click('@publicLinksTab')
+      return this.click('@sidebarLinksTab')
     }
   },
   elements: {
@@ -88,17 +85,14 @@ module.exports = {
       selector: '//div[@class="sidebar-container"]//div[@class="action"]//button',
       locateStrategy: 'xpath'
     },
-    sidebarLinksTab: {
-      selector: '//div[@class="sidebar-container"]//a[contains(text(),"Links")]',
-      locateStrategy: 'xpath'
-    },
     sidebarCollaboratorsTab: {
-      selector: '//div[@class="sidebar-container"]//a[contains(text(),"People")]',
-      locateStrategy: 'xpath'
+      selector: '#app-sidebar-files-sharing'
+    },
+    sidebarLinksTab: {
+      selector: '#app-sidebar-file-link'
     },
     sidebarVersionsTab: {
-      selector: '//div//a[normalize-space(.)="Versions"]',
-      locateStrategy: 'xpath'
+      selector: '#app-sidebar-files-version'
     },
     sidebarToggleFavoriteButton: {
       selector: '#files-sidebar-star-icon'
@@ -108,10 +102,6 @@ module.exports = {
     },
     favoriteStarShining: {
       selector: '.oc-star-shining'
-    },
-    publicLinksTab: {
-      selector: '//div[@class="sidebar-container"]//a[contains(text(),"Links")]',
-      locateStrategy: 'xpath'
     }
   }
 }

From 69b9f8e0dae3f645931bd811e0381d714bf67097 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 09:20:23 +0100
Subject: [PATCH 14/24] Set versions as first accordion item again for now

---
 apps/files/src/default.js                        | 16 ++++++++--------
 .../FilesPageElement/publicLinksDialog.js        |  8 +++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/apps/files/src/default.js b/apps/files/src/default.js
index 2e1462cb978..c4abe30c5f7 100644
--- a/apps/files/src/default.js
+++ b/apps/files/src/default.js
@@ -28,6 +28,14 @@ const appInfo = {
   extensions: [],
   fileActions: filesConfig.actions || [],
   fileSideBars: [
+    {
+      app: 'files-version',
+      icon: 'file_version',
+      component: FileInfoVersions,
+      enabled(capabilities, highlightedFile) {
+        return !!capabilities.core && highlightedFile && highlightedFile.type !== 'folder'
+      }
+    },
     {
       app: 'files-sharing',
       icon: 'group',
@@ -49,14 +57,6 @@ const appInfo = {
         }
         return false
       }
-    },
-    {
-      app: 'files-version',
-      icon: 'file_version',
-      component: FileInfoVersions,
-      enabled(capabilities, highlightedFile) {
-        return !!capabilities.core && highlightedFile && highlightedFile.type !== 'folder'
-      }
     }
   ]
 }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
index af37e3403a6..54ccf6c0b1b 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
@@ -334,20 +334,18 @@ module.exports = {
     },
     copyPrivateLink: function() {
       const appSideBarElements = this.api.page.FilesPageElement.appSideBar().elements
-      const sidebarLinksTabXpath = appSideBarElements.sidebarLinksTab.selector
+      const sidebarLinksTab = appSideBarElements.sidebarLinksTab.selector
       const sidebarCss = appSideBarElements.sideBar.selector
 
       return this.waitForElementVisible(sidebarCss)
-        .useXpath()
-        .waitForElementVisible(sidebarLinksTabXpath)
-        .click(sidebarLinksTabXpath)
+        .waitForElementVisible(sidebarLinksTab)
+        .click(sidebarLinksTab)
         .waitForElementVisible('@sidebarPrivateLinkLabel')
         .click('@sidebarPrivateLinkLabel')
         .waitForElementNotPresent('@sidebarPrivateLinkLabel')
         .waitForElementVisible('@sidebarPrivateLinkIconCopied')
         .waitForElementNotPresent('@sidebarPrivateLinkIconCopied')
         .waitForElementVisible('@sidebarPrivateLinkLabel')
-        .useCss()
     }
   },
   elements: {

From d99cabfccb2ffccff8b82bdaaccb2d77189c0a17 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 10:19:11 +0100
Subject: [PATCH 15/24] Fix selector for sidebar accordion triggers

---
 tests/acceptance/pageObjects/filesPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index a6a5e41b946..b84e62a26ab 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -458,7 +458,7 @@ module.exports = {
     tabOfSideBar: {
       // the translate bit is to make it case-insensitive
       selector:
-        "//a[contains(translate(.,'ABCDEFGHJIKLMNOPQRSTUVWXYZ','abcdefghjiklmnopqrstuvwxyz'),'%s')]",
+        "//button[contains(translate(.,'ABCDEFGHJIKLMNOPQRSTUVWXYZ','abcdefghjiklmnopqrstuvwxyz'),'%s')]",
       locateStrategy: 'xpath'
     },
     sidebarItemName: {

From f61bab44772a6e2e170b773edf8a471fbe6d3e2b Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 12:03:08 +0100
Subject: [PATCH 16/24] Click accordion items only when they are closed

---
 tests/acceptance/pageObjects/filesPage.js     | 40 +++++++++++--------
 .../stepDefinitions/filesContext.js           | 27 ++++++-------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index b84e62a26ab..1c446987cf7 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -223,25 +223,30 @@ module.exports = {
     getXpathOfLinkToTabInSidePanel: function(tab) {
       return this.elements.sideBar.selector + util.format(this.elements.tabOfSideBar.selector, tab)
     },
-    selectTabInSidePanel: function(tab) {
-      return this.useXpath()
+    selectTabInSidePanel: async function(tab) {
+      await this.useXpath()
         .waitForElementVisible('@sideBar')
-        .click(this.getXpathOfLinkToTabInSidePanel(tab))
         .useCss()
+      const panelVisible = await this.isPanelVisible(tab)
+      if (panelVisible) {
+        return this
+      } else {
+        return this.useXpath()
+          .click(this.getXpathOfLinkToTabInSidePanel(tab))
+          .useCss()
+      }
     },
-    isSidebarVisible: function(callback) {
-      return this.useXpath()
-        .isVisible('@sideBar', result => {
-          callback(result.value)
-        })
-        .useCss()
+    isSidebarVisible: async function(callback) {
+      let isVisible = false
+      await this.api.elements('@sideBar', result => {
+        isVisible = result.value.length > 0
+      })
+      return isVisible
     },
-    isPanelVisible: function(panelName, callback) {
+    isPanelVisible: async function(panelName) {
       let selector = ''
-      if (panelName === 'people') {
-        selector = this.elements.collaboratorsPanel
-      } else if (panelName === 'collaborators') {
-        // FIXME: rename once renamed in all tests
+      if (panelName === 'people' || panelName === 'collaborators') {
+        // FIXME: `collaborators` is the old name. should be removed once renamed in all tests.
         selector = this.elements.collaboratorsPanel
       } else if (panelName === 'versions') {
         selector = this.elements.versionsPanel
@@ -250,9 +255,12 @@ module.exports = {
       } else {
         throw new Error('invalid panel')
       }
-      return this.isVisible(selector, result => {
-        callback(result.value)
+
+      let isVisible = false
+      await this.api.elements(selector, result => {
+        isVisible = result.value.length > 0
       })
+      return isVisible
     },
     getVisibleTabs: async function() {
       const tabs = []
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index f53b6e80c22..b49084c8a24 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -760,16 +760,14 @@ Then(/the count of files and folders shown on the webUI should be (\d+)/, async
   return client.assert.equal(itemsCount, noOfItems)
 })
 
-Then('the app-sidebar should be visible', function() {
-  return client.page.filesPage().isSidebarVisible(value => {
-    assert.strictEqual(value, true, 'side-bar should be visible, but is not')
-  })
+Then('the app-sidebar should be visible', async function() {
+  const visible = await client.page.filesPage().isSidebarVisible()
+  assert.strictEqual(visible, true, 'side-bar should be visible, but is not')
 })
 
-Then('the {string} details panel should be visible', function(panel) {
-  return client.page.filesPage().isPanelVisible(panel, value => {
-    assert.strictEqual(value, true, `'${panel}-panel' should be visible, but is not`)
-  })
+Then('the {string} details panel should be visible', async function(panel) {
+  const visible = await client.page.filesPage().isPanelVisible(panel)
+  assert.strictEqual(visible, true, `'${panel}-panel' should be visible, but is not`)
 })
 
 Then('the following tabs should be visible in the details dialog', async function(table) {
@@ -920,13 +918,12 @@ Then(
   }
 )
 
-Then('the app-sidebar for file/folder {string} should be visible on the webUI', resource => {
-  return client.page
-    .filesPage()
-    .isSidebarVisible(value => {
-      assert.strictEqual(value, true, 'sidebar should be visible, but is not')
-    })
-    .checkSidebarItem(resource)
+Then('the app-sidebar for file/folder {string} should be visible on the webUI', async function(
+  resource
+) {
+  const visible = await client.page.filesPage().isSidebarVisible()
+  assert.strictEqual(visible, true, 'sidebar should be visible, but is not')
+  return this.checkSidebarItem(resource)
 })
 
 Then('the thumbnail should be visible in the app-sidebar', function() {

From c3540202ccf3f830739ab284b89826cc4a268ec5 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 12:19:41 +0100
Subject: [PATCH 17/24] Check in more places if accordion item already open

---
 .../pageObjects/FilesPageElement/filesList.js      | 14 ++++++++++----
 tests/acceptance/pageObjects/filesPage.js          |  2 +-
 tests/acceptance/stepDefinitions/filesContext.js   | 10 ++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index b6ee19fd0ca..1e417d0b08a 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -17,8 +17,11 @@ module.exports = {
       await appSidebar.closeSidebar(500)
       await this.waitForFileVisible(fileName)
       await this.openSideBar(fileName)
-
-      return appSidebar.openCollaboratorsTab()
+      const visible = await client.page.filesPage().isPanelVisible('people')
+      if (!visible) {
+        await appSidebar.openCollaboratorsTab()
+      }
+      return this
     },
     /**
      * @param {string} fileName
@@ -27,8 +30,11 @@ module.exports = {
     openPublicLinkDialog: async function(fileName) {
       await this.waitForFileVisible(fileName)
       await this.openSideBar(fileName)
-
-      return this.api.page.FilesPageElement.appSideBar().openLinksTab()
+      const visible = await client.page.filesPage().isPanelVisible('links')
+      if (!visible) {
+        await this.api.page.FilesPageElement.appSideBar().openLinksTab()
+      }
+      return this
     },
     /**
      * @param {string} resource
diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index 1c446987cf7..fa5af7384d6 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -236,7 +236,7 @@ module.exports = {
           .useCss()
       }
     },
-    isSidebarVisible: async function(callback) {
+    isSidebarVisible: async function() {
       let isVisible = false
       await this.api.elements('@sideBar', result => {
         isVisible = result.value.length > 0
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index b49084c8a24..1a960ef01d4 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -116,7 +116,10 @@ When('the user browses to display the {string} details of file {string}', async
 ) {
   const api = client.page.FilesPageElement
   await api.filesList().clickRow(filename)
-  api.appSideBar().openVersionsTab()
+  const visible = await api.filesList().isPanelVisible('versions')
+  if (!visible) {
+    api.appSideBar().openVersionsTab()
+  }
   return client
 })
 
@@ -454,7 +457,10 @@ Then('the versions list for resource {string} should contain {int} entry/entries
 ) {
   const api = client.page.FilesPageElement
   await api.filesList().clickRow(resourceName)
-  api.appSideBar().openVersionsTab()
+  const visible = await api.filesList().isPanelVisible('versions')
+  if (!visible) {
+    api.appSideBar().openVersionsTab()
+  }
   const count = await api.versionsDialog().getVersionsCount()
 
   assert.strictEqual(expectedNumber, count)

From 553bbba5a5223062bb88fe2ce1ddb6c6761d4e85 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 14:43:30 +0100
Subject: [PATCH 18/24] Fix a test

---
 tests/acceptance/stepDefinitions/filesContext.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 1a960ef01d4..2cf3941ab45 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -116,7 +116,7 @@ When('the user browses to display the {string} details of file {string}', async
 ) {
   const api = client.page.FilesPageElement
   await api.filesList().clickRow(filename)
-  const visible = await api.filesList().isPanelVisible('versions')
+  const visible = await client.page.filesPage().isPanelVisible('versions')
   if (!visible) {
     api.appSideBar().openVersionsTab()
   }
@@ -768,7 +768,7 @@ Then(/the count of files and folders shown on the webUI should be (\d+)/, async
 
 Then('the app-sidebar should be visible', async function() {
   const visible = await client.page.filesPage().isSidebarVisible()
-  assert.strictEqual(visible, true, 'side-bar should be visible, but is not')
+  assert.strictEqual(visible, true, 'app-sidebar should be visible, but is not')
 })
 
 Then('the {string} details panel should be visible', async function(panel) {
@@ -928,7 +928,7 @@ Then('the app-sidebar for file/folder {string} should be visible on the webUI',
   resource
 ) {
   const visible = await client.page.filesPage().isSidebarVisible()
-  assert.strictEqual(visible, true, 'sidebar should be visible, but is not')
+  assert.strictEqual(visible, true, 'app-sidebar should be visible, but is not')
   return this.checkSidebarItem(resource)
 })
 

From e02e964b8933e8a2591070febad42c1f76270a8a Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 14:48:27 +0100
Subject: [PATCH 19/24] Fix broken external accordion controls

---
 apps/files/src/components/FileDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index bdf7178d653..c10a68db774 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -34,7 +34,7 @@
       </div>
     </template>
     <template slot="content">
-      <oc-accordion class="oc-mt-m" :expand-first="true" :expanded-id="appSidebarExpandedAccordion">
+      <oc-accordion class="oc-mt-m" :expand-first="true" :expanded-id="expandedAccordionId">
         <oc-accordion-item
           v-for="accordion in fileSideBarsEnabled"
           :id="buildAppSidebarId(accordion.app)"

From 5743aa19c58e47a3e10071f38f6add863f2d3da5 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 15:35:17 +0100
Subject: [PATCH 20/24] Fix more tests

---
 tests/acceptance/pageObjects/filesPage.js        | 2 +-
 tests/acceptance/stepDefinitions/filesContext.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index fa5af7384d6..7b5a91d5edb 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -473,7 +473,7 @@ module.exports = {
       selector: '#files-sidebar-item-name'
     },
     tabsInSideBar: {
-      selector: '//div[@class="sidebar-container"]//li/a',
+      selector: '//div[@class="sidebar-container"]//li/h3/button',
       locateStrategy: 'xpath'
     },
     dialog: {
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 2cf3941ab45..439cf967273 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -457,7 +457,7 @@ Then('the versions list for resource {string} should contain {int} entry/entries
 ) {
   const api = client.page.FilesPageElement
   await api.filesList().clickRow(resourceName)
-  const visible = await api.filesList().isPanelVisible('versions')
+  const visible = await client.page.filesPage().isPanelVisible('versions')
   if (!visible) {
     api.appSideBar().openVersionsTab()
   }

From 4ff3e333c419613712878282018270acf1a93f70 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 15:39:34 +0100
Subject: [PATCH 21/24] Fix expanded accordion id on null value

---
 apps/files/src/components/FileDetails.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index c10a68db774..5251957dd49 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -97,7 +97,10 @@ export default {
     },
 
     buildAppSidebarId(accordion) {
-      return `app-sidebar-${accordion}`
+      if (accordion) {
+        return `app-sidebar-${accordion}`
+      }
+      return null
     }
   }
 }

From bd816f3e98ade329dfac0bf0151eb96f2b722737 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 16:19:37 +0100
Subject: [PATCH 22/24] Add test about invisible sidebar after closing

And fix the check for visible/invisible sidebar and accordion panels
---
 .../features/webUIFiles/fileDetails.feature           |  6 ++++++
 tests/acceptance/pageObjects/filesPage.js             |  8 ++++----
 tests/acceptance/stepDefinitions/filesContext.js      | 11 ++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/features/webUIFiles/fileDetails.feature b/tests/acceptance/features/webUIFiles/fileDetails.feature
index 2d1b1971c0f..89782c36c3a 100644
--- a/tests/acceptance/features/webUIFiles/fileDetails.feature
+++ b/tests/acceptance/features/webUIFiles/fileDetails.feature
@@ -137,3 +137,9 @@ Feature: User can open the details panel for any file or folder
     Then the "sharing" details panel should be visible
     When the user switches to "comments" tab in details panel using the webUI
     Then the "comments" details panel should be visible
+
+  Scenario: the sidebar is invisible after closing
+    When the user picks the row of file "lorem.txt" in the webUI
+    Then the app-sidebar should be visible
+    When the user closes the app-sidebar using the webUI
+    Then the app-sidebar should be invisible
diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index 7b5a91d5edb..c7dcd3a0a00 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -238,8 +238,8 @@ module.exports = {
     },
     isSidebarVisible: async function() {
       let isVisible = false
-      await this.api.elements('@sideBar', result => {
-        isVisible = result.value.length > 0
+      await this.isVisible('xpath', this.elements.sideBar.selector, result => {
+        isVisible = result.status === 0
       })
       return isVisible
     },
@@ -257,8 +257,8 @@ module.exports = {
       }
 
       let isVisible = false
-      await this.api.elements(selector, result => {
-        isVisible = result.value.length > 0
+      await this.isVisible(selector, result => {
+        isVisible = result.status === 0
       })
       return isVisible
     },
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 439cf967273..340c99fa5aa 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -162,6 +162,10 @@ Given('the user has opened the share dialog for file/folder {string}', function(
     .openSharingDialog(fileName)
 })
 
+When('the user closes the app-sidebar using the webUI', function() {
+  return client.page.FilesPageElement.appSideBar().closeSidebar(100)
+})
+
 When('the user browses to folder {string} using the breadcrumb on the webUI', resource =>
   client.page.filesPage().navigateToBreadcrumb(resource)
 )
@@ -771,6 +775,11 @@ Then('the app-sidebar should be visible', async function() {
   assert.strictEqual(visible, true, 'app-sidebar should be visible, but is not')
 })
 
+Then('the app-sidebar should be invisible', async function() {
+  const visible = await client.page.filesPage().isSidebarVisible()
+  assert.strictEqual(visible, false, 'app-sidebar should be invisible, but is not')
+})
+
 Then('the {string} details panel should be visible', async function(panel) {
   const visible = await client.page.filesPage().isPanelVisible(panel)
   assert.strictEqual(visible, true, `'${panel}-panel' should be visible, but is not`)
@@ -929,7 +938,7 @@ Then('the app-sidebar for file/folder {string} should be visible on the webUI',
 ) {
   const visible = await client.page.filesPage().isSidebarVisible()
   assert.strictEqual(visible, true, 'app-sidebar should be visible, but is not')
-  return this.checkSidebarItem(resource)
+  return client.page.filesPage().checkSidebarItem(resource)
 })
 
 Then('the thumbnail should be visible in the app-sidebar', function() {

From 26fc8dac6658550ca3a14599bd09034c21623260 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 29 Oct 2020 16:22:28 +0100
Subject: [PATCH 23/24] Changelog

---
 changelog/unreleased/sidebar-accordion | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/unreleased/sidebar-accordion

diff --git a/changelog/unreleased/sidebar-accordion b/changelog/unreleased/sidebar-accordion
new file mode 100644
index 00000000000..bb1c09a2cd6
--- /dev/null
+++ b/changelog/unreleased/sidebar-accordion
@@ -0,0 +1,5 @@
+Change: App sidebar accordion instead of tabs
+
+We replaced the tabs in the right app-sidebar with an accordion.
+
+https://github.com/owncloud/phoenix/pull/4249

From 2b0c22496ebd0019c005052b3d213266ce6d1a95 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Thu, 29 Oct 2020 18:52:32 +0100
Subject: [PATCH 24/24] Skip failing test on iphone

---
 .../features/webUITrashbinRestore/trashbinRestore.feature       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
index 8fcf54af231..f460cf8d8d7 100644
--- a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
+++ b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
@@ -11,7 +11,7 @@ Feature: Restore deleted files/folders
     And user "user1" has logged in using the webUI
     And the user has browsed to the files page
 
-  @smokeTest @ocisSmokeTest
+  @smokeTest @ocisSmokeTest @skipOnIphoneResolution
   Scenario: Restore files
     When the user deletes file "data.zip" using the webUI
     When the user deletes file "sample,1.txt" using the webUI