fix: do not open the questionnaire after uninstalling the extension i…

…f it is a subscription version (kubesphere#2824) Signed-off-by: donniean <acmilank22@gmail.com>
Leioy · Mar 8, 2024 · de6d8b3 · de6d8b3
1 parent 7d784b8
commit de6d8b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/core/src/containers/Extensions/Manager/Detail/index.tsx b/packages/core/src/containers/Extensions/Manager/Detail/index.tsx
@@ -26,6 +26,7 @@ import { handleInstalled, handleUninstalled } from '../actions';
 import { useLocalExtensionStatusItems } from '../hooks/useLocalExtensionStatusItems';
 import { DetailActionButtons } from '../components/DetailActionButtons';
 import { InstalledVersionWrapper } from './styles';
+import { useMarketplaceConfigQuery } from '../../../../stores/marketplace';
 
 export default function ExtensionsManagerDetail() {
   const navigate = useNavigate();
@@ -46,6 +47,10 @@ export default function ExtensionsManagerDetail() {
   const { isLocalInstalling, isLocalUpgrading, isLocalAnyUninstalling } =
     formatLocalExtensionsStatus(localExtensionsStatus);
 
+  const { isLoading: isMarketplaceConfigQueryLoading, isOnline } = useMarketplaceConfigQuery({
+    isIgnoreErrorNotify: true,
+  });
+
   const {
     isLoading: isExtensionQueryLoading,
     formattedExtension,
@@ -201,7 +206,9 @@ export default function ExtensionsManagerDetail() {
     });
     refetchExtension();
     refetchInstallPlan();
-    window.open(EXTENSIONS_EVALUATION_PAGE_LINK, '_blank');
+    if (isOnline) {
+      window.open(EXTENSIONS_EVALUATION_PAGE_LINK, '_blank');
+    }
   };
 
   const handleForceDeleteInstallPlanSuccess = () => {
@@ -235,7 +242,11 @@ export default function ExtensionsManagerDetail() {
 
   return (
     <ExtensionDetail
-      isLoading={isExtensionQueryLoading || isExtensionDisplayVersionQueryLoading}
+      isLoading={
+        isMarketplaceConfigQueryLoading ||
+        isExtensionQueryLoading ||
+        isExtensionDisplayVersionQueryLoading
+      }
       formattedExtension={formattedExtension}
       formattedExtensionVersion={formattedExtensionVersion}
       basicInfo={basicInfo}

diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx b/packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx
@@ -150,7 +150,9 @@ function Extensions() {
       status: 'localUninstalling',
     });
     refetchExtensions();
-    window.open(EXTENSIONS_EVALUATION_PAGE_LINK, '_blank');
+    if (isOnline) {
+      window.open(EXTENSIONS_EVALUATION_PAGE_LINK, '_blank');
+    }
   };
 
   const handleForceDeleteInstallPlanSuccess = () => {