Merge pull request #79 from upendraTekdi/cohort_list

Task #223475: change names cohorts to centers,optimize function for firstLetterUppercase , font family changes , update status imediately after delete center

public/locales/en/common.json

@@ -20,9 +20,9 @@
     "SURE_REASSIGN_CENTER": "Are you sure you want to re-assign Center to this user?",
     "OTHER": "Other",
     "SORT": "Sort",
-    "EDIT_COHORT_NAME": "Edit Center",
+    "EDIT_CENTER_NAME": "Edit Center",
     "NAME": "Name",
-    "UPDATE_COHORT": "Update Center",
+    "UPDATE_CENTER": "Update Center",
     "EDIT": "Edit",
     "DELETE": "Delete",
     "NO_DATA_FOUND": "No data found",
@@ -59,7 +59,7 @@
     "DASHBOARD": "Dashboard",
     "MANAGE_USERS": "Manage Users",
     "COURSE_PLANNER": "Course Planner",
-    "COHORTS": "Center",
+    "CENTER": "Center",
     "FACILITATORS": "Facilitators",
     "LEARNERS": "Learners",
     "TEAM_LEADERS": "Team Leaders",
@@ -148,10 +148,11 @@
     "RENAME": "Rename",
     "CENTER_RENAMED": "Center Renamed Successfully!",
     "SEND_REQUEST": "Send Request",
-    "SURE_DELETE_COHORT": "Are you sure you want to Delete Center ?",
+    "SURE_DELETE_CENTER": "Are you sure you want to Delete Center ?",
     "CENTER_UPDATE_SUCCESSFULLY": "Center has been Successfully Updated",
     "CENTER_DELETE_SUCCESSFULLY": "Center has been Successfully Deleted",
-    "CENTER_CREATED_SUCCESSFULLY": "Center Created Successfully"
+    "CENTER_CREATED_SUCCESSFULLY": "Center Created Successfully",
+    "SEARCHBAR_PLACEHOLDER": "Search Center.."
   },
   "FORM": {
     "FULL_NAME": "Full Name",
@@ -207,7 +208,7 @@
     "EMAIL": "Email",
     "YEAR_OF_JOINING_SCP": "Year of joining SCP",
     "ASSIGN_CENTERS": "Assign Centers",
-    "TYPE_OF_COHORT": "Type Of Center List",
+    "TYPE_OF_COHORT": "Type Of Center",
     "UNIT_NAME": "Unit Name",
     "SUBJECTS_I_TEACH": "Subject I Teach",
     "MY_MAIN_SUBJECTS": "Main subjects",

src/components/ActionIcon.tsx

@@ -49,7 +49,9 @@ const ActionIcon: React.FC<ActionCellProps> = ({
           }}
         >
           <EditIcon />
-          <Typography variant="body2">{t("COMMON.EDIT")}</Typography>
+          <Typography variant="body2" fontFamily={"Poppins"}>
+            {t("COMMON.EDIT")}
+          </Typography>
         </Box>
       </Tooltip>
       <Tooltip title={t("COMMON.DELETE")}>
@@ -72,7 +74,7 @@ const ActionIcon: React.FC<ActionCellProps> = ({
                 : "rgb(244, 67, 54)",
             }}
           />
-          <Typography variant="body2">{t("COMMON.DELETE")}</Typography>
+          <Typography variant="body2" fontFamily={"Poppins"}>{t("COMMON.DELETE")}</Typography>
         </Box>
       </Tooltip>
     </Box>

src/components/KaTableComponent.tsx

@@ -97,10 +97,7 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
             },
             cell: {
               content: (props) => {
-                if (
-                  props.column.key === DataKey.ACTIONS 
-
-                ) {
+                if (props.column.key === DataKey.ACTIONS) {
                   return (
                     <ActionIcon
                       rowData={props.rowData}
@@ -146,6 +143,17 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
                     );
                   }
                 }
+                if (props.column.key === DataKey.NAME) {
+                  return firtstLetterInUpperCase(props.rowData?.name)
+                }
+                if (props.column.key === "selection-cell") {
+                  return (
+                    <Checkbox
+                      checked={selectedRowIds.includes(props.rowData.id)}
+                      onChange={() => handleCheckboxChange(props.rowData.id)}
+                    />
+                  );
+                }
                 // if (props.column.key === "selection-cell") {
                 //   return (
                 //     <Checkbox

src/components/layouts/sidebar/MenuItems.js

@@ -25,9 +25,9 @@ const Menuitems = [
   },
 
   {
-    title: "SIDEBAR.COHORTS",
+    title: "SIDEBAR.CENTER",
     icon: "users",
-    href: "/cohorts",
+    href: "/centers",
   },
 
   {

src/pages/cohorts.tsx → src/pages/centers.tsx

@@ -60,7 +60,7 @@ interface CohortDetails {
   customFields?: CustomField[];
 }
 
-const Cohorts: React.FC = () => {
+const Center: React.FC = () => {
   // use hooks
   const { t } = useTranslation();
 
@@ -111,7 +111,7 @@ const Cohorts: React.FC = () => {
   const [selectedBlock, setSelectedBlock] = React.useState<string[]>([]);
   const [selectedSort, setSelectedSort] = useState("Sort");
   const [selectedFilter, setSelectedFilter] = useState("All");
-  const [cohortData, setCohortData] = useState<UserDetails[]>([]);
+  const [cohortData, setCohortData] = useState<cohortFilterDetails[]>([]);
   const [pageSize, setPageSize] = React.useState<string | number>("10");
   const [open, setOpen] = React.useState(false);
   const [confirmationModalOpen, setConfirmationModalOpen] =
@@ -363,14 +363,24 @@ const Cohorts: React.FC = () => {
       const resp = await updateCohortUpdate(selectedCohortId, cohortDetails);
       console.log(resp);
       if (resp?.responseCode === 200) {
-        console.log(resp?.params?.successmessage);
         showToastMessage(t("CENTERS.CENTER_DELETE_SUCCESSFULLY"), "success");
-        fetchUserList();
+        const cohort = cohortData?.find(
+          (item: any) => item.cohortId == selectedCohortId
+        );
+        if (cohort) {
+          cohort.status = Status.ARCHIVED;
+        }
+        // setCohortData(updatedCohorts);
+        console.log(resp?.params?.successmessage);
+
+        // fetchUserList();
       } else {
         console.log("Cohort Not Archived");
       }
+      setSelectedCohortId("");
     } else {
       console.log("No Cohort Selected");
+      setSelectedCohortId("");
     }
   };
 
@@ -546,8 +556,8 @@ const Cohorts: React.FC = () => {
 
   // props to send in header
   const userProps = {
-    userType: t("SIDEBAR.COHORTS"),
-    searchPlaceHolder: t("COHORTS.SEARCHBAR_PLACEHOLDER"),
+    userType: t("SIDEBAR.CENTER"),
+    searchPlaceHolder: t("CENTERS.SEARCHBAR_PLACEHOLDER"),
     selectedState: selectedState,
     selectedStateCode: selectedStateCode,
     selectedDistrict: selectedDistrict,
@@ -568,9 +578,9 @@ const Cohorts: React.FC = () => {
       <CustomModal
         open={editModelOpen}
         handleClose={onCloseEditMOdel}
-        title={t("COMMON.EDIT_COHORT_NAME")}
+        title={t("COMMON.EDIT_CENTER_NAME")}
         // subtitle={t("COMMON.NAME")}
-        primaryBtnText={t("COMMON.UPDATE_COHORT")}
+        primaryBtnText={t("COMMON.UPDATE_CENTER")}
         secondaryBtnText="Cancel"
         primaryBtnClick={handleUpdateAction}
         primaryBtnDisabled={confirmButtonDisable}
@@ -587,7 +597,7 @@ const Cohorts: React.FC = () => {
         </Box>
       </CustomModal>
       <ConfirmationModal
-        message={t("CENTERS.SURE_DELETE_COHORT")}
+        message={t("CENTERS.SURE_DELETE_CENTER")}
         handleAction={handleActionForDelete}
         buttonNames={{
           primary: t("COMMON.YES"),
@@ -658,4 +668,4 @@ export async function getStaticProps({ locale }: any) {
   };
 }
 
-export default Cohorts;
+export default Center;

src/styles/style.css

@@ -9,11 +9,15 @@
 }
 
 .table-header {
-  font-family: "Poppins", sans-serif;
+  font-family: "Poppins", sans-serif !important;
   font-size: small;
 }
 
 .table-cell {
-  font-family: "Poppins", sans-serif;
+  font-family: "Poppins", sans-serif !important;
   font-size: small;
 }
+
+.ka-table {
+  font-family: "Poppins" !important;
+}

src/utils/Helper.ts

@@ -78,16 +78,15 @@ export const transformArray = (arr: State[]): State[] => {
   }));
 };
 
-export const firtstLetterInUpperCase = (label: string) => {
-  if (label) {
-    const firstLetter = label.charAt(0);
-    const firstLetterCap = firstLetter.toUpperCase();
-    const remainingLetters = label.slice(1);
-    const firstUpperCaseLetter = firstLetterCap + remainingLetters;
-    return firstUpperCaseLetter;
-  } else {
+export const firtstLetterInUpperCase = (label: string): string | null => {
+  if (!label) {
     return null;
   }
+
+  return label
+    ?.split(" ")
+    ?.map((word) => word?.charAt(0).toUpperCase() + word?.slice(1))
+    ?.join(" ");
 };
 export const capitalizeFirstLetterOfEachWordInArray = (arr: string[]): string[] => {
   console.log(arr)

src/utils/app.constant.ts

@@ -45,6 +45,7 @@ export enum DataKey {
   CREATEDBY = "createdBy",
   UPDATEDBY = "updatedBy",
   STATUS = "status",
+  NAME = "name",
 }
 
 export enum DateFormat {