imprv props

packages/app/src/pages/admin/app.page.tsx

@@ -7,33 +7,15 @@ import dynamic from 'next/dynamic';
 import { Container, Provider } from 'unstated';
 
 import AdminAppContainer from '~/client/services/AdminAppContainer';
-import { SupportedActionType } from '~/interfaces/activity';
 import { CommonProps, useCustomTitle } from '~/pages/utils/commons';
 
 import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
-
 const AppSettingsPageContents = dynamic(() => import('~/components/Admin/App/AppSettingsPageContents'), { ssr: false });
 
 
-type Props = CommonProps & {
-  currentUser: any,
-
-  envVars: any,
-  isAclEnabled: boolean,
-  isSearchServiceConfigured: boolean,
-  isSearchServiceReachable: boolean,
-  isMailerSetup: boolean,
-  auditLogEnabled: boolean,
-  auditLogAvailableActions: SupportedActionType[],
-
-  customizeTitle: string,
-  siteUrl: string,
-};
-
-
-const AdminAppPage: NextPage<Props> = (props) => {
+const AdminAppPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('commons:headers.app_settings');
@@ -41,7 +23,6 @@ const AdminAppPage: NextPage<Props> = (props) => {
 
   if (isClient()) {
     const adminAppContainer = new AdminAppContainer();
-
     injectableContainers.push(adminAppContainer);
   }
 

packages/app/src/pages/admin/security.page.tsx

@@ -17,7 +17,7 @@ import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityConta
 import AdminTwitterSecurityContainer from '~/client/services/AdminTwitterSecurityContainer';
 import { CommonProps, useCustomTitle } from '~/pages/utils/commons';
 
-import { useSiteUrl } from '~/stores/context';
+import { useIsMailerSetup, useSiteUrl } from '~/stores/context';
 
 import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
@@ -26,10 +26,7 @@ const SecurityManagement = dynamic(() => import('~/components/Admin/Security/Sec
 
 
 type Props = CommonProps & {
-  // currentUser: any,
-
-  // isMailerSetup: boolean,
-
+  isMailerSetup: boolean,
   siteUrl: string,
 };
 
@@ -37,6 +34,8 @@ type Props = CommonProps & {
 const AdminSecuritySettingsPage: NextPage<Props> = (props) => {
   const { t } = useTranslation();
   useSiteUrl(props.siteUrl);
+  useIsMailerSetup(props.isMailerSetup);
+
 
   const title = t('security_settings.security_settings');
   const adminSecurityContainers: Container<any>[] = [];

packages/app/src/pages/admin/users/external-accounts.page.tsx

@@ -15,7 +15,6 @@ const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { s
 const ManageExternalAccount = dynamic(() => import('~/components/Admin/ManageExternalAccount'), { ssr: false });
 
 
-
 const AdminUserManagementPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 

packages/app/src/pages/admin/users/index.page.tsx

@@ -8,7 +8,7 @@ import { Container, Provider } from 'unstated';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import { CommonProps, useCustomTitle } from '~/pages/utils/commons';
-import { useIsMailerSetup } from '~/stores/context';
+import { useCurrentUser,  useIsMailerSetup } from '~/stores/context';
 
 import { retrieveServerSideProps } from '../../../utils/admin-page-util';
 
@@ -18,12 +18,14 @@ const UserManagement = dynamic(() => import('~/components/Admin/UserManagement')
 
 
 type Props = CommonProps & {
+  currentUser: any,
   isMailerSetup: boolean,
 };
 
 
 const AdminUserManagementPage: NextPage<Props> = (props) => {
   const { t } = useTranslation();
+  useCurrentUser(props.currentUser != null ? JSON.parse(props.currentUser) : null);
   useIsMailerSetup(props.isMailerSetup);
 
   const title = t('user_management.user_management');