fix transferttype + wallet history

2025-05-02 15:02:16 +07:00
parent c596f1b600
commit eb2a1b35b4
4 changed files with 56 additions and 67 deletions
--- a/src/pages/members/feedback-member/blocks/EditDialog.tsx
+++ b/src/pages/members/feedback-member/blocks/EditDialog.tsx
@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { Dialog, DialogContent } from '@/components/ui/dialog';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import {
  Select,
  SelectContent,
@ -59,16 +59,12 @@ const EditDialog = () => {
      if (response?.status) {
        toast.success('Feedback reviewed successfully');

-        // Close the edit dialog
        handleEditDialog(false, null);

-        // First close the detail dialog to reset its state
        handleDetailDialog(false, null);

-        // Refresh the main data grid first
        refreshData();

-        // Wait a tiny bit then reopen the detail with refreshed data
        setTimeout(() => {
          handleDetailDialog(true, selectedFeedback);
        }, 300);
@ -97,7 +93,6 @@ const EditDialog = () => {
      }

      const data = response.data;
-      // console.log('Fetched data:', data);

      setReviewNotes(data.review_notes || '');

@ -112,7 +107,11 @@ const EditDialog = () => {

  return (
    <Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}>
-      <DialogContent className="p-0 w-full sm:max-w-2xl bg-white rounded-lg overflow-hidden">
+      <DialogContent className="p-0 w-full sm:max-w-2xl bg-white rounded-lg overflow-hidden [&>button]:hidden">
+        <DialogHeader>
+          <DialogTitle></DialogTitle>
+          <DialogDescription></DialogDescription>
+        </DialogHeader>
        <div className="relative">
          <div className="p-6 flex items-center justify-between border-b">
            <div>
--- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
@ -46,8 +46,6 @@ const typeLabelMap: Record<string, string> = {
  IC: 'Income Merchant'
 };

-// Import section remains the same...
-
 const ListToolbar = () => {
  const { table, reload } = useDataGrid();
  const { handleAddDialog } = useManageTransferTypeContext();
@ -97,32 +95,25 @@ const ListToolbar = () => {
  }, []);

  const handleClearFilter = () => {
-    // Reset state variables
    setSearchValue('');
    setStatusTypes('');
    setApproval('');

-    // Clear all column filters
    table.getColumn('name')?.setFilterValue('');
    table.getColumn('type')?.setFilterValue('');
    table.getColumn('status_approval')?.setFilterValue('');

-    // Force reset the Select components by using setTimeout
-    // This ensures the state updates are processed before resetting the UI
    setTimeout(() => {
-      // Reset to first page
      table.setPageIndex(0);
-      // Reload the data
      reload();
    }, 0);
  };

  return (
-    <div className="card-header flex-wrap gap-2 border-b-0 px-5">
-      <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
-        {/* Top bar */}
+    <div className="card-header flex-wrap border-b-0 px-5">
+      <div className="flex flex-wrap gap-1  w-full">
        <div className="flex justify-between w-full items-center mb-3">
-          <div className="flex w-[34%] gap-2 items-center">
+          <div className="flex w-[34%] gap-1 items-center">
            <label className="input input-sm w-full text-sm">
              <KeenIcon icon="magnifier" />
              <input
@ -153,9 +144,7 @@ const ListToolbar = () => {
          </div>
        </div>

-        {/* Filter bar */}
        <div className="flex flex-wrap gap-2 w-full">
-          {/* Type Filter */}
          <div className="min-w-[220px]">
            <Select
              key={`type-filter-${statusTypes}`}
@ -175,7 +164,6 @@ const ListToolbar = () => {
            </Select>
          </div>

-          {/* Approval Filter */}
          <div className="min-w-[220px]">
            <Select
              key={`approval-filter-${approval}`}
--- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
+++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
@ -325,7 +325,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
      order_direction: orderDirection,
      filter: JSON.stringify(filterObject)
    });
-    console.log(response);
+    // console.log(response);
    return { data: response?.data.list, totalCount: response?.data.total_count };
  };

--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
@ -19,6 +19,13 @@ interface WalletProps {
  name: string;
 }

+const getOneMonthsAgo = () => {
+  const today = new Date();
+  return new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
+};
+
+const formatDate = (date: Date): string => date.toISOString().split('T')[0];
+
 const ListToolbar = () => {
  const { table, reload } = useDataGrid();
  const { GetData } = useCallApi();
@ -32,12 +39,10 @@ const ListToolbar = () => {
  );
  const [wallets, setWallets] = useState<WalletProps[]>([]);

-  const formatDate = (date: Date): string => date.toISOString().split('T')[0];
-
  useEffect(() => {
    const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-    setDateRange({ from: formatDate(firstDayOfMonth), to: formatDate(today) });
+    const threeMonthsAgo = getOneMonthsAgo();
+    setDateRange({ from: formatDate(threeMonthsAgo), to: formatDate(today) });
  }, []);

  useEffect(() => {
@ -45,7 +50,6 @@ const ListToolbar = () => {
      table.getColumn('msisdn')?.setFilterValue(searchValue);
      table.setPageIndex(0);
    }, 200);
-
    return () => clearTimeout(timer);
  }, [searchValue, table]);

@ -89,35 +93,49 @@ const ListToolbar = () => {
  }, []);

  const handleClearAllFilters = () => {
+    const today = new Date();
+    const threeMonthsAgo = getOneMonthsAgo();
+    const resetDateRange = {
+      from: formatDate(threeMonthsAgo),
+      to: formatDate(today)
+    };
+
    setSearchValue('');
    setWalletId('');
+    setDateRange(resetDateRange);

-    const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-    setDateRange({
-      from: formatDate(firstDayOfMonth),
-      to: formatDate(today)
-    });
-
-    table.getAllColumns().forEach((column) => {
-      if (column.id !== 'CreatedAt') {
-        column.setFilterValue(undefined);
-      }
-    });
+    // table.getAllColumns().forEach((column) => {
+    //   if (column.id !== 'CreatedAt') {
+    //     column.setFilterValue(undefined);
+    //   }
+    // });

+    table.getColumn('CreatedAt')?.setFilterValue(resetDateRange);
    table.setPageIndex(0);
+  };

-    table.getColumn('CreatedAt')?.setFilterValue({
-      from: formatDate(firstDayOfMonth),
+  const handleRefresh = () => {
+    const today = new Date();
+    const threeMonthsAgo = getOneMonthsAgo();
+    const resetDateRange = {
+      from: formatDate(threeMonthsAgo),
      to: formatDate(today)
-    });
+    };
+
+    setSearchValue('');
+    setWalletId('');
+    setDateRange(resetDateRange);
+
+    table.setColumnFilters([{ id: 'CreatedAt', value: resetDateRange }]);
+    table.setPageIndex(0);
+    reload();
  };

  return (
    <div className="card-header flex-wrap gap-2 border-b-0 px-5">
      <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
        <div className="flex justify-between w-full items-center">
-          <div className="flex gap-3 items-center flex-wrap">
+          <div className="flex flex-wrap items-end gap-3 w-full">
            <label className="input input-sm w-[160px]">
              From
              <input
@ -146,14 +164,9 @@ const ListToolbar = () => {
              />
            </label>

-            <div className="w-[220px]">
-              <Select
-                value={walletId}
-                onValueChange={(value) => {
-                  setWalletId(value);
-                }}
-              >
-                <SelectTrigger>
+            <div className="w-[160px]">
+              <Select value={walletId} onValueChange={(value) => setWalletId(value)}>
+                <SelectTrigger className="h-[32px]">
                  <SelectValue placeholder="Select Wallet" />
                </SelectTrigger>
                <SelectContent>
@ -165,25 +178,14 @@ const ListToolbar = () => {
                </SelectContent>
              </Select>
            </div>
-
-            <Button variant="outline" size="sm" onClick={handleClearAllFilters}>
-              Clear Filter
-            </Button>
          </div>

          <div className="flex gap-3 items-center">
+            <Button variant="outline" size="sm" onClick={handleClearAllFilters}>
+              Clear
+            </Button>
            <DefaultTooltip title={'Refresh'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5"
-                onClick={() => {
-                  setSearchValue('');
-                  setWalletId('');
-                  table.setColumnFilters((prev) => prev.filter((f) => f.id === 'CreatedAt'));
-                  table.setPageIndex(0);
-                  reload();
-                }}
-              >
+              <Button variant="outline" className="h-7.5" onClick={handleRefresh}>
                <KeenIcon icon="arrows-circle" />
              </Button>
            </DefaultTooltip>