Dont show default observation types when custom ones exist

Georiviere · Apr 29, 2024 · fe4a4fe · fe4a4fe
1 parent f6fe2f1
commit fe4a4fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/app/[locale]/map/observation/[path]/page.tsx b/src/app/[locale]/map/observation/[path]/page.tsx
@@ -26,13 +26,14 @@ export default async function ObservationPage({ params: { path } }: Props) {
   const isDefaultObservation = DEFAULT_OBSERVATION_TYPES.includes(path);
 
   if (isDefaultObservation) {
+    observation = {};
     jsonSchema = (await getObservationJsonSchema(path)) as JSONSchema;
   } else {
     observation = await getObservation(path);
     jsonSchema = observation?.json_schema_form as JSONSchema;
   }
 
-  if (!observation) {
+  if (!isDefaultObservation && !observation) {
     return null;
   }
 

diff --git a/src/components/observation-cta.tsx b/src/components/observation-cta.tsx
@@ -44,14 +44,15 @@ export function ObservationCTA() {
                     {observation.description ?? ''}
                   </ListItem>
                 ))}
-                {DEFAULT_OBSERVATION_TYPES.map(observation => (
-                  <ListItem
-                    href={`/map/observation/${observation}?${params.toString()}`}
-                    title={t(`${observation}.label`)}
-                  >
-                    {t(`${observation}.shortDescription`)}
-                  </ListItem>
-                ))}
+                {observations?.length === 0 &&
+                  DEFAULT_OBSERVATION_TYPES.map(observation => (
+                    <ListItem
+                      href={`/map/observation/${observation}?${params.toString()}`}
+                      title={t(`${observation}.label`)}
+                    >
+                      {t(`${observation}.shortDescription`)}
+                    </ListItem>
+                  ))}
               </ul>
             </NavigationMenuContent>
           </NavigationMenuItem>