Merge pull request #52 from CBIIT/develop

Merge with Develop

Author: David-YuWei

src/components/Pagination/Pagination.css

@@ -71,10 +71,12 @@
 }
 
 .dropdown-item.active {
-  border: 1px solid #7CACCF;
+  /* border: 1px solid #7CACCF; */
+  border-top: 1px solid #7CACCF;
+  border-bottom: 1px solid #7CACCF;
   background-color: #FFFFFF;
 }
 
-.dropdown-menu {
+.dropdown-menus {
   border: 1px solid #7CACCF;
 }

src/components/Pagination/index.js

@@ -25,21 +25,22 @@ const ResultsPerPage = styled.div`
     display: inline-block;
     margin: -2px 0 0 -3px;
     color: #004187;
-    // background-color: white;
-    // border: none;
+    background-color: white;
+    border: none;
   }
 
   ul{
     min-width: 30px;
     padding: 0 0 0 0;
+    border-radius: 0px;
     border: 1px solid #7CACCF;
     background-color: #DFEEF9;
     // background-color: red;
   }
 
   div.dropdown li a{
     min-width: 30px;
-    padding: 1px 8px 1px 8px;
+    padding: 0px 8px 0px 8px;
     color: #004187;
     text-align: center;
   }
@@ -69,7 +70,9 @@ const Pagination = ({
     pageClick(data.selected + 1);
   };
   const handleSizeClick = (size) => {
-    sizeClick(size);
+    if (pageInfo.pageSize !== size) {
+      sizeClick(size);
+    }
   };
 
   return (

src/pages/participatingResourcesPage/PageInfo/PageInfo.js

@@ -45,9 +45,7 @@ const replaceQueryStrPageSize = (query, pageSize) => {
   if (query.get("data_content_type")) {
     str += `&data_content_type=${query.get("data_content_type")}`;
   }
-  if (query.get("page")) {
-    str += `&page=${query.get("page")}`;
-  }
+  str += `&page=1`;
   str += `&pageSize=${pageSize}`;
   return str.substring(1);
 };

src/pages/searchCatalogPage/PageInfo/PageInfo.js

@@ -45,9 +45,7 @@ const replaceQueryStrPageSize = (query, pageSize) => {
   if (query.get("data_content_type")) {
     str += `&data_content_type=${query.get("data_content_type")}`;
   }
-  if (query.get("page")) {
-    str += `&page=${query.get("page")}`;
-  }
+  str += `&page=1`;
   str += `&pageSize=${pageSize}`;
   if (query.get("sortBy")) {
     str += `&sortBy=${query.get("sortBy")}`;