Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(web): keep the model provider page stable while it loads (#45654)
yyhce826bd148e5
diff --git a/web/app/components/header/account-setting/model-provider-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/__tests__/index.spec.tsxindex 45eff85d359..d6a2fb683f0 100644--- a/web/app/components/header/account-setting/model-provider-page/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/model-provider-page/__tests__/index.spec.tsx@@ -324,6 +324,7 @@ vi.mock('@/service/console', async (importOriginal) => {...actual,consoleQuery: withConsoleResponses(actual.consoleQuery, {'workspaces.current.modelProviders.summary.get': () => new Promise(() => {}),+ 'workspaces.current.modelProviders.credits.get': () => new Promise(() => {}),'workspaces.current.defaultModel.get': mockDefaultModelQuery,'workspaces.current.models.modelTypes.byModelType.get': () => ({ data: [] }),'workspaces.current.plugin.list.latestVersions.post': () => new Promise(() => {}),diff --git a/web/app/components/header/account-setting/model-provider-page/index.tsx b/web/app/components/header/account-setting/model-provider-page/index.tsxindex 772231fdedd..df3d1692969 100644--- a/web/app/components/header/account-setting/model-provider-page/index.tsx+++ b/web/app/components/header/account-setting/model-provider-page/index.tsx@@ -4,7 +4,7 @@ import type {ModelProviderSummaryResponse,} from '@dify/contracts/api/console/workspaces/types.gen'import type { ReactNode } from 'react'-import { useQuery } from '@tanstack/react-query'+import { useQuery, useSuspenseQuery } from '@tanstack/react-query'import { useDebounce } from 'ahooks'import { noop } from 'es-toolkit/function'import { useMemo } from 'react'@@ -13,11 +13,13 @@ import { SearchInput } from '@/app/components/base/search-input'import { usePluginSettingsAccess } from '@/app/components/plugins/plugin-page/use-reference-setting'import { PluginCategoryEnum } from '@/app/components/plugins/types'import { useMarketplace } from '@/features/marketplace/client'+import { systemFeaturesQueryOptions } from '@/features/system-features/client'import { consoleQuery } from '@/service/console'import { UpdateSettingDialog } from '../update-setting-dialog'import { ModelTypeEnum } from './declarations'import { useDefaultModel } from './hooks'import ModelProviderPageBody from './model-provider-page-body'+import { useTrialCredits } from './provider-added-card/use-trial-credits'import SystemModelSelector from './system-model-selector'const EMPTY_MODEL_PROVIDERS: ModelProviderSummaryListResponse['data'] = []@@ -71,9 +73,20 @@ const ModelProviderPage = ({ModelTypeEnum.tts,defaultModelQueryOptions,)- const { data: providerSummary, isLoading: isLoadingModelProviders } = useQuery(+ const { data: providerSummary, isLoading: isProviderSummaryLoading } = useQuery(consoleQuery.workspaces.current.modelProviders.summary.get.queryOptions(),)+ const { data: deploymentEdition } = useSuspenseQuery({+ ...systemFeaturesQueryOptions(),+ select: ({ deployment_edition }) => deployment_edition,+ })+ const isCloud = deploymentEdition === 'CLOUD'+ const { isPending: isTrialModelsPending } = useQuery(+ consoleQuery.trialModels.get.queryOptions({ enabled: isCloud }),+ )+ const { isLoading: isTrialCreditsLoading } = useTrialCredits()+ const isLoadingModelProviders =+ isProviderSummaryLoading || (isCloud && (isTrialModelsPending || isTrialCreditsLoading))const providers = providerSummary?.data ?? EMPTY_MODEL_PROVIDERSconst modelProviderPlugins = providerSummary?.plugins ?? EMPTY_MODEL_PROVIDER_PLUGINSdiff --git a/web/app/components/header/account-setting/model-provider-page/model-provider-page-body.tsx b/web/app/components/header/account-setting/model-provider-page/model-provider-page-body.tsxindex b267862f41e..67dc28597ba 100644--- a/web/app/components/header/account-setting/model-provider-page/model-provider-page-body.tsx+++ b/web/app/components/header/account-setting/model-provider-page/model-provider-page-body.tsx@@ -3,6 +3,7 @@ import type { FC } from 'react'import type { ModelProviderPluginSummary } from './index'import type { MarketplaceLinks } from '@/features/marketplace/links'import { useSuspenseQuery } from '@tanstack/react-query'+import { Suspense } from 'react'import { Trans, useTranslation } from 'react-i18next'import { SkeletonContainer, SkeletonRectangle, SkeletonRow } from '@/app/components/base/skeleton'import { STEP_BY_STEP_TOUR_TARGETS } from '@/app/components/step-by-step-tour/target-registry'@@ -27,21 +28,27 @@ type ModelProviderPageBodyProps = {function ModelProviderCardSkeleton() {return (- <div className="rounded-xl border-[0.5px] border-components-card-border bg-components-card-bg p-4 shadow-xs">- <SkeletonContainer className="h-24">- <SkeletonRow>- <SkeletonRectangle className="size-10 shrink-0 animate-pulse rounded-lg" />- <div className="flex flex-1 flex-col gap-1">- <SkeletonRectangle className="h-4 w-2/5 animate-pulse" />- <SkeletonRectangle className="h-3 w-1/4 animate-pulse" />- </div>- <SkeletonRectangle className="h-8 w-24 animate-pulse rounded-lg" />- </SkeletonRow>- <div className="mt-4 flex flex-col gap-2">- <SkeletonRectangle className="h-3 w-full animate-pulse" />- <SkeletonRectangle className="h-3 w-3/4 animate-pulse" />+ <div className="rounded-xl border-[0.5px] border-divider-regular bg-third-party-model-bg-default shadow-xs">+ <div className="flex py-2 ps-3 pe-2">+ <div className="grow px-1 pt-1 pb-0.5">+ <SkeletonRow className="mb-2 h-6">+ <SkeletonRectangle className="my-0 size-6 rounded-md" />+ <SkeletonRectangle className="my-0 h-4 w-28" />+ </SkeletonRow>+ <SkeletonRow className="h-4.5 gap-0.5">+ <SkeletonRectangle className="my-0 h-4.5 w-8 rounded-[5px]" />+ <SkeletonRectangle className="my-0 h-4.5 w-24 rounded-[5px]" />+ </SkeletonRow></div>- </SkeletonContainer>+ <SkeletonContainer className="ms-1 w-32 shrink-0 justify-between rounded-lg border-[0.5px] border-components-panel-border p-1">+ <SkeletonRectangle className="mx-1.5 mt-1.5 mb-0 h-3 w-16" />+ <SkeletonRectangle className="my-0 h-6 w-full rounded-md" />+ </SkeletonContainer>+ </div>+ <SkeletonRow className="justify-between border-t border-t-divider-subtle py-1.5 ps-3 pe-2.75">+ <SkeletonRectangle className="h-4 w-16" />+ <SkeletonRectangle className="h-4 w-32" />+ </SkeletonRow></div>)}@@ -50,7 +57,11 @@ function ModelProviderListSkeleton() {const { t } = useTranslation(['common'])return (- <div role="status" aria-label={t(($) => $.loading, { ns: 'common' })} className="space-y-2">+ <div+ role="status"+ aria-label={t(($) => $.loading, { ns: 'common' })}+ className="flex flex-col gap-2 motion-safe:animate-pulse"+ >{Array.from({ length: 3 }, (_, index) => (<ModelProviderCardSkeleton key={index} />))}@@ -187,50 +198,58 @@ const ModelProviderPageBody: FC<ModelProviderPageBodyProps> = ({<ModelProviderListSkeleton /></div>)}- {showEmptyProvider && (- <EmptyProviderState- enableMarketplace={marketplace !== null}- stepByStepTourTarget={- !showConfiguredProviders && !showNotConfiguredProviders- ? STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderProduction- : undefined- }- />- )}- {showConfiguredProviders && (- <ProviderCardList- firstCardTarget={STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderProduction}- providers={filteredConfiguredProviders}- pluginSummaryMap={pluginSummaryMap}- />- )}- {showNotConfiguredProviders && (- <div className="flex flex-col gap-2 pt-2">- <div className="flex h-5 items-center system-md-semibold text-text-primary">- {t(($) => $['modelProvider.toBeConfigured'], { ns: 'modelProvider' })}+ <Suspense+ fallback={+ <div>+ <ModelProviderListSkeleton /></div>- <ProviderCardList- firstCardTarget={- !showConfiguredProviders+ }+ >+ {showEmptyProvider && (+ <EmptyProviderState+ enableMarketplace={marketplace !== null}+ stepByStepTourTarget={+ !showConfiguredProviders && !showNotConfiguredProviders? STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderProduction: undefined}- providers={filteredNotConfiguredProviders}- notConfigured- pluginSummaryMap={pluginSummaryMap}/>- </div>- )}- {!isLoadingModelProviders && marketplace && (- <div>- <InstallFromMarketplace- marketplace={marketplace}- searchText={searchText}- onOpenMarketplace={onOpenMarketplace}- stepByStepTourTarget={STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderInstall}+ )}+ {showConfiguredProviders && (+ <ProviderCardList+ firstCardTarget={STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderProduction}+ providers={filteredConfiguredProviders}+ pluginSummaryMap={pluginSummaryMap}/>- </div>- )}+ )}+ {showNotConfiguredProviders && (+ <div className="flex flex-col gap-2 pt-2">+ <div className="flex h-5 items-center system-md-semibold text-text-primary">+ {t(($) => $['modelProvider.toBeConfigured'], { ns: 'modelProvider' })}+ </div>+ <ProviderCardList+ firstCardTarget={+ !showConfiguredProviders+ ? STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderProduction+ : undefined+ }+ providers={filteredNotConfiguredProviders}+ notConfigured+ pluginSummaryMap={pluginSummaryMap}+ />+ </div>+ )}+ {!isLoadingModelProviders && marketplace && (+ <div>+ <InstallFromMarketplace+ marketplace={marketplace}+ searchText={searchText}+ onOpenMarketplace={onOpenMarketplace}+ stepByStepTourTarget={STEP_BY_STEP_TOUR_TARGETS.integrationModelProviderInstall}+ />+ </div>+ )}+ </Suspense></div>)}diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/quota-panel.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/quota-panel.spec.tsxindex a7344bffc47..d51064d1d3f 100644--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/quota-panel.spec.tsx+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/quota-panel.spec.tsx@@ -156,7 +156,8 @@ describe('QuotaPanel', () => {credits = undefinedrenderQuotaPanel(<QuotaPanel providers={mockProviders} />)- expect(screen.getByRole('progressbar')).toBeInTheDocument()+ expect(screen.getByRole('status', { name: 'common.loading' })).toBeInTheDocument()+ expect(screen.queryByText(/modelProvider\.used/)).not.toBeInTheDocument()})it('should show used credits, total credits, and reset date', () => {diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsxindex cdb55963c75..02e26fa6348 100644--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx@@ -11,7 +11,7 @@ import { useBoolean } from 'ahooks'import * as React from 'react'import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'-import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'+import { SkeletonRectangle } from '@/app/components/base/skeleton'import { PluginInstallPermissionProvider } from '@/app/components/plugins/install-plugin/components/plugin-install-permission-provider'import useWorkspacePluginInstallPermission from '@/app/components/plugins/install-plugin/hooks/use-workspace-plugin-install-permission'import InstallFromMarketplace from '@/app/components/plugins/install-plugin/install-from-marketplace'@@ -93,9 +93,10 @@ const QuotaPanel: FC<QuotaPanelProps> = ({ providers }) => {exhaustedAt,nextCreditResetDate,} = useTrialCredits()- const { data: trialModels = [] } = useQuery(+ const isCloud = deploymentEdition === 'CLOUD'+ const { data: trialModels = [], isPending: isTrialModelsPending } = useQuery(consoleQuery.trialModels.get.queryOptions({- enabled: deploymentEdition === 'CLOUD',+ enabled: isCloud,select: (data) => data.trial_models,}),)@@ -174,10 +175,22 @@ const QuotaPanel: FC<QuotaPanelProps> = ({ providers }) => {.join(', '),})- if (isLoading) {+ if (isLoading || (isCloud && isTrialModelsPending)) {return (- <div className="flex h-16 items-center justify-center rounded-xl border-[0.5px] border-components-panel-border bg-third-party-model-bg-default shadow-xs">- <LoadingPlaceholder />+ <div+ role="status"+ aria-label={t(($) => $.loading, { ns: 'common' })}+ className="relative h-16 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-third-party-model-bg-default ps-4 pe-2.5 pt-3 pb-2.5 shadow-xs"+ >+ <div className={cn('pointer-events-none absolute inset-0', styles.gridBg)} />+ <div className="relative">+ <div className="mb-0.5 flex h-4 items-center system-xs-medium-uppercase text-text-tertiary">+ {t(($) => $['modelProvider.quotaLabel'], { ns: 'modelProvider' })}+ </div>+ <div className="flex h-6 items-center motion-safe:animate-pulse">+ <SkeletonRectangle className="my-0 h-5 w-48" />+ </div>+ </div></div>)}