Merge pull request #2182 from AkshataKatwal16/12-new-changes

Issue feat: Add retension for manual assessment filter,  sort content for up for review list by lastupdated date, change courseplanner success message colour

Author: rushi-tekdi

apps/admin-app-repo/src/components/CoursePlan/CoursePlanForm.tsx

@@ -287,7 +287,7 @@ const CoursePlanForm: React.FC<CoursePlanFormProps> = ({
           if (response) {
             showSnackbar({
               text: t(`Sub Topic has been successfully deleted`),
-              bgColor: '#BA1A1A',
+              bgColor: '#019722',
               textColor: '#fff',
               icon: <CheckCircleOutlineOutlinedIcon />, //ErrorOutlinedIcon
             });

mfes/content/src/components/Content/List.tsx

@@ -311,6 +311,11 @@ export default function Content(props: Readonly<ContentProps>) {
       // }
       if(props.onTotalCountChange)
       {
+        //console.log("hellooo")
+        // filter.primaryCategory = [
+        //     'Learning Resource','Practice Question Set','Activity','Story'];
+        console.log("filter====>" , filter);
+
         resultResponse = await ContentSearch({
           ...filter,
           offset: adjustedOffset,
@@ -319,7 +324,8 @@ export default function Content(props: Readonly<ContentProps>) {
           primaryCategory: ['Course'],
         });
       }
-      else{
+      else{        
+
         resultResponse = await ContentSearch({
           ...filter,
           offset: adjustedOffset,
@@ -330,15 +336,29 @@ export default function Content(props: Readonly<ContentProps>) {
       }
 
 
-      if (resultResponse?.result?.count) {
+      if(props.onTotalCountChange) {
+         console.log("hellooo")
+        // filter.primaryCategory = [
+        //     'Learning Resource','Practice Question Set','Activity','Story'];
+        console.log("filter====>" , filter);
 
-        setTotalCount(resultResponse?.result?.count);
-        if(props.setTotalResources)
+       const resultResponse2 = await ContentSearch({
+          ...filter,
+          offset: adjustedOffset,
+          limit: adjustedLimit,
+          signal: controller.signal,
+          primaryCategory: [
+            'Learning Resource','Practice Question Set','Activity','Story'],
+        });
+
+        setTotalCount(resultResponse2?.result?.count);
+      }
+        if(props.setTotalResources && resultResponse?.result?.count)
         {
           props.setTotalResources(resultResponse?.result?.count);
         }
 
-      }
+      
 
       const response = resultResponse?.result;
       if (props?._config?.getContentData) {

mfes/content/src/services/Search.ts

@@ -125,13 +125,15 @@ export const ContentSearch = async ({
   limit = 5,
   offset = 0,
   noPrimaryCategory = false,
+  primaryCategory,
 }: {
   type: string;
   query?: string;
   filters?: object;
   limit?: number;
   offset?: number;
   noPrimaryCategory?: boolean;
+  primaryCategory?: string[];
 }): Promise<ContentResponse> => {
   try {
     // Ensure the environment variable is defined
@@ -150,7 +152,10 @@ export const ContentSearch = async ({
       status: ['live'],
       channel: localStorage.getItem('channelId'),
     };
-   // console.log('filtersObject====>', filtersObject?.primaryCategory);
+    if(primaryCategory){
+      filtersObject.primaryCategory = primaryCategory;
+    }
+    console.log('filtersObject====>' , filters);
 
     // Only add primaryCategory if noPrimaryCategory is false and primaryCategory is not already set
     if (!noPrimaryCategory && !filtersObject.primaryCategory) {
@@ -161,6 +166,7 @@ export const ContentSearch = async ({
           ? ['Activity', 'Story']
           : ['Learning Resource', 'Practice Question Set'];
     }
+   // console.log('filtersObject====>', filtersObject);
 
     const data = {
       request: {

mfes/workspace/src/pages/workspace/content/up-review/index.tsx

@@ -64,7 +64,7 @@ const columns = [
     key: 'create-by',
     title: 'CREATED BY',
     dataType: DataType.String,
-    width: '100px',
+    width: '180px',
   },
   { key: 'action', title: 'ACTION', dataType: DataType.String, width: '100px' },
 ];
@@ -123,7 +123,12 @@ const UpForReviewPage = () => {
     };
   }, [searchTerm]);
   useEffect(() => {
-    const filteredArray = contentList.map((item: any) => ({
+    const sortedContentList = [...contentList].sort((a: any, b: any) => {
+      return (
+        new Date(b.lastUpdatedOn).getTime() - new Date(a.lastUpdatedOn).getTime()
+      );
+    });
+    const filteredArray = sortedContentList.map((item: any) => ({
       image: item?.appIcon,
 
       name: item?.name,

mfes/youthNet/src/pages/manual-assessments/index.tsx

@@ -165,7 +165,15 @@ const AssessmentList = () => {
                 (item: any) => ({ id: item?.value, name: item?.label })
               );
               setBlockData(transformedBlockData);
-              const firstBlockId = transformedBlockData?.[0]?.id || '';
+              let firstBlockId = transformedBlockData?.[0]?.id || '';
+              if (
+                router.query.blockId &&
+                transformedBlockData?.some(
+                  (b: any) => String(b.id) === String(router.query.blockId)
+                )
+              ) {
+                firstBlockId = router.query.blockId;
+              }
               setSelectedBlockValue(firstBlockId);
               setBlockId(firstBlockId);
             })
@@ -182,7 +190,7 @@ const AssessmentList = () => {
         setBlockData([]);
       }
     }
-  }, []);
+  }, [router.isReady, router.query.blockId]);
 
   // Village list fetching logic (role-based, following villages page pattern)
   useEffect(() => {
@@ -196,8 +204,17 @@ const AssessmentList = () => {
             : null;
           setVillageList(villageData || []);
           if (villageData && villageData.length > 0) {
-            setSelectedVillageValue(villageData[0]?.Id);
-            setVillageId(villageData[0]?.Id);
+            let firstVillageId = villageData[0]?.Id;
+            if (
+              router.query.villageId &&
+              villageData.some(
+                (v: any) => String(v.Id) === String(router.query.villageId)
+              )
+            ) {
+              firstVillageId = router.query.villageId;
+            }
+            setSelectedVillageValue(firstVillageId);
+            setVillageId(firstVillageId);
           }
         } else if (YOUTHNET_USER_ROLE.LEAD === getLoggedInUserRole() && selectedBlockValue !== '') {
           // For LEAD role: fetch villages based on selected block
@@ -216,8 +233,17 @@ const AssessmentList = () => {
           );
           setVillageList(transformedVillageData || []);
           if (transformedVillageData && transformedVillageData.length > 0) {
-            setSelectedVillageValue(transformedVillageData[0]?.Id);
-            setVillageId(transformedVillageData[0]?.Id);
+            let firstVillageId = transformedVillageData[0]?.Id;
+            if (
+              router.query.villageId &&
+              transformedVillageData.some(
+                (v: any) => String(v.Id) === String(router.query.villageId)
+              )
+            ) {
+              firstVillageId = router.query.villageId;
+            }
+            setSelectedVillageValue(firstVillageId);
+            setVillageId(firstVillageId);
           }
         }
       } catch (error) {
@@ -227,22 +253,32 @@ const AssessmentList = () => {
     };
 
     getVillageList();
-  }, [selectedBlockValue]);
+  }, [selectedBlockValue, router.query.villageId]);
 
   // Initialize villages on page load for INSTRUCTOR role
   useEffect(() => {
+    if (!router.isReady) return;
     if (YOUTHNET_USER_ROLE.INSTRUCTOR === getLoggedInUserRole()) {
       const villageDataString = localStorage.getItem('villageData');
       const villageData: any = villageDataString
         ? JSON.parse(villageDataString)
         : null;
       if (villageData && villageData.length > 0) {
         setVillageList(villageData);
-        setSelectedVillageValue(villageData[0]?.Id);
-        setVillageId(villageData[0]?.Id);
+        let firstVillageId = villageData[0]?.Id;
+        if (
+          router.query.villageId &&
+          villageData.some(
+            (v: any) => String(v.Id) === String(router.query.villageId)
+          )
+        ) {
+          firstVillageId = router.query.villageId;
+        }
+        setSelectedVillageValue(firstVillageId);
+        setVillageId(firstVillageId);
       }
     }
-  }, []);
+  }, [router.isReady, router.query.villageId]);
 
   // Reset assessment type and related lists when class changes
   useEffect(() => {
@@ -682,6 +718,13 @@ const AssessmentList = () => {
                       onSelect={(value) => {
                         setSelectedBlockValue(value);
                         setBlockId(value);
+                        const { villageId, ...rest } = router.query;
+                        const newQuery = { ...rest, blockId: value };
+                        router.push(
+                          { pathname: router.pathname, query: newQuery },
+                          undefined,
+                          { shallow: true }
+                        );
                         console.log('Block selected:', value);
                       }}
                       label={t('YOUTHNET_USERS_AND_VILLAGES.BLOCKS')}
@@ -710,6 +753,12 @@ const AssessmentList = () => {
                     console.log('Village selected:', value);
                     setSelectedVillageValue(value);
                     setVillageId(value);
+                    const newQuery = { ...router.query, villageId: value };
+                    router.push(
+                      { pathname: router.pathname, query: newQuery },
+                      undefined,
+                      { shallow: true }
+                    );
                   }}
                   label={t('YOUTHNET_USERS_AND_VILLAGES.VILLAGES')}
                 />