From b2978096fdccdbc73d0f6a34ada44d9661f704cc Mon Sep 17 00:00:00 2001
From: Calum <calum@modrinth.com>
Date: Fri, 11 Jul 2025 17:13:38 +0100
Subject: [PATCH] fix: shouldShow issues

---
 .../src/components/ui/ProjectMemberHeader.vue | 37 +++----------------
 packages/moderation/types/nags.ts             |  3 +-
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
index 917a87d06..74077a008 100644
--- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue
+++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
@@ -29,30 +29,6 @@
     <div class="flex max-w-full flex-wrap items-center gap-x-6 gap-y-4">
       <div class="flex flex-auto flex-wrap items-center gap-x-6 gap-y-4">
         <h2 class="my-0 mr-auto">Publishing checklist</h2>
-        <div class="flex w-fit max-w-full flex-row flex-wrap items-center gap-2">
-          <span class="mr-2 font-bold text-dark">Progress:</span>
-          <div class="flex w-fit max-w-full flex-row items-center gap-2">
-            <div
-              v-for="nag in applicableNags"
-              :key="`checklist-${nag.id}`"
-              v-tooltip="nag.title"
-              :aria-label="nag.title"
-              :class="[
-                'flex h-8 w-8 items-center justify-center rounded-full transition-colors',
-                isNagComplete(nag)
-                  ? 'bg-green text-inverted'
-                  : nag.status === 'required'
-                    ? 'bg-bg text-red'
-                    : nag.status === 'warning'
-                      ? 'bg-bg text-orange'
-                      : 'bg-bg text-purple',
-              ]"
-            >
-              <CheckIcon v-if="isNagComplete(nag)" class="h-4 w-4" />
-              <component :is="nag.icon || getDefaultIcon(nag.status)" v-else class="h-4 w-4" />
-            </div>
-          </div>
-        </div>
       </div>
       <div class="input-group">
         <button
@@ -63,9 +39,9 @@
         </button>
       </div>
     </div>
-    <div v-if="!collapsed" class="grid-display width-16">
+    <div v-if="!collapsed" class="grid-display width-16 mt-4">
       <div v-for="nag in visibleNags" :key="nag.id" class="grid-display__item">
-        <span class="flex items-center gap-2">
+        <span class="flex items-center gap-2 font-semibold">
           <component
             :is="nag.icon || getDefaultIcon(nag.status)"
             v-tooltip="getStatusTooltip(nag.status)"
@@ -166,12 +142,13 @@ const nagContext = computed<NagContext>(() => ({
 
 const applicableNags = computed<Nag[]>(() => {
   return nags.filter((nag) => {
-    return !nag.shouldShow || nag.shouldShow(nagContext.value);
+    return nag.shouldShow(nagContext.value);
   });
 });
 
 const isNagComplete = (nag: Nag): boolean => {
   const context = nagContext.value;
+  return !nag.shouldShow(context);
 };
 
 const visibleNags = computed<Nag[]>(() => {
@@ -179,9 +156,7 @@ const visibleNags = computed<Nag[]>(() => {
 });
 
 const shouldShowLink = (nag: Nag): boolean => {
-  if (!nag.link) return false;
-  if (!nag.link.shouldShow) return true;
-  return nag.link.shouldShow(nagContext.value);
+  return nag.link?.shouldShow ? nag.link.shouldShow(nagContext.value) : false;
 };
 
 const getDefaultIcon = (status: NagStatus): Component => {
@@ -212,7 +187,7 @@ const getStatusTooltip = (status: NagStatus): string => {
 
 const showInvitation = computed<boolean>(() => {
   if (props.allMembers && props.auth) {
-    const member = props.allMembers.find((x) => x.user.id === props.auth.user.id);
+    const member = props.allMembers.find((x) => x?.user?.id === props.auth.user.id);
     return !!member && !member.accepted;
   }
   return false;
diff --git a/packages/moderation/types/nags.ts b/packages/moderation/types/nags.ts
index 0a48f8951..0e8075c8c 100644
--- a/packages/moderation/types/nags.ts
+++ b/packages/moderation/types/nags.ts
@@ -78,10 +78,11 @@ export interface Nag {
    * If not specified it will use the default icon associated with the nag status.
    */
   icon?: FunctionalComponent<SVGAttributes>
+
   /**
    * A function that determines whether the nag should be shown based on the context.
    */
-  shouldShow?: (context: NagContext) => boolean
+  shouldShow: (context: NagContext) => boolean
   /**
    * An optional link associated with the nag.
    * If provided, it should be displayed alongside the nag.