imprv props

packages/app/src/pages/admin/export.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 ExportArchiveDataPage = dynamic(() => import('~/components/Admin/ExportArchiveDataPage'), { 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 AdminExportDataArchivePage: NextPage<Props> = (props) => {
+const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('export_archive_data');
@@ -41,11 +23,9 @@ const AdminExportDataArchivePage: NextPage<Props> = (props) => {
 
   if (isClient()) {
     const adminAppContainer = new AdminAppContainer();
-
     injectableContainers.push(adminAppContainer);
   }
 
-
   return (
     <Provider inject={[...injectableContainers]}>
       <AdminLayout title={useCustomTitle(props, title)} componentTitle={title} >
@@ -53,7 +33,6 @@ const AdminExportDataArchivePage: NextPage<Props> = (props) => {
       </AdminLayout>
     </Provider>
   );
-
 };
 
 

packages/app/src/pages/admin/global-notification/new.page.tsx

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

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

@@ -7,33 +7,15 @@ import dynamic from 'next/dynamic';
 import { Container, Provider } from 'unstated';
 
 import AdminImportContainer from '~/client/services/AdminImportContainer';
-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 DataImportPageContents = dynamic(() => import('~/components/Admin/ImportData/ImportDataPageContents'), { 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 AdminDataImportPage: NextPage<Props> = (props) => {
+const AdminDataImportPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('importer_management.import_data');
@@ -41,7 +23,6 @@ const AdminDataImportPage: NextPage<Props> = (props) => {
 
   if (isClient()) {
     const adminImportContainer = new AdminImportContainer();
-
     injectableContainers.push(adminImportContainer);
   }
 

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

@@ -7,34 +7,17 @@ import dynamic from 'next/dynamic';
 import { Container, Provider } from 'unstated';
 
 import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
-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 });
 const MarkDownSettingContents = dynamic(() => import('~/components/Admin/MarkdownSetting/MarkDownSettingContents'), { 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 AdminMarkdownPage: NextPage<Props> = (props) => {
+const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('markdown_settings.markdown_settings');
@@ -42,7 +25,6 @@ const AdminMarkdownPage: NextPage<Props> = (props) => {
 
   if (isClient()) {
     const adminMarkDownContainer = new AdminMarkDownContainer();
-
     injectableContainers.push(adminMarkDownContainer);
   }
 

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

@@ -7,33 +7,15 @@ import dynamic from 'next/dynamic';
 import { Container, Provider } from 'unstated';
 
 import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
-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 NotificationSetting = dynamic(() => import('~/components/Admin/Notification/NotificationSetting'), { 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 AdminExternalNotificationPage: NextPage<Props> = (props) => {
+const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('external_notification.external_notification');

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

@@ -1,13 +1,9 @@
-import { isClient } from '@growi/core';
 import {
   NextPage, GetServerSideProps, GetServerSidePropsContext,
 } from 'next';
 import { useTranslation } from 'next-i18next';
 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 { useIsSearchServiceReachable } from '~/stores/context';
 
@@ -20,14 +16,13 @@ const ElasticsearchManagement = dynamic(() => import('~/components/Admin/Elastic
 
 type Props = CommonProps & {
   isSearchServiceReachable: boolean,
-  // isMailerSetup: boolean,
-  // siteUrl: string,
 };
 
 
 const AdminFullTextSearchManagementPage: NextPage<Props> = (props) => {
   const { t } = useTranslation();
   useIsSearchServiceReachable(props.isSearchServiceReachable);
+
   const title = t('full_text_search_management.full_text_search_management');
 
   return (

packages/app/src/pages/admin/slack-integration-legacy.page.tsx

@@ -7,33 +7,15 @@ import dynamic from 'next/dynamic';
 import { Container, Provider } from 'unstated';
 
 import AdminSlackIntegrationLegacyContainer from '~/client/services/AdminSlackIntegrationLegacyContainer';
-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 LegacySlackIntegration = dynamic(() => import('~/components/Admin/LegacySlackIntegration/LegacySlackIntegration'), { 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 AdminLegacySlackIntegrationPage: NextPage<Props> = (props) => {
+const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation();
 
   const title = t('slack_integration_legacy.slack_integration_legacy');
@@ -41,7 +23,6 @@ const AdminLegacySlackIntegrationPage: NextPage<Props> = (props) => {
 
   if (isClient()) {
     const adminSlackIntegrationLegacyContainer = new AdminSlackIntegrationLegacyContainer();
-
     injectableContainers.push(adminSlackIntegrationLegacyContainer);
   }
 

packages/app/src/pages/admin/slack-integration.page.tsx

@@ -11,11 +11,12 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 import { useSiteUrl } from '~/stores/context';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
-
 const SlackIntegration = dynamic(() => import('~/components/Admin/SlackIntegration/SlackIntegration'), { ssr: false });
 
 
-type Props = CommonProps & { siteUrl: string };
+type Props = CommonProps & {
+  siteUrl: string
+};
 
 
 const AdminSlackIntegrationPage: NextPage<Props> = (props) => {