From ddb3e32c1afc612d60b4c6932481a630d1ae7a27 Mon Sep 17 00:00:00 2001
From: NFish <douxc512@gmail.com>
Date: Tue, 6 May 2025 11:27:46 +0800
Subject: [PATCH] fix: disable items in publish dropdown menu panel if web app
 access not set

---
 .../components/app/app-publisher/index.tsx    | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index 79c8f11c12..5b1adb5717 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -89,7 +89,7 @@ const AppPublisher = ({
   const appMode = (appDetail?.mode !== 'completion' && appDetail?.mode !== 'workflow') ? 'chat' : appDetail.mode
   const appURL = `${appBaseURL}${basePath}/${appMode}/${accessToken}`
   const isChatApp = ['chat', 'agent-chat', 'completion'].includes(appDetail?.mode || '')
-  const { data: useCanAccessApp, isLoading: isGettingUserCanAccessApp, refetch } = useGetUserCanAccessApp({ appId: appDetail?.id, enabled: false })
+  const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp, refetch } = useGetUserCanAccessApp({ appId: appDetail?.id, enabled: false })
   const { data: appAccessSubjects, isLoading: isGettingAppWhiteListSubjects } = useAppWhiteListSubjects(appDetail?.id, open && appDetail?.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS)
 
   useEffect(() => {
@@ -287,9 +287,10 @@ const AppPublisher = ({
                   {!isAppAccessSet && <p className='system-xs-regular mt-1 text-text-warning'>{t('app.publishApp.notSetDesc')}</p>}
                 </div>
                 <div className='flex flex-col gap-y-1 border-t-[0.5px] border-t-divider-regular p-4 pt-3'>
-                  <Tooltip triggerClassName='flex' disabled={useCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
+                  <Tooltip triggerClassName='flex' disabled={userCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
                     <SuggestedAction
-                      disabled={!publishedAt}
+                      className='flex-1'
+                      disabled={!publishedAt || !userCanAccessApp?.result}
                       link={appURL}
                       icon={<RiPlayCircleLine className='h-4 w-4' />}
                     >
@@ -298,9 +299,10 @@ const AppPublisher = ({
                   </Tooltip>
                   {appDetail?.mode === 'workflow' || appDetail?.mode === 'completion'
                     ? (
-                      <Tooltip triggerClassName='flex' disabled={useCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
+                      <Tooltip triggerClassName='flex' disabled={userCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
                         <SuggestedAction
-                          disabled={!publishedAt}
+                          className='flex-1'
+                          disabled={!publishedAt || !userCanAccessApp?.result}
                           link={`${appURL}${appURL.includes('?') ? '&' : '?'}mode=batch`}
                           icon={<RiPlayList2Line className='h-4 w-4' />}
                         >
@@ -320,44 +322,41 @@ const AppPublisher = ({
                         {t('workflow.common.embedIntoSite')}
                       </SuggestedAction>
                     )}
-                  <Tooltip triggerClassName='flex' disabled={useCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
+                  <Tooltip triggerClassName='flex' disabled={userCanAccessApp?.result} popupContent={t('app.noAccessPermission')} asChild={false}>
                     <SuggestedAction
+                      className='flex-1'
                       onClick={() => {
                         publishedAt && handleOpenInExplore()
                       }}
-                      disabled={!publishedAt}
+                      disabled={!publishedAt || !userCanAccessApp?.result}
                       icon={<RiPlanetLine className='h-4 w-4' />}
                     >
                       {t('workflow.common.openInExplore')}
                     </SuggestedAction>
                   </Tooltip>
-                  <div className='flex'>
-                    <SuggestedAction
-                      disabled={!publishedAt}
-                      link='./develop'
-                      icon={<RiTerminalBoxLine className='h-4 w-4' />}
-                    >
-                      {t('workflow.common.accessAPIReference')}
-                    </SuggestedAction>
-                  </div>
+                  <SuggestedAction
+                    disabled={!publishedAt}
+                    link='./develop'
+                    icon={<RiTerminalBoxLine className='h-4 w-4' />}
+                  >
+                    {t('workflow.common.accessAPIReference')}
+                  </SuggestedAction>
                   {appDetail?.mode === 'workflow' && (
-                    <div className='flex' >
-                      <WorkflowToolConfigureButton
-                        disabled={!publishedAt}
-                        published={!!toolPublished}
-                        detailNeedUpdate={!!toolPublished && published}
-                        workflowAppId={appDetail?.id}
-                        icon={{
-                          content: (appDetail.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
-                          background: (appDetail.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
-                        }}
-                        name={appDetail?.name}
-                        description={appDetail?.description}
-                        inputs={inputs}
-                        handlePublish={handlePublish}
-                        onRefreshData={onRefreshData}
-                      />
-                    </div>
+                    <WorkflowToolConfigureButton
+                      disabled={!publishedAt}
+                      published={!!toolPublished}
+                      detailNeedUpdate={!!toolPublished && published}
+                      workflowAppId={appDetail?.id}
+                      icon={{
+                        content: (appDetail.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
+                        background: (appDetail.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
+                      }}
+                      name={appDetail?.name}
+                      description={appDetail?.description}
+                      inputs={inputs}
+                      handlePublish={handlePublish}
+                      onRefreshData={onRefreshData}
+                    />
                   )}
                 </div>
               </>}