machbase/neo-web - fix refresh token & default value

machbase · May 28, 2024 · 98f685e · 98f685e
1 parent 4529a73
commit 98f685e
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 50 deletions.
diff --git a/src/api/repository/machiot.ts b/src/api/repository/machiot.ts
@@ -334,7 +334,7 @@ export const fetchMountTimeMinMax = async (aTargetInfo: any) => {
         }
     }
 
-    if (sData.data.rows.length === 0) {
+    if (!sData.data?.rows || sData.data.rows.length === 0) {
         const sNowTime = moment().unix() * 1000000;
         const sNowTimeMinMax = [moment(sNowTime).subtract(1, 'h').unix() * 1000000, sNowTime];
         return sNowTimeMinMax;
@@ -369,7 +369,7 @@ export const fetchTimeMinMax = async (aTargetInfo: any) => {
         }
     }
 
-    if (sData.data.rows.length === 0) {
+    if (!sData.data?.rows || sData.data.rows.length === 0) {
         const sNowTime = moment().unix() * 1000000;
         const sNowTimeMinMax = [moment(sNowTime).subtract(1, 'h').unix() * 1000000, sNowTime];
         return sNowTimeMinMax;
@@ -493,7 +493,7 @@ const getRollupTableList = async () => {
         }
     }
     const sConvertArray: any = {};
-    if (sData.data.rows && sData.data.rows.length > 0) {
+    if (sData.data && sData.data.rows && sData.data.rows.length > 0) {
         for (const [user, table, value] of sData.data.rows) {
             if (!sConvertArray[user]) {
                 sConvertArray[user] = {};

diff --git a/src/components/console/index.tsx b/src/components/console/index.tsx
@@ -117,7 +117,7 @@ const Console = ({ pSetTerminalSizes, pExtentionList, pTerminalSizes }: any) =>
     /** return shell list */
     const getShellList = useMemo((): any[] => {
         const sExtensionListWithoutTerm = pExtentionList.filter((aExtension: any) => aExtension.type !== 'term');
-        return sExtensionListWithoutTerm.concat(sShellList);
+        return sExtensionListWithoutTerm.concat(sShellList ?? []);
     }, [sShellList]);
 
     useOutsideClick(MenuRef, () => setIsContextMenu(false));
@@ -150,8 +150,8 @@ const Console = ({ pSetTerminalSizes, pExtentionList, pTerminalSizes }: any) =>
                                 {getShellList.map((aItem: any) => {
                                     return (
                                         <Menu.Item onClick={(aEvent: any) => addConsoleTab(aEvent, aItem)} key={aItem.id}>
-                                            {icons(aItem.icon)}
-                                            {aItem.label}
+                                            {icons(aItem?.icon) ?? ''}
+                                            {aItem?.label ?? ''}
                                         </Menu.Item>
                                     );
                                 })}

diff --git a/src/components/editor/Body.tsx b/src/components/editor/Body.tsx
@@ -141,6 +141,7 @@ const Body = ({ pExtentionList, pSideSizes, pDraged, pGetInfo, pGetPath, pSetDra
 
     useEffect(() => {
         const expiredRt = () => {
+            localStorage.removeItem('refreshToken');
             sNavigate('/login');
         };
         window.addEventListener('logoutEvent', expiredRt);

diff --git a/src/components/inputs/TagSearchSelect.tsx b/src/components/inputs/TagSearchSelect.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { ArrowLeft, ArrowRight, Close, Search } from '@/assets/icons/Icon';
-import { MdKeyboardDoubleArrowLeft, MdOutlineKeyboardArrowDown, MdOutlineKeyboardDoubleArrowRight } from 'react-icons/md';
+import { ArrowLeft, ArrowRight, Search } from '@/assets/icons/Icon';
+import { MdKeyboardDoubleArrowLeft, MdOutlineKeyboardArrowDown, MdOutlineKeyboardArrowUp, MdOutlineKeyboardDoubleArrowRight } from 'react-icons/md';
 import { getTagPagination, getTagTotal } from '@/api/repository/machiot';
 import { Input } from './Input';
 import { Tooltip } from 'react-tooltip';
@@ -106,7 +106,7 @@ export const TagSearchSelect = ({ pTable, pCallback }: { pTable: string; pCallba
     useOutsideClick(tagRef, () => sIsOpen && handleOutSideClick());
 
     return (
-        <div ref={tagRef} className="tag-search-select-wrapper" id="tag-search-select-wrapper" style={{ backgroundColor: sIsOpen ? '#bd2222' : '#323644' }}>
+        <div ref={tagRef} className="tag-search-select-wrapper" id="tag-search-select-wrapper" style={{ backgroundColor: '#323644' }}>
             <div
                 className="tag-search-select-open-btn-wrapper"
                 onClick={(e: any) => {
@@ -115,7 +115,7 @@ export const TagSearchSelect = ({ pTable, pCallback }: { pTable: string; pCallba
                 }}
             >
                 {!sIsOpen && <MdOutlineKeyboardArrowDown />}
-                {sIsOpen && <Close />}
+                {sIsOpen && <MdOutlineKeyboardArrowUp />}
             </div>
             {sIsOpen && (
                 <div className="tag-search-select-content-wrapper">

diff --git a/src/components/newBoard/index.tsx b/src/components/newBoard/index.tsx
@@ -178,7 +178,7 @@ const NewBoard = (props: NewBoardProps) => {
     /** return shell list */
     const getShellList = useMemo((): any[] => {
         const sExtensionListWithoutTerm = pExtentionList.filter((aExtension: any) => aExtension.type !== 'term');
-        return sExtensionListWithoutTerm.concat(sShellList);
+        return sExtensionListWithoutTerm.concat(sShellList ?? []);
     }, [sShellList, pGetInfo]);
 
     return (

diff --git a/src/components/side/DBExplorer/DBExplorer.tsx b/src/components/side/DBExplorer/DBExplorer.tsx
@@ -36,40 +36,42 @@ const DBExplorer = ({ pServer }: any) => {
         if (aEvent) aEvent.stopPropagation();
         setRefresh(sRefresh + 1);
         const sData = await getTableList();
-        const U_NAME = getUserName();
-        const DB_NAME_LIST: string[] = Array.from(
-            new Set(U_NAME === 'sys' ? ['MACHBASEDB', ...sData.data.rows.map((aRow: any) => aRow[0])] : sData.data.rows.map((aRow: any) => aRow[0]))
-        );
-        const USER_NAME_LIST: string[] = Array.from(
-            new Set(U_NAME === 'sys' ? ['SYS', ...sData.data.rows.map((aRow: any) => aRow[1])] : sData.data.rows.map((aRow: any) => aRow[1]))
-        );
-        // DB > USER > TABLE > TYPE
-        let DB_LIST: any = [];
-        DB_NAME_LIST
-            ? (DB_LIST = DB_NAME_LIST.map((aName: string) => {
-                  return {
-                      dbName: aName,
-                      userList: USER_NAME_LIST.map((aUser: string) => {
-                          return { userName: aUser, total: 0, tableList: { log: [], fixed: [], volatile: [], lookup: [], keyValue: [], tag: [] } };
-                      }),
-                      tableLen: 0,
-                  };
-              }))
-            : null;
-        sData.data.rows.map((bRow: any) => {
-            DB_LIST.map((aDB: any, aIdx: number) => {
-                if (aDB.dbName === bRow[0]) {
-                    DB_LIST[aIdx].tableLen++;
-                    USER_NAME_LIST.map((aUser: string, bIdx: number) => {
-                        if (bRow[1] === aUser) {
-                            DB_LIST[aIdx]['userList'][bIdx].total++;
-                            DB_LIST[aIdx]['userList'][bIdx].tableList[TableTypeConverter(bRow[4])].push(bRow);
-                        }
-                    });
-                }
+        if (sData && sData.data) {
+            const U_NAME = getUserName();
+            const DB_NAME_LIST: string[] = Array.from(
+                new Set(U_NAME === 'sys' ? ['MACHBASEDB', ...sData.data.rows.map((aRow: any) => aRow[0])] : sData.data.rows.map((aRow: any) => aRow[0]))
+            );
+            const USER_NAME_LIST: string[] = Array.from(
+                new Set(U_NAME === 'sys' ? ['SYS', ...sData.data.rows.map((aRow: any) => aRow[1])] : sData.data.rows.map((aRow: any) => aRow[1]))
+            );
+            // DB > USER > TABLE > TYPE
+            let DB_LIST: any = [];
+            DB_NAME_LIST
+                ? (DB_LIST = DB_NAME_LIST.map((aName: string) => {
+                      return {
+                          dbName: aName,
+                          userList: USER_NAME_LIST.map((aUser: string) => {
+                              return { userName: aUser, total: 0, tableList: { log: [], fixed: [], volatile: [], lookup: [], keyValue: [], tag: [] } };
+                          }),
+                          tableLen: 0,
+                      };
+                  }))
+                : null;
+            sData.data.rows.map((bRow: any) => {
+                DB_LIST.map((aDB: any, aIdx: number) => {
+                    if (aDB.dbName === bRow[0]) {
+                        DB_LIST[aIdx].tableLen++;
+                        USER_NAME_LIST.map((aUser: string, bIdx: number) => {
+                            if (bRow[1] === aUser) {
+                                DB_LIST[aIdx]['userList'][bIdx].total++;
+                                DB_LIST[aIdx]['userList'][bIdx].tableList[TableTypeConverter(bRow[4])].push(bRow);
+                            }
+                        });
+                    }
+                });
             });
-        });
-        setDBList(DB_LIST);
+            setDBList(DB_LIST);
+        } else setDBList([]);
     };
 
     const setHiddenObj = (aEvent: any) => {

diff --git a/src/components/side/ReferenceList.tsx b/src/components/side/ReferenceList.tsx
@@ -8,7 +8,7 @@ const ReferenceList = ({ pServer }: any) => {
     const init = async () => {
         try {
             const sData = await getReferenceList();
-            setReferences(sData.data.refs);
+            setReferences(sData?.data?.refs);
         } catch (err) {
             console.log(err);
         }

diff --git a/src/hooks/useToken.ts b/src/hooks/useToken.ts
@@ -7,9 +7,10 @@ export const useToken = (callback: (val: boolean) => void) => {
     const sRefreshToken = localStorage.getItem('refreshToken');
 
     const checkExpire = () => {
-        if (!sRefreshToken) return false;
+        const sTmpRefreshToken = localStorage.getItem('refreshToken');
+        if (!sTmpRefreshToken) return false;
         try {
-            const sBase64Url = sRefreshToken.split('.')[1];
+            const sBase64Url = sTmpRefreshToken.split('.')[1];
             const sBase64 = sBase64Url.replace(/-/g, '+').replace(/_/g, '/');
             const sJwtInfo = decodeURIComponent(
                 atob(sBase64)
@@ -33,7 +34,8 @@ export const useToken = (callback: (val: boolean) => void) => {
     }, [callback]);
 
     useEffect(() => {
-        if (sAccToken) {
+        const sTmpAccToken = localStorage.getItem('accessToken');
+        if (sTmpAccToken) {
             const sRJWTStatus = checkExpire();
             if (sRJWTStatus) return callback(true);
             else return callback(false);

diff --git a/src/utils/DashboardChartCodeParser.ts b/src/utils/DashboardChartCodeParser.ts
@@ -13,7 +13,7 @@ const NameValueFunc = (aChartType: string) => {
 /** TIME_VALUE func */
 const TimeValueFunc = () => {
     return `(obj) => {
-        \t\t_chartOption.series[aIdx].data = obj.data.rows;
+        \t\t_chartOption.series[aIdx].data = obj?.data?.rows ?? [];
         \t\t_chart.setOption(_chartOption);
         \t}`;
 };

diff --git a/src/view/Home/Home.tsx b/src/view/Home/Home.tsx
@@ -67,10 +67,10 @@ const Home = () => {
 
                     timer.current = setInterval(() => {
                         if (count > 60) {
-                            clearInterval(timer.current);
                             localStorage.removeItem('accessToken');
                             localStorage.removeItem('refreshToken');
                             sNavigate('/login');
+                            clearInterval(timer.current);
                         } else {
                             init();
                             count++;