Revert "🪣 🪣 🪣 🪣"

This reverts commit 10fb5f1e9e28d97615c24a5b7dea8f344771646f.

packages/app/src/client/app.jsx

@@ -83,7 +83,7 @@ logger.info('unstated containers have been initialized');
  *  value: React Element
  */
 Object.assign(componentMappings, {
-  'grw-sidebar-wrapper': <Sidebar appContainer={appContainer} />,
+  'grw-sidebar-wrapper': <Sidebar />,
 
   'search-page': <SearchPage crowi={appContainer} />,
   'all-in-app-notifications': <InAppNotificationPage />,

packages/app/src/components/Sidebar.tsx

@@ -18,15 +18,10 @@ import SidebarContents from './Sidebar/SidebarContents';
 import { NavigationResizeHexagon } from './Sidebar/NavigationResizeHexagon';
 import StickyStretchableScroller from './StickyStretchableScroller';
 
-import AppContainer from '~/client/services/AppContainer';
-
 const sidebarMinWidth = 240;
 const sidebarMinimizeWidth = 20;
 const sidebarFixedWidthInDrawerMode = 320;
 
-type CommonProps = {
-  appContainer: AppContainer
-}
 
 const GlobalNavigation = () => {
   const { data: isDrawerMode } = useDrawerMode();
@@ -54,7 +49,7 @@ const GlobalNavigation = () => {
   return <SidebarNav onItemSelected={itemSelectedHandler} />;
 };
 
-const SidebarContentsWrapper: FC<CommonProps> = (props: CommonProps) => {
+const SidebarContentsWrapper = () => {
   const [resetKey, setResetKey] = useState(0);
 
   const scrollTargetSelector = '#grw-sidebar-contents-scroll-target';
@@ -78,7 +73,7 @@ const SidebarContentsWrapper: FC<CommonProps> = (props: CommonProps) => {
 
       <div id="grw-sidebar-contents-scroll-target" style={{ minHeight: '100%' }}>
         <div id="grw-sidebar-content-container" onLoad={() => setResetKey(Math.random())}>
-          <SidebarContents appContainer={props.appContainer} />
+          <SidebarContents />
         </div>
       </div>
 
@@ -87,7 +82,11 @@ const SidebarContentsWrapper: FC<CommonProps> = (props: CommonProps) => {
   );
 };
 
-const Sidebar: FC<CommonProps> = (props: CommonProps) => {
+
+type Props = {
+}
+
+const Sidebar: FC<Props> = (props: Props) => {
   const { data: isDrawerMode } = useDrawerMode();
   const { data: isDrawerOpened, mutate: mutateDrawerOpened } = useDrawerOpened();
   const { data: currentProductNavWidth, mutate: mutateProductNavWidth } = useCurrentProductNavWidth();
@@ -314,7 +313,7 @@ const Sidebar: FC<CommonProps> = (props: CommonProps) => {
               >
                 <div className="grw-contextual-navigation-child">
                   <div role="group" className={`grw-contextual-navigation-sub ${showContents ? '' : 'd-none'}`}>
-                    <SidebarContentsWrapper appContainer={props.appContainer} />
+                    <SidebarContentsWrapper></SidebarContentsWrapper>
                   </div>
                 </div>
               </div>

packages/app/src/components/Sidebar/PageTree.tsx

@@ -9,13 +9,7 @@ import {
 import ItemsTree from './PageTree/ItemsTree';
 import PrivateLegacyPages from './PageTree/PrivateLegacyPages';
 
-import AppContainer from '~/client/services/AppContainer';
-
-type Props = {
-  appContainer: AppContainer,
-};
-
-const PageTree: FC<Props> = memo((props: Props) => {
+const PageTree: FC = memo(() => {
   const { t } = useTranslation();
 
   const { data: isGuestUser } = useIsGuestUser();
@@ -73,7 +67,6 @@ const PageTree: FC<Props> = memo((props: Props) => {
 
       <div className="grw-sidebar-content-body">
         <ItemsTree
-          appContainer={props.appContainer}
           isEnableActions={!isGuestUser}
           targetPath={path}
           targetPathOrId={targetPathOrId}

packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -22,10 +22,7 @@ import ClosableTextInput, { AlertInfo, AlertType } from '../../Common/ClosableTe
 import { PageItemControl } from '../../Common/Dropdown/PageItemControl';
 import { ItemNode } from './ItemNode';
 
-import AppContainer from '~/client/services/AppContainer';
-
 interface ItemProps {
-  appContainer: AppContainer
   isEnableActions: boolean
   itemNode: ItemNode
   targetPathOrId?: string
@@ -271,16 +268,16 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
       return;
     }
 
-    let initBody = '';
-    const { isEnabledAttachTitleHeader } = props.appContainer.getConfig();
-    if (isEnabledAttachTitleHeader) {
-      initBody = pathUtils.attachTitleHeader(newPagePath);
-    }
+    // const initBody = '';
+    // const { isEnabledAttachTitleHeader } = props.appContainer.getConfig();
+    // if (isEnabledAttachTitleHeader) {
+    //   initBody = pathUtils.attachTitleHeader(newPagePath);
+    // }
 
     try {
       await apiv3Post('/pages/', {
         path: newPagePath,
-        body: initBody,
+        body: '',
         grant: page.grant,
         grantUserGroupId: page.grantedGroup,
         createFromPageTree: true,
@@ -414,7 +411,6 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
         isOpen && hasChildren() && currentChildren.map(node => (
           <div key={node.page._id} className="grw-pagetree-item-children">
             <Item
-              appContainer={props.appContainer}
               isEnableActions={isEnableActions}
               itemNode={node}
               isOpen={false}

packages/app/src/components/Sidebar/PageTree/ItemsTree.tsx

@@ -13,8 +13,6 @@ import {
 } from '~/stores/ui';
 import { smoothScrollIntoView } from '~/client/util/smooth-scroll';
 
-import AppContainer from '~/client/services/AppContainer';
-
 /*
  * Utility to generate initial node
  */
@@ -32,8 +30,7 @@ const generateInitialNodeBeforeResponse = (targetAndAncestors: Partial<IPageHasI
   return rootNode;
 };
 
-const generateInitialNodeAfterResponse = (ancestorsChildren: Record<string, Partial<IPageHasId>[]>, rootNode: ItemNode):
-ItemNode => {
+const generateInitialNodeAfterResponse = (ancestorsChildren: Record<string, Partial<IPageHasId>[]>, rootNode: ItemNode): ItemNode => {
   const paths = Object.keys(ancestorsChildren);
 
   let currentNode = rootNode;
@@ -56,7 +53,6 @@ ItemNode => {
 };
 
 type ItemsTreeProps = {
-  appContainer: AppContainer
   isEnableActions: boolean
   targetPath: string
   targetPathOrId?: string
@@ -64,7 +60,6 @@ type ItemsTreeProps = {
 }
 
 const renderByInitialNode = (
-    appContainer: AppContainer,
     initialNode: ItemNode,
     isEnableActions: boolean,
     targetPathOrId?: string,
@@ -76,7 +71,6 @@ const renderByInitialNode = (
   return (
     <ul className="grw-pagetree list-group p-3">
       <Item
-        appContainer={appContainer}
         key={initialNode.page.path}
         targetPathOrId={targetPathOrId}
         itemNode={initialNode}
@@ -165,9 +159,7 @@ const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
    */
   if (ancestorsChildrenData != null && rootPageData != null) {
     const initialNode = generateInitialNodeAfterResponse(ancestorsChildrenData.ancestorsChildren, new ItemNode(rootPageData.rootPage));
-    return renderByInitialNode(
-      props.appContainer, initialNode, isEnableActions, targetPathOrId, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem,
-    );
+    return renderByInitialNode(initialNode, isEnableActions, targetPathOrId, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem);
   }
 
   /*
@@ -175,9 +167,7 @@ const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
    */
   if (targetAndAncestorsData != null) {
     const initialNode = generateInitialNodeBeforeResponse(targetAndAncestorsData.targetAndAncestors);
-    return renderByInitialNode(
-      props.appContainer, initialNode, isEnableActions, targetPathOrId, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem,
-    );
+    return renderByInitialNode(initialNode, isEnableActions, targetPathOrId, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem);
   }
 
   return null;

packages/app/src/components/Sidebar/SidebarContents.tsx

@@ -7,10 +7,7 @@ import CustomSidebar from './CustomSidebar';
 import PageTree from './PageTree';
 import Tag from './Tag';
 
-import AppContainer from '~/client/services/AppContainer';
-
 type Props = {
-  appContainer: AppContainer
 };
 
 const SidebarContents: FC<Props> = (props: Props) => {
@@ -32,7 +29,7 @@ const SidebarContents: FC<Props> = (props: Props) => {
   }
 
   return (
-    <Contents appContainer={props.appContainer} />
+    <Contents />
   );
 
 };