Merge pull request learningequality#5838 from AllanOXDi/deletedforreal

Fix Administration  bug  when deleted users are still listed in the users table.

Author: bjester

contentcuration/contentcuration/frontend/administration/composables/useTable.js

@@ -115,5 +115,6 @@ export function useTable({ fetchFunc, filterFetchQueryParams }) {
   return {
     pagination,
     loading,
+    loadItems,
   };
 }

contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue

@@ -113,6 +113,7 @@
       <UserActionsDropdown
         :userId="userId"
         flat
+        @deleted="$emit('deleted')"
       />
     </td>
   </tr>

contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue

@@ -123,6 +123,7 @@
         <UserItem
           v-model="selected"
           :userId="item"
+          @deleted="loadItems"
         />
       </template>
     </VDataTable>
@@ -246,7 +247,7 @@
         return store.dispatch('userAdmin/loadUsers', fetchParams);
       }
 
-      const { pagination, loading } = useTable({
+      const { pagination, loading, loadItems } = useTable({
         fetchFunc: fetchParams => loadUsers(fetchParams),
         filterFetchQueryParams,
       });
@@ -261,6 +262,7 @@
         clearSearch,
         pagination,
         loading,
+        loadItems,
         filterFetchQueryParams,
       };
     },

contentcuration/contentcuration/viewsets/user.py

@@ -431,7 +431,7 @@ class AdminUserViewSet(
         "edit_count",
         "view_count",
     )
-    queryset = User.objects.all()
+    queryset = User.objects.filter(deleted=False)
 
     def annotate_queryset(self, queryset):
         edit_channel_query = (