Merge branch 'new-question-flow-p2' of https://github.com/metabase/metabase...

Merge branch 'new-question-flow-p2' of https://github.com/metabase/metabase into nqf-search-arrow-keys

frontend/src/metabase/containers/EntitySearch.jsx

@@ -380,25 +380,32 @@ class SearchResultsList extends Component {
         const { entities, currentPage, setCurrentPage } = this.props
 
         const currentEntitiesText = start === end ? `${start + 1}` : `${start + 1}-${end + 1}`
+        const isInBeginning = start === 0
+        const isInEnd = end + 1 >= entityCount
+
         return (
             <li className="py1 px3 flex justify-end align-center">
                 <span className="text-bold">{ currentEntitiesText }</span>&nbsp;of&nbsp;<span
                 className="text-bold">{entityCount}</span>
                 <span
-                    className={cx("mx1 flex align-center justify-center rounded", {"cursor-pointer bg-grey-2 text-white": start !== 0}, {"bg-grey-0 text-grey-1": start === 0})}
+                    className={cx(
+                        "mx1 flex align-center justify-center rounded",
+                        { "cursor-pointer bg-grey-2 text-white": !isInBeginning },
+                        { "bg-grey-0 text-grey-1": isInBeginning }
+                    )}
                     style={{width: "22px", height: "22px"}}
-                    onClick={() => setCurrentPage(entities, currentPage - 1)}>
-                            <Icon name="chevronleft" size={14}/>
+                    onClick={() => !isInBeginning && setCurrentPage(entities, currentPage - 1)}>
+                    <Icon name="chevronleft" size={14}/>
                 </span>
                 <span
                     className={cx(
                         "flex align-center justify-center rounded",
-                        { "cursor-pointer bg-grey-2 text-white": end + 1 < entityCount },
-                        { "bg-grey-0 text-grey-2": end + 1 >= entityCount }
+                        { "cursor-pointer bg-grey-2 text-white": !isInEnd },
+                        { "bg-grey-0 text-grey-2": isInEnd }
                     )}
                     style={{width: "22px", height: "22px"}}
-                    onClick={() => setCurrentPage(entities, currentPage + 1)}>
-                            <Icon name="chevronright" size={14}/>
+                    onClick={() => !isInEnd && setCurrentPage(entities, currentPage + 1)}>
+                        <Icon name="chevronright" size={14}/>
                 </span>
             </li>
         )