Removed favorite button from file list and added it instead in action…

… dropdown
owncloud · Apr 14, 2020 · 357a629 · 357a629
1 parent 628c8c8
commit 357a629
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 31 deletions.
diff --git a/apps/files/src/components/AllFilesList.vue b/apps/files/src/components/AllFilesList.vue
@@ -2,10 +2,6 @@
   <file-list :fileData="fileData" id="files-list" :loading="loadingFolder" :actions="actions" :compactMode="_sidebarOpen"
       :isActionEnabled="isActionEnabled">
     <template #headerColumns>
-      <div v-if="!publicPage()">
-        <span class="oc-visually-hidden" v-text="favoritesHeaderText" />
-        <oc-star id="files-table-header-star" aria-hidden="true" class="uk-display-block uk-disabled" />
-      </div>
       <div class="uk-text-truncate uk-text-meta uk-width-expand" ref="headerNameColumn" >
         <sortable-column-header
           @click="toggleSort('name')"
@@ -44,9 +40,6 @@
       </div>
     </template>
     <template #rowColumns="{ item, index }">
-      <div v-if="!publicPage()">
-        <oc-star class="uk-display-block" @click.native.stop="toggleFileFavorite(item)" :shining="item.starred" />
-      </div>
       <div class="uk-text-truncate uk-width-expand" :ref="index === 0 ? 'firstRowNameColumn' : null">
         <file-item
           @click.native.stop="item.type === 'folder' ? navigateTo(item.path.substr(1)) : openFileActionBar(item)"
@@ -141,11 +134,6 @@ export default {
     FileActions
   ],
   props: ['fileData', 'starsEnabled', 'checkboxEnabled', 'dateEnabled', 'parentFolder'],
-  data () {
-    return {
-      favoritesHeaderText: this.$gettext('Favorites')
-    }
-  },
   computed: {
     ...mapState(['route']),
     ...mapGetters('Files', [
@@ -237,7 +225,6 @@ export default {
   methods: {
     ...mapActions('Files', [
       'loadFolder',
-      'markFavorite',
       'setHighlightedFile'
     ]),
 
@@ -289,12 +276,6 @@ export default {
         })
       })
     },
-    toggleFileFavorite (item) {
-      this.markFavorite({
-        client: this.$client,
-        file: item
-      })
-    },
 
     isActionEnabled (item, action) {
       return action.isEnabled(item, this.parentFolder)

diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
@@ -9,7 +9,7 @@
           <span id="files-sidebar-item-name" class="uk-margin-small-right uk-text-bold" v-text="highlightedFile.name" />
         </div>
         <div v-if="$route.name !== 'files-shared-with-others'">
-          <oc-star v-if="!publicPage()" class="uk-inline" :shining="highlightedFile.starred"/>
+          <oc-star v-if="!publicPage()" @click.native.stop="toggleFileFavorite(highlightedFile)" class="uk-inline" :shining="highlightedFile.starred"/>
           <template v-if="highlightedFile.size > -1">
             {{ highlightedFile.size | fileSize }},
           </template>
@@ -73,13 +73,19 @@ export default {
     this.activeTab = this.defaultTab
   },
   methods: {
-    ...mapActions('Files', ['deleteFiles']),
+    ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
     close () {
       this.$emit('reset')
     },
     showSidebar (app) {
       this.activeTab = app
+    },
+    toggleFileFavorite (file) {
+      this.markFavorite({
+        client: this.$client,
+        file: file
+      })
     }
   }
 }

diff --git a/apps/files/src/components/FileList.vue b/apps/files/src/components/FileList.vue
@@ -160,20 +160,14 @@ export default {
     }
   },
   methods: {
-    ...mapActions('Files', ['loadFolder', 'markFavorite',
+    ...mapActions('Files', ['loadFolder',
       'setHighlightedFile', 'setPublicLinkPassword',
       'resetFileSelection', 'addFileSelection', 'removeFileSelection', 'toggleFileSelection'
     ]),
 
     labelSelectSingleItem (item) {
       return this.$gettextInterpolate(this.labelSelectSingleItemText, { name: item.name, type: item.type }, true)
     },
-    toggleFileFavorite (item) {
-      this.markFavorite({
-        client: this.$client,
-        file: item
-      })
-    },
     $_ocFileName (item) {
       if (this.$route.name === 'files-favorites') {
         const pathSplit = item.path.substr(1).split('/')

diff --git a/apps/files/src/fileactions.js b/apps/files/src/fileactions.js
@@ -40,6 +40,14 @@ export default {
             }
             return item.canBeDeleted()
           }
+        },
+        {
+          icon: 'star',
+          handler: this.toggleFileFavorite,
+          ariaLabel: this.$gettext('Mark/Unmark as favorite'),
+          isEnabled: function () {
+            return true
+          }
         }
       ]
       // FIXME: we are assuming this.fileSideBars and others are available on object
@@ -66,7 +74,8 @@ export default {
   methods: {
     ...mapActions('Files', [
       'renameFile', 'promptFileRename', 'closePromptFileRename',
-      'deleteFiles', 'promptFileDelete', 'closePromptFileDelete'
+      'deleteFiles', 'promptFileDelete', 'closePromptFileDelete',
+      'markFavorite'
     ]),
     ...mapActions(['showMessage']),
 
@@ -112,7 +121,19 @@ export default {
         this.closePromptFileRename()
       })
     },
-
+    toggleFileFavorite (file) {
+      this.markFavorite({
+        client: this.$client,
+        file: file
+      }).catch(() => {
+        const translated = this.$gettext('Error while starring "%{file}"')
+        const title = this.$gettextInterpolate(translated, { file: file.name }, true)
+        this.showMessage({
+          title: title,
+          status: 'danger'
+        })
+      })
+    },
     cancelDeleteFile () {
       this.closePromptFileDelete()
     },
@@ -125,7 +146,7 @@ export default {
       })
     },
     reallyDeleteFiles () {
-      let files = this.deleteDialogSelectedFiles ? this.deleteDialogSelectedFiles : this.selectedFiles
+      let files = this.dfavoriteFileeleteDialogSelectedFiles ? this.deleteDialogSelectedFiles : this.selectedFiles
       if (!Array.isArray(files)) {
         files = [files]
       }

diff --git a/changelog/unreleased/3336 b/changelog/unreleased/3336
@@ -0,0 +1,8 @@
+Change: Removed favorite button from file list and added it in the sidebar
+
+We've removed the favorite star button in the file list and added instead a functionality 
+to the before non-working star button in the file's sidebar. We also added a new action in 
+the file action dropdown menu which allows you to toggle the favorite status of your file.
+
+https://github.com/owncloud/phoenix/issues/1987
+https://github.com/owncloud/phoenix/pull/3336