diff --git a/src/views/Admin/AdminUserProfile.vue b/src/views/Admin/AdminUserProfile.vue index e643c8e41..d8b142533 100644 --- a/src/views/Admin/AdminUserProfile.vue +++ b/src/views/Admin/AdminUserProfile.vue @@ -175,7 +175,7 @@

{{ t("Actions") }}

-
+
{{ t("Accept") diff --git a/src/views/Admin/UsersView.vue b/src/views/Admin/UsersView.vue index 81b01458f..7761f9911 100644 --- a/src/views/Admin/UsersView.vue +++ b/src/views/Admin/UsersView.vue @@ -125,7 +125,7 @@ const USERS_PER_PAGE = 10; const emailFilter = useRouteQuery("emailFilter", ""); const ipFilter = useRouteQuery("ipFilter", ""); -const pendingFilter = useRouteQuery("pendingFilter", "true"); +const pendingFilter = useRouteQuery("pendingFilter", "false"); const page = useRouteQuery("page", 1, integerTransformer); const languagesCodes = computed((): string[] => { @@ -211,11 +211,11 @@ const filterUsers = async (): void => { } }; -const resetFilters = (): void => { +const resetFilters = async (): void => { emailFilterFieldValue.value = ""; ipFilterFieldValue.value = ""; - pendingFieldValue.value = true; - activateFilters(); + pendingFieldValue.value = false; + await filterUsers(); }; diff --git a/tests/unit/specs/components/admin/__snapshots__/usersView.spec.ts.snap b/tests/unit/specs/components/admin/__snapshots__/usersView.spec.ts.snap index 367b96cfd..2834b7d97 100644 --- a/tests/unit/specs/components/admin/__snapshots__/usersView.spec.ts.snap +++ b/tests/unit/specs/components/admin/__snapshots__/usersView.spec.ts.snap @@ -9,7 +9,7 @@ exports[`UsersView > Show list with moderation 1`] = `
-

+

diff --git a/tests/unit/specs/components/admin/usersView.spec.ts b/tests/unit/specs/components/admin/usersView.spec.ts index 2152f591e..f5224e047 100644 --- a/tests/unit/specs/components/admin/usersView.spec.ts +++ b/tests/unit/specs/components/admin/usersView.spec.ts @@ -152,8 +152,8 @@ describe("UsersView", () => { await wrapper.vm.$nextTick(); await flushPromises(); expect(wrapper.exists()).toBe(true); - expect(requestHandlers.languagecode).toHaveBeenCalled(); - expect(requestHandlers.list_users).toHaveBeenCalled(); + expect(requestHandlers.languagecode).toHaveBeenCalledTimes(2); + expect(requestHandlers.list_users).toHaveBeenCalledTimes(1); expect(requestHandlers.list_users).toHaveBeenCalledWith({ currentSignInIp: "", email: "", @@ -169,29 +169,29 @@ describe("UsersView", () => { await wrapper.vm.$nextTick(); await flushPromises(); expect(wrapper.exists()).toBe(true); + expect(wrapper.vm.pendingFieldValue).toBe(false); expect(requestHandlers.languagecode).toHaveBeenCalledTimes(0); - expect(requestHandlers.list_users).toHaveBeenCalledTimes(1); - expect(requestHandlers.list_users).toHaveBeenCalledWith({ - currentSignInIp: "", - email: "", - limit: 10, - page: 1, - pendingUser: true, - }); expect(htmlRemoveId(wrapper.html())).toMatchSnapshot(); - wrapper.vm.pendingFieldValue = false; + wrapper.vm.pendingFieldValue = true; //wrapper.find('input[type="checkbox"]').trigger("change"); wrapper.find('input[type="text"]').setValue("@email.tld"); wrapper.find('button[type="button"]').trigger("click"); await flushPromises(); - expect(requestHandlers.list_users).toHaveBeenCalledTimes(3); - expect(requestHandlers.list_users).toHaveBeenNthCalledWith(3, { + expect(requestHandlers.list_users).toHaveBeenCalledTimes(2); + expect(requestHandlers.list_users).toHaveBeenNthCalledWith(1, { currentSignInIp: "", email: "@email.tld", limit: 10, page: 1, pendingUser: false, }); + expect(requestHandlers.list_users).toHaveBeenNthCalledWith(2, { + currentSignInIp: "", + email: "@email.tld", + limit: 10, + page: 1, + pendingUser: true, + }); }); });