Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into anika_schema_view

5 files changed, 28 insertions, 25 deletions

diff --git a/src/client/views/nodes/KeyValueBox.tsx b/src/client/views/nodes/KeyValueBox.tsx
index d375466c9..b732f5f83 100644
--- a/src/client/views/nodes/KeyValueBox.tsx
+++ b/src/client/views/nodes/KeyValueBox.tsx
@@ -169,8 +169,8 @@ export class KeyValueBox extends React.Component<FieldViewProps> {
 
     getTemplate = async () => {
         const parent = Docs.Create.StackingDocument([], { _width: 800, _height: 800, title: "Template" });
-        parent.singleColumn = false;
-        parent.columnWidth = 100;
+        parent._columnsStack = false;
+        parent._columnWidth = 100;
         for (const row of this.rows.filter(row => row.isChecked)) {
             await this.createTemplateField(parent, row);
             row.uncheck();
diff --git a/src/client/views/nodes/PDFBox.scss b/src/client/views/nodes/PDFBox.scss
index f55c4f7d6..c6a83b662 100644
--- a/src/client/views/nodes/PDFBox.scss
+++ b/src/client/views/nodes/PDFBox.scss
@@ -199,7 +199,7 @@
 }
 
 .pdfBox {
-    .pdfViewer-text {
+    .pdfViewerDash-text {
         .textLayer {
             span {
                 user-select: none;
@@ -210,7 +210,7 @@
 
 .pdfBox-interactive {
     pointer-events: all;
-    .pdfViewer-text {
+    .pdfViewerDash-text {
         .textLayer {
             span {
                 user-select: text;
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!");
         }
     }
 
diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx
index 8c16f4a1a..8718bf329 100644
--- a/src/client/views/nodes/formattedText/DashFieldView.tsx
+++ b/src/client/views/nodes/formattedText/DashFieldView.tsx
@@ -184,9 +184,9 @@ export class DashFieldViewInternal extends React.Component<IDashFieldViewInterna
         if (container) {
             const alias = Doc.MakeAlias(container.props.Document);
             alias.viewType = CollectionViewType.Time;
-            let list = Cast(alias.schemaColumns, listSpec(SchemaHeaderField));
+            let list = Cast(alias._columnHeaders, listSpec(SchemaHeaderField));
             if (!list) {
-                alias.schemaColumns = list = new List<SchemaHeaderField>();
+                alias._columnHeaders = list = new List<SchemaHeaderField>();
             }
             list.map(c => c.heading).indexOf(this._fieldKey) === -1 && list.push(new SchemaHeaderField(this._fieldKey, "#f1efeb"));
             list.map(c => c.heading).indexOf("text") === -1 && list.push(new SchemaHeaderField("text", "#f1efeb"));
diff --git a/src/client/views/nodes/formattedText/RichTextRules.ts b/src/client/views/nodes/formattedText/RichTextRules.ts
index ba3230801..6a85e3b7c 100644
--- a/src/client/views/nodes/formattedText/RichTextRules.ts
+++ b/src/client/views/nodes/formattedText/RichTextRules.ts
@@ -275,7 +275,7 @@ export class RichTextRules {
                     if (!fieldKey) {
                         if (docid) {
                             DocServer.GetRefField(docid).then(docx => {
-                                const target = ((docx instanceof Doc) && docx) || Docs.Create.FreeformDocument([], { title: docid, _width: 500, _height: 500, _LODdisable: true, }, docid);
+                                const target = ((docx instanceof Doc) && docx) || Docs.Create.FreeformDocument([], { title: docid, _width: 500, _height: 500, }, docid);
                                 DocUtils.Publish(target, docid, returnFalse, returnFalse);
                                 DocUtils.MakeLink({ doc: this.Document }, { doc: target }, "portal to");
                             });
@@ -305,7 +305,7 @@ export class RichTextRules {
                     if (!fieldKey && !docid) return state.tr;
                     docid && DocServer.GetRefField(docid).then(docx => {
                         if (!(docx instanceof Doc && docx)) {
-                            const docx = Docs.Create.FreeformDocument([], { title: docid, _width: 500, _height: 500, _LODdisable: true }, docid);
+                            const docx = Docs.Create.FreeformDocument([], { title: docid, _width: 500, _height: 500 }, docid);
                             DocUtils.Publish(docx, docid, returnFalse, returnFalse);
                         }
                     });