diff options
author | 2022-07-07 09:31:50 +0200 | |
---|---|---|
committer | 2022-07-07 09:31:50 +0200 | |
commit | 71c52373f81cace664047edd19d9d289f45a4dff (patch) | |
tree | 69b3f1d45a8b3f1ceab9497ea3c96e9dc18e3166 /src/containers/layout/AppLayoutContainer.tsx | |
parent | 6.0.0-nightly.91 [skip ci] (diff) | |
download | ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.tar.gz ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.tar.zst ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.zip |
chore: Mobx & React-Router upgrade (#406)
Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.tsx')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.tsx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/containers/layout/AppLayoutContainer.tsx b/src/containers/layout/AppLayoutContainer.tsx index 984ea8b68..a4857a426 100644 --- a/src/containers/layout/AppLayoutContainer.tsx +++ b/src/containers/layout/AppLayoutContainer.tsx | |||
@@ -1,19 +1,17 @@ | |||
1 | import { Children, Component, ReactElement, ReactNode } from 'react'; | 1 | import { Component, ReactElement } from 'react'; |
2 | import { inject, observer } from 'mobx-react'; | 2 | import { inject, observer } from 'mobx-react'; |
3 | import { ThemeProvider } from 'react-jss'; | 3 | import { ThemeProvider } from 'react-jss'; |
4 | import { Outlet } from 'react-router-dom'; | ||
4 | 5 | ||
5 | import { StoresProps } from '../../@types/ferdium-components.types'; | 6 | import { StoresProps } from '../../@types/ferdium-components.types'; |
6 | import AppLayout from '../../components/layout/AppLayout'; | 7 | import AppLayout from '../../components/layout/AppLayout'; |
7 | import Sidebar from '../../components/layout/Sidebar'; | 8 | import Sidebar from '../../components/layout/Sidebar'; |
8 | import Services from '../../components/services/content/Services'; | 9 | import Services from '../../components/services/content/Services'; |
9 | import AppLoader from '../../components/ui/AppLoader'; | 10 | import AppLoader from '../../components/ui/AppLoader'; |
10 | |||
11 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 11 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
12 | import { workspaceStore } from '../../features/workspaces'; | 12 | import { workspaceStore } from '../../features/workspaces'; |
13 | 13 | ||
14 | interface AppLayoutContainerProps extends StoresProps { | 14 | interface AppLayoutContainerProps extends StoresProps {} |
15 | children: ReactNode; | ||
16 | } | ||
17 | 15 | ||
18 | class AppLayoutContainer extends Component<AppLayoutContainerProps> { | 16 | class AppLayoutContainer extends Component<AppLayoutContainerProps> { |
19 | render(): ReactElement { | 17 | render(): ReactElement { |
@@ -62,8 +60,6 @@ class AppLayoutContainer extends Component<AppLayoutContainerProps> { | |||
62 | 60 | ||
63 | const { openSettings, closeSettings } = this.props.actions.ui; | 61 | const { openSettings, closeSettings } = this.props.actions.ui; |
64 | 62 | ||
65 | const { children } = this.props; | ||
66 | |||
67 | const isLoadingFeatures = | 63 | const isLoadingFeatures = |
68 | features.featuresRequest.isExecuting && | 64 | features.featuresRequest.isExecuting && |
69 | !features.featuresRequest.wasExecuted; | 65 | !features.featuresRequest.wasExecuted; |
@@ -162,7 +158,7 @@ class AppLayoutContainer extends Component<AppLayoutContainerProps> { | |||
162 | retryRequiredRequests={retryRequiredRequests} | 158 | retryRequiredRequests={retryRequiredRequests} |
163 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 159 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
164 | > | 160 | > |
165 | {Children.count(children) > 0 ? children : null} | 161 | <Outlet /> |
166 | </AppLayout> | 162 | </AppLayout> |
167 | </ThemeProvider> | 163 | </ThemeProvider> |
168 | ); | 164 | ); |