82546 create type for page delete modal / delete unused toastr

packages/app/src/components/Page/PageManagement.jsx

@@ -158,9 +158,7 @@ const PageManagement = (props) => {
   }
 
   function generatePageObjectToDelete() {
-    return {
-      pageData: { pageId, revisionId, path },
-    };
+    return { pageId, revisionId, path };
   }
 
   function renderModals() {

packages/app/src/components/PageDeleteModal.tsx

@@ -5,7 +5,7 @@ import {
 } from 'reactstrap';
 import { useTranslation } from 'react-i18next';
 
-import { IPageSearchResultData } from '../interfaces/search';
+import { IPageForPageDeleteModal } from '../interfaces/page';
 
 // import { apiPost } from '~/client/util/apiv1-client';
 
@@ -26,7 +26,7 @@ const deleteIconAndKey = {
 
 type Props = {
   isOpen: boolean,
-  pages: IPageSearchResultData[],
+  pages: IPageForPageDeleteModal[],
   isDeleteCompletelyModal: boolean,
   isAbleToDeleteCompletely: boolean,
   onClose?: () => void,
@@ -142,7 +142,7 @@ const PageDeleteModal: FC<Props> = (props: Props) => {
         <div className="form-group">
           <label>{ t('modal_delete.deleting_page') }:</label><br />
           {pages.map((page) => {
-            return <div><code>{ page.pageData.path }</code></div>;
+            return <div><code>{ page.path }</code></div>;
           })}
         </div>
         {renderDeleteRecursivelyForm()}

packages/app/src/components/SearchPage.jsx

@@ -3,7 +3,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
-import toastr from 'toastr';
 
 import { withUnstatedContainers } from './UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';
@@ -20,16 +19,6 @@ export const specificPathNames = {
   user: '/user',
   trash: '/trash',
 };
-
-const toastrOption = {
-  closeButton: true,
-  progressBar: true,
-  newestOnTop: false,
-  showDuration: '100',
-  hideDuration: '100',
-  timeOut: '3000',
-};
-
 class SearchPage extends React.Component {
 
   constructor(props) {
@@ -239,10 +228,15 @@ class SearchPage extends React.Component {
     });
   };
 
-  getSelectedPages() {
-    return this.state.searchResults.filter((page) => {
+  getSelectedPagesToDelete() {
+    const filteredPages = this.state.searchResults.filter((page) => {
       return Array.from(this.state.deleteTargetPageIds).find(id => id === page.pageData._id);
     });
+    return filteredPages.map(page => ({
+      pageId: page.pageData._id,
+      revisionId: page.pageData.revision,
+      path: page.pageData.path,
+    }));
   }
 
   deleteSinglePageButtonHandler(pageId) {
@@ -321,7 +315,7 @@ class SearchPage extends React.Component {
         <PageDeleteModal
           isOpen={this.state.isDeleteConfirmModalShown}
           onClose={this.closeDeleteConfirmModalHandler}
-          pages={this.getSelectedPages()}
+          pages={this.getSelectedPagesToDelete()}
         />
       </div>
     );

packages/app/src/interfaces/page.ts

@@ -19,3 +19,9 @@ export type IPage = {
 export type IPageHasId = IPage & {
   _id: string,
 };
+
+export type IPageForPageDeleteModal = {
+  pageId: string,
+  revisionId: string,
+  path: string
+}