Merge pull request #499 from ONLYOFFICE/bugfix/get-current-tab

Client/Pages/PortalSettings: remove method getCurrentTab
This commit is contained in:
Alexey Safronov 2024-06-19 10:44:57 +04:00 committed by GitHub
commit 60aa632984
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -67,13 +67,6 @@ const TabsCommon = (props) => {
}
}, [tReady, isLoadedSubmenu]);
const load = async () => {
const currentTab = getCurrentTab();
await loadBaseInfo(
!isMobileView ? (currentTab === 0 ? "general" : "branding") : "",
);
};
const data = [
{
id: "general",
@ -92,6 +85,24 @@ const TabsCommon = (props) => {
},
];
const getCurrentTabId = () => {
const path = location.pathname;
const currentTab = data.find((item) => path.includes(item.id));
return currentTab !== -1 && data.length ? currentTab.id : data[0].id;
};
const currentTabId = getCurrentTabId();
const load = async () => {
await loadBaseInfo(
!isMobileView
? currentTabId === "general"
? "general"
: "branding"
: "",
);
};
const onSelect = (e) => {
navigate(
combineUrl(
@ -102,14 +113,6 @@ const TabsCommon = (props) => {
);
};
const getCurrentTabId = () => {
const path = location.pathname;
const currentTab = data.find((item) => path.includes(item.id));
return currentTab !== -1 && data.length ? currentTab.id : data[0].id;
};
const currentTabId = getCurrentTabId();
if (!isLoadedSubmenu) return <LoaderTabs />;
return (