Merge pull request #598 from NIUANULP/main

Merging dev into prod III
NIUANULP · Sep 9, 2024 · dbf2bd9 · dbf2bd9
2 parents dd06941 + 45b31bc
commit dbf2bd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -1419,7 +1419,7 @@ className="xs-hide accordionBoxShadow"
                     <Typography
                       className="h6-title"
                       onClick={handlecopyrightOpen}
-                      style={{ cursor: "pointer", color: "blue" }} 
+                      style={{ cursor: "pointer", color: "blue !important" }} 
                     >
                     {t("CREDITS")}
                   </Typography>

diff --git a/packages/nulp_elite/src/pages/search/ContentList.js b/packages/nulp_elite/src/pages/search/ContentList.js
@@ -114,9 +114,11 @@ const ContentList = (props) => {
   }, [domain]);
 
   useEffect(() => {
+    setCurrentPage(1)
     fetchData();
   }, [contentTypeFilter]);
   useEffect(() => {
+        setCurrentPage(1)
     fetchData();
   }, [subDomainFilter]);
 
@@ -129,6 +131,7 @@ const ContentList = (props) => {
   }, [globalSearchQuery]);
 
   useEffect(() => {
+    setCurrentPage(1)
     if (headerSearch) {
       setSearchQuery(headerSearch || "");
     }
@@ -399,7 +402,7 @@ const ContentList = (props) => {
   const handlefilterChanges = (selectedFilters) => {
     setContentTypeFilter(selectedFilters.contentFilter || []);
     setSubDomainFilter(selectedFilters.subDomainFilter || []);
-    fetchData();
+    // fetchData();
   };
 
   return (