PR review fixes

Georiviere · Feb 6, 2025 · d2edb1e · d2edb1e
1 parent f00fcf3
commit d2edb1e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/src/api/customObservations.ts b/src/api/customObservations.ts
@@ -85,7 +85,7 @@ export async function getObservationDetails(
 ): Promise<ObservationDetails | null> {
   const schema = await fetchObservation(type);
   const detailsList = await fetchObservationDetails(type);
-  const values = detailsList?.find(detail => detail.id === parseInt(id));
+  const values = detailsList?.find(detail => detail.id === parseInt(id, 10));
 
   if (!values) return null;
 
@@ -98,23 +98,24 @@ export async function getObservationDetails(
         label: (schema?.json_schema_form.properties?.[key] as any)?.title,
       })),
     id,
-    contributedAt: values?.contributed_at,
+    contributedAt: values.contributed_at,
     label: schema?.label,
     description: schema?.description,
-    attachments: values?.attachments,
+    attachments: values.attachments,
   };
 
   return details;
 }
 
 export async function getObservation(id: string) {
   const observation = await fetchObservation(id);
+  if (!observation || !observation.json_schema_form) return null;
   return {
     ...observation,
     json_schema_form: {
-      ...observation?.json_schema_form,
+      ...observation.json_schema_form,
       properties: {
-        ...observation?.json_schema_form?.properties,
+        ...observation.json_schema_form.properties,
       },
     },
   };

diff --git a/src/api/stations.ts b/src/api/stations.ts
@@ -71,13 +71,12 @@ export async function getStations() {
 
 export async function getStation(id: number): Promise<Station | null> {
   const station = await fetchStation(id);
-  const observations = await fetchStationObservations(id);
-  if (station) {
-    return {
-      ...station,
-      observations,
-    };
-  } else {
+  if (!station) {
     return null;
   }
+  const observations = await fetchStationObservations(id);
+  return {
+    ...station,
+    observations,
+  };
 }
diff --git a/src/components/map/geometry-tooltip.tsx b/src/components/map/geometry-tooltip.tsx
@@ -18,12 +18,9 @@ export const GeometryTooltip = ({
   ) {
     return null;
   }
-  if (layer.type === undefined || !layer.url || !properties.id) {
-    return (
-      <Tooltip>
-        {properties.name ?? properties.category ?? properties.label}
-      </Tooltip>
-    );
+  const label = properties?.name || properties?.category || properties?.label;
+  if (label) {
+    return <Tooltip>{label}</Tooltip>;
   }
   return (
     <Tooltip

diff --git a/src/components/observation-cta.tsx b/src/components/observation-cta.tsx
@@ -42,7 +42,7 @@ export function ObservationCTA({ observations }: OversationsCTAProps) {
                     }?${params.toString()}`}
                     title={observation.label}
                   >
-                    {observation.description ?? ''}
+                    {observation.description}
                   </ListItem>
                 ))}
                 {observations?.length === 0 &&
@@ -84,9 +84,11 @@ const ListItem = React.forwardRef<
       >
         <span>
           <span className="text-sm font-medium leading-none">{title}</span>
-          <span className="line-clamp-2 block text-sm leading-snug text-muted-foreground">
-            {children}
-          </span>
+          {children && (
+            <span className="line-clamp-2 block text-sm leading-snug text-muted-foreground">
+              {children}
+            </span>
+          )}
         </span>
         <Icons.chevronRight className="shrink-0" />
       </Link>