fixes

- added proper query key for `useUnverifiedUsers` and added it to the
  invalidations in `useUpdateUserVerification`
- removed unnecessary query invalidations in `useUpdateUserVerification`
- in `admin/users_controller#verified`, filtering is done by both active
  and verified
- reverted changed tests back to checking for `status: 'verified'`

Author: alihadimazeh

app/controllers/api/v1/admin/users_controller.rb

@@ -57,7 +57,7 @@ def verified
 
           users = User.includes(:role)
                       .with_provider(current_provider)
-                      .where(verified: true)
+                      .where(status: 'active', verified: true)
                       .with_attached_avatar
                       .order(sort_config, created_at: :desc)&.search(params[:search])
 

app/javascript/components/admin/manage_users/BannedPendingRow.jsx

@@ -53,16 +53,14 @@ export default function BannedPendingRow({ user, tableType }) {
           </Dropdown.Item>
         </>
       );
-    }
-    if (tableType === 'banned') {
+    } if (tableType === 'banned') {
       return (
         <Dropdown.Item onClick={() => updateUserStatus.mutate({ id: user.id, status: 'active' })}>
           <CheckIcon className="hi-s me-2" />
           {t('admin.manage_users.unban')}
         </Dropdown.Item>
       );
-    }
-    if (tableType === 'unverified') {
+    } if (tableType === 'unverified') {
       return (
         <Dropdown.Item onClick={() => updateUserVerification.mutate({ id: user.id, verified: true })}>
           <CheckIcon className="hi-s me-2" />

app/javascript/hooks/mutations/admin/manage_users/useUpdateUserVerification.jsx

@@ -27,9 +27,8 @@ export default function useUpdateUserVerification() {
     (data) => axios.patch(`/admin/users/${data.id}.json`, { user: { verified: data.verified } }),
     {
       onSuccess: () => {
-        queryClient.invalidateQueries(['getPendingUsers']);
-        queryClient.invalidateQueries(['getBannedUsers']);
         queryClient.invalidateQueries(['getAdminUsers']);
+        queryClient.invalidateQueries(['getUnverifiedUsers']);
 
         toast.success(t('toast.success.user.user_updated'));
       },

app/javascript/hooks/queries/admin/manage_users/useUnverifiedUsers.jsx

@@ -29,7 +29,7 @@ export default function useUnverifiedUsers(input, page) {
   };
 
   return useQuery(
-    ['getAdminUsers', { ...params }],
+    ['getUnverifiedUsers', { ...params }],
     () => axios.get('/admin/users/unverified.json', { params }).then((resp) => resp.data),
     {
       keepPreviousData: true,

spec/controllers/admin/users_controller_spec.rb

@@ -28,8 +28,8 @@
   end
 
   describe '#verified_users' do
-    it 'returns the list of verified users' do
-      users = create_list(:user, 3, verified: true) + [user, user_with_manage_users_permission]
+    it 'returns the list of active users' do
+      users = create_list(:user, 3, status: 'active') + [user, user_with_manage_users_permission]
       get :verified
       expect(response).to have_http_status(:ok)
       response_user_ids = response.parsed_body['data'].pluck('id')
@@ -115,8 +115,8 @@
         sign_in_user(super_admin)
       end
 
-      it 'returns the list of verified users' do
-        users = create_list(:user, 3, verified: true) + [user, user_with_manage_users_permission]
+      it 'returns the list of active users' do
+        users = create_list(:user, 3, status: 'active') + [user, user_with_manage_users_permission]
         get :verified
         expect(response).to have_http_status(:ok)
         response_user_ids = response.parsed_body['data'].pluck('id')