From 2b79008596351f6948d8de80c7887446d97b068c Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Fri, 15 May 2020 00:03:41 -0700
Subject: renamed new_fields to fields

---
 src/client/views/linking/LinkEditor.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/client/views/linking/LinkEditor.tsx')

diff --git a/src/client/views/linking/LinkEditor.tsx b/src/client/views/linking/LinkEditor.tsx
index b7f3dd995..5fb4cf3c6 100644
--- a/src/client/views/linking/LinkEditor.tsx
+++ b/src/client/views/linking/LinkEditor.tsx
@@ -3,8 +3,8 @@ import { faArrowLeft, faCog, faEllipsisV, faExchangeAlt, faPlus, faTable, faTime
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { action, observable } from "mobx";
 import { observer } from "mobx-react";
-import { Doc } from "../../../new_fields/Doc";
-import { StrCast } from "../../../new_fields/Types";
+import { Doc } from "../../../fields/Doc";
+import { StrCast } from "../../../fields/Types";
 import { Utils } from "../../../Utils";
 import { LinkManager } from "../../util/LinkManager";
 import './LinkEditor.scss';
-- 
cgit v1.2.3-70-g09d2


From 00e853b714f61104531cdfe224cfc688c53878a2 Mon Sep 17 00:00:00 2001
From: Stanley Yip <stanley_yip@brown.edu>
Date: Mon, 18 May 2020 14:36:57 -0700
Subject: Fixed stacking view column height and bug that caused cffv to mobx
 crash when following links

---
 .../views/collections/CollectionStackingView.scss  | 39 +++++++++++++++-------
 src/client/views/linking/LinkEditor.tsx            |  2 +-
 2 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'src/client/views/linking/LinkEditor.tsx')

diff --git a/src/client/views/collections/CollectionStackingView.scss b/src/client/views/collections/CollectionStackingView.scss
index 5eaf29316..ad595ec56 100644
--- a/src/client/views/collections/CollectionStackingView.scss
+++ b/src/client/views/collections/CollectionStackingView.scss
@@ -7,11 +7,13 @@
 .collectionStackingView {
     display: flex;
 }
+
 .collectionStackingMasonry-cont {
-    position:relative;
-    height:100%;
-    width:100%;
+    position: relative;
+    height: 100%;
+    width: 100%;
 }
+
 .collectionStackingView,
 .collectionMasonryView {
     height: 100%;
@@ -22,12 +24,14 @@
     overflow-x: hidden;
     flex-wrap: wrap;
     transition: top .5s;
+
     >div {
         position: relative;
         display: block;
     }
+
     .collectionStackingViewFieldColumn {
-        height:max-content;
+        height: 100%;
     }
 
     .collectionSchemaView-previewDoc {
@@ -129,27 +133,34 @@
             background: red;
         }
     }
+
     .collectionStackingView-miniHeader {
         width: 100%;
+
         .editableView-container-editing-oneLine {
             min-height: 20px;
             display: flex;
             align-items: center;
             flex-direction: row;
         }
-        span::before , span::after{
+
+        span::before,
+        span::after {
             content: "";
             width: 50%;
             border-top: dashed gray 1px;
             position: relative;
             display: inline-block;
         }
+
         span::before {
             margin-right: 10px;
         }
-        span::after{
+
+        span::after {
             margin-left: 10px;
         }
+
         span {
             position: relative;
             text-align: center;
@@ -157,10 +168,11 @@
             overflow: visible;
             width: 100%;
             display: flex;
-            color:gray;
+            color: gray;
             align-items: center;
         }
     }
+
     .collectionStackingView-sectionHeader {
         text-align: center;
         margin: auto;
@@ -277,7 +289,7 @@
                     height: 20px;
                     border-radius: 10px;
                     margin: 3px;
-                    width:max-content;
+                    width: max-content;
 
                     &.active {
                         color: red;
@@ -294,15 +306,18 @@
             display: none;
         }
     }
+
     .collectionStackingView-sectionHeader:hover {
         .collectionStackingView-sectionColor {
-            display:unset;
+            display: unset;
         }
+
         .collectionStackingView-sectionOptions {
-            display:unset;
+            display: unset;
         }
+
         .collectionStackingView-sectionDelete {
-            display:unset;
+            display: unset;
         }
     }
 
@@ -403,4 +418,4 @@
     .rc-switch-checked .rc-switch-inner {
         left: 8px;
     }
-}
+}
\ No newline at end of file
diff --git a/src/client/views/linking/LinkEditor.tsx b/src/client/views/linking/LinkEditor.tsx
index b7f3dd995..a7ce18820 100644
--- a/src/client/views/linking/LinkEditor.tsx
+++ b/src/client/views/linking/LinkEditor.tsx
@@ -298,7 +298,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
             <div className="linkEditor">
                 {this.props.hideback ? (null) : <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>}
                 <div className="linkEditor-info">
-                    <p className="linkEditor-linkedTo">editing link to: <b>{destination.proto!.title}</b></p>
+                    <p className="linkEditor-linkedTo">editing link to: <b>{destination.proto?.title ?? destination.title ?? "untitled"}</b></p>
                     <button className="linkEditor-button" onPointerDown={() => this.deleteLink()} title="Delete link"><FontAwesomeIcon icon="trash" size="sm" /></button>
                 </div>
                 {groups.length > 0 ? groups : <div className="linkEditor-group">There are currently no relationships associated with this link.</div>}
-- 
cgit v1.2.3-70-g09d2

