Просмотр исходного кода

remove useDeleteModalPages hook

kaori 4 лет назад
Родитель
Сommit
a07a402cad
2 измененных файлов с 3 добавлено и 15 удалено
  1. 3 4
      packages/app/src/components/PageDeleteModal.tsx
  2. 0 11
      packages/app/src/stores/ui.tsx

+ 3 - 4
packages/app/src/components/PageDeleteModal.tsx

@@ -38,8 +38,7 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
   } = props;
 
 
-  const { close: closeDeleteModal } = usePageDeleteModalStatus();
-  const { data: pagesDataToDelete } = useDeleteModalPages();
+  const { data: pagesDataToDelete, close: closeDeleteModal } = usePageDeleteModalStatus();
   const { data: isOpened } = usePageDeleteModalOpened();
 
   const [isDeleteRecursively, setIsDeleteRecursively] = useState(true);
@@ -145,8 +144,8 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
   }
 
   const renderPagePathsToDelete = () => {
-    if (pagesDataToDelete != null) {
-      return pagesDataToDelete.map(page => <div key={page.pageId}><code>{ page.path }</code></div>);
+    if (pagesDataToDelete != null && pagesDataToDelete.pages != null) {
+      return pagesDataToDelete.pages.map(page => <div key={page.pageId}><code>{ page.path }</code></div>);
     }
     return <></>;
   };

+ 0 - 11
packages/app/src/stores/ui.tsx

@@ -334,17 +334,6 @@ export const usePageDeleteModalOpened = (): SWRResponse<boolean, Error> => {
   );
 };
 
-export const useDeleteModalPages = (): SWRResponse<IPageForPageDeleteModal[] | null | undefined, Error> => {
-  const { data: status } = usePageDeleteModalStatus();
-
-  return useSWR(
-    status != null ? [status] : null,
-    (status) => {
-      return status.pages;
-    },
-  );
-};
-
 
 export const useSelectedGrant = (initialData?: Nullable<number>): SWRResponse<Nullable<number>, Error> => {
   return useStaticSWR<Nullable<number>, Error>('grant', initialData);