resolved comments

tekdi · Jul 29, 2024 · 8276c48 · 8276c48
1 parent 56e43b0
commit 8276c48
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 32 deletions.
diff --git a/src/components/KaTableComponent.tsx b/src/components/KaTableComponent.tsx
@@ -1,14 +1,10 @@
-// components/KaTableComponent.tsx
-
 import React, { useState } from "react";
 import { ITableProps, Table } from "ka-table";
 import { SortingMode, PagingPosition } from "ka-table/enums";
 import { Paper, Checkbox } from "@mui/material";
 import "ka-table/style.css";
-import { IPagingProps } from "ka-table/props";
-import { updatePageIndex, updatePageSize } from "ka-table/actionCreators";
-import ActionCell from "./ActionCell";
 import ActionIcon from "./ActionIcon";
+import { useTranslation } from "react-i18next";
 
 interface KaTableComponentProps {
   columns: ITableProps["columns"];
@@ -49,6 +45,7 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
   pagination = true,
 }) => {
   const [selectedRowIds, setSelectedRowIds] = useState<number[]>([]);
+  const { t } = useTranslation();
 
   const handleCheckboxChange = (rowId: number) => {
     setSelectedRowIds((prevSelected) =>
@@ -122,7 +119,7 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
             },
           }}
           noData={{
-            text: "No Data Found",
+            text: t("COURSE_PLANNER.DATA_NOT_FOUND"),
           }}
         />
       </div>

diff --git a/src/pages/block.tsx b/src/pages/block.tsx
@@ -16,8 +16,8 @@ import {
   getDistrictsForState,
   getBlocksForDistricts,
 } from "@/services/MasterDataService";
-import formatLabel from "@/utils/formatLabel";
 import CustomModal from "@/components/CustomModal";
+import { transformLabel } from "@/utils/Helper";
 
 type StateDetail = {
   value: string;
@@ -138,11 +138,9 @@ const Block: React.FC = () => {
     []
   );
 
-  const handleEdit = useCallback((rowData: any) => {
-  }, []);
+  const handleEdit = useCallback((rowData: any) => {}, []);
 
-  const handleDelete = useCallback((rowData: any) => {
-  }, []);
+  const handleDelete = useCallback((rowData: any) => {}, []);
 
   const handleConfirmDelete = useCallback(() => {
     setConfirmationModalOpen(false);
@@ -226,7 +224,7 @@ const Block: React.FC = () => {
                 >
                   {stateData.map((stateDetail) => (
                     <MenuItem key={stateDetail.value} value={stateDetail.value}>
-                      {formatLabel(stateDetail.label)}
+                      {transformLabel(stateDetail.label)}
                     </MenuItem>
                   ))}
                 </Select>
@@ -252,7 +250,7 @@ const Block: React.FC = () => {
                       key={districtDetail.value}
                       value={districtDetail.value}
                     >
-                      {formatLabel(districtDetail.label)}
+                      {transformLabel(districtDetail.label)}
                     </MenuItem>
                   ))}
                 </Select>
@@ -267,7 +265,7 @@ const Block: React.FC = () => {
               <KaTableComponent
                 columns={columns}
                 data={blockData.map((block) => ({
-                  block: formatLabel(block.label),
+                  block: transformLabel(block.label),
                   actions: "Action buttons",
                 }))}
                 limit={pageLimit}

diff --git a/src/pages/district.tsx b/src/pages/district.tsx
@@ -16,7 +16,7 @@ import {
   getStateBlockDistrictList,
   getDistrictsForState,
 } from "@/services/MasterDataService";
-import formatLabel from "@/utils/formatLabel";
+import { transformLabel } from "@/utils/Helper";
 
 type StateDetail = {
   value: string;
@@ -233,7 +233,7 @@ const District: React.FC = () => {
             >
               {stateData.map((state) => (
                 <MenuItem key={state.value} value={state.value}>
-                  {formatLabel(state.label)}
+                  {transformLabel(state.label)}
                 </MenuItem>
               ))}
             </Select>
@@ -242,7 +242,7 @@ const District: React.FC = () => {
         <KaTableComponent
           columns={columns}
           data={sortedDistricts.map((districtDetail) => ({
-            label: formatLabel(districtDetail.label),
+            label: transformLabel(districtDetail.label),
             actions: "Action buttons",
           }))}
           limit={pageLimit}
@@ -261,7 +261,7 @@ const District: React.FC = () => {
           extraActions={[]}
           onEdit={handleEdit}
           onDelete={handleDelete}
-          noData={!!(sortedDistricts.length === 0 ? "No Data Found" : "")}
+          noData={districtData.length === 0}
         />
       </HeaderComponent>
     </React.Fragment>

diff --git a/src/pages/state.tsx b/src/pages/state.tsx
@@ -12,6 +12,7 @@ import { SortDirection } from "ka-table/enums";
 import Loader from "@/components/Loader";
 import { Box } from "@mui/material";
 import CustomModal from "@/components/CustomModal";
+import { transformLabel } from "@/utils/Helper";
 
 type StateDetail = {
   label: string;
@@ -170,9 +171,7 @@ const State: React.FC = () => {
           <KaTableComponent
             columns={columns}
             data={stateData.map((stateDetail) => ({
-              label:
-                stateDetail.label?.toLocaleLowerCase().charAt(0).toUpperCase() +
-                stateDetail.label?.toLocaleLowerCase().slice(1),
+              label: transformLabel(stateDetail.label),
             }))}
             limit={pageLimit}
             offset={pageOffset}

diff --git a/src/utils/Helper.ts b/src/utils/Helper.ts
@@ -51,7 +51,7 @@ export const generateUUID = () => {
     label: string;
   }
 
-  const transformLabel = (label: string): string => {
+  export const transformLabel = (label: string): string => {
     return label
       .toLowerCase() // Convert to lowercase to standardize
       .replace(/_/g, ' ') // Replace underscores with spaces

diff --git a/src/utils/formatLabel.ts b/src/utils/formatLabel.ts