Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into propsRefactor

4 files changed, 69 insertions, 59 deletions

diff --git a/src/client/views/collections/CollectionSchemaView.tsx b/src/client/views/collections/CollectionSchemaView.tsx
index 3817d5333..4604945d1 100644
--- a/src/client/views/collections/CollectionSchemaView.tsx
+++ b/src/client/views/collections/CollectionSchemaView.tsx
@@ -91,12 +91,10 @@ export class CollectionSchemaView extends CollectionViewBase {
         )
         let reference = React.createRef<HTMLDivElement>();
         let onItemDown = setupDrag(reference, () => props.Document, this.props.moveDocument);
-        let applyToDoc = (doc: Document, value: string) => {
-            let script = CompileScript(value, { this: doc }, true);
-            if (!script.compiled) {
-                return false;
-            }
-            let field = script();
+        let applyToDoc = (doc: Document, run: (args?: { [name: string]: any }) => any) => {
+            const res = run({ this: doc });
+            if (!res.success) return false;
+            const field = res.result;
             if (field instanceof Field) {
                 doc.Set(props.fieldKey, field);
                 return true;
@@ -122,11 +120,23 @@ export class CollectionSchemaView extends CollectionViewBase {
                         }
                         return field || "";
                     }}
-                    SetValue={(value: string) => applyToDoc(props.Document, value)}
+                    SetValue={(value: string) => {
+                        let script = CompileScript(value, { addReturn: true, params: { this: "Document" } });
+                        if (!script.compiled) {
+                            return false;
+                        }
+                        return applyToDoc(props.Document, script.run);
+                    }}
                     OnFillDown={(value: string) => {
+                        let script = CompileScript(value, { addReturn: true, params: { this: "Document" } });
+                        if (!script.compiled) {
+                            return;
+                        }
+                        const run = script.run;
+                        //TODO This should be able to be refactored to compile the script once
                         this.props.Document.GetTAsync<ListField<Document>>(this.props.fieldKey, ListField).then((val) => {
                             if (val) {
-                                val.Data.forEach(doc => applyToDoc(doc, value));
+                                val.Data.forEach(doc => applyToDoc(doc, run));
                             }
                         })
                     }}>
diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 5a14aa54d..f2affbf55 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -1,64 +1,62 @@
 @import "../global_variables";
-#body {
+
+.collectionTreeView-dropTarget {
+    border: 0px solid transparent;
+    border-radius: $border-radius;
+    box-sizing: border-box;
+    height: 100%;
     padding: 20px;
     padding-left: 10px;
     padding-right: 0px;
     background: $light-color-secondary;
     font-size: 13px;
     overflow: scroll;
-}
 
-ul {
-    list-style: none;
-    padding-left: 20px;
-}
+    ul {
+        list-style: none;
+        padding-left: 20px;
+    }
 
-li {
-    margin: 5px 0;
-}
+    li {
+        margin: 5px 0;
+    }
 
-.collection-child {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
+    .collection-child {
+        margin-top: 10px;
+        margin-bottom: 10px;
+    }
 
-.no-indent {
-    padding-left: 0;
-}
+    .no-indent {
+        padding-left: 0;
+    }
 
-.bullet {
-    width: 1.5em;
-    display: inline-block;
-    color: $intermediate-color;
-}
+    .bullet {
+        width: 1.5em;
+        display: inline-block;
+        color: $intermediate-color;
+    }
 
-.coll-title {
-    font-size: 24px;
-    margin-bottom: 20px;
-}
+    .coll-title {
+        font-size: 24px;
+        margin-bottom: 20px;
+    }
 
-.collectionTreeView-dropTarget {
-    border: 0px solid transparent;
-    border-radius: $border-radius;
-    box-sizing: border-box;
-    height: 100%;
-}
+    .docContainer {
+        display: inline-table;
+    }
 
-.docContainer {
-    display: inline-table;
-}
+    .docContainer:hover {
+        .delete-button {
+            display: inline;
+            width: auto;
+        }
+    }
 
-.docContainer:hover {
     .delete-button {
+        color: $intermediate-color;
+        float: right;
+        margin-left: 15px;
+        margin-top: 3px;
         display: inline;
-        width: auto;
     }
-}
-
-.delete-button {
-    color: $intermediate-color;
-    float: right;
-    margin-left: 15px;
-    margin-top: 3px;
-    display: inline;
 }
\ No newline at end of file
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 32d74164d..dce35868e 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -14,12 +14,14 @@ import { CollectionView } from "./CollectionView";
 import { CollectionViewBase } from "./CollectionViewBase";
 import React = require("react")
 import { COLLECTION_BORDER_WIDTH } from './CollectionBaseView';
+import { props } from 'bluebird';
 
 
 export interface TreeViewProps {
     document: Document;
     deleteDoc: (doc: Document) => void;
     moveDocument: DragManager.MoveFunction;
+    copyOnDrag: boolean;
 }
 
 export enum BulletType {
@@ -75,7 +77,7 @@ class TreeView extends React.Component<TreeViewProps> {
      */
     renderTitle() {
         let reference = React.createRef<HTMLDivElement>();
-        let onItemDown = setupDrag(reference, () => this.props.document, this.props.moveDocument);
+        let onItemDown = setupDrag(reference, () => this.props.document, this.props.moveDocument, this.props.copyOnDrag);
         let editableView = (titleString: string) =>
             (<EditableView
                 display={"inline"}
@@ -97,14 +99,13 @@ class TreeView extends React.Component<TreeViewProps> {
     render() {
         let bulletType = BulletType.List;
         let childElements: JSX.Element | undefined = undefined;
-
         var children = this.props.document.GetT<ListField<Document>>(KeyStore.Data, ListField);
         if (children && children !== FieldWaiting) { // add children for a collection
             if (!this._collapsed) {
                 bulletType = BulletType.Collapsible;
                 childElements = <ul>
-                    {children.Data.map(value => <TreeView key={value.Id} document={value} deleteDoc={this.remove} moveDocument={this.move} />)}
-                </ul>
+                    {children.Data.map(value => <TreeView key={value.Id} document={value} deleteDoc={this.remove} moveDocument={this.move} copyOnDrag={this.props.copyOnDrag} />)}
+                </ul >
             }
             else bulletType = BulletType.Collapsed;
         }
@@ -130,10 +131,11 @@ export class CollectionTreeView extends CollectionViewBase {
     }
 
     render() {
-        var children = this.props.Document.GetT<ListField<Document>>(KeyStore.Data, ListField);
+        let children = this.props.Document.GetT<ListField<Document>>(KeyStore.Data, ListField);
+        let copyOnDrag = this.props.Document.GetBoolean(KeyStore.CopyDraggedItems, false);
         let childrenElement = !children || children === FieldWaiting ? (null) :
             (children.Data.map(value =>
-                <TreeView document={value} key={value.Id} deleteDoc={this.remove} moveDocument={this.props.moveDocument} />)
+                <TreeView document={value} key={value.Id} deleteDoc={this.remove} moveDocument={this.props.moveDocument} copyOnDrag={copyOnDrag} />)
             )
 
         return (
diff --git a/src/client/views/collections/CollectionViewBase.tsx b/src/client/views/collections/CollectionViewBase.tsx
index 446b1c240..84d378e1c 100644
--- a/src/client/views/collections/CollectionViewBase.tsx
+++ b/src/client/views/collections/CollectionViewBase.tsx
@@ -70,7 +70,7 @@ export class CollectionViewBase extends React.Component<SubCollectionViewProps>
     @action
     protected drop(e: Event, de: DragManager.DropEvent): boolean {
         if (de.data instanceof DragManager.DocumentDragData) {
-            if (de.data.aliasOnDrop) {
+            if (de.data.aliasOnDrop || de.data.copyOnDrop) {
                 [KeyStore.Width, KeyStore.Height, KeyStore.CurPage].map(key =>
                     de.data.draggedDocuments.map((draggedDocument: Document, i: number) =>
                         draggedDocument.GetTAsync(key, NumberField, (f: Opt<NumberField>) => f ? de.data.droppedDocuments[i].SetNumber(key, f.Data) : null)));