hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

In users list, change option "Users pending for moderation" to false by default - #877

Browse Source
This commit is contained in:
Laurent GAY
2025-10-03 16:50:44 +02:00
parent 65f07a37b2
commit 9b708e1c80
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Admin/AdminUserProfile.vue
View File

@@ -175,7 +175,7 @@
<h2 class="text-lg font-bold mb-3">{{ t("Actions") }}</h2> <h2 class="text-lg font-bold mb-3">{{ t("Actions") }}</h2>
<table> <table>
<tr> <tr>
<td v-if="user.role == ICurrentUserRole.PENDING"> <td v-if="user.role == ICurrentUserRole.PENDING && !user.disabled">
<div class="buttons"> <div class="buttons">
<o-button @click="acceptAccount" variant="success">{{ <o-button @click="acceptAccount" variant="success">{{
t("Accept") t("Accept")

8
src/views/Admin/UsersView.vue
View File

@@ -125,7 +125,7 @@ const USERS_PER_PAGE = 10;
const emailFilter = useRouteQuery("emailFilter", ""); const emailFilter = useRouteQuery("emailFilter", "");
const ipFilter = useRouteQuery("ipFilter", ""); const ipFilter = useRouteQuery("ipFilter", "");
const pendingFilter = useRouteQuery("pendingFilter", "true"); const pendingFilter = useRouteQuery("pendingFilter", "false");
const page = useRouteQuery("page", 1, integerTransformer); const page = useRouteQuery("page", 1, integerTransformer);
const languagesCodes = computed((): string[] => { const languagesCodes = computed((): string[] => {
@@ -211,11 +211,11 @@ const filterUsers = async (): void => {
} }
}; };
const resetFilters = (): void => { const resetFilters = async (): void => {
emailFilterFieldValue.value = ""; emailFilterFieldValue.value = "";
ipFilterFieldValue.value = ""; ipFilterFieldValue.value = "";
pendingFieldValue.value = true; pendingFieldValue.value = false;
activateFilters(); await filterUsers();
}; };
</script> </script>

2
tests/unit/specs/components/admin/__snapshots__/usersView.spec.ts.snap
View File

@@ -9,7 +9,7 @@ exports[`UsersView > Show list with moderation 1`] = `
<!----> <!---->
<div class="o-field__body"> <div class="o-field__body">
<div class="o-field o-field--grouped-multiline o-field--grouped"> <div class="o-field o-field--grouped-multiline o-field--grouped">
<p data-v-01123d3b="" class="control mb-3 m-auto"><label data-v-01123d3b="" class="o-chk o-chk--checked" data-oruga="checkbox" role="checkbox" aria-checked="true"><input type="checkbox" data-oruga-input="checkbox" class="o-chk__input o-chk__input--checked" autocomplete="off" true-value="true" false-value="false"><span class="o-chk__label">Users pending for moderation</span></label></p> <p data-v-01123d3b="" class="control mb-3 m-auto"><label data-v-01123d3b="" class="o-chk" data-oruga="checkbox" role="checkbox" aria-checked="false"><input type="checkbox" data-oruga-input="checkbox" class="o-chk__input" autocomplete="off" true-value="true" false-value="false"><span class="o-chk__label">Users pending for moderation</span></label></p>
<div data-v-01123d3b="" data-oruga="field" class="o-field" expanded=""><label class="o-field__label" for="">Email</label> <div data-v-01123d3b="" data-oruga="field" class="o-field" expanded=""><label class="o-field__label" for="">Email</label>
<div class="o-field__body"> <div class="o-field__body">
<div class="o-field o-field--addons"> <div class="o-field o-field--addons">

26
tests/unit/specs/components/admin/usersView.spec.ts
View File

@@ -152,8 +152,8 @@ describe("UsersView", () => {
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
await flushPromises(); await flushPromises();
expect(wrapper.exists()).toBe(true); expect(wrapper.exists()).toBe(true);
expect(requestHandlers.languagecode).toHaveBeenCalled(); expect(requestHandlers.languagecode).toHaveBeenCalledTimes(2);
expect(requestHandlers.list_users).toHaveBeenCalled(); expect(requestHandlers.list_users).toHaveBeenCalledTimes(1);
expect(requestHandlers.list_users).toHaveBeenCalledWith({ expect(requestHandlers.list_users).toHaveBeenCalledWith({
currentSignInIp: "", currentSignInIp: "",
email: "", email: "",
@@ -169,29 +169,29 @@ describe("UsersView", () => {
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
await flushPromises(); await flushPromises();
expect(wrapper.exists()).toBe(true); expect(wrapper.exists()).toBe(true);
expect(wrapper.vm.pendingFieldValue).toBe(false);
expect(requestHandlers.languagecode).toHaveBeenCalledTimes(0); 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(); expect(htmlRemoveId(wrapper.html())).toMatchSnapshot();
wrapper.vm.pendingFieldValue = false; wrapper.vm.pendingFieldValue = true;
//wrapper.find('input[type="checkbox"]').trigger("change"); //wrapper.find('input[type="checkbox"]').trigger("change");
wrapper.find('input[type="text"]').setValue("@email.tld"); wrapper.find('input[type="text"]').setValue("@email.tld");
wrapper.find('button[type="button"]').trigger("click"); wrapper.find('button[type="button"]').trigger("click");
await flushPromises(); await flushPromises();
expect(requestHandlers.list_users).toHaveBeenCalledTimes(3); expect(requestHandlers.list_users).toHaveBeenCalledTimes(2);
expect(requestHandlers.list_users).toHaveBeenNthCalledWith(3, { expect(requestHandlers.list_users).toHaveBeenNthCalledWith(1, {
currentSignInIp: "", currentSignInIp: "",
email: "@email.tld", email: "@email.tld",
limit: 10, limit: 10,
page: 1, page: 1,
pendingUser: false, pendingUser: false,
}); });
expect(requestHandlers.list_users).toHaveBeenNthCalledWith(2, {
currentSignInIp: "",
email: "@email.tld",
limit: 10,
page: 1,
pendingUser: true,
});
}); });
}); });