fix: unexpected redirection when landing at workflow (#22932)

web/app/components/app/configuration/index.tsx

@@ -82,6 +82,7 @@ import { supportFunctionCall } from '@/utils/tool-call'
 import { MittProvider } from '@/context/mitt-context'
 import { fetchAndMergeValidCompletionParams } from '@/utils/completion-params'
 import Toast from '@/app/components/base/toast'
+import { useAppContext } from '@/context/app-context'
 
 type PublishConfig = {
   modelConfig: ModelConfig
@@ -91,6 +92,8 @@ type PublishConfig = {
 const Configuration: FC = () => {
   const { t } = useTranslation()
   const { notify } = useContext(ToastContext)
+  const { isLoadingCurrentWorkspace, currentWorkspace } = useAppContext()
+
   const { appDetail, showAppConfigureFeaturesModal, setAppSiderbarExpand, setShowAppConfigureFeaturesModal } = useAppStore(useShallow(state => ({
     appDetail: state.appDetail,
     setAppSiderbarExpand: state.setAppSiderbarExpand,
@@ -693,7 +696,6 @@ const Configuration: FC = () => {
         setHasFetchedDetail(true)
       })
     })()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [appId])
 
   const promptEmpty = (() => {
@@ -843,7 +845,7 @@ const Configuration: FC = () => {
     setAppSiderbarExpand('collapse')
   }
 
-  if (isLoading) {
+  if (isLoading || isLoadingCurrentWorkspace || !currentWorkspace.id) {
     return <div className='flex h-full items-center justify-center'>
       <Loading type='area' />
     </div>

web/app/components/workflow-app/index.tsx

@@ -19,6 +19,7 @@ import { FeaturesProvider } from '@/app/components/base/features'
 import type { Features as FeaturesData } from '@/app/components/base/features/types'
 import { FILE_EXTS } from '@/app/components/base/prompt-editor/constants'
 import { fetchFileUploadConfig } from '@/service/common'
+import { useAppContext } from '@/context/app-context'
 import WorkflowWithDefaultContext from '@/app/components/workflow'
 import {
   WorkflowContextProvider,
@@ -31,6 +32,7 @@ const WorkflowAppWithAdditionalContext = () => {
     data,
     isLoading,
   } = useWorkflowInit()
+  const { isLoadingCurrentWorkspace, currentWorkspace } = useAppContext()
   const { data: fileUploadConfigResponse } = useSWR({ url: '/files/upload' }, fetchFileUploadConfig)
 
   const nodesData = useMemo(() => {
@@ -46,7 +48,7 @@ const WorkflowAppWithAdditionalContext = () => {
     return []
   }, [data])
 
-  if (!data || isLoading) {
+  if (!data || isLoading || isLoadingCurrentWorkspace || !currentWorkspace.id) {
     return (
       <div className='relative flex h-full w-full items-center justify-center'>
         <Loading />