fixes for git-like to work with sidebar. added 'lastModified' field for changes to x/y/width/height

4 files changed, 38 insertions, 14 deletions

diff --git a/src/client/documents/Gitlike.ts b/src/client/documents/Gitlike.ts
index fddf317bc..575c984f5 100644
--- a/src/client/documents/Gitlike.ts
+++ b/src/client/documents/Gitlike.ts
@@ -1,7 +1,8 @@
-import { Doc, DocListCast, DocListCastAsync } from "../../fields/Doc";
+import { Doc, DocListCast, DocListCastAsync, Field } from "../../fields/Doc";
 import { List } from "../../fields/List";
-import { ObjectField } from "../../fields/ObjectField";
 import { Cast, DateCast } from "../../fields/Types";
+import { DateField } from "../../fields/DateField";
+import { Id } from "../../fields/FieldSymbols";
 
 // synchs matching documents on the two branches that are being merged/pulled
 // currently this just synchs the main 'fieldKey' component of the data since 
@@ -10,11 +11,22 @@ function GitlikeSynchDocs(bd: Doc, md: Doc) {
     const fieldKey = Doc.LayoutFieldKey(md);
     const bdate = DateCast(bd[`${fieldKey}-lastModified`])?.date;
     const mdate = DateCast(md[`${fieldKey}-lastModified`])?.date;
-    if (bdate === mdate || bdate > mdate) return;
     const bdproto = bd && Doc.GetProto(bd);
+    if (bdate !== mdate && bdate <= mdate) {
+        if (bdproto && md) {
+            bdproto[fieldKey] = Field.Copy(md[fieldKey]);
+            bdproto[`${fieldKey}-lastModified`] = new DateField();
+        }
+    }
+    const bldate = DateCast(bd._lastModified)?.date;
+    const mldate = DateCast(md._lastModified)?.date;
+    if (bldate === mldate || bldate > mldate) return;
     if (bdproto && md) {
-        bdproto[fieldKey] = ObjectField.MakeCopy(md[fieldKey] as ObjectField);
-        bdproto[`${fieldKey}-lastModified`] = ObjectField.MakeCopy(md[`${fieldKey}-lastModified`] as ObjectField);
+        bd.x = Field.Copy(md.x);
+        bd.y = Field.Copy(md.y);
+        bd.width = Field.Copy(md.width);
+        bd.height = Field.Copy(md.height);
+        bdproto._lastModified = new DateField();
     }
 }
 
@@ -36,8 +48,9 @@ async function GitlikePullFromMaster(branch: Doc, suffix = "") {
         const bd = branchMainDocs?.find(bd => (Cast(bd.branchOf, Doc, null) || bd) === md);
         bd && GitlikeSynchDocs(bd, md);
     });
+    const cloneMap = new Map<string, Doc>(); cloneMap.set(masterMain[Id], branch);
     // make branch clones of them, then add them to the branch
-    const newlyBranchedDocs = await Promise.all(newDocsFromMaster?.map(async md => (await Doc.MakeClone(md, false, true)).clone) || []);
+    const newlyBranchedDocs = await Promise.all(newDocsFromMaster?.map(async md => (await Doc.MakeClone(md, false, true, cloneMap)).clone) || []);
     newlyBranchedDocs.forEach(nd => {
         Doc.AddDocToList(branch, Doc.LayoutFieldKey(branch) + suffix, nd);
         nd.context = branch;
@@ -56,22 +69,26 @@ async function GitlikeMergeWithMaster(master: Doc, suffix = "") {
     branches?.map(async branch => {
         const branchChildren = await DocListCastAsync(branch[Doc.LayoutFieldKey(branch) + suffix]);
         branchChildren && await Promise.all(branchChildren.map(async bd => {
+            const cloneMap = new Map<string, Doc>(); cloneMap.set(master[Id], branch);
             // see if the branch's child exists on master.  
-            const masterChild = Cast(bd.branchOf, Doc, null) || (await Doc.MakeClone(bd, false, true)).clone;
+            const masterChild = Cast(bd.branchOf, Doc, null) || (await Doc.MakeClone(bd, false, true, cloneMap)).clone;
             // if the branch's child didn't exist on master, we make a branch clone of the child to add to master.  
             // however, since master is supposed to have the "main" clone, and branches, the "branch" clones, we have to reverse the fields
             // on the branch child and master clone.
             if (masterChild.branchOf) {
                 const branchDocProto = Doc.GetProto(bd);
                 const masterChildProto = Doc.GetProto(masterChild);
-                masterChildProto.branchOf = undefined; // the master child should not be a branch of the branch child, so unset 'branchOf'
+                const branchTitle = bd.title;
+                branchDocProto.title = masterChildProto.title;
+                masterChildProto.title = branchTitle;
+                masterChildProto.branchOf = masterChild.branchOf = undefined; // the master child should not be a branch of the branch child, so unset 'branchOf'
                 masterChildProto.branches = new List<Doc>([bd]); // the master child's branches needs to include the branch child
                 Doc.RemoveDocFromList(branchDocProto, "branches", masterChildProto);   // the branch child should not have the master child in its branch list.
                 branchDocProto.branchOf = masterChild;                                 // the branch child is now a branch of the master child
             }
             Doc.AddDocToList(master, Doc.LayoutFieldKey(master) + suffix, masterChild); // add the masterChild to master (if it's already there, this is a no-op)
             masterChild.context = master;
-            GitlikeSynchDocs(Doc.GetProto(masterChild), bd);
+            GitlikeSynchDocs(masterChild, bd);//Doc.GetProto(masterChild), bd);
         }));
         const masterChildren = await DocListCastAsync(master[Doc.LayoutFieldKey(master) + suffix]);
         masterChildren?.forEach(mc => {                      // see if any master children
@@ -93,6 +110,7 @@ export async function BranchTask(target: Doc, action: "pull" | "merge") {
     const func = action === "pull" ? GitlikePullFromMaster : GitlikeMergeWithMaster;
     await func(target, "");
     await DocListCast(target[Doc.LayoutFieldKey(target)]).forEach(async targetChild => func(targetChild, "-annotations"));
+    await DocListCast(target[Doc.LayoutFieldKey(target)]).forEach(async targetChild => func(targetChild, "-sidebar"));
 }
 
 export async function BranchCreate(target: Doc) {
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index d24ab974c..118d2e7c7 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -27,6 +27,7 @@ import { LightboxView } from './LightboxView';
 import { DocumentView } from "./nodes/DocumentView";
 import React = require("react");
 import { FormattedTextBox } from './nodes/formattedText/FormattedTextBox';
+import { DateField } from '../../fields/DateField';
 
 @observer
 export class DocumentDecorations extends React.Component<{ boundsLeft: number, boundsTop: number }, { value: string }> {
@@ -367,6 +368,7 @@ export class DocumentDecorations extends React.Component<{ boundsLeft: number, b
                     dW && (doc._width = actualdW);
                     dH && (doc._autoHeight = false);
                 }
+                doc._lastModified = new DateField();
             }
             const val = this._dragHeights.get(docView.layoutDoc);
             if (val) this._dragHeights.set(docView.layoutDoc, { start: val.start, lowest: Math.min(val.lowest, NumCast(docView.layoutDoc._height)) });
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index ba6222605..fa7e75202 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -49,6 +49,7 @@ import "./CollectionFreeFormView.scss";
 import { MarqueeView } from "./MarqueeView";
 import React = require("react");
 import { DocumentType } from "../../../documents/DocumentTypes";
+import { DateField } from "../../../../fields/DateField";
 
 export const panZoomSchema = createSchema({
     _panX: "number",
@@ -257,6 +258,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
                 d.x = x + NumCast(d.x) - dropPos[0];
                 d.y = y + NumCast(d.y) - dropPos[1];
             }
+            d._lastModified = new DateField();
             const nd = [Doc.NativeWidth(layoutDoc), Doc.NativeHeight(layoutDoc)];
             layoutDoc._width = NumCast(layoutDoc._width, 300);
             layoutDoc._height = NumCast(layoutDoc._height, nd[0] && nd[1] ? nd[1] / nd[0] * NumCast(layoutDoc._width) : 300);
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 85ea3cfa9..1eeadeedc 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -55,6 +55,9 @@ export namespace Field {
             || (field instanceof RefField)
             || (includeUndefined && field === undefined);
     }
+    export function Copy(field: any) {
+        return field instanceof ObjectField ? ObjectField.MakeCopy(field) : field;
+    }
 }
 export type Field = number | string | boolean | ObjectField | RefField;
 export type Opt<T> = T | undefined;
@@ -537,7 +540,7 @@ export namespace Doc {
             const cfield = ComputedField.WithoutComputed(() => FieldValue(doc[key]));
             const field = ProxyField.WithoutProxy(() => doc[key]);
             const copyObjectField = async (field: ObjectField) => {
-                const list = Cast(doc[key], listSpec(Doc));
+                const list = await Cast(doc[key], listSpec(Doc));
                 const docs = list && (await DocListCastAsync(list))?.filter(d => d instanceof Doc);
                 if (docs !== undefined && docs.length) {
                     const clones = await Promise.all(docs.map(async d => Doc.makeClone(d, cloneMap, linkMap, rtfs, exclusions, dontCreate, asBranch)));
@@ -589,11 +592,10 @@ export namespace Doc {
         }
         return copy;
     }
-    export async function MakeClone(doc: Doc, dontCreate: boolean = false, asBranch = false) {
-        const cloneMap = new Map<string, Doc>();
+    export async function MakeClone(doc: Doc, dontCreate: boolean = false, asBranch = false, cloneMap: Map<string, Doc> = new Map()) {
         const linkMap = new Map<Doc, Doc>();
         const rtfMap: { copy: Doc, key: string, field: RichTextField }[] = [];
-        const copy = await Doc.makeClone(doc, cloneMap, linkMap, rtfMap, ["context", "annotationOn", "cloneOf", "branches", "branchOf"], dontCreate, asBranch);
+        const copy = await Doc.makeClone(doc, cloneMap, linkMap, rtfMap, ["cloneOf", "branches", "branchOf"], dontCreate, asBranch);
         Array.from(linkMap.entries()).map((links: Doc[]) => LinkManager.Instance.addLink(links[1], true));
         rtfMap.map(({ copy, key, field }) => {
             const replacer = (match: any, attr: string, id: string, offset: any, string: any) => {
@@ -1385,7 +1387,7 @@ Scripting.addGlobal(function getAlias(doc: any) { return Doc.MakeAlias(doc); });
 Scripting.addGlobal(function getCopy(doc: any, copyProto: any) { return doc.isTemplateDoc ? Doc.ApplyTemplate(doc) : Doc.MakeCopy(doc, copyProto); });
 Scripting.addGlobal(function copyDragFactory(dragFactory: Doc) { return Doc.copyDragFactory(dragFactory); });
 Scripting.addGlobal(function delegateDragFactory(dragFactory: Doc) { return Doc.delegateDragFactory(dragFactory); });
-Scripting.addGlobal(function copyField(field: any) { return field instanceof ObjectField ? ObjectField.MakeCopy(field) : field; });
+Scripting.addGlobal(function copyField(field: any) { return Field.Copy(field); });
 Scripting.addGlobal(function docList(field: any) { return DocListCast(field); });
 Scripting.addGlobal(function setInPlace(doc: any, field: any, value: any) { return Doc.SetInPlace(doc, field, value, false); });
 Scripting.addGlobal(function sameDocs(doc1: any, doc2: any) { return Doc.AreProtosEqual(doc1, doc2); });