Skip to content

Commit e262919

Browse files
authored
fix hydration error in moderation queue (#5038)
* fix hydration error in moderation queue * disabled moderation button when no projects * fix circular prop type issue * Make moderation checklist clientonly
1 parent 3fc18fe commit e262919

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</button>
9191
</ButtonStyled>
9292
<ButtonStyled circular>
93-
<OverflowMenu :options="quickActions">
93+
<OverflowMenu :options="quickActions" :dropdown-id="`${baseId}-quick-actions`">
9494
<template #default>
9595
<EllipsisVerticalIcon class="size-4" />
9696
</template>
@@ -133,6 +133,8 @@ const { addNotification } = injectNotificationManager()
133133
const formatRelativeTime = useRelativeTime()
134134
const moderationStore = useModerationStore()
135135
136+
const baseId = useId()
137+
136138
const props = defineProps<{
137139
queueEntry: ModerationProject
138140
}>()

apps/frontend/src/pages/[type]/[id].vue

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
? `standard`
464464
: `brand`
465465
"
466-
:circular="auth.user && currentMember"
466+
:circular="!!auth.user && !!currentMember"
467467
>
468468
<button
469469
v-tooltip="
@@ -927,16 +927,18 @@
927927
</div>
928928
</div>
929929

930-
<div
931-
v-if="auth.user && tags.staffRoles.includes(auth.user.role) && showModerationChecklist"
932-
class="moderation-checklist"
933-
>
934-
<ModerationChecklist
935-
:collapsed="collapsedModerationChecklist"
936-
@exit="showModerationChecklist = false"
937-
@toggle-collapsed="collapsedModerationChecklist = !collapsedModerationChecklist"
938-
/>
939-
</div>
930+
<ClientOnly>
931+
<div
932+
v-if="auth.user && tags.staffRoles.includes(auth.user.role) && showModerationChecklist"
933+
class="moderation-checklist"
934+
>
935+
<ModerationChecklist
936+
:collapsed="collapsedModerationChecklist"
937+
@exit="showModerationChecklist = false"
938+
@toggle-collapsed="collapsedModerationChecklist = !collapsedModerationChecklist"
939+
/>
940+
</div>
941+
</ClientOnly>
940942

941943
<template v-if="hasEditDetailsPermission">
942944
<ProjectEnvironmentModal ref="projectEnvironmentModal" />

apps/frontend/src/pages/moderation/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<ButtonStyled color="orange" class="w-full sm:w-auto">
6565
<button
6666
class="flex !h-[40px] w-full items-center justify-center gap-2 sm:w-auto"
67+
:disabled="paginatedProjects?.length === 0"
6768
@click="moderateAllInFilter()"
6869
>
6970
<ScaleIcon class="flex-shrink-0" />

0 commit comments

Comments
 (0)