Explorar el Código

81006 fix null check and rename

SULLEY\ryo-h hace 4 años
padre
commit
2caab8a39e

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

@@ -245,7 +245,7 @@ class SearchPage extends React.Component {
     return (
       <SearchControl
         searchingKeyword={this.state.searchingKeyword}
-        searchResultCount={this.state.searchResultCount}
+        searchResultCount={this.state.searchResultCount || 0}
         appContainer={this.props.appContainer}
         onSearchInvoked={this.searchHandler}
         onExcludeUsersHome={this.onExcludeUsersHome}

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

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { CheckboxType } from '../../interfaces/search';
 
 type Props = {
-  isCheckboxDisabled: boolean,
+  isSelectAllCheckboxDisabled: boolean,
   selectAllCheckboxType: CheckboxType,
   onClickDeleteButton?: () => void,
   onClickSelectAllCheckbox?: (nextSelectAllCheckboxType: CheckboxType) => void,
@@ -31,7 +31,7 @@ const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
         type="checkbox"
         name="check-all-pages"
         className="custom-control custom-checkbox ml-1 align-self-center"
-        disabled={props.isCheckboxDisabled}
+        disabled={props.isSelectAllCheckboxDisabled}
         onClick={onClickCheckbox}
         checked={selectAllCheckboxType !== CheckboxType.NONE_CHECKED}
       />

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

@@ -54,7 +54,7 @@ const SearchControl: FC <Props> = (props: Props) => {
       <div className="d-flex my-4">
         {/* Todo: design will be fixed in #80324. Function will be implemented in #77525 */}
         <DeleteSelectedPageGroup
-          isCheckboxDisabled={(searchResultCount == null || searchResultCount === 0) || false}
+          isSelectAllCheckboxDisabled={searchResultCount === 0 || false}
           selectAllCheckboxType={props.selectAllCheckboxType}
           onClickDeleteButton={onDeleteSelectedPageHandler}
           onClickSelectAllCheckbox={props.onClickSelectAllCheckbox}