update keys

labring · Jan 24, 2025 · e263253 · e263253
1 parent ee3b77f
commit e263253
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 49 deletions.
diff --git a/frontend/providers/applaunchpad/src/components/BaseTable/index.tsx b/frontend/providers/applaunchpad/src/components/BaseTable/index.tsx
@@ -28,16 +28,22 @@ export function BaseTable<T extends unknown>({
   table,
   isLoading,
   tdStyle,
+  isHeaderFixed = false,
   ...props
 }: {
   table: ReactTable<T>;
   isLoading: boolean;
   tdStyle?: HTMLChakraProps<'td'>;
+  isHeaderFixed?: boolean;
 } & TableContainerProps) {
   return (
-    <TableContainer {...props}>
+    <TableContainer {...props} position={'relative'}>
       <Table variant="unstyled" width={'full'}>
-        <Thead>
+        <Thead
+          position={isHeaderFixed ? 'sticky' : 'relative'}
+          top={0}
+          zIndex={isHeaderFixed ? 2 : 0}
+        >
           {table.getHeaderGroups().map((headers) => {
             return (
               <Tr key={headers.id}>

diff --git a/frontend/providers/applaunchpad/src/components/app/detail/logs/LogTable.tsx b/frontend/providers/applaunchpad/src/components/app/detail/logs/LogTable.tsx
@@ -55,58 +55,56 @@ export const LogTable = ({
   const isJsonMode = formHook.watch('isJsonMode');
   const { exportLogs } = useLogStore();
 
-  const generateFieldList = useCallback(
-    (data: any[], prevFieldList: FieldItem[] = []) => {
-      if (!data.length) return [];
+  const generateFieldList = useCallback((data: any[], prevFieldList: FieldItem[] = []) => {
+    if (!data.length) return [];
 
-      if (!isJsonMode) {
-        return [
-          {
-            value: 'time',
-            label: 'Time',
-            checked: true,
-            accessorKey: '_time'
-          },
-          {
-            value: 'message',
-            label: 'Message',
-            checked: true,
-            accessorKey: '_msg'
-          }
-        ];
-      }
+    // if (!isJsonMode) {
+    //   return [
+    //     {
+    //       value: 'time',
+    //       label: 'Time',
+    //       checked: true,
+    //       accessorKey: '_time'
+    //     },
+    //     {
+    //       value: 'message',
+    //       label: 'Message',
+    //       checked: true,
+    //       accessorKey: '_msg'
+    //     }
+    //   ];
+    // }
 
-      const uniqueKeys = new Set<string>();
-      data.forEach((item) => {
-        Object.keys(item).forEach((key) => {
-          if (key !== '_msg') {
-            uniqueKeys.add(key);
-          }
-        });
+    const uniqueKeys = new Set<string>();
+    data.forEach((item) => {
+      Object.keys(item).forEach((key) => {
+        uniqueKeys.add(key);
       });
+    });
 
-      const prevFieldStates = prevFieldList.reduce((acc, field) => {
-        acc[field.value] = field.checked;
-        return acc;
-      }, {} as Record<string, boolean>);
+    const prevFieldStates = prevFieldList.reduce((acc, field) => {
+      acc[field.value] = field.checked;
+      return acc;
+    }, {} as Record<string, boolean>);
 
-      return Array.from(uniqueKeys).map((key) => ({
-        value: key,
-        label: key,
-        checked: key in prevFieldStates ? prevFieldStates[key] : true,
-        accessorKey: key
-      }));
-    },
-    [isJsonMode]
-  );
+    return Array.from(uniqueKeys).map((key) => ({
+      value: key,
+      label: key,
+      checked: key in prevFieldStates ? prevFieldStates[key] : true,
+      accessorKey: key
+    }));
+  }, []);
 
   const [fieldList, setFieldList] = useState<FieldItem[]>(() => generateFieldList(data, []));
 
   useEffect(() => {
     setFieldList((prevFieldList) => generateFieldList(data, prevFieldList));
+    const excludeFields = ['_time', '_msg', 'container', 'pod', 'stream'];
     formHook.setValue(
       'filterKeys',
-      generateFieldList(data).map((field) => ({ value: field.value, label: field.label }))
+      generateFieldList(data)
+        .filter((field) => !excludeFields.includes(field.value))
+        .map((field) => ({ value: field.value, label: field.label }))
     );
   }, [data, generateFieldList, isJsonMode, formHook]);
 
@@ -290,6 +288,7 @@ export const LogTable = ({
           isLoading={isLoading}
           overflowY={'auto'}
           maxH={'500px'}
+          isHeaderFixed={true}
           tdStyle={{
             p: '10px 24px',
             borderBottom: 'none'

diff --git a/frontend/providers/applaunchpad/src/components/layouts/DetailLayout.tsx b/frontend/providers/applaunchpad/src/components/layouts/DetailLayout.tsx
@@ -46,8 +46,8 @@ export default function DetailLayout({ children, appName }: DetailLayoutProps) {
     },
     {
       refetchOnMount: true,
-      refetchInterval: router.pathname === ROUTES.OVERVIEW ? 3000 : 10000,
-      staleTime: router.pathname === ROUTES.OVERVIEW ? 3000 : 10000
+      refetchInterval: router.pathname === ROUTES.OVERVIEW ? 3000 : 5000,
+      staleTime: router.pathname === ROUTES.OVERVIEW ? 3000 : 5000
     }
   );
 

diff --git a/frontend/providers/applaunchpad/src/pages/app/detail/logs.tsx b/frontend/providers/applaunchpad/src/pages/app/detail/logs.tsx
@@ -56,7 +56,7 @@ export default function LogsPage({ appName }: { appName: string }) {
     defaultValues: {
       pods: [],
       containers: [],
-      limit: 10,
+      limit: 100,
       keyword: '',
       isJsonMode: false,
       isOnlyStderr: false,
@@ -118,8 +118,14 @@ export default function LogsPage({ appName }: { appName: string }) {
         limit: formHook.watch('limit').toString(),
         jsonMode: formHook.watch('isJsonMode').toString(),
         keyword: formHook.watch('keyword'),
-        pod: selectedPods.map((pod) => pod.value),
-        container: selectedContainers.map((container) => container.value),
+        pod:
+          selectedPods.length === formHook.watch('pods').length
+            ? []
+            : selectedPods.map((pod) => pod.value),
+        container:
+          selectedContainers.length === formHook.watch('containers').length
+            ? []
+            : selectedContainers.map((container) => container.value),
         jsonQuery: jsonFilters
       }),
     {
@@ -154,8 +160,14 @@ export default function LogsPage({ appName }: { appName: string }) {
         numberLevel: timeRange.slice(-1),
         time: timeRange,
         stderrMode: formHook.watch('isOnlyStderr').toString(),
-        pod: selectedPods.map((pod) => pod.value),
-        container: selectedContainers.map((container) => container.value)
+        pod:
+          selectedPods.length === formHook.watch('pods').length
+            ? []
+            : selectedPods.map((pod) => pod.value),
+        container:
+          selectedContainers.length === formHook.watch('containers').length
+            ? []
+            : selectedContainers.map((container) => container.value)
       }),
     {
       refetchInterval: refreshInterval,