From 72d19ec9c141eb471e30c81f4be29228dd9ba939 Mon Sep 17 00:00:00 2001
From: Maxime Bouveron <maxime.bouveron@gmail.com>
Date: Mon, 29 Apr 2024 18:33:53 +0200
Subject: [PATCH] PR review

---
 src/api/customObservations.ts                 | 21 +++++++++++--------
 src/api/postObservation.ts                    |  8 +------
 .../[locale]/map/observation/[path]/page.tsx  |  4 ++--
 ...n-form.tsx => custom-observation-form.tsx} |  4 ++--
 src/components/map.tsx                        |  3 +++
 src/components/observation.page.tsx           | 17 +++------------
 6 files changed, 23 insertions(+), 34 deletions(-)
 rename src/components/{new-observation-form.tsx => custom-observation-form.tsx} (98%)

diff --git a/src/api/customObservations.ts b/src/api/customObservations.ts
index 4496571..6cf9174 100644
--- a/src/api/customObservations.ts
+++ b/src/api/customObservations.ts
@@ -1,5 +1,7 @@
 import { JSONSchema } from 'json-schema-yup-transformer/dist/schema';
 
+import { Attachement } from './settings';
+
 export type Observation = {
   id: number;
   label: string;
@@ -9,20 +11,21 @@ export type Observation = {
 };
 
 export type ObservationDetails = {
-  value: number;
+  values: { id: string; value: any; label?: string }[];
   id: string;
-  label: string;
-  description: string;
-  customContributionTypes: number[];
-  geometry: {
+  contributedAt: string;
+  label?: string;
+  description?: string;
+  attachments?: Attachement[];
+  geometry?: {
     coordinates: number[];
   };
 };
 
-type ObservationList = {
+type ObservationListItem = {
   id: number;
   contributed_at: string;
-  attachments: any[];
+  attachments: Attachement[];
 };
 
 async function fetchObservations(): Promise<Observation[]> {
@@ -59,7 +62,7 @@ async function fetchObservation(id: string): Promise<Observation | null> {
 
 async function fetchObservationDetails(
   id: string,
-): Promise<ObservationList[] | null> {
+): Promise<ObservationListItem[] | null> {
   const res = await fetch(
     `${process.env.apiHost}/api/portal/fr/${process.env.portal}/custom-contribution-types/${id}/contributions`,
     {
@@ -78,7 +81,7 @@ async function fetchObservationDetails(
 export async function getObservationDetails(
   type: string,
   id: string,
-): Promise<any> {
+): Promise<ObservationDetails | null> {
   const schema = await fetchObservation(type);
   const detailsList = await fetchObservationDetails(type);
   const values = detailsList?.find(detail => detail.id === parseInt(id));
diff --git a/src/api/postObservation.ts b/src/api/postObservation.ts
index defcc49..0765d18 100644
--- a/src/api/postObservation.ts
+++ b/src/api/postObservation.ts
@@ -1,9 +1,3 @@
-export type PostObservationProps = {
-  geom?: string;
-  properties: string;
-  files?: string;
-};
-
 async function postObservation(
   props: { [key: string]: string | Blob },
   id: string,
@@ -53,7 +47,7 @@ async function postObservation(
 }
 
 export async function handleSubmitCustomObservation(
-  body: PostObservationProps,
+  body: { [key: string]: string | Blob },
   id: string,
   formData: FormData,
 ) {
diff --git a/src/app/[locale]/map/observation/[path]/page.tsx b/src/app/[locale]/map/observation/[path]/page.tsx
index 9ff6f7f..3d445c3 100644
--- a/src/app/[locale]/map/observation/[path]/page.tsx
+++ b/src/app/[locale]/map/observation/[path]/page.tsx
@@ -9,7 +9,7 @@ import { JSONSchema } from 'json-schema-yup-transformer/dist/schema';
 import { getTranslations } from 'next-intl/server';
 
 import ButtonClose from '@/components/button-close';
-import NewObservationForm from '@/components/new-observation-form';
+import CustomObservationForm from '@/components/custom-observation-form';
 import ObservationForm from '@/components/observation-form';
 
 type Props = {
@@ -60,7 +60,7 @@ export default async function ObservationPage({ params: { path } }: Props) {
           handleSubmit={handleSubmitObservation}
         />
       ) : (
-        <NewObservationForm
+        <CustomObservationForm
           id={observation.id}
           schema={jsonSchema}
           stations={observation.stations}
diff --git a/src/components/new-observation-form.tsx b/src/components/custom-observation-form.tsx
similarity index 98%
rename from src/components/new-observation-form.tsx
rename to src/components/custom-observation-form.tsx
index 9be3f31..e091490 100644
--- a/src/components/new-observation-form.tsx
+++ b/src/components/custom-observation-form.tsx
@@ -20,7 +20,7 @@ import { useTranslations } from 'next-intl';
 import { Icons, propsForSVGPresentation } from './icons';
 import { Button } from './ui/button';
 
-const NewObservationForm = ({
+const CustomObservationForm = ({
   schema,
   id,
   stations,
@@ -194,4 +194,4 @@ const NewObservationForm = ({
   );
 };
 
-export default NewObservationForm;
+export default CustomObservationForm;
diff --git a/src/components/map.tsx b/src/components/map.tsx
index c8e5c2f..ed1fa32 100644
--- a/src/components/map.tsx
+++ b/src/components/map.tsx
@@ -45,11 +45,14 @@ export default function SearchMap() {
       const obs = await getObservation(id);
       if (obs?.stations?.length === 0) setHasObservationMarker(true);
     };
+
     if (pathName.startsWith('/map/observation')) {
       const observationType = pathName.match(
         /\/map\/observation\/([^?/]+)/,
       )?.[1];
+
       if (!observationType) return;
+
       if (DEFAULT_OBSERVATION_TYPES.includes(observationType)) {
         setHasObservationMarker(true);
       } else {
diff --git a/src/components/observation.page.tsx b/src/components/observation.page.tsx
index 21aac69..0aabcae 100644
--- a/src/components/observation.page.tsx
+++ b/src/components/observation.page.tsx
@@ -1,4 +1,4 @@
-import { Attachement } from '@/api/settings';
+import { ObservationDetails } from '@/api/customObservations';
 import { LatLngTuple } from 'leaflet';
 import { useTranslations } from 'next-intl';
 
@@ -9,18 +9,7 @@ import ButtonClose from './button-close';
 import Carousel from './carousel';
 
 type Props = {
-  content: {
-    values: any[];
-    contributedAt: string;
-    id: string;
-    label: string;
-    description: string;
-    customContributionTypes: number[];
-    geometry: {
-      coordinates: number[];
-    };
-    attachments: Attachement[];
-  };
+  content: ObservationDetails;
 };
 
 export default function ObservationDetailsPageUI({ content }: Props) {
@@ -30,7 +19,7 @@ export default function ObservationDetailsPageUI({ content }: Props) {
 
   return (
     <article>
-      {content?.attachments?.length > 0 && (
+      {content.attachments && content.attachments?.length > 0 && (
         <div className="-m-8 mb-6">
           <Carousel
             className="w-full"