fix

apps/app/src/components/ItemsTree/ItemsTree.tsx

@@ -27,7 +27,7 @@ import loggerFactory from '~/utils/logger';
 
 import { ItemNode, SimpleItemProps } from '../TreeItem';
 
-import ItemsTreeContentSkeleton from '../Sidebar/Skeleton/ItemsTreeContentSkeleton';
+import ItemsTreeContentSkeleton from './ItemsTreeContentSkeleton';
 
 import styles from './ItemsTree.module.scss';
 

apps/app/src/components/Sidebar/Skeleton/ItemsTreeContentSkeleton.tsx → apps/app/src/components/ItemsTree/ItemsTreeContentSkeleton.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Skeleton } from '~/components/Skeleton';
 
-import styles from '../../ItemsTree/ItemsTree.module.scss';
+import styles from './ItemsTree.module.scss';
 
 const ItemsTreeContentSkeleton = (): JSX.Element => {
 

apps/app/src/components/ItemsTree/index.ts

@@ -1,3 +1,3 @@
 export { ItemNode } from './ItemNode';
-export * from '../Sidebar/Skeleton/ItemsTreeContentSkeleton';
+export * from './ItemsTreeContentSkeleton';
 export * from './ItemsTree';

apps/app/src/components/Layout/BasicLayout.tsx

@@ -3,16 +3,11 @@ import React, { ReactNode } from 'react';
 import dynamic from 'next/dynamic';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
-import { Button } from 'reactstrap';
 
-import { usePageSelectModal } from '~/stores/modal';
-
-import { PageSelectModal } from '../PageSelectModal/PageSelectModal';
 import { Sidebar } from '../Sidebar';
 
 import { RawLayout } from './RawLayout';
 
-
 const AlertSiteUrlUndefined = dynamic(() => import('../AlertSiteUrlUndefined').then(mod => mod.AlertSiteUrlUndefined), { ssr: false });
 const DeleteAttachmentModal = dynamic(() => import('../PageAttachment/DeleteAttachmentModal').then(mod => mod.DeleteAttachmentModal), { ssr: false });
 const HotkeysManager = dynamic(() => import('../Hotkeys/HotkeysManager'), { ssr: false });
@@ -37,10 +32,6 @@ type Props = {
 
 
 export const BasicLayout = ({ children, className }: Props): JSX.Element => {
-  const {
-    open: openModal,
-  } = usePageSelectModal();
-
   return (
     <RawLayout className={className ?? ''}>
       <DndProvider backend={HTML5Backend}>
@@ -71,10 +62,6 @@ export const BasicLayout = ({ children, className }: Props): JSX.Element => {
 
       <ShortcutsModal />
       <SystemVersion showShortcutsButton />
-
-      <Button onClick={() => openModal()}>Open!</Button>
-      <PageSelectModal />
-      {/* TODO: remove unnecessary code with https://redmine.weseek.co.jp/issues/128327 */}
     </RawLayout>
   );
 };

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

@@ -3,7 +3,7 @@ import { Suspense } from 'react';
 import dynamic from 'next/dynamic';
 import { useTranslation } from 'react-i18next';
 
-import ItemsTreeContentSkeleton from '../Skeleton/ItemsTreeContentSkeleton';
+import ItemsTreeContentSkeleton from '../../ItemsTree/ItemsTreeContentSkeleton';
 import { PageTreeHeader } from './PageTreeSubstance';
 
 const PageTreeContent = dynamic(

apps/app/src/components/Sidebar/PageTree/PageTreeSubstance.tsx

@@ -6,10 +6,10 @@ import { useTargetAndAncestors, useIsGuestUser, useIsReadOnlyUser } from '~/stor
 import { useCurrentPagePath, useCurrentPageId } from '~/stores/page';
 import { mutatePageTree, useSWRxRootPage, useSWRxV5MigrationStatus } from '~/stores/page-listing';
 
-import { PageTreeItem } from '../PageTreeItem/PageTreeItem';
+import { ItemsTree } from '../../ItemsTree/ItemsTree';
+import { PageTreeItem } from '../PageTreeItem';
 import { SidebarHeaderReloadButton } from '../SidebarHeaderReloadButton';
 
-import { ItemsTree } from '../../ItemsTree/ItemsTree';
 import { PrivateLegacyPagesLink } from './PrivateLegacyPagesLink';
 
 

apps/app/src/components/Sidebar/PageTree/index.ts

@@ -0,0 +1 @@
+export * from './PageTree';

apps/app/src/components/Sidebar/PageTreeItem/index.ts

@@ -0,0 +1,2 @@
+export * from './PageTreeItem';
+export * from './Ellipsis';

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

@@ -3,10 +3,10 @@ import React, { memo } from 'react';
 import { SidebarContentsType } from '~/interfaces/ui';
 import { useCurrentSidebarContents } from '~/stores/ui';
 
-import { PageTree } from './PageTree/PageTree';
 
 import { Bookmarks } from './Bookmarks';
 import { CustomSidebar } from './Custom';
+import { PageTree } from './PageTree';
 import { RecentChanges } from './RecentChanges';
 import Tag from './Tag';