From 203a4e4ceee07c56e49578b4f14635181d416df5 Mon Sep 17 00:00:00 2001
From: sajjad_talkhabi <talkhabisajad10@gmail.com>
Date: Tue, 5 Apr 2022 20:54:00 +0430
Subject: [PATCH] Dfix

---
 src/components/Users/Item.vue                   |  2 +-
 src/components/Users/Items.vue                  | 15 +++++----------
 src/components/Users/Modals/ChangeRoleModal.vue |  9 ++++-----
 src/views/Users.vue                             |  4 ----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/components/Users/Item.vue b/src/components/Users/Item.vue
index 3f46f3b..73b7869 100644
--- a/src/components/Users/Item.vue
+++ b/src/components/Users/Item.vue
@@ -104,8 +104,8 @@ export default {
       });
     },
     chageRole() {
-      this.$emit("userId", this.user.id);
       this.$_openModal("changeRole", {
+        userId: this.user.id,
         role: this.user.role_id ? this.user.role_id : null,
         roles: this.getRoles,
       });
diff --git a/src/components/Users/Items.vue b/src/components/Users/Items.vue
index 1ce312f..60561d8 100644
--- a/src/components/Users/Items.vue
+++ b/src/components/Users/Items.vue
@@ -44,17 +44,14 @@
           </template>
           <template #items="{ item }">
             <v-col cols="12" class="pb-0">
-              <UserItem :user="item" @userId="userId" />
+              <UserItem :user="item" />
             </v-col>
           </template>
         </data-iterator>
       </div>
-      <!-- <div class="text-center mt-40 mb-5">
-        <pagination :pagination="getPaginationUser" @pagination="changePagination" />
-      </div> -->
     </main-back>
     <div class="text-center">
-      <ChangeRoleModal :userId="id" v-if="isModal('modal_changeRole')" /><FiltersModal
+      <ChangeRoleModal v-if="isModal('modal_changeRole')" /><FiltersModal
         @filter="load"
         v-if="isModal('modal_filters')"
       />
@@ -79,7 +76,6 @@ export default {
   },
   data: () => ({
     role: UserStorage.getRole() ? UserStorage.getRole() : null,
-    id: null,
   }),
   computed: {
     ...mapGetters("users", [
@@ -111,10 +107,9 @@ export default {
       }
     },
     async load() {
-      this.role === "admin" ? await this.loadUsers() : await this.loadTrainerTrainee();
-    },
-    userId(id) {
-      this.id = id;
+      this.role === "admin"
+        ? await this.loadUsers()
+        : await this.loadTrainerTrainee();
     },
   },
   async created() {
diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue
index cfb84ec..42cfdad 100644
--- a/src/components/Users/Modals/ChangeRoleModal.vue
+++ b/src/components/Users/Modals/ChangeRoleModal.vue
@@ -67,23 +67,22 @@ import { mapActions } from "vuex";
 import toast from "@/utils/toast";
 export default {
   name: "modal_changeRole",
-  props: {
-    userId: {},
-  },
   data: () => ({
     role_id: null,
     currectRoleId: null,
     changeRoleRequestLoading: false,
     roles: null,
+    user_id: null,
   }),
   computed: {
     form() {
-      return { userId: this.userId };
+      return { userId: this.user_id };
     },
   },
   methods: {
     ...mapActions("users", ["updateRole"]),
-    openModal({ role, roles }) {
+    openModal({ role, roles, userId }) {
+      this.user_id = userId;
       this.roles = { ...roles };
       this.currectRoleId = role ? role : 0;
       this.role_id = role ? role : 0;
diff --git a/src/views/Users.vue b/src/views/Users.vue
index d472225..7452f80 100644
--- a/src/views/Users.vue
+++ b/src/views/Users.vue
@@ -22,14 +22,10 @@
   </v-container>
 </template>
 <script>
-import { mapState } from 'vuex';
 import UsersHome from "../components/Users/Items";
 export default {
   components: {
     UsersHome,
   },
-  computed: {
-    ...mapState('users', ['filters']),
-  },
 };
 </script>
\ No newline at end of file