Merge pull request #235 from GeekGene/fix/trim-agentpubkeys

Fix/trim agentpubkeys
GeekGene · Sep 13, 2023 · 9206b0b · 9206b0b
2 parents 246ad1d + aa4ee0b
commit 9206b0b
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 13 deletions.
diff --git a/ui/src/components/BaseAgentProfileList.vue b/ui/src/components/BaseAgentProfileList.vue
@@ -21,6 +21,7 @@
       :agent-pub-key="item.agentPubKey"
       :profile="item.profile"
       :enable-popup="enablePopups"
+      :trim-agent-pub-key="trimAgentPubKey"
       class="cursor-pointer py-3"
       @click="
         router.push({
@@ -51,11 +52,13 @@ withDefaults(
     loading: boolean;
     emptyText?: string;
     enablePopups?: boolean;
+    trimAgentPubKey?: boolean;
   }>(),
   {
     agentProfiles: undefined,
     emptyText: undefined,
     enablePopups: true,
+    trimAgentPubKey: true,
   }
 );
 const router = useRouter();

diff --git a/ui/src/components/BaseAgentProfileListItem.vue b/ui/src/components/BaseAgentProfileListItem.vue
@@ -9,6 +9,7 @@
       class="text-lg"
       :profile="profile"
       :agentPubKey="agentPubKey"
+      :trim-agent-pub-key="trimAgentPubKey"
     />
   </div>
 </template>
@@ -24,10 +25,12 @@ withDefaults(
     agentPubKey: AgentPubKey;
     profile?: Profile;
     enablePopup?: boolean;
+    trimAgentPubKey?: boolean;
   }>(),
   {
     enablePopup: true,
     profile: undefined,
+    trimAgentPubKey: true,
   }
 );
 </script>
diff --git a/ui/src/components/BaseAgentProfileName.vue b/ui/src/components/BaseAgentProfileName.vue
@@ -10,7 +10,11 @@
       <div class="font-mono">@{{ profile.nickname }}</div>
     </div>
     <div v-else class="font-mono">
-      {{ encodeHashToBase64(agentPubKey).slice(0, 8) }}
+      {{
+        trimAgentPubKey
+          ? `${encodeHashToBase64(agentPubKey).slice(0, 15)}...`
+          : encodeHashToBase64(agentPubKey)
+      }}
     </div>
   </div>
 </template>
@@ -20,10 +24,17 @@ import { Profile } from "@holochain-open-dev/profiles";
 import { PROFILE_FIELDS } from "@/types/types";
 import { AgentPubKey, encodeHashToBase64 } from "@holochain/client";
 
-defineProps<{
-  profile?: Profile | null;
-  agentPubKey: AgentPubKey;
-}>();
+withDefaults(
+  defineProps<{
+    profile?: Profile | null;
+    agentPubKey: AgentPubKey;
+    trimAgentPubKey?: boolean;
+  }>(),
+  {
+    profile: null,
+    trimAgentPubKey: true,
+  }
+);
 </script>
 
 <style scoped></style>
diff --git a/ui/src/components/BaseAgentProfileNameLarge.vue b/ui/src/components/BaseAgentProfileNameLarge.vue
@@ -10,7 +10,11 @@
       <div class="font-mono text-sm">@{{ profile.nickname }}</div>
     </div>
     <div v-else class="font-mono">
-      {{ encodeHashToBase64(agentPubKey) }}
+      {{
+        trimAgentPubKey
+          ? `${encodeHashToBase64(agentPubKey).slice(0, 15)}...`
+          : encodeHashToBase64(agentPubKey)
+      }}
     </div>
   </div>
 </template>
@@ -20,10 +24,17 @@ import { Profile } from "@holochain-open-dev/profiles";
 import { PROFILE_FIELDS } from "@/types/types";
 import { AgentPubKey, encodeHashToBase64 } from "@holochain/client";
 
-defineProps<{
-  profile?: Profile | null;
-  agentPubKey: AgentPubKey;
-}>();
+withDefaults(
+  defineProps<{
+    profile?: Profile | null;
+    agentPubKey: AgentPubKey;
+    trimAgentPubKey?: boolean;
+  }>(),
+  {
+    profile: null,
+    trimAgentPubKey: true,
+  }
+);
 </script>
 
 <style scoped></style>
diff --git a/ui/src/components/CreatorsListDialog.vue b/ui/src/components/CreatorsListDialog.vue
@@ -22,6 +22,7 @@
             :agent-profiles="page"
             :loading="isInitialLoading"
             :enable-popups="false"
+            :trim-agent-pub-key="false"
           />
           <hr v-if="i !== data.pages.length - 1" class="border-base-300" />
         </template>

diff --git a/ui/src/components/FollowersListDialog.vue b/ui/src/components/FollowersListDialog.vue
@@ -22,6 +22,7 @@
             :agent-profiles="page"
             :loading="isInitialLoading"
             :enable-popups="false"
+            :trim-agent-pub-key="false"
           />
           <hr v-if="i !== data.pages.length - 1" class="border-base-300" />
         </template>

diff --git a/ui/src/pages/AgentProfile.vue b/ui/src/pages/AgentProfile.vue
@@ -232,7 +232,7 @@ const fetchJoinedTimestamp = () =>
     role_name: "mewsfeed",
     zome_name: "profiles",
     fn_name: "get_joining_timestamp_for_agent",
-    payload: agentPubKey.value,
+    payload: route.params.agentPubKey,
   });
 
 const { data: joinedTimestamp, error: errorJoinedTimestamp } = useQuery({
@@ -246,7 +246,7 @@ const fetchCreatorsCount = async (): Promise<number> =>
     role_name: "mewsfeed",
     zome_name: "follows",
     fn_name: "count_creators_for_follower",
-    payload: agentPubKey.value,
+    payload: route.params.agentPubKey,
   });
 
 const { data: creatorsCount, error: errorCreatorsCount } = useQuery({
@@ -260,7 +260,7 @@ const fetchFollowersCount = async (): Promise<number> =>
     role_name: "mewsfeed",
     zome_name: "follows",
     fn_name: "count_followers_for_creator",
-    payload: agentPubKey.value,
+    payload: route.params.agentPubKey,
   });
 
 const {