fix sorting (#161)

Author: idormenco

client/request.http

@@ -136,7 +136,6 @@ export const columns: ColumnDef<NgoVM>[] = [
     enableSorting: true,
     filterFn: (row, id, value) => {
       const rowValue = row.getValue<string | undefined>(id);
-      if (!rowValue) return true;
       if (!Array.isArray(value) || value.length !== 2) return true; // fallback if invalid
 
       if (!rowValue) return false;

client/src/pages/admin/NgosList/components/columns.tsx

@@ -6,16 +6,13 @@ import { Link } from "@tanstack/react-router";
 import { type ColumnDef } from "@tanstack/react-table";
 import type { MenteeVM } from "../types";
 import type { FinalProgramModel } from "@/services/api/types";
+import { format } from "date-fns";
 
 export const columns: ColumnDef<MenteeVM>[] = [
   {
     accessorKey: "name",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="Nume ONG"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="Nume ONG" />
     ),
     cell: ({ row }) => {
       return (
@@ -26,35 +23,27 @@ export const columns: ColumnDef<MenteeVM>[] = [
         </div>
       );
     },
-    enableSorting: false,
+    enableSorting: true,
   },
   {
     accessorKey: "ongIdentificationNumber",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="CIF"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="CIF" />
     ),
     cell: ({ row }) => <div>{row.original.ongIdentificationNumber ?? "-"}</div>,
     enableSorting: false,
   },
   {
     accessorKey: "createdAt",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="DATĂ ÎNREGISTRARE"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="DATĂ ÎNREGISTRARE" />
     ),
     cell: ({ row }) => {
       return formatDate(row.original.createdAt);
     },
-    enableSorting: false,
+    enableSorting: true,
     filterFn: (row, id, value) => {
-      const rowValue = row.getValue<string>(id);
+      const rowValue = format(row.getValue<string>(id), "yyyy-MM-dd");
 
       if (!Array.isArray(value) || value.length !== 2) return true; // fallback if invalid
 
@@ -65,15 +54,10 @@ export const columns: ColumnDef<MenteeVM>[] = [
   {
     accessorKey: "ngoPrograms",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="PROGRAME ASOCIATE"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="PROGRAME ASOCIATE" />
     ),
     cell: ({ row }) => (
       <div className="flex flex-wrap gap-2">
-        1222
         {row.original.ngoPrograms?.map(({ id, name, endDate }) => (
           <Badge
             key={id}
@@ -101,35 +85,23 @@ export const columns: ColumnDef<MenteeVM>[] = [
   {
     accessorKey: "county",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="JUDEȚ"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="JUDEȚ" />
     ),
     cell: ({ row }) => <span>{row.original.county}</span>,
-    enableSorting: false,
+    enableSorting: true,
   },
   {
     accessorKey: "city",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="LOCALITATE"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="LOCALITATE" />
     ),
     cell: ({ row }) => <span>{row.original.city}</span>,
-    enableSorting: false,
+    enableSorting: true,
   },
   {
     accessorKey: "domains",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="DOMENIU DE ACTIVITATE"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="DOMENIU DE ACTIVITATE" />
     ),
     cell: ({ row }) => {
       return row.original.domains?.length ? (
@@ -151,25 +123,25 @@ export const columns: ColumnDef<MenteeVM>[] = [
   {
     accessorKey: "lastEvaluationDate",
     header: ({ column }) => (
-      <DataTableColumnHeader
-        column={column}
-        title="ULTIMA EVALUARE"
-        className="whitespace-nowrap py-4 text-sm font-bold text-gray-900 "
-      />
+      <DataTableColumnHeader column={column} title="ULTIMA EVALUARE" />
     ),
     cell: ({ row }) => {
       return row.original.lastEvaluationDate
         ? formatDate(row.original.lastEvaluationDate)
         : "-";
     },
-    enableSorting: false,
+    enableSorting: true,
     filterFn: (row, id, value) => {
-      const rowValue = row.getValue<string>(id);
-
+      const rowValue = row.getValue<string | undefined>(id);
       if (!Array.isArray(value) || value.length !== 2) return true; // fallback if invalid
 
+      if (!rowValue) return false;
+
       const [min, max] = value;
-      return rowValue >= min && rowValue <= max;
+      return (
+        format(rowValue, "yyyy-MM-dd") >= min &&
+        format(rowValue, "yyyy-MM-dd") <= max
+      );
     },
   },
   {

client/src/pages/mentor/MenteesList/components/columns.tsx

@@ -31,7 +31,10 @@ const menteeMapper = (mentees: FinalDetailedUserModel[]): MenteeVM[] =>
       county: ngo.county,
       city: ngo.city,
       domains: ngo?.domains?.map((d) => d.name) ?? [],
-      lastEvaluationDate: ngo.reports?.at(-1)?.createdAt,
+      lastEvaluationDate:
+        ngo.reports && ngo.reports.length > 0
+          ? ngo.reports[ngo.reports.length - 1].createdAt
+          : undefined,
     })
   );
 export function MenteesTable() {

client/src/pages/mentor/MenteesList/components/table.tsx

@@ -122,6 +122,7 @@ export function MenteesDataTableToolbar({
           title={"Localitate"}
           options={availableCities}
           multiple={false}
+          disabled={!county}
         />
         {isFiltered && (
           <Button