fix: switch pod logs (#5040)

labring · Sep 5, 2024 · 8eef22e · 8eef22e
1 parent 95ce6b8
commit 8eef22e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/frontend/providers/applaunchpad/src/pages/app/detail/components/LogsModal.tsx b/frontend/providers/applaunchpad/src/pages/app/detail/components/LogsModal.tsx
@@ -48,6 +48,7 @@ const LogsModal = ({
   const watchLogs = useCallback(() => {
     // podName is empty. pod may  has been deleted
     if (!podName) return closeFn();
+    setIsLoading(true);
 
     const controller = new AbortController();
     streamFetch({
@@ -60,6 +61,7 @@ const LogsModal = ({
       abortSignal: controller,
       firstResponse() {
         setIsLoading(false);
+        setLogs('');
         setTimeout(() => {
           if (!LogBox.current) return;
 
@@ -96,7 +98,7 @@ const LogsModal = ({
     return () => {
       controller?.abort();
     };
-  }, []);
+  }, [watchLogs]);
 
   const exportLogs = useCallback(async () => {
     const allLogs = await getPodLogs({
@@ -116,7 +118,7 @@ const LogsModal = ({
             <Box fontSize={'xl'} fontWeight={'bold'}>
               Pod {t('Log')}
             </Box>
-            <Box px={3}>
+            <Box px={3} zIndex={10000}>
               <SealosMenu
                 width={240}
                 Button={

diff --git a/frontend/providers/applaunchpad/src/pages/app/detail/components/Pods.tsx b/frontend/providers/applaunchpad/src/pages/app/detail/components/Pods.tsx
@@ -49,6 +49,8 @@ const Pods = ({
   const [detailPodIndex, setDetailPodIndex] = useState<number>();
   const [detailFilePodIndex, setDetailFilePodIndex] = useState<number>();
 
+  const closeFn = useCallback(() => setLogsPodIndex(undefined), [setLogsPodIndex]);
+
   const { Loading } = useLoading();
   const { openConfirm: openConfirmRestart, ConfirmChild: RestartConfirmChild } = useConfirm({
     content: 'Please confirm to restart the Pod?'
@@ -306,7 +308,7 @@ const Pods = ({
           setLogsPodName={(name: string) =>
             setLogsPodIndex(pods.findIndex((item) => item.podName === name))
           }
-          closeFn={() => setLogsPodIndex(undefined)}
+          closeFn={closeFn}
         />
       )}
       {detailPodIndex !== undefined && (