diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index a685938bd6..f84e965323 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -105,7 +105,7 @@ const TabsCommon = (props) => { const getCurrentTabId = () => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - return currentTab !== -1 ? currentTab.id : data[0].id; + return currentTab !== -1 && data.length ? currentTab.id : data[0].id; }; const currentTabId = getCurrentTabId(); diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/index.js b/packages/client/src/pages/PortalSettings/categories/data-management/index.js index 4ed39f2688..33e2b8835b 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-management/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-management/index.js @@ -122,7 +122,7 @@ const DataManagementWrapper = (props) => { useEffect(() => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - if (currentTab !== -1) setCurrentTabId(currentTab.id); + if (currentTab !== -1 && data.length) setCurrentTabId(currentTab.id); setIsLoading(true); }, [location]); diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js index 3b9ee94dd0..0f7b53bcec 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js @@ -61,7 +61,7 @@ const DeleteData = (props) => { useEffect(() => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - if (currentTab !== -1) setCurrentTabId(currentTab.id); + if (currentTab !== -1 && data.length) setCurrentTabId(currentTab.id); setIsLoading(true); }, [location]); diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/index.js index 5fd36a23af..631ba082ee 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/index.js @@ -116,7 +116,7 @@ const DeveloperToolsWrapper = (props) => { useEffect(() => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - if (currentTab !== -1) { + if (currentTab !== -1 && data.length) { setCurrentTabId(currentTab.id); } diff --git a/packages/client/src/pages/PortalSettings/categories/integration/index.js b/packages/client/src/pages/PortalSettings/categories/integration/index.js index d481918e5e..615118c849 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/index.js @@ -116,7 +116,7 @@ const IntegrationWrapper = (props) => { const getCurrentTabId = () => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - return currentTab !== -1 ? currentTab.id : data[0].id; + return currentTab !== -1 && data.length ? currentTab.id : data[0].id; }; const currentTabId = getCurrentTabId();