aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-09-04 17:03:53 +0200
committerLibravatar GitHub <noreply@github.com>2021-09-04 17:03:53 +0200
commitf39cbe7d803245702885b308ab1cee4551aea9a1 (patch)
tree56d2e5dbe6242bb64b03ba5028b8bac39ea0c7ed /src/containers
parentUse namespaces when pulling docker base images since this is reqd for podman (diff)
downloadferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.tar.gz
ferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.tar.zst
ferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.zip
chore: remove what's new functionality (#1864)
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/auth/AuthLayoutContainer.js23
-rw-r--r--src/containers/layout/AppLayoutContainer.js48
2 files changed, 40 insertions, 31 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index f99a8a73f..a0d50ab54 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,7 +14,10 @@ import AppLoader from '../../components/ui/AppLoader';
14import { oneOrManyChildElements } from '../../prop-types'; 14import { oneOrManyChildElements } from '../../prop-types';
15import FeaturesStore from '../../stores/FeaturesStore'; 15import FeaturesStore from '../../stores/FeaturesStore';
16 16
17export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component { 17export default
18@inject('stores', 'actions')
19@observer
20class AuthLayoutContainer extends Component {
18 static propTypes = { 21 static propTypes = {
19 children: oneOrManyChildElements.isRequired, 22 children: oneOrManyChildElements.isRequired,
20 location: PropTypes.shape({ 23 location: PropTypes.shape({
@@ -23,15 +26,12 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
23 }; 26 };
24 27
25 render() { 28 render() {
26 const { 29 const { stores, actions, children, location } = this.props;
27 stores, actions, children, location, 30 const { app, features, globalError, user } = stores;
28 } = this.props;
29 const {
30 app, features, globalError, user,
31 } = stores;
32 31
33 const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting 32 const isLoadingBaseFeatures =
34 && !features.defaultFeaturesRequest.wasExecuted; 33 features.defaultFeaturesRequest.isExecuting &&
34 !features.defaultFeaturesRequest.wasExecuted;
35 35
36 if (isLoadingBaseFeatures) { 36 if (isLoadingBaseFeatures) {
37 return ( 37 return (
@@ -61,8 +61,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
61 isHealthCheckLoading={app.healthCheckRequest.isExecuting} 61 isHealthCheckLoading={app.healthCheckRequest.isExecuting}
62 isFullScreen={app.isFullScreen} 62 isFullScreen={app.isFullScreen}
63 installAppUpdate={actions.app.installUpdate} 63 installAppUpdate={actions.app.installUpdate}
64 nextAppReleaseVersion={app.nextAppReleaseVersion} 64 appUpdateIsDownloaded={
65 appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} 65 app.updateStatus === app.updateStatusTypes.DOWNLOADED
66 }
66 > 67 >
67 {children} 68 {children}
68 </AuthLayout> 69 </AuthLayout>
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 32b1f1cf7..83a25168b 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -25,7 +25,10 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe
25import { workspaceStore } from '../../features/workspaces'; 25import { workspaceStore } from '../../features/workspaces';
26import WorkspacesStore from '../../features/workspaces/store'; 26import WorkspacesStore from '../../features/workspaces/store';
27 27
28export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { 28export default
29@inject('stores', 'actions')
30@observer
31class AppLayoutContainer extends Component {
29 static defaultProps = { 32 static defaultProps = {
30 children: null, 33 children: null,
31 }; 34 };
@@ -65,25 +68,25 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
65 68
66 const { retryRequiredRequests } = this.props.actions.requests; 69 const { retryRequiredRequests } = this.props.actions.requests;
67 70
68 const { 71 const { installUpdate, toggleMuteApp } = this.props.actions.app;
69 installUpdate,
70 toggleMuteApp,
71 } = this.props.actions.app;
72 72
73 const { 73 const { openSettings, closeSettings } = this.props.actions.ui;
74 openSettings,
75 closeSettings,
76 } = this.props.actions.ui;
77 74
78 const { children } = this.props; 75 const { children } = this.props;
79 76
80 const isLoadingFeatures = features.featuresRequest.isExecuting 77 const isLoadingFeatures =
81 && !features.featuresRequest.wasExecuted; 78 features.featuresRequest.isExecuting &&
79 !features.featuresRequest.wasExecuted;
82 80
83 const isLoadingServices = services.allServicesRequest.isExecuting 81 const isLoadingServices =
84 && services.allServicesRequest.isExecutingFirstTime; 82 services.allServicesRequest.isExecuting &&
83 services.allServicesRequest.isExecutingFirstTime;
85 84
86 if (isLoadingFeatures || isLoadingServices || workspaces.isLoadingWorkspaces) { 85 if (
86 isLoadingFeatures ||
87 isLoadingServices ||
88 workspaces.isLoadingWorkspaces
89 ) {
87 return ( 90 return (
88 <ThemeProvider theme={ui.theme}> 91 <ThemeProvider theme={ui.theme}>
89 <AppLoader /> 92 <AppLoader />
@@ -93,9 +96,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
93 96
94 const workspacesDrawer = ( 97 const workspacesDrawer = (
95 <WorkspaceDrawer 98 <WorkspaceDrawer
96 getServicesForWorkspace={(workspace) => ( 99 getServicesForWorkspace={workspace =>
97 workspace ? workspaceStore.getWorkspaceServices(workspace).map((s) => s.name) : services.all.map((s) => s.name) 100 (workspace
98 )} 101 ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name)
102 : services.all.map(s => s.name))
103 }
99 /> 104 />
100 ); 105 );
101 106
@@ -118,7 +123,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
118 toggleMuteApp={toggleMuteApp} 123 toggleMuteApp={toggleMuteApp}
119 toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} 124 toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer}
120 isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} 125 isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
121 showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} 126 showMessageBadgeWhenMutedSetting={
127 settings.all.app.showMessageBadgeWhenMuted
128 }
122 showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} 129 showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
123 isTodosServiceActive={services.isTodosServiceActive || false} 130 isTodosServiceActive={services.isTodosServiceActive || false}
124 /> 131 />
@@ -145,8 +152,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
145 isFullScreen={app.isFullScreen} 152 isFullScreen={app.isFullScreen}
146 isOnline={app.isOnline} 153 isOnline={app.isOnline}
147 showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} 154 showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
148 appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} 155 appUpdateIsDownloaded={
149 nextAppReleaseVersion={app.nextAppReleaseVersion} 156 app.updateStatus === app.updateStatusTypes.DOWNLOADED
157 }
150 authRequestFailed={app.authRequestFailed} 158 authRequestFailed={app.authRequestFailed}
151 sidebar={sidebar} 159 sidebar={sidebar}
152 workspacesDrawer={workspacesDrawer} 160 workspacesDrawer={workspacesDrawer}