From 35cb61f0d93983464b29152f159d09ea6bd4edf9 Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Wed, 7 Aug 2019 21:37:14 -0400
Subject: Mostly have field level read only working

---
 src/client/DocServer.ts | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/client/DocServer.ts')

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 87a87be92..5af89cf49 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -1,6 +1,6 @@
 import * as OpenSocket from 'socket.io-client';
 import { MessageStore, Diff, YoutubeQueryTypes } from "./../server/Message";
-import { Opt } from '../new_fields/Doc';
+import { Opt, Doc } from '../new_fields/Doc';
 import { Utils, emptyFunction } from '../Utils';
 import { SerializationHelper } from './util/SerializationHelper';
 import { RefField } from '../new_fields/RefField';
@@ -26,6 +26,38 @@ export namespace DocServer {
     let GUID: string;
     // indicates whether or not a document is currently being udpated, and, if so, its id
 
+    export enum WriteMode {
+        Always = 0,
+        None = 1,
+        SameUser = 2,
+    }
+
+    const fieldWriteModes: { [field: string]: WriteMode } = {};
+    const docsWithUpdates: { [field: string]: Doc[] } = {};
+
+    export function setFieldWriteMode(field: string, writeMode: WriteMode) {
+        fieldWriteModes[field] = writeMode;
+        if (writeMode === WriteMode.Always) {
+            const docs = docsWithUpdates[field];
+            if (docs) {
+                docs.forEach(doc => Doc.RunCachedUpdate(doc, field));
+                delete docsWithUpdates[field];
+            }
+        }
+    }
+
+    export function getFieldWriteMode(field: string) {
+        return fieldWriteModes[field];
+    }
+
+    export function registerDocWithCachedUpdate(doc: Doc, field: string) {
+        let list = docsWithUpdates[field];
+        if (!list) {
+            list = docsWithUpdates[field] = [];
+        }
+        list.push(doc);
+    }
+
     export function init(protocol: string, hostname: string, port: number, identifier: string) {
         _cache = {};
         GUID = identifier;
-- 
cgit v1.2.3-70-g09d2


From 68f613b5e762649b743059e494e9307eb103ff0d Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Thu, 8 Aug 2019 16:15:22 -0400
Subject: Fixed per field write modes

---
 src/client/DocServer.ts       | 11 +++++++----
 src/client/views/MainView.tsx | 17 ++++++++---------
 src/new_fields/Doc.ts         | 12 ++++++++++--
 src/new_fields/util.ts        |  2 +-
 4 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'src/client/DocServer.ts')

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 5af89cf49..977eb7772 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -33,7 +33,7 @@ export namespace DocServer {
     }
 
     const fieldWriteModes: { [field: string]: WriteMode } = {};
-    const docsWithUpdates: { [field: string]: Doc[] } = {};
+    const docsWithUpdates: { [field: string]: Set<Doc> } = {};
 
     export function setFieldWriteMode(field: string, writeMode: WriteMode) {
         fieldWriteModes[field] = writeMode;
@@ -50,12 +50,15 @@ export namespace DocServer {
         return fieldWriteModes[field];
     }
 
-    export function registerDocWithCachedUpdate(doc: Doc, field: string) {
+    export function registerDocWithCachedUpdate(doc: Doc, field: string, oldValue: any) {
         let list = docsWithUpdates[field];
         if (!list) {
-            list = docsWithUpdates[field] = [];
+            list = docsWithUpdates[field] = new Set;
+        }
+        if (!list.has(doc)) {
+            Doc.AddCachedUpdate(doc, field, oldValue);
+            list.add(doc);
         }
-        list.push(doc);
     }
 
     export function init(protocol: string, hostname: string, port: number, identifier: string) {
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index ddb023aca..7629a0906 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -435,6 +435,7 @@ export class MainView extends React.Component {
     }
 
 
+    private mode: DocServer.WriteMode = DocServer.WriteMode.Always;
     @observable private _colorPickerDisplay = false;
     /* for the expandable add nodes menu. Not included with the miscbuttons because once it expands it expands the whole div with it, making canvas interactions limited. */
     nodesMenu() {
@@ -479,15 +480,13 @@ export class MainView extends React.Component {
                             </button>
                         </div></li>)}
                     <li key="undoTest"><button className="add-button round-button" title="Click if undo isn't working" onClick={() => UndoManager.TraceOpenBatches()}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
-                    <li key="test"><button className="add-button round-button" title="asdf" onClick={(() => {
-                        let state = DocServer.WriteMode.Always;
-                        return () => {
-                            state++;
-                            state = state % 3;
-                            DocServer.setFieldWriteMode("x", state);
-                            DocServer.setFieldWriteMode("y", state);
-                        };
-                    })()}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
+                    <li key="test"><button className="add-button round-button" title="asdf" onClick={() => {
+                        this.mode++;
+                        this.mode = this.mode % 3;
+                        console.log(DocServer.WriteMode[this.mode]);
+                        DocServer.setFieldWriteMode("x", this.mode);
+                        DocServer.setFieldWriteMode("y", this.mode);
+                    }}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
                     <li key="color"><button className="add-button round-button" title="Select Color" style={{ zIndex: 1000 }} onClick={() => this.toggleColorPicker()}><div className="toolbar-color-button" style={{ backgroundColor: InkingControl.Instance.selectedColor }} >
                         <div className="toolbar-color-picker" onClick={this.onColorClick} style={this._colorPickerDisplay ? { color: "black", display: "block" } : { color: "black", display: "none" }}>
                             <SketchPicker color={InkingControl.Instance.selectedColor} onChange={InkingControl.Instance.switchColor} />
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index ba01cfd9c..87e048140 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -148,7 +148,7 @@ export class Doc extends RefField {
         return "invalid";
     }
 
-    private [CachedUpdates]: { [key: string]: () => Promise<any> } = {};
+    private [CachedUpdates]: { [key: string]: () => void | Promise<any> } = {};
 
     public async [HandleUpdate](diff: any) {
         const set = diff.$set;
@@ -178,7 +178,7 @@ export class Doc extends RefField {
                     continue;
                 }
                 const fKey = key.substring(7);
-                const fn = async () => {
+                const fn = () => {
                     updatingFromServer = true;
                     delete this[fKey];
                     updatingFromServer = false;
@@ -211,6 +211,14 @@ export namespace Doc {
             delete doc[CachedUpdates][field];
         }
     }
+    export function AddCachedUpdate(doc: Doc, field: string, oldValue: any) {
+        const val = oldValue;
+        doc[CachedUpdates][field] = () => {
+            updatingFromServer = true;
+            doc[field] = val;
+            updatingFromServer = false;
+        };
+    }
     export function MakeReadOnly(): { end(): void } {
         makeReadOnly();
         return {
diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts
index 099fe2d0a..6c05da507 100644
--- a/src/new_fields/util.ts
+++ b/src/new_fields/util.ts
@@ -70,7 +70,7 @@ const _setterImpl = action(function (target: any, prop: string | symbol | number
         if (value === undefined) target[Update]({ '$unset': { ["fields." + prop]: "" } });
         else target[Update]({ '$set': { ["fields." + prop]: value instanceof ObjectField ? SerializationHelper.Serialize(value) : (value === undefined ? null : value) } });
     } else {
-        DocServer.registerDocWithCachedUpdate(receiver, prop as string);
+        DocServer.registerDocWithCachedUpdate(receiver, prop as string, curValue);
     }
     UndoManager.AddEvent({
         redo: () => receiver[prop] = value,
-- 
cgit v1.2.3-70-g09d2


From 4b358bfc1122f91b907305c15fc4214d7fc74a4c Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Fri, 9 Aug 2019 15:01:42 -0400
Subject: Compile errors and Fixed read only modes

---
 src/client/DocServer.ts                            | 11 ++++---
 src/client/views/MainView.tsx                      | 17 +++++-----
 .../views/collections/CollectionSchemaView.tsx     |  4 +--
 src/new_fields/Doc.ts                              | 35 +++++++++++---------
 src/new_fields/util.ts                             | 38 +++++++++++++---------
 5 files changed, 59 insertions(+), 46 deletions(-)

(limited to 'src/client/DocServer.ts')

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 977eb7772..bf5168c22 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -27,9 +27,10 @@ export namespace DocServer {
     // indicates whether or not a document is currently being udpated, and, if so, its id
 
     export enum WriteMode {
-        Always = 0,
-        None = 1,
-        SameUser = 2,
+        Default = 0, //Anything goes
+        Playground = 1,
+        LiveReadonly = 2,
+        LivePlayground = 3,
     }
 
     const fieldWriteModes: { [field: string]: WriteMode } = {};
@@ -37,7 +38,7 @@ export namespace DocServer {
 
     export function setFieldWriteMode(field: string, writeMode: WriteMode) {
         fieldWriteModes[field] = writeMode;
-        if (writeMode === WriteMode.Always) {
+        if (writeMode !== WriteMode.Playground) {
             const docs = docsWithUpdates[field];
             if (docs) {
                 docs.forEach(doc => Doc.RunCachedUpdate(doc, field));
@@ -47,7 +48,7 @@ export namespace DocServer {
     }
 
     export function getFieldWriteMode(field: string) {
-        return fieldWriteModes[field];
+        return fieldWriteModes[field] || WriteMode.Default;
     }
 
     export function registerDocWithCachedUpdate(doc: Doc, field: string, oldValue: any) {
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 7629a0906..eabb23489 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -435,7 +435,6 @@ export class MainView extends React.Component {
     }
 
 
-    private mode: DocServer.WriteMode = DocServer.WriteMode.Always;
     @observable private _colorPickerDisplay = false;
     /* for the expandable add nodes menu. Not included with the miscbuttons because once it expands it expands the whole div with it, making canvas interactions limited. */
     nodesMenu() {
@@ -463,6 +462,11 @@ export class MainView extends React.Component {
         ];
         if (!ClientUtils.RELEASE) btns.unshift([React.createRef<HTMLDivElement>(), "cat", "Add Cat Image", addImageNode]);
 
+        const setWriteMode = (mode: DocServer.WriteMode) => {
+            console.log(DocServer.WriteMode[mode]);
+            DocServer.setFieldWriteMode("x", mode);
+            DocServer.setFieldWriteMode("y", mode);
+        };
         return < div id="add-nodes-menu" style={{ left: this.flyoutWidth + 20, bottom: 20 }} >
             <input type="checkbox" id="add-menu-toggle" ref={this.addMenuToggle} />
             <label htmlFor="add-menu-toggle" style={{ marginTop: 2 }} title="Add Node"><p>+</p></label>
@@ -480,13 +484,10 @@ export class MainView extends React.Component {
                             </button>
                         </div></li>)}
                     <li key="undoTest"><button className="add-button round-button" title="Click if undo isn't working" onClick={() => UndoManager.TraceOpenBatches()}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
-                    <li key="test"><button className="add-button round-button" title="asdf" onClick={() => {
-                        this.mode++;
-                        this.mode = this.mode % 3;
-                        console.log(DocServer.WriteMode[this.mode]);
-                        DocServer.setFieldWriteMode("x", this.mode);
-                        DocServer.setFieldWriteMode("y", this.mode);
-                    }}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
+                    <li key="test"><button className="add-button round-button" title="Default" onClick={() => setWriteMode(DocServer.WriteMode.Default)}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
+                    <li key="test1"><button className="add-button round-button" title="Playground" onClick={() => setWriteMode(DocServer.WriteMode.Playground)}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
+                    <li key="test2"><button className="add-button round-button" title="Live Playground" onClick={() => setWriteMode(DocServer.WriteMode.LivePlayground)}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
+                    <li key="test3"><button className="add-button round-button" title="Live Readonly" onClick={() => setWriteMode(DocServer.WriteMode.LiveReadonly)}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li>
                     <li key="color"><button className="add-button round-button" title="Select Color" style={{ zIndex: 1000 }} onClick={() => this.toggleColorPicker()}><div className="toolbar-color-button" style={{ backgroundColor: InkingControl.Instance.selectedColor }} >
                         <div className="toolbar-color-picker" onClick={this.onColorClick} style={this._colorPickerDisplay ? { color: "black", display: "block" } : { color: "black", display: "none" }}>
                             <SketchPicker color={InkingControl.Instance.selectedColor} onChange={InkingControl.Instance.switchColor} />
diff --git a/src/client/views/collections/CollectionSchemaView.tsx b/src/client/views/collections/CollectionSchemaView.tsx
index ebfa737be..897796174 100644
--- a/src/client/views/collections/CollectionSchemaView.tsx
+++ b/src/client/views/collections/CollectionSchemaView.tsx
@@ -303,13 +303,13 @@ export class SchemaTable extends React.Component<SchemaTableProps> {
             return resized;
         }, [] as { "id": string, "value": number }[]);
     }
-    @computed get sorted(): { "id": string, "desc"?: true }[] {
+    @computed get sorted(): { id: string, desc: boolean }[] {
         return this.columns.reduce((sorted, shf) => {
             if (shf.desc) {
                 sorted.push({ "id": shf.heading, "desc": shf.desc });
             }
             return sorted;
-        }, [] as { "id": string, "desc"?: true }[]);
+        }, [] as { id: string, desc: boolean }[]);
     }
 
     @computed get borderWidth() { return Number(COLLECTION_BORDER_WIDTH); }
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index 87e048140..543ee46cc 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -13,6 +13,7 @@ import { List } from "./List";
 import { DocumentType } from "../client/documents/Documents";
 import { ComputedField, ScriptField } from "./ScriptField";
 import { PrefetchProxy, ProxyField } from "./Proxy";
+import { CurrentUserUtils } from "../server/authentication/models/current_user_utils";
 
 export namespace Field {
     export function toKeyValueString(doc: Doc, key: string): string {
@@ -68,6 +69,7 @@ export function DocListCast(field: FieldResult): Doc[] {
 
 export const WidthSym = Symbol("Width");
 export const HeightSym = Symbol("Height");
+export const UpdatingFromServer = Symbol("UpdatingFromServer");
 const CachedUpdates = Symbol("Cached updates");
 
 function fetchProto(doc: Doc) {
@@ -77,8 +79,6 @@ function fetchProto(doc: Doc) {
     }
 }
 
-let updatingFromServer = false;
-
 @scriptingGlobal
 @Deserializable("Doc", fetchProto).withFields(["id"])
 export class Doc extends RefField {
@@ -132,8 +132,10 @@ export class Doc extends RefField {
     //{ [key: string]: Field | FieldWaiting | undefined }
     private ___fields: any = {};
 
+    private [UpdatingFromServer]: boolean = false;
+
     private [Update] = (diff: any) => {
-        if (updatingFromServer) {
+        if (this[UpdatingFromServer]) {
             return;
         }
         DocServer.UpdateField(this[Id], diff);
@@ -152,6 +154,7 @@ export class Doc extends RefField {
 
     public async [HandleUpdate](diff: any) {
         const set = diff.$set;
+        const sameAuthor = this.author === CurrentUserUtils.email;
         if (set) {
             for (const key in set) {
                 if (!key.startsWith("fields.")) {
@@ -160,14 +163,15 @@ export class Doc extends RefField {
                 const fKey = key.substring(7);
                 const fn = async () => {
                     const value = await SerializationHelper.Deserialize(set[key]);
-                    updatingFromServer = true;
+                    this[UpdatingFromServer] = true;
                     this[fKey] = value;
-                    updatingFromServer = false;
+                    this[UpdatingFromServer] = false;
                 };
-                if (DocServer.getFieldWriteMode(fKey)) {
-                    this[CachedUpdates][fKey] = fn;
-                } else {
+                if (sameAuthor || DocServer.getFieldWriteMode(fKey) !== DocServer.WriteMode.Playground) {
+                    delete this[CachedUpdates][fKey];
                     await fn();
+                } else {
+                    this[CachedUpdates][fKey] = fn;
                 }
             }
         }
@@ -179,14 +183,15 @@ export class Doc extends RefField {
                 }
                 const fKey = key.substring(7);
                 const fn = () => {
-                    updatingFromServer = true;
+                    this[UpdatingFromServer] = true;
                     delete this[fKey];
-                    updatingFromServer = false;
+                    this[UpdatingFromServer] = false;
                 };
-                if (DocServer.getFieldWriteMode(fKey)) {
-                    this[CachedUpdates][fKey] = fn;
-                } else {
+                if (sameAuthor || DocServer.getFieldWriteMode(fKey) !== DocServer.WriteMode.Playground) {
+                    delete this[CachedUpdates][fKey];
                     await fn();
+                } else {
+                    this[CachedUpdates][fKey] = fn;
                 }
             }
         }
@@ -214,9 +219,9 @@ export namespace Doc {
     export function AddCachedUpdate(doc: Doc, field: string, oldValue: any) {
         const val = oldValue;
         doc[CachedUpdates][field] = () => {
-            updatingFromServer = true;
+            doc[UpdatingFromServer] = true;
             doc[field] = val;
-            updatingFromServer = false;
+            doc[UpdatingFromServer] = false;
         };
     }
     export function MakeReadOnly(): { end(): void } {
diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts
index 6c05da507..c546e2aac 100644
--- a/src/new_fields/util.ts
+++ b/src/new_fields/util.ts
@@ -1,5 +1,5 @@
 import { UndoManager } from "../client/util/UndoManager";
-import { Doc, Field, FieldResult } from "./Doc";
+import { Doc, Field, FieldResult, UpdatingFromServer } from "./Doc";
 import { SerializationHelper } from "../client/util/SerializationHelper";
 import { ProxyField } from "./Proxy";
 import { RefField } from "./RefField";
@@ -59,23 +59,29 @@ const _setterImpl = action(function (target: any, prop: string | symbol | number
         delete curValue[Parent];
         delete curValue[OnUpdate];
     }
-    if (value === undefined) {
-        delete target.__fields[prop];
-    } else {
-        target.__fields[prop] = value;
-    }
     const writeMode = DocServer.getFieldWriteMode(prop as string);
-    if (typeof value === "object" && !(value instanceof ObjectField)) debugger;
-    if (!writeMode || (writeMode === DocServer.WriteMode.SameUser && receiver.author === CurrentUserUtils.email)) {
-        if (value === undefined) target[Update]({ '$unset': { ["fields." + prop]: "" } });
-        else target[Update]({ '$set': { ["fields." + prop]: value instanceof ObjectField ? SerializationHelper.Serialize(value) : (value === undefined ? null : value) } });
-    } else {
-        DocServer.registerDocWithCachedUpdate(receiver, prop as string, curValue);
+    const fromServer = target[UpdatingFromServer];
+    const sameAuthor = fromServer || (receiver.author === CurrentUserUtils.email);
+    const writeToDoc = sameAuthor || (writeMode !== DocServer.WriteMode.LiveReadonly);
+    const writeToServer = sameAuthor || (writeMode === DocServer.WriteMode.Default);
+    if (writeToDoc) {
+        if (value === undefined) {
+            delete target.__fields[prop];
+        } else {
+            target.__fields[prop] = value;
+        }
+        if (typeof value === "object" && !(value instanceof ObjectField)) debugger;
+        if (writeToServer) {
+            if (value === undefined) target[Update]({ '$unset': { ["fields." + prop]: "" } });
+            else target[Update]({ '$set': { ["fields." + prop]: value instanceof ObjectField ? SerializationHelper.Serialize(value) : (value === undefined ? null : value) } });
+        } else {
+            DocServer.registerDocWithCachedUpdate(receiver, prop as string, curValue);
+        }
+        UndoManager.AddEvent({
+            redo: () => receiver[prop] = value,
+            undo: () => receiver[prop] = curValue
+        });
     }
-    UndoManager.AddEvent({
-        redo: () => receiver[prop] = value,
-        undo: () => receiver[prop] = curValue
-    });
     return true;
 });
 
-- 
cgit v1.2.3-70-g09d2