Feature/move

.drone.star

@@ -43,7 +43,8 @@ config = {
 				'webUISharingFolderPermissionMultipleUsers': 'SharingFolderPermissionMultipleUsers',
 				'webUISharingFolderAdvancedPermissionMultipleUsers': 'SharingFolderAdvancedPermissionMU',
 				'webUISharingNotifications': 'SharingNotifications',
-				'webUIAccount': 'Account'
+				'webUIAccount': 'Account',
+				'webUIMoveFilesFolders': 'Move'
 			},
 			'extraEnvironment': {
 				'OPENID_LOGIN': 'true',

apps/files/src/components/AllFilesList.vue

@@ -6,6 +6,7 @@
     :actions="actions"
     :compact-mode="_sidebarOpen"
     :is-action-enabled="isActionEnabled"
+    :has-two-rows="true"
   >
     <template #headerColumns>
       <div ref="headerNameColumn" class="uk-text-truncate uk-text-meta uk-width-expand">
@@ -55,9 +56,9 @@
         <file-item
           :key="rowItem.viewId"
           :item="rowItem"
-          :dav-url="davUrl"
           :show-path="$_isFavoritesList"
           :indicators="indicatorArray(rowItem)"
+          :has-two-rows="true"
           @click.native.stop="
             rowItem.type === 'folder'
               ? navigateTo(rowItem.path.substr(1))
@@ -155,10 +156,8 @@ 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'
-import intersection from 'lodash/intersection'
-import { shareTypes, userShareTypes } from '../helpers/shareTypes'
-import { getParentPaths } from '../helpers/path'
 
 export default {
   name: 'AllFilesList',
@@ -169,7 +168,7 @@ export default {
     SortableColumnHeader,
     QuickActions
   },
-  mixins: [Mixins, FileActions],
+  mixins: [Mixins, FileActions, MixinsFilesListIndicators],
   props: {
     fileData: {
       type: Array,
@@ -204,55 +203,14 @@ export default {
       'activeFilesCount',
       'currentFolder',
       'fileSortField',
-      'fileSortDirectionDesc',
-      'sharesTree'
+      'fileSortDirectionDesc'
     ]),
     ...mapGetters(['configuration']),
 
     item() {
       return this.$route.params.item
     },
 
-    shareTypesIndirect() {
-      const parentPath = this.currentFolder.path
-      if (!parentPath) {
-        return []
-      }
-      const parentPaths = getParentPaths(parentPath, true)
-      if (parentPaths.length === 0) {
-        return []
-      }
-
-      // remove root entry
-      parentPaths.pop()
-
-      const shareTypes = {}
-      parentPaths.forEach(parentPath => {
-        // TODO: optimize for performance by skipping once we got all known types
-        const shares = this.sharesTree[parentPath]
-        if (shares) {
-          shares.forEach(share => {
-            // note: no distinction between incoming and outgoing shares as we display the same
-            // indirect indicator for them
-            shareTypes[share.shareType] = true
-          })
-        }
-      })
-
-      return Object.keys(shareTypes).map(shareType => parseInt(shareType, 10))
-    },
-
-    davUrl() {
-      let davUrl
-      // FIXME: use SDK once it switches to DAV v2
-      if (this.publicPage()) {
-        davUrl = ['..', 'dav', 'public-files'].join('/')
-      } else {
-        davUrl = ['..', 'dav', 'files', this.$store.getters.user.id].join('/')
-      }
-      return this.$client.files.getFileUrl(davUrl)
-    },
-
     $_isFavoritesList() {
       return this.$route.name === 'files-favorites'
     },
@@ -290,7 +248,8 @@ export default {
         absolutePath: absolutePath,
         $gettext: this.$gettext,
         routeName: this.$route.name,
-        loadSharesTree: !this.publicPage()
+        loadSharesTree: !this.publicPage(),
+        isPublicPage: this.publicPage()
       })
         .then(() => {
           const scrollTo = this.$route.query.scrollTo
@@ -325,80 +284,6 @@ export default {
 
     isActionEnabled(item, action) {
       return action.isEnabled(item, this.parentFolder)
-    },
-
-    indicatorArray(item) {
-      const indicators = [
-        {
-          id: 'files-sharing',
-          label: this.shareUserIconLabel(item),
-          visible: this.isUserShare(item),
-          icon: 'group',
-          handler: this.indicatorHandler
-        },
-        {
-          id: 'file-link',
-          label: this.shareLinkIconLabel(item),
-          visible: this.isLinkShare(item),
-          icon: 'link',
-          handler: this.indicatorHandler
-        }
-      ]
-
-      return indicators.filter(indicator => indicator.visible)
-    },
-
-    $_shareTypes(item) {
-      if (typeof item.shareTypes !== 'undefined') {
-        return item.shareTypes
-      }
-
-      if (item.shares) {
-        return Array.from(new Set(item.shares.map(share => parseInt(share.type, 10))))
-      }
-      return []
-    },
-
-    isDirectUserShare(item) {
-      return intersection(userShareTypes, this.$_shareTypes(item)).length > 0
-    },
-
-    isIndirectUserShare(item) {
-      return (
-        item.isReceivedShare() || intersection(userShareTypes, this.shareTypesIndirect).length > 0
-      )
-    },
-
-    isDirectLinkShare(item) {
-      return this.$_shareTypes(item).indexOf(shareTypes.link) >= 0
-    },
-
-    isIndirectLinkShare() {
-      return this.shareTypesIndirect.indexOf(shareTypes.link) >= 0
-    },
-
-    isUserShare(item) {
-      return this.isDirectUserShare(item) || this.isIndirectUserShare(item)
-    },
-
-    isLinkShare(item) {
-      return this.isDirectLinkShare(item) || this.isIndirectLinkShare(item)
-    },
-
-    shareUserIconLabel(item) {
-      return this.isDirectUserShare(item)
-        ? this.$gettext('Directly shared with collaborators')
-        : this.$gettext('Shared with collaborators through one of the parent folders')
-    },
-
-    shareLinkIconLabel(item) {
-      return this.isDirectLinkShare(item)
-        ? this.$gettext('Directly shared with links')
-        : this.$gettext('Shared with links through one of the parent folders')
-    },
-
-    indicatorHandler(item, sideBarName) {
-      this.$_openSideBar(item, sideBarName)
     }
   }
 }

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

@@ -59,7 +59,6 @@
         <file-item
           :key="item.path"
           :item="item"
-          :dav-url="davUrl"
           @click.native.stop="
             item.type === 'folder' ? navigateTo(item.path.substr(1)) : openFileActionBar(item)
           "
@@ -205,12 +204,6 @@ export default {
 
     $_isSharedWithMe() {
       return this.$route.name === 'files-shared-with-me'
-    },
-
-    davUrl() {
-      // FIXME: use SDK once it switches to DAV v2
-      const davUrl = ['..', 'dav', 'files', this.$store.getters.user.id].join('/')
-      return this.$client.files.getFileUrl(davUrl)
     }
   },
   watch: {

apps/files/src/components/FileItem.vue

@@ -38,6 +38,7 @@
           key="status-indicators"
           :default-indicators="indicators"
           :item="item"
+          :are-indicators-clickable="areIndicatorsClickable"
           class="files-list-indicators"
         />
         <span v-else key="no-status-indicators" aria-hidden="true" v-text="'-'" />
@@ -71,11 +72,6 @@ export default {
       required: false,
       default: undefined
     },
-    davUrl: {
-      type: String,
-      required: false,
-      default: undefined
-    },
     showPath: {
       type: Boolean,
       default: false
@@ -84,6 +80,21 @@ export default {
       type: Array,
       required: false,
       default: () => []
+    },
+    hasTwoRows: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    displayPreview: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    areIndicatorsClickable: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data: function() {
@@ -113,12 +124,23 @@ export default {
       return this.fileTypeIcon(this.item)
     },
 
-    hasTwoRows() {
-      return this.$route.name === 'files-list' || this.$route.name === 'files-favorites'
+    davUrl() {
+      let davUrl
+      // FIXME: use SDK once it switches to DAV v2
+      if (this.publicPage()) {
+        davUrl = ['..', 'dav', 'public-files'].join('/')
+      } else {
+        davUrl = ['..', 'dav', 'files', this.$store.getters.user.id].join('/')
+      }
+      return this.$client.files.getFileUrl(davUrl)
     }
   },
   mounted() {
-    this.loadPreview()
+    if (this.displayPreview) {
+      this.loadPreview()
+    } else {
+      this.previewLoaded = 'disabled'
+    }
   },
   methods: {
     loadPreview() {

apps/files/src/components/FileList.vue

@@ -12,7 +12,7 @@
         flex
         class="uk-padding-small uk-padding-remove-top uk-padding-remove-bottom uk-margin-xsmall-bottom"
       >
-        <div>
+        <div v-if="checkboxEnabled">
           <oc-checkbox
             id="filelist-check-all"
             class="uk-margin-small-left"
@@ -44,6 +44,7 @@
         >
           <div
             :data-is-visible="active"
+            :class="{ 'files-list-row-disabled': rowDisabled(rowItem) }"
             @click="
               selectRow(rowItem, $event)
               hideRowActionsDropdown()
@@ -57,7 +58,7 @@
               class="uk-padding-small oc-border-top"
               :class="_rowClasses(rowItem)"
             >
-              <div>
+              <div v-if="checkboxEnabled">
                 <oc-checkbox
                   class="uk-margin-small-left"
                   :value="selectedFiles.indexOf(rowItem) >= 0"
@@ -69,6 +70,7 @@
               </div>
               <slot name="rowColumns" :item="rowItem" :index="index" />
               <div
+                v-if="actions.length > 1 || $scopedSlots.rowActions"
                 class="uk-flex uk-flex-middle uk-flex-right"
                 :class="{ 'uk-width-small': $scopedSlots.rowActions }"
               >
@@ -133,7 +135,9 @@ export default {
       type: Boolean
     },
     checkboxEnabled: {
-      type: Boolean
+      type: Boolean,
+      required: false,
+      default: true
     },
     loading: {
       type: Boolean,
@@ -155,6 +159,16 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    hasTwoRows: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    rowDisabled: {
+      type: Function,
+      required: false,
+      default: () => false
     }
   },
   data() {
@@ -185,10 +199,6 @@ export default {
 
     item() {
       return this.$route.params.item
-    },
-
-    hasTwoRows() {
-      return this.$route.name === 'files-list' || this.$route.name === 'files-favorites'
     }
   },
   watch: {
@@ -257,7 +267,9 @@ export default {
       return 'file-row'
     },
     selectRow(item, event) {
-      if (!this.selectableRow) return
+      if (!this.selectableRow || this.rowDisabled(item)) {
+        return
+      }
 
       if (item.status && (item.status === 1 || item.status === 2)) return
 
@@ -320,3 +332,10 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.files-list-row-disabled {
+  opacity: 0.3;
+  pointer-events: none;
+}
+</style>