From f4d7ad945386b7292941626e191ecfef10923451 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 30 May 2020 21:51:13 +0300
Subject: [PATCH] Refactoring and unification of function names

---
 src/views/reports/components/Report.vue       |  8 +++---
 .../users/components/MultipleUsersMenu.vue    | 27 ++++++++++---------
 src/views/users/index.vue                     |  8 +++---
 src/views/users/show.vue                      | 10 +++----
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/views/reports/components/Report.vue b/src/views/reports/components/Report.vue
index 56a13372..0df17b10 100644
--- a/src/views/reports/components/Report.vue
+++ b/src/views/reports/components/Report.vue
@@ -24,7 +24,7 @@
                   <el-dropdown-item v-if="report.state !== 'closed'" @click.native="changeReportState('closed', report.id)">{{ $t('reports.close') }}</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
-              <moderate-user-dropdown v-if="validAccount(report.account)" :account="report.account"/>
+              <moderate-user-dropdown v-if="isValid(report.account)" :account="report.account"/>
             </div>
           </div>
           <div>
@@ -174,14 +174,14 @@ export default {
     handlePageChange(page) {
       this.$store.dispatch('FetchReports', page)
     },
+    isValid(account) {
+      return account.nickname && account.id
+    },
     parseTimestamp(timestamp) {
       return moment(timestamp).format('L HH:mm')
     },
     showStatuses(statuses = []) {
       return statuses.length > 0
-    },
-    validAccount(account) {
-      return account.nickname && account.id
     }
   }
 }
diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue
index f7476c0b..70883598 100644
--- a/src/views/users/components/MultipleUsersMenu.vue
+++ b/src/views/users/components/MultipleUsersMenu.vue
@@ -165,33 +165,33 @@ export default {
       }
       return {
         grantRight: (right) => () => {
-          const filterUsersFn = user => user.nickname && user.id && user.local && !user.roles[right] && this.$store.state.user.id !== user.id
+          const filterUsersFn = user => this.isValid(user) && user.local && !user.roles[right] && this.$store.state.user.id !== user.id
           const addRightFn = async(users) => await this.$store.dispatch('AddRight', { users, right })
           const filtered = this.selectedUsers.filter(filterUsersFn)
 
           applyAction(filtered, addRightFn)
         },
         revokeRight: (right) => () => {
-          const filterUsersFn = user => user.nickname && user.id && user.local && user.roles[right] && this.$store.state.user.id !== user.id
+          const filterUsersFn = user => this.isValid(user) && user.local && user.roles[right] && this.$store.state.user.id !== user.id
           const deleteRightFn = async(users) => await this.$store.dispatch('DeleteRight', { users, right })
           const filtered = this.selectedUsers.filter(filterUsersFn)
 
           applyAction(filtered, deleteRightFn)
         },
         activate: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.deactivated && this.$store.state.user.id !== user.id)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.deactivated && this.$store.state.user.id !== user.id)
           const activateUsersFn = async(users) => await this.$store.dispatch('ActivateUsers', { users })
 
           applyAction(filtered, activateUsersFn)
         },
         deactivate: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && !user.deactivated && this.$store.state.user.id !== user.id)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && !user.deactivated && this.$store.state.user.id !== user.id)
           const deactivateUsersFn = async(users) => await this.$store.dispatch('DeactivateUsers', { users })
 
           applyAction(filtered, deactivateUsersFn)
         },
         remove: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && this.$store.state.user.id !== user.id)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && this.$store.state.user.id !== user.id)
           const deleteAccountFn = async(users) => await this.$store.dispatch('DeleteUsers', { users })
 
           applyAction(filtered, deleteAccountFn)
@@ -199,40 +199,43 @@ export default {
         addTag: (tag) => () => {
           const filtered = this.selectedUsers.filter(user =>
             tag === 'disable_remote_subscription' || tag === 'disable_any_subscription'
-              ? user.nickname && user.id && user.local && !user.tags.includes(tag)
-              : user.nickname && user.id && !user.tags.includes(tag))
+              ? this.isValid(user) && user.local && !user.tags.includes(tag)
+              : this.isValid(user) && !user.tags.includes(tag))
           const addTagFn = async(users) => await this.$store.dispatch('AddTag', { users, tag })
           applyAction(filtered, addTagFn)
         },
         removeTag: (tag) => async() => {
           const filtered = this.selectedUsers.filter(user =>
             tag === 'disable_remote_subscription' || tag === 'disable_any_subscription'
-              ? user.nickname && user.id && user.local && user.tags.includes(tag)
-              : user.nickname && user.id && user.tags.includes(tag))
+              ? this.isValid(user) && user.local && user.tags.includes(tag)
+              : this.isValid(user) && user.tags.includes(tag))
           const removeTagFn = async(users) => await this.$store.dispatch('RemoveTag', { users, tag })
 
           applyAction(filtered, removeTagFn)
         },
         requirePasswordReset: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local)
           const requirePasswordResetFn = async(users) => await this.$store.dispatch('RequirePasswordReset', users)
 
           applyAction(filtered, requirePasswordResetFn)
         },
         confirmAccounts: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local && user.confirmation_pending)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local && user.confirmation_pending)
           const confirmAccountFn = async(users) => await this.$store.dispatch('ConfirmUsersEmail', { users })
 
           applyAction(filtered, confirmAccountFn)
         },
         resendConfirmation: () => {
-          const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local && user.confirmation_pending)
+          const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local && user.confirmation_pending)
           const resendConfirmationFn = async(users) => await this.$store.dispatch('ResendConfirmationEmail', users)
 
           applyAction(filtered, resendConfirmationFn)
         }
       }
     },
+    isValid(user) {
+      return user.nickname && user.id
+    },
     grantRightToMultipleUsers(right) {
       const { grantRight } = this.mappers()
       this.confirmMessage(
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 56df8612..474a438e 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -75,7 +75,7 @@
       <el-table-column :label="$t('users.actions')" fixed="right">
         <template slot-scope="scope">
           <moderation-dropdown
-            v-if="validUser(scope.row)"
+            v-if="isValid(scope.row)"
             :user="scope.row"
             :page="'users'"
             @open-reset-token-dialog="openResetPasswordDialog"/>
@@ -211,14 +211,14 @@ export default {
     handleSelectionChange(value) {
       this.$data.selectedUsers = value
     },
+    isValid(user) {
+      return user.nickname && user.id
+    },
     openResetPasswordDialog() {
       this.resetPasswordDialogOpen = true
     },
     showDeactivatedButton(id) {
       return this.$store.state.user.id !== id
-    },
-    validUser(user) {
-      return user.nickname && user.id
     }
   }
 }
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index 9ccb530e..0d6d081b 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -7,7 +7,7 @@
       </div>
       <div class="left-header-container">
         <moderation-dropdown
-          v-if="validUser(user)"
+          v-if="isValid(user)"
           :user="user"
           :page="'userPage'"
           @open-reset-token-dialog="openResetPasswordDialog"/>
@@ -23,7 +23,7 @@
         <reboot-button/>
       </header>
       <moderation-dropdown
-        v-if="validUser(user)"
+        v-if="isValid(user)"
         :user="user"
         :page="'userPage'"
         @open-reset-token-dialog="openResetPasswordDialog"/>
@@ -179,14 +179,14 @@ export default {
       this.resetPasswordDialogOpen = false
       this.$store.dispatch('RemovePasswordToken')
     },
+    isValid(user) {
+      return user.nickname && user.id
+    },
     onTogglePrivate() {
       this.$store.dispatch('FetchUserProfile', { userId: this.$route.params.id, godmode: this.showPrivate })
     },
     openResetPasswordDialog() {
       this.resetPasswordDialogOpen = true
-    },
-    validUser(user) {
-      return user.nickname && user.id
     }
   }
 }