From b0fc6546a4a0461611e8daac2f6dae31618f24e5 Mon Sep 17 00:00:00 2001 From: Hannah Chow Date: Thu, 7 Mar 2019 01:24:06 -0500 Subject: added source or destination document labelling --- src/client/views/nodes/LinkBox.scss | 2 +- src/client/views/nodes/LinkBox.tsx | 9 +++++---- src/client/views/nodes/LinkMenu.tsx | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss index 3ae8ed666..00e5ebb3d 100644 --- a/src/client/views/nodes/LinkBox.scss +++ b/src/client/views/nodes/LinkBox.scss @@ -8,7 +8,7 @@ .info-container { width: 60%; - padding-top: 10px; + padding-top: 5px; padding-left: 5px; display: flex; flex-direction: column diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx index d493c55e7..ee281e2ee 100644 --- a/src/client/views/nodes/LinkBox.tsx +++ b/src/client/views/nodes/LinkBox.tsx @@ -12,7 +12,8 @@ import { ListField } from "../../../fields/ListField"; interface Props { linkDoc: Document; linkName: String; - // pairedDoc: Document; + pairedDoc: Document; + type: String; } @observer @@ -59,9 +60,9 @@ export class LinkBox extends React.Component {

{this.props.linkName}

- {/*
-

{this.props.pairedDoc.Title}

-
*/} +
+

{this.props.type}{this.props.pairedDoc.Title}

+
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx index d0909e266..c01e26b62 100644 --- a/src/client/views/nodes/LinkMenu.tsx +++ b/src/client/views/nodes/LinkMenu.tsx @@ -10,6 +10,7 @@ import { LinkBox } from "./LinkBox" import { Document } from "../../../fields/Document"; import { ListField } from "../../../fields/ListField"; import { TextField } from "../../../fields/TextField"; +import { FieldWaiting } from "../../../fields/Field"; interface Props { docView: DocumentView; @@ -30,12 +31,23 @@ export class LinkMenu extends React.Component { {linkTo.map(link => { let name = link.GetData(KeyStore.Title, TextField, new String); - return + let doc = link.GetT(KeyStore.LinkedToDocs, Document); + if (doc && doc != FieldWaiting) { + return + } else { + return
+ } + })} {linkFrom.map(link => { let name = link.GetData(KeyStore.Title, TextField, new String); - return + let doc = link.GetT(KeyStore.LinkedFromDocs, Document); + if (doc && doc != FieldWaiting) { + return + } else { + return
+ } })}
-- cgit v1.2.3-70-g09d2