Merge pull request #133 from rahulg1254/admin-master

Task #223691 feat: Resolved issue of sorting on dristrict and block
tekdi · Aug 13, 2024 · 7efb6f0 · 7efb6f0
2 parents d857d5b + 2a20757
commit 7efb6f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/src/pages/block.tsx b/src/pages/block.tsx
@@ -214,28 +214,29 @@ const Block: React.FC = () => {
       width: "130",
     },
     {
-      key: "createdAt",
-      title: t("MASTER.CREATED_AT"),
+      key: "createdBy",
+      title: t("MASTER.CREATED_BY"),
       dataType: DataType.String,
-      width: "130",
+      width: "160",
     },
     {
-      key: "updatedAt",
-      title: t("MASTER.UPDATED_AT"),
+      key: "updatedBy",
+      title: t("MASTER.UPDATED_BY"),
       dataType: DataType.String,
-      width: "130",
+      width: "160",
     },
+
     {
       key: "createdAt",
-      title: t("MASTER.CREATED_BY"),
+      title: t("MASTER.CREATED_AT"),
       dataType: DataType.String,
-      width: "160",
+      width: "130",
     },
     {
       key: "updatedAt",
-      title: t("MASTER.UPDATED_BY"),
+      title: t("MASTER.UPDATED_AT"),
       dataType: DataType.String,
-      width: "160",
+      width: "130",
     },
     {
       key: "actions",
@@ -402,14 +403,12 @@ const Block: React.FC = () => {
   );
 
   const userProps = {
-    selectedSort,
     selectedFilter,
     showStateDropdown: false,
     userType: t("MASTER.BLOCKS"),
     searchPlaceHolder: t("MASTER.SEARCHBAR_PLACEHOLDER_BLOCK"),
     showFilter: false,
     showSort: true,
-    handleSortChange: { handleSortChange },
   };
 
   const handleAddNewBlock = () => {
@@ -507,6 +506,9 @@ const Block: React.FC = () => {
         {...userProps}
         handleAddUserClick={handleAddNewBlock}
         handleSearch={handleSearch}
+        selectedSort={selectedSort}
+        handleSortChange={handleSortChange}
+        showSort={true}
       >
         <>
           <Box

diff --git a/src/pages/district.tsx b/src/pages/district.tsx
@@ -305,16 +305,6 @@ const District: React.FC = () => {
       event.target.value === "Z-A" ? SORT.DESCENDING : SORT.ASCENDING;
     setSortBy(["name", sortOrder]);
     setSelectedSort(event.target.value);
-
-    const afterFilter = stateData.filter((item) => {
-      return item.value === selectedState;
-    });
-    const setSort =
-      afterFilter[0]?.label === undefined ? "ALL" : afterFilter[0]?.label;
-
-    console.log(setSort);
-
-    fetchDistrictData(setSort);
   };
 
   const handlePaginationChange = (
@@ -383,8 +373,8 @@ const District: React.FC = () => {
       <HeaderComponent
         userType={t("MASTER.DISTRICTS")}
         searchPlaceHolder={t("MASTER.SEARCHBAR_PLACEHOLDER_DISTRICT")}
-        states={stateData.map((state) => state.value)}
-        districts={districtData.map((district) => district.label)}
+        // states={stateData.map((state) => state.value)}
+        // districts={districtData.map((district) => district.label)}
         selectedState={selectedState}
         showStateDropdown={false}
         handleSortChange={handleSortChange}