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

Merge branch 'feat/77525-80785-implement-select-all-checkbox' into feat/77525-81100-check-if-selected-pages-has-page

# Conflicts:
#	packages/app/src/components/SearchPage.jsx
SULLEY\ryo-h 4 лет назад
Родитель
Сommit
980001d321

+ 1 - 1
packages/app/src/components/SearchPage.jsx

@@ -241,7 +241,7 @@ class SearchPage extends React.Component {
         onExcludeTrash={this.onExcludeTrash}
         onExcludeTrash={this.onExcludeTrash}
         onClickSelectAllCheckbox={this.toggleAllCheckBox}
         onClickSelectAllCheckbox={this.toggleAllCheckBox}
         selectedPagesCount={this.state.selectedPagesIdList.size}
         selectedPagesCount={this.state.selectedPagesIdList.size}
-        searchedPagesCount={this.state.searchedPages.length}
+        displayPageCount={this.state.searchedPages.length}
       >
       >
       </SearchControl>
       </SearchControl>
     );
     );

+ 5 - 6
packages/app/src/components/SearchPage/DeleteSelectedPageGroup.tsx

@@ -4,7 +4,7 @@ import { CheckboxType } from '../../interfaces/search';
 
 
 type Props = {
 type Props = {
   selectedPagesCount: number,
   selectedPagesCount: number,
-  searchedPagesCount: number,
+  displayPageCount: number,
   onClickInvoked?: () => void,
   onClickInvoked?: () => void,
   onClickSelectAllCheckbox?: () => void,
   onClickSelectAllCheckbox?: () => void,
 }
 }
@@ -12,20 +12,19 @@ type Props = {
 const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
 const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
   const {
   const {
-    onClickInvoked, onClickSelectAllCheckbox, selectedPagesCount, searchedPagesCount,
+    onClickInvoked, onClickSelectAllCheckbox, selectedPagesCount, displayPageCount,
   } = props;
   } = props;
 
 
   const checkboxType = useMemo(() => {
   const checkboxType = useMemo(() => {
     switch (selectedPagesCount) {
     switch (selectedPagesCount) {
       case 0:
       case 0:
         return CheckboxType.NONE_CHECKED;
         return CheckboxType.NONE_CHECKED;
-      case searchedPagesCount:
+      case displayPageCount:
         return CheckboxType.ALL_CHECKED;
         return CheckboxType.ALL_CHECKED;
       default:
       default:
         return CheckboxType.INDETERMINATE;
         return CheckboxType.INDETERMINATE;
     }
     }
-  }, [selectedPagesCount, searchedPagesCount]);
-
+  }, [selectedPagesCount, displayPageCount]);
 
 
   return (
   return (
     <>
     <>
@@ -47,7 +46,7 @@ const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
         type="button"
         type="button"
         className="btn text-danger font-weight-light p-0 ml-3"
         className="btn text-danger font-weight-light p-0 ml-3"
         onClick={() => {
         onClick={() => {
-          if (onClickInvoked == null) {
+          if (onClickInvoked != null) {
             onClickInvoked();
             onClickInvoked();
           }
           }
         }}
         }}

+ 2 - 2
packages/app/src/components/SearchPage/SearchControl.tsx

@@ -8,7 +8,7 @@ type Props = {
   searchingKeyword: string,
   searchingKeyword: string,
   appContainer: AppContainer,
   appContainer: AppContainer,
   selectedPagesCount: number,
   selectedPagesCount: number,
-  searchedPagesCount: number,
+  displayPageCount: number,
   onSearchInvoked: (data : any[]) => boolean,
   onSearchInvoked: (data : any[]) => boolean,
   onExcludeUsersHome?: () => void,
   onExcludeUsersHome?: () => void,
   onExcludeTrash?: () => void,
   onExcludeTrash?: () => void,
@@ -55,7 +55,7 @@ const SearchControl: FC <Props> = (props: Props) => {
           onClickInvoked={onDeleteSelectedPageHandler}
           onClickInvoked={onDeleteSelectedPageHandler}
           onClickSelectAllCheckbox={props.onClickSelectAllCheckbox}
           onClickSelectAllCheckbox={props.onClickSelectAllCheckbox}
           selectedPagesCount={props.selectedPagesCount}
           selectedPagesCount={props.selectedPagesCount}
-          searchedPagesCount={props.searchedPagesCount}
+          displayPageCount={props.displayPageCount}
         />
         />
         <div className="d-flex align-items-center border rounded border-gray px-2 py-1 mr-2 ml-auto">
         <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">
           <label className="my-0 mr-2" htmlFor="flexCheckDefault">