Merge branch 'main' into new-main

NIUANULP · Sep 20, 2024 · 5765cb8 · 5765cb8
2 parents 662524b + 7c1a6ba
commit 5765cb8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/nulp_elite/src/pages/content/CategoryPage.js b/packages/nulp_elite/src/pages/content/CategoryPage.js
@@ -63,18 +63,18 @@ const CategoryPage = () => {
   const handleDomainFilter = (query, domainName) => {
     setSelectedDomain(query);
     setDomainName(domainName);
-    fetchMoreItems(domainName);
+    // fetchMoreItems(domainName);
   };
 
   useEffect(() => {
-    if (selectedDomain) {
-      fetchMoreItems(selectedDomain);
-    }
-  }, [selectedDomain]);
+
+      fetchMoreItems();
+
+  }, [selectedDomain,domainName,clearDomains]);
 
   useEffect(() => {
     fetchMoreItems(selectedDomain);
-  }, [currentPage,clearDomains]);
+  }, [currentPage]);
 
   const handleGoBack = () => {
     navigate(-1); // Navigate back in history
@@ -223,8 +223,9 @@ const CategoryPage = () => {
   };
 
   const clearDomain = () => {
-    setDomainName(null)
+    setDomainName(null);
     setClearDomain(null);
+    setSelectedDomain(null)
   }
 
   useEffect(() => {

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -646,7 +646,9 @@ const JoinCourse = () => {
           <>
           <Box>
             <Button
+
               disabled={ isCompleted}
+
               onClick={() =>
                 handleLinkClick(
                   ContinueLearning ?? NotConsumedContent ?? childnode