fix(funding): Set data sort on budget desc by default

Author: annelhote

client/src/boards/financements-par-aap/pages/structures/components/projects-data/datatable.tsx

@@ -12,29 +12,16 @@ export default function DataTable({ aggregations, columns, dataTable, filters, n
 
   const getSortableIcon = (column) => {
     if (column.isSortable) {
-      const id = column?.sortableField ?? column.id;
-      if ((id === sorting?.id) && (sorting?.order === 'asc')) return (
-        <button
-          className="button-action border p-1 rounded"
-          onClick={() => handleSort(column)}
-        >
-          <i className="ri-sort-asc" />
-        </button>
-      )
-      if ((id === sorting?.id) && (sorting?.order === 'desc')) return (
-        <button
-          className="button-action border p-1 rounded"
-          onClick={() => handleSort(column)}
-        >
-          <i className="ri-sort-desc" />
-        </button>
-      )
-      else return (
+      const id = column?.sortableField ?? column.id
+      let icon = <i className="ri-arrow-up-down-fill" />
+      if ((id === sorting?.id) && (sorting?.order === 'asc')) icon = <i className="ri-sort-asc" />
+      if ((id === sorting?.id) && (sorting?.order === 'desc')) icon = <i className="ri-sort-desc" />
+      return (
         <button
           className="button-action border p-1 rounded"
           onClick={() => handleSort(column)}
         >
-          <i className="ri-subtract-line" />
+          {icon}
         </button>
       )
     }

client/src/boards/financements-par-aap/pages/structures/components/projects-data/index.tsx

@@ -1,6 +1,6 @@
 import { Button, Col, Row, Text, Title } from "@dataesr/dsfr-plus";
 import { useQuery } from "@tanstack/react-query";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 
 import DefaultSkeleton from "../../../../../../components/charts-skeletons/default.tsx";
@@ -49,7 +49,7 @@ export default function ProjectsData() {
 
   const [filters, setFilters] = useState<Filter[]>([])
   const [pagination, setPagination] = useState({ from: 0, size: 10 })
-  const [sorting, setSorting] = useState<Sort>();
+  const [sorting, setSorting] = useState<Sort>({ id: 'project_budgetFinanced', order: 'desc' });
 
   const body = {
     ...getEsQuery({ structures: [structure], yearMax, yearMin }),

client/src/boards/financements-par-aap/utils.ts

@@ -46,7 +46,6 @@ const getEsQuery = ({ regions, structures, yearMax = years[years.length - 1], ye
           { range: { project_year: { gte: yearMin, lte: yearMax } } },
           { term: { participant_isFrench: true } },
           { term: { participant_status: "active" } },
-          { term: { "participant_kind.keyword": "Secteur public" } },
           { terms: { "project_type.keyword": funders } },
           { bool: { must_not: { terms: { "participant_typologie_1.keyword": typologiesExcluded } } } },
         ],
@@ -58,6 +57,7 @@ const getEsQuery = ({ regions, structures, yearMax = years[years.length - 1], ye
     query.query.bool.filter.push({ term: { participant_is_main_parent: 1 } });
     query.query.bool.filter.push({ term: { participant_type: "institution" } });
     query.query.bool.filter.push({ terms: { "participant_id.keyword": structuresNotNull } });
+    query.query.bool.filter.push({ term: { "participant_kind.keyword": "Secteur public" } });
   };
   const regionsNotNull = regions?.filter((region) => region !== null);
   if (regionsNotNull?.length ?? 0 > 0) {