From 5135fd31a3d7dcd2a220d087181906b39d608192 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 20 Jun 2024 10:17:09 +0300 Subject: [PATCH] Client: move portal settings roout layoyt to lazy loading from react-router-dom --- .../client/src/pages/PortalSettings/index.js | 16 +++++++++++++--- packages/client/src/routes/index.js | 8 +------- packages/client/src/routes/portalSettings.js | 16 +--------------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/index.js b/packages/client/src/pages/PortalSettings/index.js index 7e634e3022..3797889659 100644 --- a/packages/client/src/pages/PortalSettings/index.js +++ b/packages/client/src/pages/PortalSettings/index.js @@ -27,11 +27,13 @@ import React from "react"; import { Outlet, useLocation } from "react-router-dom"; -import Layout from "./Layout"; - import Panels from "SRC_DIR/components/FilesPanels"; +import PrivateRoute from "SRC_DIR/components/PrivateRouteWrapper"; +import ErrorBoundary from "SRC_DIR/components/ErrorBoundaryWrapper"; import { generalRoutes } from "SRC_DIR/routes/general"; +import Layout from "./Layout"; + const Settings = () => { const location = useLocation(); @@ -58,4 +60,12 @@ const Settings = () => { ); }; -export default Settings; +export const Component = () => { + return ( + + + + + + ); +}; diff --git a/packages/client/src/routes/index.js b/packages/client/src/routes/index.js index 4aabc7b2af..3a1f402997 100644 --- a/packages/client/src/routes/index.js +++ b/packages/client/src/routes/index.js @@ -27,13 +27,7 @@ import PortalSettingsRoutes from "./portalSettings"; import ClientRoutes from "./client"; import ConfirmRoutes from "./confirm"; -import { generalRoutes } from "./general"; -const routes = [ - ...ClientRoutes, - PortalSettingsRoutes, - ...ConfirmRoutes, - // ...generalRoutes, -]; +const routes = [...ClientRoutes, PortalSettingsRoutes, ...ConfirmRoutes]; export default routes; diff --git a/packages/client/src/routes/portalSettings.js b/packages/client/src/routes/portalSettings.js index 4ca9b602fb..241f4a7319 100644 --- a/packages/client/src/routes/portalSettings.js +++ b/packages/client/src/routes/portalSettings.js @@ -24,24 +24,16 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import React from "react"; import { Navigate } from "react-router-dom"; import loadable from "@loadable/component"; import Error404 from "@docspace/shared/components/errors/Error404"; import componentLoader from "@docspace/shared/utils/component-loader"; -import PrivateRoute from "../components/PrivateRouteWrapper"; -import ErrorBoundary from "../components/ErrorBoundaryWrapper"; - import { generalRoutes } from "./general"; import SettingsContainer from "../pages/PortalSettings/categories/integration/LDAP/sub-components/SettingsContainer"; import SyncContainer from "../pages/PortalSettings/categories/integration/LDAP/sub-components/SyncContainer"; -const PortalSettings = loadable(() => - componentLoader(() => import("../pages/PortalSettings")), -); - const CustomizationSettings = loadable(() => componentLoader( () => import("../pages/PortalSettings/categories/common/index.js"), @@ -358,13 +350,7 @@ const Viewer = loadable(() => const PortalSettingsRoutes = { path: "portal-settings/", - element: ( - - - - - - ), + lazy: () => import("../pages/PortalSettings"), errorElement: , children: [ {