From 025c86af93cb73f103f64b3a62246bc47937b938 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@kiteworks.com>
Date: Thu, 26 Sep 2024 15:22:14 +0200
Subject: [PATCH] fix(admin-settings): user filters after page reload

Fixes an issue where applied user filters would not be visible after page reload.
---
 changelog/unreleased/bugfix-user-filters-after-page-reload  | 6 ++++++
 packages/web-app-admin-settings/src/views/Users.vue         | 2 ++
 .../web-app-admin-settings/tests/unit/views/Users.spec.ts   | 4 ++--
 .../tests/unit/views/__snapshots__/Users.spec.ts.snap       | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 changelog/unreleased/bugfix-user-filters-after-page-reload

diff --git a/changelog/unreleased/bugfix-user-filters-after-page-reload b/changelog/unreleased/bugfix-user-filters-after-page-reload
new file mode 100644
index 00000000000..24a6e20894b
--- /dev/null
+++ b/changelog/unreleased/bugfix-user-filters-after-page-reload
@@ -0,0 +1,6 @@
+Bugfix: User filters after page reload
+
+We've fixed an issue where applied user filters would not be visible after page reload.
+
+https://github.com/owncloud/web/issues/11604
+https://github.com/owncloud/web/pull/11666
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index d9aec693853..55c4514d367 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -45,6 +45,7 @@
                 <span v-text="$gettext('Filter:')" />
               </div>
               <item-filter
+                v-if="groups.length"
                 :allow-multiple="true"
                 :filter-label="$gettext('Groups')"
                 :filterable-attributes="['displayName']"
@@ -64,6 +65,7 @@
                 </template>
               </item-filter>
               <item-filter
+                v-if="roles.length"
                 :allow-multiple="true"
                 :filter-label="$gettext('Roles')"
                 :filterable-attributes="['displayName']"
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index 52ddb9af2a1..73c861c725a 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -3,7 +3,7 @@ import { ItemFilter, OptionsConfig, UserAction, useAppDefaults } from '@owncloud
 import { mock, mockDeep } from 'vitest-mock-extended'
 import { defaultComponentMocks, defaultPlugins, mount, shallowMount } from 'web-test-helpers'
 import { ClientService, queryItemAsString } from '@ownclouders/web-pkg'
-import { User } from '@ownclouders/web-client/graph/generated'
+import { Group, User } from '@ownclouders/web-client/graph/generated'
 import { useAppDefaultsMock } from 'web-test-helpers/src/mocks/useAppDefaultsMock'
 import { useUserActionsCreateUser } from '../../../src/composables/actions/users/useUserActionsCreateUser'
 import { ref } from 'vue'
@@ -74,7 +74,7 @@ const getClientService = () => {
   clientService.graphAuthenticated.users.listUsers.mockResolvedValue([mock<User>(getDefaultUser())])
   clientService.graphAuthenticated.users.getUser.mockResolvedValue(mock<User>(getDefaultUser()))
   clientService.graphAuthenticated.users.editUser.mockResolvedValue(mock<User>(getDefaultUser()))
-  clientService.graphAuthenticated.groups.listGroups.mockResolvedValue([])
+  clientService.graphAuthenticated.groups.listGroups.mockResolvedValue([mock<Group>()])
   clientService.graphAuthenticated.applications.listApplications.mockResolvedValue(
     getDefaultApplications()
   )
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
index cc8a6fa3f25..7c3e809e49e 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
@@ -23,7 +23,7 @@ exports[`Users view > list view > renders initially warning if filters are manda
         <div class="user-filters oc-flex oc-flex-between oc-flex-wrap oc-flex-bottom oc-mx-m oc-mb-m">
           <div data-v-32efd9c6="" class="oc-flex oc-flex-middle">
             <div data-v-32efd9c6="" class="oc-mr-m oc-flex oc-flex-middle"><span data-v-32efd9c6="" class="oc-icon oc-icon-m oc-icon-passive oc-mr-xs"><!----></span> <span data-v-32efd9c6="">Filter:</span></div>
-            <item-filter-stub data-v-32efd9c6="" filterlabel="Groups" items="" filtername="groups" optionfilterlabel="Filter groups" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false" class="oc-mr-s"></item-filter-stub>
+            <item-filter-stub data-v-32efd9c6="" filterlabel="Groups" items="undefined" filtername="groups" optionfilterlabel="Filter groups" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false" class="oc-mr-s"></item-filter-stub>
             <item-filter-stub data-v-32efd9c6="" filterlabel="Roles" items="[object Object],[object Object],[object Object],[object Object]" filtername="roles" optionfilterlabel="Filter roles" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false"></item-filter-stub>
           </div>
           <div data-v-32efd9c6="" class="oc-flex oc-flex-middle">
@@ -71,7 +71,7 @@ exports[`Users view > list view > renders list initially 1`] = `
         <div class="user-filters oc-flex oc-flex-between oc-flex-wrap oc-flex-bottom oc-mx-m oc-mb-m">
           <div data-v-32efd9c6="" class="oc-flex oc-flex-middle">
             <div data-v-32efd9c6="" class="oc-mr-m oc-flex oc-flex-middle"><span data-v-32efd9c6="" class="oc-icon oc-icon-m oc-icon-passive oc-mr-xs"><!----></span> <span data-v-32efd9c6="">Filter:</span></div>
-            <item-filter-stub data-v-32efd9c6="" filterlabel="Groups" items="" filtername="groups" optionfilterlabel="Filter groups" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false" class="oc-mr-s"></item-filter-stub>
+            <item-filter-stub data-v-32efd9c6="" filterlabel="Groups" items="undefined" filtername="groups" optionfilterlabel="Filter groups" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false" class="oc-mr-s"></item-filter-stub>
             <item-filter-stub data-v-32efd9c6="" filterlabel="Roles" items="[object Object],[object Object],[object Object],[object Object]" filtername="roles" optionfilterlabel="Filter roles" showoptionfilter="true" allowmultiple="true" idattribute="id" displaynameattribute="displayName" filterableattributes="displayName" closeonclick="false"></item-filter-stub>
           </div>
           <div data-v-32efd9c6="" class="oc-flex oc-flex-middle">