src/factory/admin/unit/damageReport.ts

@@ -25,12 +25,18 @@ export default abstract class DamageReportFactory {
         assigned: "vehicle",
         related: VehicleFactory.mapToSingle(record.vehicle),
       };
-    } else {
+    } else if (record?.wearableId) {
       assigned = {
         relatedId: record.wearableId,
         assigned: "wearable",
         related: WearableFactory.mapToSingle(record.wearable),
       };
+    } else {
+      assigned = {
+        relatedId: undefined,
+        assigned: undefined,
+        related: undefined,
+      };
     }
 
     return {
@@ -39,7 +45,9 @@ export default abstract class DamageReportFactory {
       status: record.status,
       done: record.done,
       description: record.description,
-      image: record.images,
+      location: record.location,
+      note: record.note,
+      images: record.images.filter((i) => !!i),
       reportedBy: record?.reportedBy,
       ...assigned,
       maintenance: record.maintenance ? MaintenanceFactory.mapToSingle(record.maintenance) : null,

src/viewmodel/admin/unit/damageReport.models.ts

@@ -26,7 +26,9 @@ export type DamageReportViewModel = {
   status: string;
   done: boolean;
   description: string;
-  image: string[];
+  location: string;
+  note: string;
+  images: string[];
   reportedBy: string;
   maintenance?: MaintenanceViewModel;
 } & DamageReportAssigned;