feat(api): start using some generated types from openapi

alexandresoro · Jan 7, 2025 · c40a846 · c40a846
1 parent a52fcaa
commit c40a846
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/packages/frontend/src/features/search/SearchPage.tsx b/packages/frontend/src/features/search/SearchPage.tsx
@@ -1,7 +1,6 @@
 import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@headlessui/react";
 import usePaginationParams from "@hooks/usePaginationParams";
-import type { EntriesOrderBy } from "@ou-ca/common/api/entry";
-import type { SpeciesOrderBy } from "@ou-ca/common/api/species";
+import type { GetV1EntriesOrderBy, GetV1SearchSpeciesOrderBy } from "@ou-ca/api/models";
 import { useApiEntriesInfiniteQuery } from "@services/api/entry/api-entry-queries";
 import { useApiDownloadExport } from "@services/api/export/api-export-queries";
 import { useApiSearchInfiniteSpecies } from "@services/api/search/api-search-queries";
@@ -31,7 +30,7 @@ const SearchPage: FunctionComponent = () => {
     setOrderBy: setOrderByEntries,
     sortOrder: sortOrderEntries,
     setSortOrder: setSortOrderEntries,
-  } = usePaginationParams<EntriesOrderBy>({
+  } = usePaginationParams<GetV1EntriesOrderBy>({
     orderBy: "date",
     sortOrder: "desc",
   });
@@ -41,7 +40,7 @@ const SearchPage: FunctionComponent = () => {
     setOrderBy: setOrderBySpecies,
     sortOrder: sortOrderSpecies,
     setSortOrder: setSortOrderSpecies,
-  } = usePaginationParams<SpeciesOrderBy>({
+  } = usePaginationParams<GetV1SearchSpeciesOrderBy>({
     orderBy: "nbDonnees",
     sortOrder: "desc",
   });
@@ -70,13 +69,13 @@ const SearchPage: FunctionComponent = () => {
     ...searchCriteria,
   });
 
-  const handleRequestSortEntries = (sortingColumn: EntriesOrderBy) => {
+  const handleRequestSortEntries = (sortingColumn: GetV1EntriesOrderBy) => {
     const isAsc = orderByEntries === sortingColumn && sortOrderEntries === "asc";
     setSortOrderEntries(isAsc ? "desc" : "asc");
     setOrderByEntries(sortingColumn);
   };
 
-  const handleRequestSortSpecies = (sortingColumn: SpeciesOrderBy) => {
+  const handleRequestSortSpecies = (sortingColumn: GetV1SearchSpeciesOrderBy) => {
     const isAsc = orderBySpecies === sortingColumn && sortOrderSpecies === "asc";
     setSortOrderSpecies(isAsc ? "desc" : "asc");
     setOrderBySpecies(sortingColumn);

diff --git a/packages/frontend/src/features/search/search-entries-table/SearchEntriesTable.tsx b/packages/frontend/src/features/search/search-entries-table/SearchEntriesTable.tsx
@@ -1,9 +1,8 @@
 import InfiniteTable from "@components/base/table/InfiniteTable";
 import TableSortLabel from "@components/base/table/TableSortLabel";
 import { useNotifications } from "@hooks/useNotifications";
-import type { SortOrder } from "@ou-ca/common/api/common/entitiesSearchParams";
+import type { GetV1EntriesOrderBy, GetV1EntriesSortOrder, UpsertEntryInput } from "@ou-ca/api/models";
 import type { Entry } from "@ou-ca/common/api/entities/entry";
-import type { EntriesOrderBy, UpsertEntryInput } from "@ou-ca/common/api/entry";
 import { useApiEntryDelete, useApiEntryUpdate } from "@services/api/entry/api-entry-queries";
 import { type FunctionComponent, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -37,9 +36,9 @@ type SearchEntriesTableProps = {
   onEntryDeleted?: () => void;
   hasNextPage?: boolean;
   onMoreRequested?: () => void;
-  orderBy: EntriesOrderBy | undefined;
-  sortOrder: SortOrder;
-  handleRequestSort: (sortingColumn: EntriesOrderBy) => void;
+  orderBy: GetV1EntriesOrderBy | undefined;
+  sortOrder: GetV1EntriesSortOrder;
+  handleRequestSort: (sortingColumn: GetV1EntriesOrderBy) => void;
 };
 
 const SearchEntriesTable: FunctionComponent<SearchEntriesTableProps> = ({

diff --git a/packages/frontend/src/features/search/search-species-table/SearchSpeciesTable.tsx b/packages/frontend/src/features/search/search-species-table/SearchSpeciesTable.tsx
@@ -1,8 +1,6 @@
 import InfiniteTable from "@components/base/table/InfiniteTable";
 import TableSortLabel from "@components/base/table/TableSortLabel";
-import type { SortOrder } from "@ou-ca/common/api/common/entitiesSearchParams";
-import type { Species } from "@ou-ca/common/api/entities/species";
-import type { SpeciesOrderBy } from "@ou-ca/common/api/species";
+import type { GetV1SearchSpeciesOrderBy, GetV1SearchSpeciesSortOrder, Species } from "@ou-ca/api/models";
 import type { FunctionComponent } from "react";
 import { useTranslation } from "react-i18next";
 import SearchSpeciesTableRow from "./SearchSpeciesTableRow";
@@ -30,9 +28,9 @@ type SearchSpeciesTableProps = {
   species: Species[];
   hasNextPage?: boolean;
   onMoreRequested?: () => void;
-  orderBy: SpeciesOrderBy | undefined;
-  sortOrder: SortOrder;
-  handleRequestSort: (sortingColumn: SpeciesOrderBy) => void;
+  orderBy: GetV1SearchSpeciesOrderBy | undefined;
+  sortOrder: GetV1SearchSpeciesSortOrder;
+  handleRequestSort: (sortingColumn: GetV1SearchSpeciesOrderBy) => void;
 };
 
 const SearchSpeciesTable: FunctionComponent<SearchSpeciesTableProps> = ({

diff --git a/packages/frontend/src/features/search/search-species-table/SearchSpeciesTableRow.tsx b/packages/frontend/src/features/search/search-species-table/SearchSpeciesTableRow.tsx
@@ -1,4 +1,4 @@
-import type { Species } from "@ou-ca/common/api/entities/species";
+import type { Species } from "@ou-ca/api/models";
 import { useApiSpeciesInfoQuery } from "@services/api/species/api-species-queries";
 import { useAtomValue } from "jotai";
 import type { FunctionComponent } from "react";