kaori 4 лет назад
Родитель
Сommit
81818460c0

+ 1 - 1
packages/app/src/components/Page/PageManagement.jsx

@@ -145,7 +145,7 @@ const LegacyPageManagemenet = (props) => {
     return (
       <>
         <div className="dropdown-divider"></div>
-        <button className="dropdown-item text-danger" type="button" onClick={() => openDeleteModal({ pages: [pageToDelete] })}>
+        <button className="dropdown-item text-danger" type="button" onClick={() => openDeleteModal([pageToDelete])}>
           <i className="icon-fw icon-fire"></i> { t('Delete') }
         </button>
       </>

+ 1 - 1
packages/app/src/components/PageDeleteModal.tsx

@@ -151,7 +151,7 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
 
   const renderPagePathsToDelete = () => {
     if (pagesDataToDelete != null) {
-      return pagesDataToDelete.pages.map(page => <div key={page.pageId}><code>{ page.path }</code></div>);
+      return pagesDataToDelete.map(page => <div key={page.pageId}><code>{ page.path }</code></div>);
     }
     return <></>;
   };

+ 2 - 4
packages/app/src/stores/ui.tsx

@@ -301,9 +301,7 @@ export const useCreateModalPath = (): SWRResponse<string | null | undefined, Err
 // PageDeleteModal
 type DeleteModalStatus = {
   isOpened: boolean,
-  // TODO: refactoring
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  pages?: any,
+  pages?: IPageForPageDeleteModal[],
 }
 
 type DeleteModalStatusUtils = {
@@ -332,7 +330,7 @@ export const usePageDeleteModalOpened = (): SWRResponse<boolean, Error> => {
   );
 };
 
-export const useDeleteModalPages = (): SWRResponse<DeleteModalStatus | null | undefined, Error> => {
+export const useDeleteModalPages = (): SWRResponse<IPageForPageDeleteModal[] | null | undefined, Error> => {
   const { data: status } = usePageDeleteModalStatus();
 
   return useSWR(