Move actions to sidebar

apps/draw-io/src/app.js

@@ -28,7 +28,14 @@ const appInfo = {
         menuTitle($gettext) {
           return $gettext('New draw.io document…')
         }
-      }
+      },
+      routes: [
+        'files-list',
+        'files-favorites',
+        'files-shared-with-others',
+        'files-shared-with-me',
+        'public-files'
+      ]
     }
   ]
 }

apps/files/src/components/AllFilesList.vue

@@ -3,10 +3,9 @@
     id="files-list"
     :file-data="fileData"
     :loading="loadingFolder"
-    :actions="actions"
     :compact-mode="_sidebarOpen"
-    :is-action-enabled="isActionEnabled"
     :has-two-rows="true"
+    :actions-enabled="true"
   >
     <template #headerColumns>
       <div ref="headerNameColumn" class="uk-text-truncate uk-text-meta uk-width-expand">
@@ -51,29 +50,7 @@
         </sortable-column-header>
       </div>
     </template>
-    <template #rowColumns="{ item: rowItem, index }">
-      <div
-        :ref="index === 0 ? 'firstRowNameColumn' : null"
-        class="uk-width-expand uk-flex uk-flex-middle"
-      >
-        <file-item
-          :key="rowItem.viewId"
-          :item="rowItem"
-          :show-path="$_isFavoritesList"
-          :indicators="indicatorArray(rowItem)"
-          :has-two-rows="true"
-          @click.native.stop="
-            rowItem.type === 'folder'
-              ? navigateTo(rowItem.path.substr(1))
-              : triggerDefaultFileAction(rowItem)
-          "
-        />
-        <oc-spinner
-          v-if="actionInProgress(rowItem)"
-          :uk-tooltip="disabledActionTooltip(rowItem)"
-          class="oc-ml-s"
-        />
-      </div>
+    <template #rowColumns="{ item: rowItem }">
       <div
         class="uk-text-meta uk-text-nowrap uk-width-small uk-text-right"
         :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
@@ -141,26 +118,22 @@
 </template>
 <script>
 import FileList from './FileList.vue'
-import FileItem from './FileItem.vue'
 import NoContentMessage from './NoContentMessage.vue'
 import QuickActions from './FilesLists/QuickActions.vue'
 import SortableColumnHeader from './FilesLists/SortableColumnHeader.vue'
 
 import { mapGetters, mapActions, mapState } from 'vuex'
 import Mixins from '../mixins'
-import MixinsFilesListIndicators from '../mixins/filesListIndicators'
-import FileActions from '../fileactions'
 
 export default {
   name: 'AllFilesList',
   components: {
     FileList,
-    FileItem,
     NoContentMessage,
     SortableColumnHeader,
     QuickActions
   },
-  mixins: [Mixins, FileActions, MixinsFilesListIndicators],
+  mixins: [Mixins],
   props: {
     fileData: {
       type: Array,
@@ -270,10 +243,6 @@ export default {
             }
           })
         })
-    },
-
-    isActionEnabled(item, action) {
-      return action.isEnabled(item, this.parentFolder)
     }
   }
 }

apps/files/src/components/Collaborators/SharedFilesList.vue

@@ -3,9 +3,8 @@
     id="files-list"
     :file-data="fileData"
     :loading="loadingFolder"
-    :actions="actions"
     :compact-mode="_sidebarOpen"
-    :is-action-enabled="isActionEnabled"
+    :actions-enabled="true"
   >
     <template #headerColumns>
       <div class="uk-text-truncate uk-text-meta uk-width-expand">
@@ -21,7 +20,8 @@
       <div
         v-if="!$_isSharedWithMe"
         key="shared-with-header-cell"
-        class="uk-visible@s uk-text-nowrap uk-text-meta uk-width-medium uk-text-right"
+        class="uk-text-nowrap uk-text-meta uk-width-medium uk-text-right"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
         translate-context="'People' table column"
         v-text="$gettext('Shared with')"
       />
@@ -37,11 +37,15 @@
       <div
         v-if="$route.name === 'files-shared-with-me'"
         key="shared-with-header-cell"
-        class="uk-visible@s uk-text-nowrap uk-text-meta uk-width-small uk-text-right"
+        class="uk-text-nowrap uk-text-meta uk-width-small uk-text-right"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
         translate-context="Owner table column"
         v-text="$gettext('Owner')"
       />
-      <div class="uk-visible@s uk-text-nowrap uk-text-meta uk-width-small">
+      <div
+        class="uk-text-nowrap uk-text-meta uk-width-small"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
+      >
         <sortable-column-header
           :aria-label="$gettext('Sort files by share time')"
           :is-active="fileSortField == 'shareTimeMoment'"
@@ -55,26 +59,11 @@
       <div class="oc-icon" />
     </template>
     <template #rowColumns="{ item }">
-      <div class="uk-width-expand uk-flex uk-flex-middle">
-        <file-item
-          :key="item.path"
-          :item="item"
-          @click.native.stop="
-            item.type === 'folder'
-              ? navigateTo(item.path.substr(1))
-              : triggerDefaultFileAction(item)
-          "
-        />
-        <oc-spinner
-          v-if="actionInProgress(item)"
-          :uk-tooltip="disabledActionTooltip(item)"
-          class="oc-ml-s"
-        />
-      </div>
       <div
         v-if="!$_isSharedWithMe"
         key="shared-with-cell"
-        class="uk-visible@s uk-text-meta uk-text-nowrap uk-text-truncate uk-width-medium uk-flex file-row-collaborators uk-flex-right"
+        class="uk-text-meta uk-text-nowrap uk-text-truncate uk-width-medium uk-flex file-row-collaborators uk-flex-right"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
       >
         <span
           v-for="share in prepareCollaborators(item.shares)"
@@ -137,7 +126,8 @@
       <div
         v-if="$_isSharedWithMe"
         key="shared-from-cell"
-        class="uk-visible@s uk-text-meta uk-text-nowrap uk-text-truncate uk-width-small uk-flex uk-flex-middle file-row-collaborators uk-flex-right"
+        class="uk-text-meta uk-text-nowrap uk-text-truncate uk-width-small uk-flex uk-flex-middle file-row-collaborators uk-flex-right"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
       >
         <avatar-image
           class="oc-mr-xs"
@@ -148,7 +138,8 @@
         <span class="file-row-owner-name" v-text="item.shareOwner.displayName" />
       </div>
       <div
-        class="uk-visible@s uk-text-meta uk-text-nowrap uk-width-small uk-text-right"
+        class="uk-text-meta uk-text-nowrap uk-width-small uk-text-right"
+        :class="{ 'uk-visible@s': !_sidebarOpen, 'uk-hidden': _sidebarOpen }"
         v-text="formDateFromNow(item.shareTime)"
       />
     </template>
@@ -173,9 +164,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 import Mixins from '../../mixins'
-import FileActions from '../../fileactions'
 import FileList from '../FileList.vue'
-import FileItem from '../FileItem.vue'
 import NoContentMessage from '../NoContentMessage.vue'
 import SortableColumnHeader from '../FilesLists/SortableColumnHeader.vue'
 import { shareTypes } from '../../helpers/shareTypes'
@@ -185,11 +174,10 @@ export default {
   name: 'SharedFilesList',
   components: {
     FileList,
-    FileItem,
     NoContentMessage,
     SortableColumnHeader
   },
-  mixins: [Mixins, FileActions],
+  mixins: [Mixins],
   props: {
     /**
      * Array of active files
@@ -299,10 +287,6 @@ export default {
       })
     },
 
-    isActionEnabled(item, action) {
-      return action.isEnabled(item, null)
-    },
-
     shareStatus(status) {
       if (status === 0) return