Allow to filter user memberships and group memberships (contacts=) on

backend side Closes #981 #969 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-12-13 17:02:10 +01:00 · 2021-12-13 17:02:10 +01:00 · 124a9cb6a6
commit 124a9cb6a6
parent 9f8bd5c87a
11 changed files with 122 additions and 53 deletions
--- a/js/src/components/Event/OrganizerPicker.vue
+++ b/js/src/components/Event/OrganizerPicker.vue
@ -51,6 +51,13 @@ import { MemberRole } from "@/types/enums";
    groupMemberships: {
      query: LOGGED_USER_MEMBERSHIPS,
      update: (data) => data.loggedUser.memberships,
+      variables() {
+        return {
+          page: 1,
+          limit: 10,
+          membershipName: this.actorFilter,
+        };
+      },
    },
    identities: IDENTITIES,
    currentActor: CURRENT_ACTOR_CLIENT,
--- a/js/src/components/Event/OrganizerPickerWrapper.vue
+++ b/js/src/components/Event/OrganizerPickerWrapper.vue
@ -65,42 +65,60 @@
              />
            </div>
            <div class="column contact-picker">
-              <div v-if="isSelectedActorAGroup && actorMembers.length > 0">
+              <div v-if="isSelectedActorAGroup">
                <p>{{ $t("Add a contact") }}</p>
                <b-input
                  :placeholder="$t('Filter by name')"
                  v-model="contactFilter"
                  dir="auto"
                />
-                <p
-                  class="field"
-                  v-for="actor in filteredActorMembers"
-                  :key="actor.id"
-                >
-                  <b-checkbox v-model="actualContacts" :native-value="actor.id">
-                    <div class="media">
-                      <div class="media-left">
-                        <figure class="image is-48x48" v-if="actor.avatar">
-                          <img
-                            class="image is-rounded"
-                            :src="actor.avatar.url"
-                            :alt="actor.avatar.alt"
+                <div v-if="actorMembers.length > 0">
+                  <p
+                    class="field"
+                    v-for="actor in filteredActorMembers"
+                    :key="actor.id"
+                  >
+                    <b-checkbox
+                      v-model="actualContacts"
+                      :native-value="actor.id"
+                    >
+                      <div class="media">
+                        <div class="media-left">
+                          <figure class="image is-48x48" v-if="actor.avatar">
+                            <img
+                              class="image is-rounded"
+                              :src="actor.avatar.url"
+                              :alt="actor.avatar.alt"
+                            />
+                          </figure>
+                          <b-icon
+                            v-else
+                            size="is-large"
+                            icon="account-circle"
                          />
-                        </figure>
-                        <b-icon v-else size="is-large" icon="account-circle" />
-                      </div>
-                      <div class="media-content" v-if="actor.name">
-                        <p class="is-4">{{ actor.name }}</p>
-                        <p class="is-6 has-text-grey-dark">
+                        </div>
+                        <div class="media-content" v-if="actor.name">
+                          <p class="is-4">{{ actor.name }}</p>
+                          <p class="is-6 has-text-grey-dark">
+                            {{ `@${usernameWithDomain(actor)}` }}
+                          </p>
+                        </div>
+                        <div class="media-content" v-else>
                          {{ `@${usernameWithDomain(actor)}` }}
-                        </p>
+                        </div>
                      </div>
-                      <div class="media-content" v-else>
-                        {{ `@${usernameWithDomain(actor)}` }}
-                      </div>
-                    </div>
-                  </b-checkbox>
-                </p>
+                    </b-checkbox>
+                  </p>
+                </div>
+                <div
+                  v-else-if="
+                    actorMembers.length === 0 && contactFilter.length > 0
+                  "
+                >
+                  <empty-content icon="account-multiple" :inline="true">
+                    {{ $t("No group member found") }}
+                  </empty-content>
+                </div>
              </div>
              <div v-else class="content has-text-grey-dark has-text-centered">
                <p>{{ $t("Your profile will be shown as contact.") }}</p>
@ -122,6 +140,7 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { IMember } from "@/types/actor/member.model";
 import { IActor, IGroup, IPerson, usernameWithDomain } from "../../types/actor";
 import OrganizerPicker from "./OrganizerPicker.vue";
+import EmptyContent from "../Utils/EmptyContent.vue";
 import {
  CURRENT_ACTOR_CLIENT,
  IDENTITIES,
@ -139,16 +158,17 @@ const MEMBER_ROLES = [
 ];

@Component({
-  components: { OrganizerPicker },
+  components: { OrganizerPicker, EmptyContent },
  apollo: {
    members: {
      query: GROUP_MEMBERS,
      variables() {
        return {
-          name: usernameWithDomain(this.selectedActor),
+          groupName: usernameWithDomain(this.selectedActor),
          page: this.membersPage,
          limit: 10,
          roles: MEMBER_ROLES.join(","),
+          name: this.contactFilter,
        };
      },
      update: (data) => data.group.members,
@ -161,9 +181,11 @@ const MEMBER_ROLES = [
    currentActor: CURRENT_ACTOR_CLIENT,
    userMemberships: {
      query: LOGGED_USER_MEMBERSHIPS,
-      variables: {
-        page: 1,
-        limit: 100,
+      variables() {
+        return {
+          page: 1,
+          limit: 10,
+        };
      },
      update: (data) => data.loggedUser.memberships,
    },
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@ -239,10 +239,14 @@ export const LOGGED_USER_DRAFTS = gql`
 `;

 export const LOGGED_USER_MEMBERSHIPS = gql`
-  query LoggedUserMemberships($page: Int, $limit: Int) {
+  query LoggedUserMemberships(
+    $membershipName: String
+    $page: Int
+    $limit: Int
+  ) {
    loggedUser {
      id
-      memberships(page: $page, limit: $limit) {
+      memberships(name: $membershipName, page: $page, limit: $limit) {
        total
        elements {
          id
--- a/js/src/graphql/member.ts
+++ b/js/src/graphql/member.ts
@ -44,10 +44,16 @@ export const REJECT_INVITATION = gql`
 `;

 export const GROUP_MEMBERS = gql`
-  query ($name: String!, $roles: String, $page: Int, $limit: Int) {
-    group(preferredUsername: $name) {
+  query (
+    $groupName: String!
+    $name: String
+    $roles: String
+    $page: Int
+    $limit: Int
+  ) {
+    group(preferredUsername: $groupName) {
      ...ActorFragment
-      members(page: $page, limit: $limit, roles: $roles) {
+      members(name: $name, page: $page, limit: $limit, roles: $roles) {
        elements {
          id
          role
--- a/js/src/views/Group/GroupMembers.vue
+++ b/js/src/views/Group/GroupMembers.vue
@ -275,7 +275,7 @@ import EmptyContent from "@/components/Utils/EmptyContent.vue";
      query: GROUP_MEMBERS,
      variables() {
        return {
-          name: this.$route.params.preferredUsername,
+          groupName: this.$route.params.preferredUsername,
          page: this.page,
          limit: this.MEMBERS_PER_PAGE,
          roles: this.roles,
@ -325,7 +325,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
      this.inviteError = "";
      const { roles, MEMBERS_PER_PAGE, group, page } = this;
      const variables = {
-        name: usernameWithDomain(group),
+        groupName: usernameWithDomain(group),
        page,
        limit: MEMBERS_PER_PAGE,
        roles,
@ -393,7 +393,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
  async removeMember(oldMember: IMember): Promise<void> {
    const { roles, MEMBERS_PER_PAGE, group, page } = this;
    const variables = {
-      name: usernameWithDomain(group),
+      groupName: usernameWithDomain(group),
      page,
      limit: MEMBERS_PER_PAGE,
      roles,
--- a/lib/graphql/resolvers/member.ex
+++ b/lib/graphql/resolvers/member.ex
@ -21,7 +21,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
          {:ok, Page.t(Member.t())}
  def find_members_for_group(
        %Actor{id: group_id} = group,
-        %{page: page, limit: limit, roles: roles},
+        %{page: page, limit: limit, roles: roles} = args,
        %{
          context: %{current_user: %User{role: user_role}, current_actor: %Actor{id: actor_id}}
        } = _resolution
@ -39,7 +39,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
            |> Enum.map(&String.to_existing_atom/1)
        end

-      %Page{} = page = Actors.list_members_for_group(group, roles, page, limit)
+      %Page{} =
+        page = Actors.list_members_for_group(group, Map.get(args, :name), roles, page, limit)
+
      {:ok, page}
    else
      # Actor is not member of group, fallback to public
--- a/lib/graphql/resolvers/user.ex
+++ b/lib/graphql/resolvers/user.ex
@ -376,13 +376,14 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
  """
  def user_memberships(
        %User{id: user_id},
-        %{page: page, limit: limit} = _args,
+        %{page: page, limit: limit} = args,
        %{context: %{current_user: %User{id: logged_user_id}}}
      ) do
    with true <- user_id == logged_user_id,
         memberships <-
           Actors.list_memberships_for_user(
             user_id,
+             Map.get(args, :name),
             page,
             limit
           ) do
--- a/lib/graphql/schema/actors/group.ex
+++ b/lib/graphql/schema/actors/group.ex
@ -103,6 +103,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
    )

    field :members, :paginated_member_list do
+      arg(:name, :string, description: "A name to filter members by")
      arg(:page, :integer, default_value: 1, description: "The page in the paginated member list")
      arg(:limit, :integer, default_value: 10, description: "The limit of members per page")
      arg(:roles, :string, default_value: "", description: "Filter members by their role")
--- a/lib/graphql/schema/user.ex
+++ b/lib/graphql/schema/user.ex
@ -85,6 +85,8 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
    field(:memberships, :paginated_member_list,
      description: "The list of memberships for this user"
    ) do
+      arg(:name, :string, description: "A name to filter members by")
+
      arg(:page, :integer,
        default_value: 1,
        description: "The page in the paginated memberships list"
--- a/lib/mobilizon/actors/actors.ex
+++ b/lib/mobilizon/actors/actors.ex
@ -794,12 +794,14 @@ defmodule Mobilizon.Actors do
  """
  @spec list_memberships_for_user(
          integer,
+          String.t() | nil,
          integer | nil,
          integer | nil
-        ) :: Page.t()
-  def list_memberships_for_user(user_id, page, limit) do
+        ) :: Page.t(Member.t())
+  def list_memberships_for_user(user_id, name, page, limit) do
    user_id
    |> list_members_for_user_query()
+    |> filter_members_by_group_name(name)
    |> Page.build_page(page, limit)
  end

@ -827,12 +829,15 @@ defmodule Mobilizon.Actors do
          Page.t(Member.t())
  def list_members_for_group(
        %Actor{id: group_id, type: :Group},
+        name \\ nil,
        roles \\ [],
        page \\ nil,
        limit \\ nil
      ) do
    group_id
    |> members_for_group_query()
+    |> join_members_actor()
+    |> filter_members_by_actor_name(name)
    |> filter_member_role(roles)
    |> Page.build_page(page, limit)
  end
@ -1380,13 +1385,10 @@ defmodule Mobilizon.Actors do

  @spec list_members_for_user_query(integer()) :: Ecto.Query.t()
  defp list_members_for_user_query(user_id) do
-    from(
-      m in Member,
-      join: a in Actor,
-      on: m.actor_id == a.id,
-      where: a.user_id == ^user_id and m.role != ^:not_approved,
-      preload: [:parent, :actor, :invited_by]
-    )
+    Member
+    |> join_members_actor()
+    |> where([m, a], a.user_id == ^user_id and m.role != ^:not_approved)
+    |> preload([:parent, :actor, :invited_by])
  end

  @spec members_for_actor_query(integer | String.t()) :: Ecto.Query.t()
@ -1446,6 +1448,28 @@ defmodule Mobilizon.Actors do
    from(m in query, where: m.role == ^role)
  end

+  @spec filter_members_by_actor_name(Ecto.Query.t(), String.t() | nil) :: Ecto.Query.t()
+  defp filter_members_by_actor_name(query, nil), do: query
+  defp filter_members_by_actor_name(query, ""), do: query
+
+  defp filter_members_by_actor_name(query, name) when is_binary(name) do
+    where(query, [_q, a], like(a.name, ^"%#{name}%") or like(a.preferred_username, ^"%#{name}%"))
+  end
+
+  defp filter_members_by_group_name(query, nil), do: query
+  defp filter_members_by_group_name(query, ""), do: query
+
+  defp filter_members_by_group_name(query, name) when is_binary(name) do
+    query
+    |> join(:inner, [q], a in Actor, on: q.parent_id == a.id)
+    |> where([_q, ..., a], like(a.name, ^"%#{name}%") or like(a.preferred_username, ^"%#{name}%"))
+  end
+
+  @spec join_members_actor(Ecto.Query.t()) :: Ecto.Query.t()
+  defp join_members_actor(query) do
+    join(query, :inner, [q], a in Actor, on: q.actor_id == a.id)
+  end
+
  @spec administrator_members_for_group_query(integer | String.t()) :: Ecto.Query.t()
  defp administrator_members_for_group_query(group_id) do
    from(
--- a/lib/web/views/activity_pub/actor_view.ex
+++ b/lib/web/views/activity_pub/actor_view.ex
@ -100,7 +100,7 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
  end

  defp fetch_collection(:members, actor, page) do
-    Actors.list_members_for_group(actor, @selected_member_roles, page)
+    Actors.list_members_for_group(actor, nil, @selected_member_roles, page)
  end

  defp fetch_collection(:resources, actor, page) do