Added attachement find

ConductionNL · Sep 29, 2023 · a5981dc · a5981dc
1 parent fe66f11
commit a5981dc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/pwa/src/services/getNameFromBijlageArray.ts b/pwa/src/services/getNameFromBijlageArray.ts
@@ -0,0 +1,8 @@
+export const getNameFromBijlageArray = (url: string, array: any[]) => {
+  if (!array) return;
+  const bijlage = array.find((option) => {
+    return option.URL_Bijlage === url;
+  });
+
+  return bijlage?.Titel_Bijlage;
+};
diff --git a/pwa/src/services/getPDFName.ts b/pwa/src/services/getPDFName.ts
@@ -1,4 +1,6 @@
 export const getPDFName = (url: string) => {
+  if (!url) return;
+
   const finalSlashIndex = url.lastIndexOf("/");
   const pdfName = url.substring(finalSlashIndex + 1);
   return pdfName;

diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
@@ -26,7 +26,7 @@ export const CardsResultsTemplate: React.FC<CardsResultsTemplateProps> = ({ requ
                 {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : "N.v.t."}
               </CardHeaderDate>
               <CardHeaderTitle className={styles.title}>
-                <Heading2>{request.Titel !== "" ? request.Titel : "Geen titel beschikbaar"}</Heading2>
+                <Heading2>{request.Titel !== ("" || null) ? request.Titel : "Geen titel beschikbaar"}</Heading2>
               </CardHeaderTitle>
             </CardHeader>
 

diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx
@@ -22,6 +22,7 @@ import { useOpenWoo } from "../../hooks/openWoo";
 import Skeleton from "react-loading-skeleton";
 import { getPDFName } from "../../services/getPDFName";
 import { isUUID } from "../../services/isUUID";
+import { getNameFromBijlageArray } from "../../services/getNameFromBijlageArray";
 
 interface WOOItemDetailTemplateProps {
   wooItemId: string;
@@ -133,7 +134,10 @@ export const WOOItemDetailTemplate: React.FC<WOOItemDetailTemplateProps> = ({ wo
                     <TableCell>{t("Bijlage informatieverzoek")}</TableCell>
                     <TableCell>
                       <Link href={getItems.data.URL_informatieverzoek} target="blank">
-                        {getPDFName(getItems.data.URL_informatieverzoek)}
+                        {getNameFromBijlageArray(
+                          getItems.data.URL_informatieverzoek,
+                          getItems.data?.embedded?.Bijlagen,
+                        ) ?? getPDFName(getItems.data.URL_informatieverzoek)}
                       </Link>
                     </TableCell>
                   </TableRow>
@@ -144,7 +148,10 @@ export const WOOItemDetailTemplate: React.FC<WOOItemDetailTemplateProps> = ({ wo
                     <TableCell>{t("Bijlage inventarisatielijst")}</TableCell>
                     <TableCell>
                       <Link href={getItems.data.URL_inventarisatielijst} target="blank">
-                        {getPDFName(getItems.data.URL_inventarisatielijst)}
+                        {getNameFromBijlageArray(
+                          getItems.data.URL_inventarisatielijst,
+                          getItems.data?.embedded?.Bijlagen,
+                        ) ?? getPDFName(getItems.data.URL_inventarisatielijst)}
                       </Link>
                     </TableCell>
                   </TableRow>
@@ -155,7 +162,8 @@ export const WOOItemDetailTemplate: React.FC<WOOItemDetailTemplateProps> = ({ wo
                     <TableCell>{t("Bijlage besluit")}</TableCell>
                     <TableCell>
                       <Link href={getItems.data.URL_besluit} target="blank">
-                        {getPDFName(getItems.data.URL_besluit)}
+                        {getNameFromBijlageArray(getItems.data.URL_besluit, getItems.data?.embedded?.Bijlagen) ??
+                          getPDFName(getItems.data.URL_besluit)}
                       </Link>
                     </TableCell>
                   </TableRow>