Merge pull request #2516 from AkshataKatwal16/feat-lead-mapping-new

rushi-tekdi · web-flow · commit 78ea66d0a3b1 · 2026-01-09T16:49:27.000+05:30
Issue feat:Add 'Board' filter for SCP CCTA and SCTAs and filter out retired boards from form
diff --git a/apps/admin-app-repo/src/constant/Forms/ContentCreatorSearch.js b/apps/admin-app-repo/src/constant/Forms/ContentCreatorSearch.js
@@ -25,6 +25,40 @@ export const ContentCreatorSearchSchema = {
       isMultiSelect: true,
       maxSelection: 1000,
     },
+    board: {
+      "type": "array",
+      "title": "BOARD",
+      "coreField": 0,
+      "fieldId": "f93c0ac3-f827-4794-9457-441fa1057b42",
+      "field_type": "drop_down",
+      "maxSelection": 10000,
+      "isMultiSelect": true,
+      "uniqueItems": true,
+      "isRequired": true,
+      "items": {
+          "type": "string",
+          "enum": [
+              "Select"
+          ],
+          "enumNames": [
+              "Select"
+          ]
+      },
+      "api": {
+          "url": "/api/dynamic-form/get-framework",
+          "method": "POST",
+          "options": {
+              "label": "label",
+              "value": "value",
+              "optionObj": "options"
+          },
+          "payload": {
+              "code": "board",
+              "fetchUrl": `${process.env.NEXT_PUBLIC_MIDDLEWARE_URL}/api/framework/v1/read/scp-framework`
+          },
+          "callType": "initial"
+      }
+  },
     name: {
       type: 'string',
       title: 'Search Content Creator',
@@ -54,7 +88,14 @@ export const ContentCreatorUISchema = {
       uniqueItems: true,
     },
   },
-
+  board: {
+    "ui:widget": "AutoCompleteMultiSelectWidget",
+    "ui:options": {
+        "multiple": true,
+        "uniqueItems": true,
+        "hideError": false
+    }
+  },
   firstName: {
     'ui:widget': 'SearchTextFieldWidget',
   },
diff --git a/apps/admin-app-repo/src/constant/Forms/ContentReviewerSearch.js b/apps/admin-app-repo/src/constant/Forms/ContentReviewerSearch.js
@@ -25,6 +25,40 @@ export const ContentReviewerSearchSchema = {
       isMultiSelect: true,
       maxSelection: 1000,
     },
+    board: {
+      "type": "array",
+      "title": "BOARD",
+      "coreField": 0,
+      "fieldId": "f93c0ac3-f827-4794-9457-441fa1057b42",
+      "field_type": "drop_down",
+      "maxSelection": 10000,
+      "isMultiSelect": true,
+      "uniqueItems": true,
+      "isRequired": true,
+      "items": {
+          "type": "string",
+          "enum": [
+              "Select"
+          ],
+          "enumNames": [
+              "Select"
+          ]
+      },
+      "api": {
+          "url": "/api/dynamic-form/get-framework",
+          "method": "POST",
+          "options": {
+              "label": "label",
+              "value": "value",
+              "optionObj": "options"
+          },
+          "payload": {
+              "code": "board",
+              "fetchUrl": `${process.env.NEXT_PUBLIC_MIDDLEWARE_URL}/api/framework/v1/read/scp-framework`
+          },
+          "callType": "initial"
+      }
+  },
     name: {
       type: 'string',
       title: 'Search Content Reviewer',
@@ -54,6 +88,14 @@ export const ContentReviewerUISchema = {
       uniqueItems: true,
     },
   },
+  board: {
+    "ui:widget": "AutoCompleteMultiSelectWidget",
+    "ui:options": {
+        "multiple": true,
+        "uniqueItems": true,
+        "hideError": false
+    }
+  },
 
   firstName: {
     'ui:widget': 'SearchTextFieldWidget',
diff --git a/apps/admin-app-repo/src/pages/api/dynamic-form/get-framework.js b/apps/admin-app-repo/src/pages/api/dynamic-form/get-framework.js
@@ -56,10 +56,12 @@ export default function handler(req, res) {
                 } else if (selectedvalue != '') {
                   // Transform terms into options
                   // console.log('in initial state');
-                  options = categories?.terms.map((term) => ({
-                    label: term.name,
-                    value: term.name,
-                  }));
+                  options = categories?.terms
+                    .filter((term) => term.status !== "Retired") // Filter out retired boards
+                    .map((term) => ({
+                      label: term.name,
+                      value: term.name,
+                    }));
                 }
                 // console.log('option', options);
               }
diff --git a/apps/teachers/src/pages/api/dynamic-form/get-framework.js b/apps/teachers/src/pages/api/dynamic-form/get-framework.js
@@ -56,10 +56,12 @@ export default function handler(req, res) {
                 } else if (selectedvalue != '') {
                   // Transform terms into options
                   // console.log('in initial state');
-                  options = categories?.terms.map((term) => ({
-                    label: term.name,
-                    value: term.name,
-                  }));
+                  options = categories?.terms
+                    .filter((term) => term.status !== "Retired") // Filter out retired boards
+                    .map((term) => ({
+                      label: term.name,
+                      value: term.name,
+                    }));
                 }
                 // console.log('option', options);
               }
diff --git a/libs/shared-lib-v2/src/DynamicForm/utils/Helper.ts b/libs/shared-lib-v2/src/DynamicForm/utils/Helper.ts
@@ -651,7 +651,7 @@ export const getOptionsByCategory = (frameworks: any, categoryCode: string) => {
 
   // Return the mapped terms
   return category?.terms?.filter((term: any) => {
-    if (term.status === 'Live') {
+    if (term.status === 'Live' &&  term.status !== "Retired") {
       return {
         name: term?.name,
         code: term?.code,
diff --git a/mfes/editors/src/utils/Helper.ts b/mfes/editors/src/utils/Helper.ts
@@ -56,7 +56,7 @@ export const getOptionsByCategory = (frameworks: any, categoryCode: string) => {
   );
 
   // Return the mapped terms
-  return category.terms.map((term: any) => ({
+  return category.terms.filter((term: any) => term.status !== "Retired").map((term: any) => ({
     name: term.name,
     code: term.code,
     associations: term.associations,
diff --git a/mfes/players/src/components/utils/Helper.ts b/mfes/players/src/components/utils/Helper.ts
@@ -56,7 +56,7 @@ export const getOptionsByCategory = (frameworks: any, categoryCode: string) => {
   );
 
   // Return the mapped terms
-  return category.terms.map((term: any) => ({
+  return category.terms.filter((term: any) => term.status !== "Retired").map((term: any) => ({
     name: term.name,
     code: term.code,
     associations: term.associations,
diff --git a/mfes/workspace/src/components/ActionIcon.tsx b/mfes/workspace/src/components/ActionIcon.tsx
@@ -62,7 +62,7 @@ const ActionIcon: React.FC<ActionCellProps> = ({
         </Box>
       </Tooltip>
 
-      {/* {rowData?.status === 'Live' &&  getLocalStoredUserRole()!==Role.SCTA&& (
+      {rowData?.status === 'Live' &&  getLocalStoredUserRole()!==Role.SCTA&& (
         <Tooltip title="Unpublish">
           <Box
             onClick={() => {
@@ -102,7 +102,7 @@ const ActionIcon: React.FC<ActionCellProps> = ({
             <PublishIcon sx={{ color: 'green' }} />
           </Box>
         </Tooltip>
-      )} */}
+      )}
 
       <DeleteConfirmation
         open={open}
diff --git a/mfes/workspace/src/utils/Helper.ts b/mfes/workspace/src/utils/Helper.ts
@@ -56,7 +56,7 @@ export const getOptionsByCategory = (frameworks: any, categoryCode: string) => {
   );
 
   // Return the mapped terms
-  return category.terms.map((term: any) => ({
+  return category.terms.filter((term: any) => term.status !== "Retired").map((term: any) => ({
     name: term.name,
     code: term.code,
     associations: term.associations,
