Handle null extensions

opencrvs · Jan 2, 2025 · 6fdda76 · 6fdda76
1 parent d27be1d
commit 6fdda76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/commons/src/fhir/extension.ts b/packages/commons/src/fhir/extension.ts
@@ -258,6 +258,6 @@ export function findExtension<URL extends AllExtensions['url']>(
 ): Extract<AllExtensions, { url: URL }> | undefined {
   return listOfExtensions.find(
     (extension): extension is Extract<AllExtensions, { url: URL }> =>
-      extension.url === url
+      extension && extension.url === url
   )
 }
diff --git a/packages/search/src/features/fhir/fhir-utils.ts b/packages/search/src/features/fhir/fhir-utils.ts
@@ -37,7 +37,7 @@ export function findTaskExtension<
   Task extends TaskHistory | SavedTask
 >(task: Task, extensionUrl: T) {
   return task.extension.find(
-    (ext): ext is KnownExtensionType[T] => ext.url === extensionUrl
+    (ext): ext is KnownExtensionType[T] => ext && ext.url === extensionUrl
   )
 }