mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +00:00
5eda23b7aa
## Summary - Fix: flash of wrong workspace icon (replaced with loader) - Fix: personal workspace showing 0 credits ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-8323-fix-workspace-icon-flash-and-credits-showing-0-while-workspace-is-in-2f46d73d36508159b52fec3fa0c17e35) by [Unito](https://www.unito.io)
120 lines
3.3 KiB
Vue
120 lines
3.3 KiB
Vue
<!-- A button that shows workspace icon (Cloud) or user avatar -->
|
|
<template>
|
|
<div>
|
|
<Button
|
|
v-if="isLoggedIn"
|
|
class="p-1 hover:bg-transparent"
|
|
variant="muted-textonly"
|
|
:aria-label="$t('g.currentUser')"
|
|
@click="popover?.toggle($event)"
|
|
>
|
|
<div
|
|
:class="
|
|
cn(
|
|
'flex items-center gap-1 rounded-full hover:bg-interface-button-hover-surface justify-center',
|
|
compact && 'size-full '
|
|
)
|
|
"
|
|
>
|
|
<Skeleton
|
|
v-if="showWorkspaceSkeleton"
|
|
shape="circle"
|
|
width="32px"
|
|
height="32px"
|
|
/>
|
|
<WorkspaceProfilePic
|
|
v-else-if="showWorkspaceIcon"
|
|
:workspace-name="workspaceName"
|
|
:class="compact && 'size-full'"
|
|
/>
|
|
<UserAvatar
|
|
v-else
|
|
:photo-url="photoURL"
|
|
:class="compact && 'size-full'"
|
|
/>
|
|
|
|
<i v-if="showArrow" class="icon-[lucide--chevron-down] size-4 px-1" />
|
|
</div>
|
|
</Button>
|
|
|
|
<Popover
|
|
ref="popover"
|
|
:show-arrow="false"
|
|
:pt="{
|
|
root: {
|
|
class: 'rounded-lg w-80'
|
|
}
|
|
}"
|
|
>
|
|
<!-- Workspace mode: workspace-aware popover (only when ready) -->
|
|
<CurrentUserPopoverWorkspace
|
|
v-if="teamWorkspacesEnabled && initState === 'ready'"
|
|
@close="closePopover"
|
|
/>
|
|
<!-- Legacy mode: original popover -->
|
|
<CurrentUserPopover
|
|
v-else-if="!teamWorkspacesEnabled"
|
|
@close="closePopover"
|
|
/>
|
|
</Popover>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { storeToRefs } from 'pinia'
|
|
import Popover from 'primevue/popover'
|
|
import Skeleton from 'primevue/skeleton'
|
|
import { computed, defineAsyncComponent, ref } from 'vue'
|
|
|
|
import UserAvatar from '@/components/common/UserAvatar.vue'
|
|
import WorkspaceProfilePic from '@/components/common/WorkspaceProfilePic.vue'
|
|
import Button from '@/components/ui/button/Button.vue'
|
|
import { useCurrentUser } from '@/composables/auth/useCurrentUser'
|
|
import { useFeatureFlags } from '@/composables/useFeatureFlags'
|
|
import { isCloud } from '@/platform/distribution/types'
|
|
import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
|
|
import { cn } from '@/utils/tailwindUtil'
|
|
|
|
import CurrentUserPopover from './CurrentUserPopover.vue'
|
|
|
|
const CurrentUserPopoverWorkspace = defineAsyncComponent(
|
|
() => import('./CurrentUserPopoverWorkspace.vue')
|
|
)
|
|
|
|
const { showArrow = true, compact = false } = defineProps<{
|
|
showArrow?: boolean
|
|
compact?: boolean
|
|
}>()
|
|
|
|
const { flags } = useFeatureFlags()
|
|
const teamWorkspacesEnabled = computed(() => flags.teamWorkspacesEnabled)
|
|
|
|
const { isLoggedIn, userPhotoUrl } = useCurrentUser()
|
|
|
|
const photoURL = computed<string | undefined>(
|
|
() => userPhotoUrl.value ?? undefined
|
|
)
|
|
|
|
const { workspaceName: teamWorkspaceName, initState } = storeToRefs(
|
|
useTeamWorkspaceStore()
|
|
)
|
|
|
|
const showWorkspaceSkeleton = computed(
|
|
() => isCloud && teamWorkspacesEnabled.value && initState.value === 'loading'
|
|
)
|
|
const showWorkspaceIcon = computed(
|
|
() => isCloud && teamWorkspacesEnabled.value && initState.value === 'ready'
|
|
)
|
|
|
|
const workspaceName = computed(() => {
|
|
if (!showWorkspaceIcon.value) return ''
|
|
return teamWorkspaceName.value
|
|
})
|
|
|
|
const popover = ref<InstanceType<typeof Popover> | null>(null)
|
|
|
|
const closePopover = () => {
|
|
popover.value?.hide()
|
|
}
|
|
</script>
|