Merge pull request #157 from amansinghbais/128-search-on-permissionid

Improved: removed other category, fetched permission description at fetching (#128)
hotwax · Mar 8, 2024 · d0bd4cf · d0bd4cf
2 parents 2db5b5c + 25cabfe
commit d0bd4cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/src/components/PermissionItems.vue b/src/components/PermissionItems.vue
@@ -21,7 +21,7 @@
           <ion-card-header>
             <div>
               <ion-card-title>{{ permission.permissionId }}</ion-card-title>
-              <ion-card-subtitle>{{ getPermissionDescription(permission.permissionId) }}</ion-card-subtitle>
+              <ion-card-subtitle>{{ permission.description }}</ion-card-subtitle>
             </div>
             <ion-checkbox :disabled="!hasPermission(Actions.APP_PERMISSION_UPDATE)" :checked="permission.isChecked" @click="updatePermissionAssociation($event, permission)" />
           </ion-card-header>
@@ -80,8 +80,7 @@ export default defineComponent({
       query: 'permission/getQuery',
       currentGroupPermissions: 'permission/getCurrentGroupPermissions',
       currentGroup: "permission/getCurrentGroup",
-      filteredPermissions: "permission/getFilteredPermissions",
-      getPermissionDescription: "permission/getPermissionDescription"
+      filteredPermissions: "permission/getFilteredPermissions"
     })
   },
   methods: {

diff --git a/src/store/modules/permission/actions.ts b/src/store/modules/permission/actions.ts
@@ -84,21 +84,14 @@ const actions: ActionTree<PermissionState, RootState> = {
       }
     })
 
-    // Filtering all the permissions which are not part of any group type.
-    const otherPermissions = JSON.parse(JSON.stringify(state.allPermissions))
+    // Mapping permission description to the desciption of permission data fetched.
+    const allPermissions = state.allPermissions
     Object.values(groupTypes).map((group: any) => {
       group.permissions.map((permission: any) => {
-        delete otherPermissions[permission.permissionId]
+        permission.description = allPermissions[permission.permissionId]?.description
       })
     })
 
-    // Others category for permissions not in any internal group.
-    groupTypes['OTHERS'] = {
-      groupId: 'OTHERS',
-      groupName: 'Other Category',
-      permissions: Object.values(otherPermissions)
-    }
-
     commit(types.PERMISSION_BY_CLASSIFICATION_GROUPS_UPDATED, groupTypes)
   },
 

diff --git a/src/store/modules/permission/getters.ts b/src/store/modules/permission/getters.ts
@@ -44,9 +44,6 @@ const getters: GetterTree<PermissionState, RootState> = {
   },
   getAllPermissions(state) {
     return state.allPermissions
-  },
-  getPermissionDescription: (state) => (permissionId: any) => {
-    return state.allPermissions[permissionId]?.description ? state.allPermissions[permissionId].description : permissionId
   }
 }
 export default getters;