From f6421130703db012c09a26afccfef1c928ea8bde Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 1 Dec 2020 16:14:53 +0100
Subject: [PATCH] Show identity for each membership in MyGroups

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Group/GroupMemberCard.vue | 36 ++++++++++++++++-----
 js/src/graphql/actor.ts                     | 10 ++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/js/src/components/Group/GroupMemberCard.vue b/js/src/components/Group/GroupMemberCard.vue
index eb0bf1b42..69bd79004 100644
--- a/js/src/components/Group/GroupMemberCard.vue
+++ b/js/src/components/Group/GroupMemberCard.vue
@@ -1,5 +1,11 @@
 <template>
   <div class="card">
+    <div class="identity-header">
+      <figure class="image is-24x24" v-if="member.actor.avatar">
+        <img class="is-rounded" :src="member.actor.avatar.url" alt="" />
+      </figure>
+      {{ displayNameAndUsername(member.actor) }}
+    </div>
     <div class="card-content">
       <div>
         <div class="media">
@@ -60,7 +66,7 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
-import { usernameWithDomain } from "@/types/actor";
+import { displayNameAndUsername, usernameWithDomain } from "@/types/actor";
 import { IMember } from "@/types/actor/member.model";
 import { MemberRole } from "@/types/enums";
 import RouteName from "../../router/name";
@@ -73,20 +79,34 @@ export default class GroupMemberCard extends Vue {
 
   usernameWithDomain = usernameWithDomain;
 
+  displayNameAndUsername = displayNameAndUsername;
+
   MemberRole = MemberRole;
 }
 </script>
 <style lang="scss" scoped>
-.card-content {
-  display: flex;
-  align-items: center;
+.card {
+  .card-content {
+    display: flex;
+    align-items: center;
 
-  & > div:first-child {
-    flex: 1;
+    & > div:first-child {
+      flex: 1;
+    }
+
+    & > div:last-child {
+      cursor: pointer;
+    }
   }
 
-  & > div:last-child {
-    cursor: pointer;
+  .identity-header {
+    background: $yellow-2;
+    display: flex;
+    padding: 5px;
+
+    figure {
+      padding-right: 3px;
+    }
   }
 }
 </style>
diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index f3cb8c31d..0203d36f1 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -287,6 +287,16 @@ export const LOGGED_USER_MEMBERSHIPS = gql`
         elements {
           id
           role
+          actor {
+            id
+            avatar {
+              id
+              url
+            }
+            preferredUsername
+            name
+            domain
+          }
           parent {
             id
             preferredUsername