Przeglądaj źródła

Merge branch 'feat/77525-enable-to-delete-pages' into feat/77525-81100-check-if-selected-pages-has-page

# Conflicts:
#	packages/app/src/components/SearchPage.jsx
SULLEY\ryo-h 4 lat temu
rodzic
commit
3d9bbcddf6

+ 8 - 16
packages/app/src/components/SearchPage.jsx

@@ -194,20 +194,14 @@ class SearchPage extends React.Component {
     else {
       selectedPagesIdList.add(pageId);
     }
-    const getNextSelectAllCheckboxType = () => {
-      switch (this.state.selectedPages.size) {
-        case 0:
-          return CheckboxType.NONE_CHECKED;
-        case this.state.searchedPages.length:
-          return CheckboxType.ALL_CHECKED;
-        default:
-          return CheckboxType.INDETERMINATE;
-      }
-    };
-    this.setState({
-      selectedPagesIdList,
-      selectAllCheckboxType: getNextSelectAllCheckboxType(),
-    });
+    switch (this.state.selectedPages.size) {
+      case 0:
+        return this.setState({ selectAllCheckboxType: CheckboxType.NONE_CHECKED });
+      case this.state.searchedPages.length:
+        return this.setState({ selectAllCheckboxType: CheckboxType.ALL_CHECKED });
+      default:
+        return this.setState({ selectAllCheckboxType: CheckboxType.INDETERMINATE });
+    }
   }
 
   toggleAllCheckBox = (nextSelectAllCheckboxType) => {
@@ -262,8 +256,6 @@ class SearchPage extends React.Component {
         onExcludeUsersHome={this.onExcludeUsersHome}
         onExcludeTrash={this.onExcludeTrash}
         onClickSelectAllCheckbox={this.toggleAllCheckBox}
-        selectedPagesCount={this.state.selectedPagesIdList.size}
-        displayPageCount={this.state.searchedPages.length}
         selectAllCheckboxType={this.state.selectAllCheckboxType}
       >
       </SearchControl>

+ 0 - 3
packages/app/src/components/SearchPage/DeleteSelectedPageGroup.tsx

@@ -3,8 +3,6 @@ import { useTranslation } from 'react-i18next';
 import { CheckboxType } from '../../interfaces/search';
 
 type Props = {
-  selectedPagesCount: number,
-  displayPageCount: number,
   selectAllCheckboxType: CheckboxType,
   onClickDeleteButton?: () => void,
   onClickSelectAllCheckbox?: (nextSelectAllCheckboxType: CheckboxType) => void,
@@ -27,7 +25,6 @@ const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
   return (
     <>
       {/** todo: implement the design for CheckboxType = INDETERMINATE */}
-      {/** refs: https://estoc.weseek.co.jp/redmine/issues/81246  */}
       <input
         id="check-all-pages"
         type="checkbox"

+ 0 - 4
packages/app/src/components/SearchPage/SearchControl.tsx

@@ -8,8 +8,6 @@ import { CheckboxType } from '../../interfaces/search';
 type Props = {
   searchingKeyword: string,
   appContainer: AppContainer,
-  selectedPagesCount: number,
-  displayPageCount: number,
   selectAllCheckboxType: CheckboxType,
   onSearchInvoked: (data : any[]) => boolean,
   onExcludeUsersHome?: () => void,
@@ -57,8 +55,6 @@ const SearchControl: FC <Props> = (props: Props) => {
           selectAllCheckboxType={props.selectAllCheckboxType}
           onClickDeleteButton={onDeleteSelectedPageHandler}
           onClickSelectAllCheckbox={props.onClickSelectAllCheckbox}
-          selectedPagesCount={props.selectedPagesCount}
-          displayPageCount={props.displayPageCount}
         />
         <div className="d-flex align-items-center border rounded border-gray px-2 py-1 mr-2 ml-auto">
           <label className="my-0 mr-2" htmlFor="flexCheckDefault">