Merge pull request #5126 from balagowda/refresh

refresh redirection dissabled
layer5io · Nov 29, 2023 · ce5934b · ce5934b
2 parents 323bcc0 + 085a305
commit ce5934b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/src/reusecore/Search/index.js b/src/reusecore/Search/index.js
@@ -11,7 +11,8 @@ const SearchBox = ({
   setHideFilter,
   paginate,
   currentPage,
-  classnames
+  classnames,
+  focusSearch
 }) => {
   const handleChange = (e) => {
     if (hideFilter != undefined && setHideFilter != undefined) {
@@ -30,6 +31,7 @@ const SearchBox = ({
       paginate(1);
     searchData(e);
   };
+
   return (
     <SearchWrapper>
       <div className={`search-box ${classnames ? classnames.join(" ") : ""}`}>
@@ -40,7 +42,7 @@ const SearchBox = ({
           debounceTimeout={500}
           onChange={(e) => handleChange(e)}
           placeholder="Search..."
-          autoFocus
+          autoFocus={focusSearch}
         />
         <Button aria-label="search icon">
           <FaSearch />

diff --git a/src/sections/Blog/Blog-grid/index.js b/src/sections/Blog/Blog-grid/index.js
@@ -49,7 +49,7 @@ const BlogGrid = ({
                   setListView={setListView}
                   setGridView={setGridView}
                 />
-                <SearchBox searchQuery={searchQuery} searchData={searchData} paginate={paginate} currentPage={currentPage} />
+                <SearchBox searchQuery={searchQuery} searchData={searchData} paginate={paginate} currentPage={currentPage} focusSearch={true}/>
               </div>
               <div className="blog-grid-wrapper">
                 <Row>

diff --git a/src/sections/Blog/Blog-list/index.js b/src/sections/Blog/Blog-list/index.js
@@ -61,10 +61,11 @@ const BlogList = ({
                     searchQuery={searchQuery}
                     searchData={searchData}
                     paginate={paginate} currentPage={currentPage}
+                    focusSearch={true}
                   />
                 </div>
               ) : (
-                <SearchBox searchQuery={searchQuery} searchData={searchData} paginate={paginate} currentPage={currentPage} />
+                <SearchBox searchQuery={searchQuery} searchData={searchData} paginate={paginate} currentPage={currentPage} focusSearch={true}/>
               )}
               <div className="blog-list-wrapper">
                 <Row className="blog-lists">

diff --git a/src/sections/Company/News-grid/index.js b/src/sections/Company/News-grid/index.js
@@ -89,7 +89,7 @@ const NewsGrid = ({ data }) => {
               </div>
               <div className="search">
                 <div className="searchBox">
-                  <SearchBox searchQuery={searchQuery} searchData={searchData} />
+                  <SearchBox searchQuery={searchQuery} searchData={searchData} focusSearch={true}/>
                 </div>
               </div>
             </div>

diff --git a/src/sections/Meshery/Meshery-integrations/Integration.style.js b/src/sections/Meshery/Meshery-integrations/Integration.style.js
@@ -37,7 +37,7 @@ export const HoneycombGrid = styled.div`
     &:hover {
       opacity: 0.8;
       box-shadow: 0px 0px 6px -2px rgb(60, 73, 79);
-}
+    }
   }
 
   .selected {

diff --git a/src/sections/Meshery/Meshery-integrations/IntegrationsGrid.js b/src/sections/Meshery/Meshery-integrations/IntegrationsGrid.js
@@ -235,6 +235,7 @@ const IntegrationsGrid = ({ category, count }) => {
         hideFilter={hideFilter}
         setHideFilter={setHideFilter}
         classnames={["integration-search"]}
+        focusSearch={false}
       />
 
       <section style={{ "margin": "0 2.6rem" }}>

diff --git a/src/sections/Resources/Resources-grid/index.js b/src/sections/Resources/Resources-grid/index.js
@@ -36,6 +36,7 @@ const ResourceGrid = (props) => {
               searchData={props.searchData}
               paginate={paginate}
               currentPage={props.currentPage}
+              focusSearch={true}
             />
           </div>
         </div>