show admin navigation

packages/app/src/components/Admin/Common/AdminNavigation.jsx

@@ -10,17 +10,17 @@ import { useTranslation } from 'next-i18next';
 import urljoin from 'url-join';
 
 
-import AppContainer from '~/client/services/AppContainer';
+// import AppContainer from '~/client/services/AppContainer';
 
-import { withUnstatedContainers } from '../../UnstatedUtils';
+// import { withUnstatedContainers } from '../../UnstatedUtils';
 
 const AdminNavigation = (props) => {
   const { t } = useTranslation();
-  const { appContainer } = props;
+  // const { appContainer } = props;
   const pathname = window.location.pathname;
 
-  const growiCloudUri = appContainer.config.env.GROWI_CLOUD_URI;
-  const growiAppIdForGrowiCloud = appContainer.config.env.GROWI_APP_ID_FOR_GROWI_CLOUD;
+  // const growiCloudUri = appContainer.config.env.GROWI_CLOUD_URI;
+  // const growiAppIdForGrowiCloud = appContainer.config.env.GROWI_APP_ID_FOR_GROWI_CLOUD;
 
   // eslint-disable-next-line react/prop-types
   const MenuLabel = ({ menu }) => {
@@ -86,7 +86,7 @@ const AdminNavigation = (props) => {
         <MenuLink menu="users"        isListGroupItems isActive={isActiveMenu('/users')} />
         <MenuLink menu="user-groups"  isListGroupItems isActive={isActiveMenu('/user-groups')} />
         <MenuLink menu="search"       isListGroupItems isActive={isActiveMenu('/search')} />
-        {growiCloudUri != null && growiAppIdForGrowiCloud != null
+        {/* {growiCloudUri != null && growiAppIdForGrowiCloud != null
           && (
             <a
               href={`${growiCloudUri}/my/apps/${growiAppIdForGrowiCloud}`}
@@ -95,7 +95,7 @@ const AdminNavigation = (props) => {
               <MenuLabel menu="cloud" />
             </a>
           )
-        }
+        } */}
       </>
     );
   };
@@ -142,10 +142,11 @@ const AdminNavigation = (props) => {
   );
 };
 
-const AdminNavigationWrapper = withUnstatedContainers(AdminNavigation, [AppContainer]);
+// const AdminNavigationWrapper = withUnstatedContainers(AdminNavigation, [AppContainer]);
 
 AdminNavigation.propTypes = {
-  appContainer: PropTypes.instanceOf(AppContainer).isRequired,
+  // appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 };
 
-export default AdminNavigationWrapper;
+// export default AdminNavigationWrapper;
+export default AdminNavigation;

packages/app/src/components/AdminLayout.tsx

@@ -1,8 +1,10 @@
 import React, { ReactNode } from 'react';
 import { Provider } from 'unstated';
+import dynamic from 'next/dynamic';
 
 import { BasicLayout } from './BasicLayout';
-import AdminNavigation from '~/components/Admin/Common/AdminNavigation';
+// import { injectableContainers } from '~/client/admin';
+// import AdminNavigation from '~/components/Admin/Common/AdminNavigation';
 
 type Props = {
   title: string
@@ -19,6 +21,8 @@ const AdminLayout = ({
   children, title, selectedNavOpt,
 }: Props): JSX.Element => {
 
+  const AdminNavigation = dynamic(() => import('~/components/Admin/Common/AdminNavigation'), { ssr: false });
+
   return (
     <BasicLayout title={title}>
       <header className="py-0">

packages/app/src/pages/admin/[...path].page.tsx

@@ -113,12 +113,12 @@ const AdminMarkdownSettingsPage: NextPage<Props> = (props: Props) => {
     },
     'user-groups': {
       title: useCustomTitle(props, t('UserGroup Management')),
-      component: <></>,
+      component: <>user-groups</>,
     },
     search: {
       title: useCustomTitle(props, t('Full Text Search Management')),
       // component: <ElasticsearchManagement />,
-      component: <></>,
+      component: <>ElasticsearchManagement</>,
     },
   };
 
@@ -135,10 +135,9 @@ const AdminMarkdownSettingsPage: NextPage<Props> = (props: Props) => {
   // useEnvVars(props.envVars);
 
   return (
-    // <AdminLayout title={title} selectedNavOpt={name}>
-    //   {content.component}
-    // </AdminLayout>
-    <h1>Admin Page</h1>
+    <AdminLayout title={title} selectedNavOpt={name}>
+      {content.component}
+    </AdminLayout>
   );
 };