mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-09 09:30:06 +00:00
don't use compound name, use isSubscriptionRequirementMet
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<component
|
||||
:is="currentButton"
|
||||
:key="isSubscribedOrIsNotCloud ? 'queue' : 'subscribe'"
|
||||
:key="isSubscriptionRequirementMet ? 'queue' : 'subscribe'"
|
||||
/>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
@@ -11,9 +11,9 @@ import ComfyQueueButton from '@/components/actionbar/ComfyRunButton/ComfyQueueBu
|
||||
import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'
|
||||
import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
|
||||
|
||||
const { isSubscribedOrIsNotCloud } = useSubscription()
|
||||
const { isSubscriptionRequirementMet } = useSubscription()
|
||||
|
||||
const currentButton = computed(() =>
|
||||
isSubscribedOrIsNotCloud.value ? ComfyQueueButton : SubscribeToRunButton
|
||||
isSubscriptionRequirementMet.value ? ComfyQueueButton : SubscribeToRunButton
|
||||
)
|
||||
</script>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<UserCredit text-class="text-3xl font-bold" />
|
||||
<Skeleton v-if="loading" width="2rem" height="2rem" />
|
||||
<Button
|
||||
v-else-if="isSubscribedOrIsNotCloud"
|
||||
v-else-if="isSubscriptionRequirementMet"
|
||||
:label="$t('credits.purchaseCredits')"
|
||||
:loading="loading"
|
||||
@click="handlePurchaseCreditsClick"
|
||||
@@ -146,9 +146,9 @@ const authActions = useFirebaseAuthActions()
|
||||
const commandStore = useCommandStore()
|
||||
const telemetry = useTelemetry()
|
||||
const subscription = isCloud ? useSubscription() : null
|
||||
const isSubscribedOrIsNotCloud = computed(() => {
|
||||
const isSubscriptionRequirementMet = computed(() => {
|
||||
if (!isCloud) return true
|
||||
return subscription?.isSubscribedOrIsNotCloud.value ?? false
|
||||
return subscription?.isSubscriptionRequirementMet.value ?? false
|
||||
})
|
||||
const loading = computed(() => authStore.loading)
|
||||
const balanceLoading = computed(() => authStore.isFetchingBalance)
|
||||
|
||||
@@ -82,7 +82,7 @@ vi.mock('@/stores/firebaseAuthStore', () => ({
|
||||
const mockFetchStatus = vi.fn().mockResolvedValue(undefined)
|
||||
vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
|
||||
useSubscription: vi.fn(() => ({
|
||||
isSubscribedOrIsNotCloud: { value: true },
|
||||
isSubscriptionRequirementMet: { value: true },
|
||||
fetchStatus: mockFetchStatus
|
||||
}))
|
||||
}))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="isSubscribedOrIsNotCloud"
|
||||
v-if="isSubscriptionRequirementMet"
|
||||
class="flex items-center justify-between"
|
||||
>
|
||||
<div class="flex flex-col gap-1">
|
||||
@@ -71,7 +71,7 @@
|
||||
/>
|
||||
|
||||
<Button
|
||||
v-if="isSubscribedOrIsNotCloud"
|
||||
v-if="isSubscriptionRequirementMet"
|
||||
class="justify-start"
|
||||
:label="$t(planSettingsLabel)"
|
||||
icon="pi pi-receipt"
|
||||
@@ -98,7 +98,7 @@
|
||||
<script setup lang="ts">
|
||||
import Button from 'primevue/button'
|
||||
import Divider from 'primevue/divider'
|
||||
import { onMounted } from 'vue'
|
||||
import { computed, onMounted } from 'vue'
|
||||
|
||||
import UserAvatar from '@/components/common/UserAvatar.vue'
|
||||
import UserCredit from '@/components/common/UserCredit.vue'
|
||||
@@ -125,7 +125,10 @@ const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
|
||||
useCurrentUser()
|
||||
const authActions = useFirebaseAuthActions()
|
||||
const dialogService = useDialogService()
|
||||
const { isSubscribedOrIsNotCloud, fetchStatus } = useSubscription()
|
||||
const subscription = isCloud ? useSubscription() : null
|
||||
const isSubscriptionRequirementMet =
|
||||
subscription?.isSubscriptionRequirementMet ?? computed(() => true)
|
||||
const fetchStatus = subscription?.fetchStatus ?? (async () => {})
|
||||
|
||||
const handleOpenUserSettings = () => {
|
||||
dialogService.showSettingsDialog('user')
|
||||
|
||||
Reference in New Issue
Block a user