From 929512da59d8678ac37c7ac9d0f6c2c9fa968d50 Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Fri, 10 Apr 2020 14:08:22 -0400 Subject: rearranged button/script field keys to -rawscript, - --- src/client/views/nodes/LabelBox.tsx | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/client/views/nodes/LabelBox.tsx') diff --git a/src/client/views/nodes/LabelBox.tsx b/src/client/views/nodes/LabelBox.tsx index b9701f923..9b063e2aa 100644 --- a/src/client/views/nodes/LabelBox.tsx +++ b/src/client/views/nodes/LabelBox.tsx @@ -1,21 +1,20 @@ import { library } from '@fortawesome/fontawesome-svg-core'; import { faEdit } from '@fortawesome/free-regular-svg-icons'; -import { action, computed } from 'mobx'; +import { action } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import { Doc, DocListCast } from '../../../new_fields/Doc'; +import { documentSchema } from '../../../new_fields/documentSchemas'; import { List } from '../../../new_fields/List'; -import { createSchema, makeInterface, listSpec } from '../../../new_fields/Schema'; -import { ScriptField } from '../../../new_fields/ScriptField'; -import { BoolCast, StrCast, Cast, FieldValue, NumCast } from '../../../new_fields/Types'; +import { createSchema, listSpec, makeInterface } from '../../../new_fields/Schema'; +import { Cast, NumCast, StrCast } from '../../../new_fields/Types'; import { DragManager } from '../../util/DragManager'; import { undoBatch } from '../../util/UndoManager'; +import { ContextMenu } from '../ContextMenu'; +import { ContextMenuProps } from '../ContextMenuItem'; import { ViewBoxBaseComponent } from '../DocComponent'; -import './LabelBox.scss'; import { FieldView, FieldViewProps } from './FieldView'; -import { ContextMenuProps } from '../ContextMenuItem'; -import { ContextMenu } from '../ContextMenu'; -import { documentSchema } from '../../../new_fields/documentSchemas'; +import './LabelBox.scss'; library.add(faEdit as any); @@ -41,7 +40,7 @@ export class LabelBox extends ViewBoxBaseComponent { - const params = Cast(this.dataDoc[this.fieldKey + "-params"], listSpec("string"), []); + const params = Cast(this.dataDoc[this.fieldKey + "-paramFieldKeys"], listSpec("string"), []); params?.map(p => this.dataDoc[p] = undefined); }, icon: "trash" }); @@ -53,7 +52,7 @@ export class LabelBox extends ViewBoxBaseComponent { const docDragData = de.complete.docDragData; - const params = Cast(this.dataDoc[this.fieldKey + "-params"], listSpec("string"), []); + const params = Cast(this.dataDoc[this.fieldKey + "-paramFieldKeys"], listSpec("string"), []); const missingParams = params?.filter(p => this.dataDoc[p] === undefined); if (docDragData && missingParams?.includes((e.target as any).textContent)) { this.dataDoc[(e.target as any).textContent] = new List(docDragData.droppedDocuments.map((d, i) => @@ -63,7 +62,7 @@ export class LabelBox extends ViewBoxBaseComponent m + ":").join(" ") + ")") render() { - const params = Cast(this.dataDoc[this.fieldKey + "-params"], listSpec("string"), []); + const params = Cast(this.dataDoc[this.fieldKey + "-paramFieldKeys"], listSpec("string"), []); const missingParams = params?.filter(p => this.dataDoc[p] === undefined); params?.map(p => DocListCast(this.dataDoc[p])); // bcz: really hacky form of prefetching ... return ( @@ -80,7 +79,7 @@ export class LabelBox extends ViewBoxBaseComponent -
+
{!missingParams?.length ? (null) : missingParams.map(m =>
{m}
)}
-- cgit v1.2.3-70-g09d2