Merge pull request #6919 from owncloud/create-space-with-open-sidebar

Prevent 'Create Space'-button from disappearing when sidebar is open
owncloud · May 10, 2022 · 561c719 · 561c719
2 parents ee3df16 + 2eb2252
commit 561c719
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/changelog/unreleased/bugfix-create-space-button-sidebar b/changelog/unreleased/bugfix-create-space-button-sidebar
@@ -0,0 +1,6 @@
+Bugfix: "Create Space"-button with open sidebar
+
+We've fixed a bug where the "Create Space"-button would disappear when opening the sidebar for a space.
+
+https://github.com/owncloud/web/pull/6919
+https://github.com/owncloud/web/issues/6918
diff --git a/packages/web-app-files/src/components/AppBar/AppBar.vue b/packages/web-app-files/src/components/AppBar/AppBar.vue
@@ -33,7 +33,7 @@
       </div>
       <div class="files-app-bar-actions">
         <div class="oc-flex-1 oc-flex oc-flex-start" style="gap: 15px">
-          <slot v-if="selectedFiles.length === 0" name="actions" />
+          <slot v-if="showActionsOnSelection || selectedFiles.length === 0" name="actions" />
           <size-info v-if="showSelectionInfo" class="oc-visible@l" />
           <batch-actions v-if="showBatchActions" />
         </div>
@@ -73,7 +73,8 @@ export default {
     hasBulkActions: { type: Boolean, default: false },
     hasSharesNavigation: { type: Boolean, default: false },
     hasSidebarToggle: { type: Boolean, default: true },
-    hasViewOptions: { type: Boolean, default: true }
+    hasViewOptions: { type: Boolean, default: true },
+    showActionsOnSelection: { type: Boolean, default: false }
   },
   computed: {
     ...mapGetters('Files', ['files', 'selectedFiles']),

diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -5,6 +5,7 @@
       :breadcrumbs="breadcrumbs"
       :has-view-options="false"
       :has-sidebar-toggle="false"
+      :show-actions-on-selection="true"
     >
       <template #actions>
         <create-space />

diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Spaces projects view should list spaces 1`] = `
 <div>
-  <app-bar-stub breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" class="oc-border-b"></app-bar-stub>
+  <app-bar-stub breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" showactionsonselection="true" class="oc-border-b"></app-bar-stub>
   <div class="spaces-list oc-px-m oc-mt-l">
     <ul class="
           oc-grid