merge conflicts resolved

1 files changed, 20 insertions, 17 deletions

diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx
index 6b1c9fcde..eb2a85eeb 100644
--- a/src/client/views/nodes/PDFBox.tsx
+++ b/src/client/views/nodes/PDFBox.tsx
@@ -55,25 +55,28 @@ export class PDFBox extends ViewBoxAnnotatableComponent<FieldViewProps, PdfDocum
 
         const backup = "oldPath";
         const { Document } = this.props;
-        const { url: { href } } = Cast(this.dataDoc[this.props.fieldKey], PdfField)!;
-        const pathCorrectionTest = /upload\_[a-z0-9]{32}.(.*)/g;
-        const matches = pathCorrectionTest.exec(href);
-        console.log("\nHere's the { url } being fed into the outer regex:");
-        console.log(href);
-        console.log("And here's the 'properPath' build from the captured filename:\n");
-        if (matches !== null && href.startsWith(window.location.origin)) {
-            const properPath = Utils.prepend(`/files/pdfs/${matches[0]}`);
-            console.log(properPath);
-            if (!properPath.includes(href)) {
-                console.log(`The two (url and proper path) were not equal`);
-                const proto = Doc.GetProto(Document);
-                proto[this.props.fieldKey] = new PdfField(properPath);
-                proto[backup] = href;
+        const pdf = Cast(this.dataDoc[this.props.fieldKey], PdfField);
+        const href = pdf?.url?.href;
+        if (href) {
+            const pathCorrectionTest = /upload\_[a-z0-9]{32}.(.*)/g;
+            const matches = pathCorrectionTest.exec(href);
+            console.log("\nHere's the { url } being fed into the outer regex:");
+            console.log(href);
+            console.log("And here's the 'properPath' build from the captured filename:\n");
+            if (matches !== null && href.startsWith(window.location.origin)) {
+                const properPath = Utils.prepend(`/files/pdfs/${matches[0]}`);
+                console.log(properPath);
+                if (!properPath.includes(href)) {
+                    console.log(`The two (url and proper path) were not equal`);
+                    const proto = Doc.GetProto(Document);
+                    proto[this.props.fieldKey] = new PdfField(properPath);
+                    proto[backup] = href;
+                } else {
+                    console.log(`The two (url and proper path) were equal`);
+                }
             } else {
-                console.log(`The two (url and proper path) were equal`);
+                console.log("Outer matches was null!");
             }
-        } else {
-            console.log("Outer matches was null!");
         }
     }