Merge branch 'dev' into main

gustavotoyota · gustavotoyota · commit fb5d0cdeae97 · 2023-08-10T14:35:23.000-04:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,5 +7,6 @@
   "eslint.validate": ["javascript", "typescript"],
   "typescript.tsdk": "node_modules/typescript/lib",
   "vue.features.codeActions.enable": false,
-  "java.configuration.updateBuildConfiguration": "interactive"
+  "java.configuration.updateBuildConfiguration": "interactive",
+  "testing.automaticallyOpenPeekView": "never"
 }
diff --git a/apps/client/package.json b/apps/client/package.json
@@ -82,6 +82,7 @@
     "qrcode": "1.5.1",
     "quasar": "npm:@deepnotes/quasar@2.12.0",
     "serialize-javascript": "6.0.0",
+    "showdown": "^2.1.0",
     "superjson": "npm:@deepnotes/superjson@1.12.4",
     "turndown": "^7.1.2",
     "unilogr": "0.0.27",
@@ -108,6 +109,7 @@
     "@types/marked": "4.0.8",
     "@types/node-fetch": "^2.6.3",
     "@types/qrcode": "1.5.0",
+    "@types/showdown": "^2.0.1",
     "@types/turndown": "^5.0.1",
     "@types/zxcvbn": "4.4.1",
     "@vue/devtools": "6.4.5",
diff --git a/apps/client/src/code/pages/page/arrows/arrow-creation.ts b/apps/client/src/code/pages/page/arrows/arrow-creation.ts
@@ -10,6 +10,7 @@ import {
 
 import { ISerialArrow } from '../../serialization';
 import { makeSlim } from '../../slim';
+import { roundTimeToMinutes } from '../notes/date';
 import type { PageNote } from '../notes/note';
 import type { Page } from '../page';
 import type { IArrowCollabInput, PageArrow } from './arrow';
@@ -126,6 +127,9 @@ export class PageArrowCreation {
       this.fakeArrow.react.collab.label,
     );
 
+    newCollab.createdAt = roundTimeToMinutes(Date.now());
+    newCollab.editedAt = null;
+
     // Insert arrow into document
 
     const arrowId = nanoid();
diff --git a/apps/client/src/code/pages/page/arrows/arrow.ts b/apps/client/src/code/pages/page/arrows/arrow.ts
@@ -59,6 +59,9 @@ export const IArrowCollab = once(() =>
     color: z.string().default('grey'),
 
     readOnly: z.boolean().default(false),
+
+    createdAt: z.number().nullable().default(null),
+    editedAt: z.number().nullable().default(null),
   }),
 );
 export type IArrowCollabInput = z.input<ReturnType<typeof IArrowCollab>>;
diff --git a/apps/client/src/code/pages/page/notes/date.ts b/apps/client/src/code/pages/page/notes/date.ts
@@ -0,0 +1,8 @@
+import { roundToMultiple } from 'src/code/utils/math';
+
+export function roundTimeToMinutes(value: number): number {
+  return roundToMultiple(value, {
+    base: 60 * 1000,
+    roundFunc: Math.floor,
+  });
+}
diff --git a/apps/client/src/code/pages/page/notes/dragging.ts b/apps/client/src/code/pages/page/notes/dragging.ts
@@ -4,6 +4,7 @@ import { refProp, watchUntilTrue } from '@stdlib/vue';
 import type { UnwrapRef } from 'vue';
 
 import type { Page } from '../page';
+import { roundTimeToMinutes } from './date';
 
 export interface IDraggingReact {
   active: boolean;
@@ -19,6 +20,9 @@ export class NoteDragging {
 
   react: UnwrapRef<IDraggingReact>;
 
+  initialRegionId?: string;
+  finalRegionId?: string;
+
   private _cancelPointerEvents?: () => void;
 
   constructor(input: { page: Page }) {
@@ -67,6 +71,9 @@ export class NoteDragging {
   private _dragStart = async (event: PointerEvent) => {
     this.react.active = true;
 
+    this.initialRegionId = this.page.activeRegion.react.value.id;
+    this.finalRegionId = this.page.id;
+
     // Update note dragging states
 
     for (const selectedNote of this.page.selection.react.notes) {
@@ -204,6 +211,18 @@ export class NoteDragging {
   }
 
   private _dragFinish = () => {
+    if (this.react.active && this.finalRegionId !== this.initialRegionId) {
+      const date = roundTimeToMinutes(Date.now());
+
+      this.page.collab.doc.transact(() => {
+        for (const selectedNote of this.page.selection.react.notes) {
+          if (date !== this.page.collab.store.notes[selectedNote.id]?.movedAt) {
+            this.page.collab.store.notes[selectedNote.id].movedAt = date;
+          }
+        }
+      });
+    }
+
     this.react.active = false;
 
     for (const selectedNote of this.page.selection.react.notes) {
diff --git a/apps/client/src/code/pages/page/notes/dropping.ts b/apps/client/src/code/pages/page/notes/dropping.ts
@@ -1,6 +1,7 @@
 import { Vec2 } from '@stdlib/misc';
 
 import type { Page } from '../page';
+import { roundTimeToMinutes } from './date';
 import type { PageNote } from './note';
 
 export class NoteDropping {
@@ -11,20 +12,28 @@ export class NoteDropping {
   }
 
   async perform(parentNote: PageNote, dropIndex?: number) {
+    this.page.dragging.finalRegionId = parentNote.id;
+
     this.page.collab.doc.transact(() => {
       const containerWorldPos = parentNote.getContainerWorldRect()?.topLeft;
 
       if (containerWorldPos == null) {
         return;
       }
 
+      const date = roundTimeToMinutes(Date.now());
+
       for (const selectedNote of this.page.selection.react.notes) {
         const newPos = new Vec2(selectedNote.react.collab.pos).sub(
           containerWorldPos,
         );
 
         selectedNote.react.collab.pos.x = newPos.x;
         selectedNote.react.collab.pos.y = newPos.y;
+
+        if (date !== this.page.collab.store.notes[selectedNote.id]?.movedAt) {
+          this.page.collab.store.notes[selectedNote.id].movedAt = date;
+        }
       }
     });
 
diff --git a/apps/client/src/code/pages/page/notes/note-collab.ts b/apps/client/src/code/pages/page/notes/note-collab.ts
@@ -83,6 +83,10 @@ export const INoteCollab = once(() =>
         .default({}),
 
       zIndex: z.number().default(-1),
+
+      createdAt: z.number().nullable().default(null),
+      editedAt: z.number().nullable().default(null),
+      movedAt: z.number().nullable().default(null),
     }),
   ),
 );
diff --git a/apps/client/src/code/pages/page/notes/note.ts b/apps/client/src/code/pages/page/notes/note.ts
@@ -202,10 +202,14 @@ export class PageNote extends PageElem() implements IPageRegion {
       }),
 
       notes: computed(() =>
-        this.page.notes.fromIds(this.react.collab?.noteIds ?? [], this.id),
+        this.react.collab?.container.enabled
+          ? this.page.notes.fromIds(this.react.collab?.noteIds ?? [], this.id)
+          : [],
       ),
       arrows: computed(() =>
-        this.page.arrows.fromIds(this.react.collab?.arrowIds ?? []),
+        this.react.collab?.container.enabled
+          ? this.page.arrows.fromIds(this.react.collab?.arrowIds ?? [])
+          : [],
       ),
       elems: computed(() =>
         (this.react.notes as (PageNote | PageArrow)[]).concat(
diff --git a/apps/client/src/code/pages/page/notes/notes.ts b/apps/client/src/code/pages/page/notes/notes.ts
@@ -1,4 +1,5 @@
 import { Vec2 } from '@stdlib/misc';
+import { watchUntilTrue } from '@stdlib/vue';
 import type { Y } from '@syncedstore/core';
 import { getYjsValue } from '@syncedstore/core';
 import type { Factories } from 'src/code/factories';
@@ -113,28 +114,34 @@ export class PageNotes {
     );
   }
 
-  async create(
-    region: PageRegion,
-    worldPos: Vec2,
-    center = true,
-    destIndex?: number,
-  ) {
+  async create(params: {
+    region: PageRegion;
+    worldPos?: Vec2;
+    center?: boolean;
+    destIndex?: number;
+    edit?: boolean;
+  }) {
     if (this.page.react.readOnly) {
       return;
     }
 
     const note = this.page.app.serialization.deserialize(
       internals.pages.defaultNote,
-      region,
-      destIndex,
+      params.region,
+      params?.destIndex,
     ).notes[0];
 
-    await this.page.editing.start(note);
+    await nextTick();
+    await watchUntilTrue(() => note.react.loaded);
 
-    note.react.collab.pos.x = worldPos.x;
-    note.react.collab.pos.y = worldPos.y;
+    if (params.edit !== false) {
+      await this.page.editing.start(note);
+    }
+
+    note.react.collab.pos.x = params?.worldPos?.x ?? 0;
+    note.react.collab.pos.y = params?.worldPos?.y ?? 0;
 
-    if (center) {
+    if (params?.center !== false) {
       const worldSize = note.getWorldRect('note-frame')?.size;
 
       if (worldSize != null) {
diff --git a/apps/client/src/code/pages/serialization.ts b/apps/client/src/code/pages/serialization.ts
@@ -9,6 +9,7 @@ import { z } from 'zod';
 import type { IArrowCollabInput, PageArrow } from './page/arrows/arrow';
 import { IArrowCollabDefault } from './page/arrows/arrow';
 import { IArrowCollab } from './page/arrows/arrow';
+import { roundTimeToMinutes } from './page/notes/date';
 import type { PageNote } from './page/notes/note';
 import type { INoteCollabPartial } from './page/notes/note-collab';
 import { INoteCollab, INoteCollabDefault } from './page/notes/note-collab';
@@ -363,6 +364,10 @@ export class Serialization {
       INoteCollabDefault(),
     );
 
+    noteCollab.createdAt = roundTimeToMinutes(Date.now());
+    noteCollab.editedAt = null;
+    noteCollab.movedAt = null;
+
     const noteId = nanoid();
 
     noteMap.set(noteIndex, noteId);
@@ -415,24 +420,7 @@ export class Serialization {
     destRegionId: string,
     destRegionCollab: IRegionCollabOutput,
   ) {
-    const arrowCollab = this.parseArrowCollab(
-      serialArrow,
-      destRegionId,
-      noteMap,
-    );
-
-    const arrowId = nanoid();
-
-    destRegionCollab.arrowIds.push(arrowId);
-
-    internals.pages.react.page.arrows.react.collab[arrowId] = arrowCollab;
-  }
-  parseArrowCollab(
-    serialArrow: ISerialArrowOutput,
-    destRegionId: string,
-    noteMap = new Map<number, string>(),
-  ) {
-    return makeSlim(
+    const arrowCollab = makeSlim(
       IArrowCollab().parse({
         ...serialArrow,
 
@@ -448,5 +436,14 @@ export class Serialization {
       } as IArrowCollabInput),
       IArrowCollabDefault(),
     );
+
+    arrowCollab.createdAt = roundTimeToMinutes(Date.now());
+    arrowCollab.editedAt = null;
+
+    const arrowId = nanoid();
+
+    destRegionCollab.arrowIds.push(arrowId);
+
+    internals.pages.react.page.arrows.react.collab[arrowId] = arrowCollab;
   }
 }
diff --git a/apps/client/src/code/utils/math.ts b/apps/client/src/code/utils/math.ts
@@ -0,0 +1,6 @@
+export function roundToMultiple(
+  value: number,
+  params: { base: number; roundFunc?: (value: number) => number },
+) {
+  return (params.roundFunc ?? Math.round)(value / params.base) * params.base;
+}
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayArrow/ArrowLabel.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayArrow/ArrowLabel.vue
@@ -25,6 +25,7 @@
 <script setup lang="ts">
 import { Y } from '@syncedstore/core';
 import type { PageArrow } from 'src/code/pages/page/arrows/arrow';
+import { roundTimeToMinutes } from 'src/code/pages/page/notes/date';
 import type { Page } from 'src/code/pages/page/page';
 import { isTiptapEditorEmpty } from 'src/code/tiptap/utils';
 import { createDoubleClickChecker } from 'src/code/utils/misc';
@@ -67,6 +68,16 @@ const editor = internals.tiptap().useEditor({
   onDestroy() {
     props.arrow!.react.editor = null;
   },
+
+  onUpdate({ editor, transaction }) {
+    if (editor.isEditable && transaction.docChanged) {
+      const date = roundTimeToMinutes(Date.now());
+
+      if (date !== page.collab.store.arrows[props.arrow.id]?.editedAt) {
+        page.collab.store.arrows[props.arrow.id].editedAt = date;
+      }
+    }
+  },
 });
 
 const empty = computed(
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayBackground.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayBackground.vue
@@ -56,7 +56,10 @@ async function onLeftClick(event: MouseEvent) {
     const clientPos = page.pos.eventToClient(event);
     const worldPos = page.pos.clientToWorld(clientPos);
 
-    await page.notes.create(page, worldPos);
+    await page.notes.create({
+      region: page,
+      worldPos,
+    });
   }
 }
 </script>
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteListContainer.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteListContainer.vue
@@ -146,7 +146,12 @@ async function onLeftClick(event: MouseEvent, destIndex?: number) {
 
     const worldPos = page.sizes.screenToWorld2D(clientPos.sub(clientTopLeft));
 
-    await page.notes.create(note, worldPos, false, destIndex);
+    await page.notes.create({
+      region: note,
+      worldPos,
+      center: false,
+      destIndex,
+    });
   }
 }
 
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteSpatialContainer.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteSpatialContainer.vue
@@ -109,10 +109,10 @@ async function onLeftPointerUp(event: PointerEvent) {
       return;
     }
 
-    const newNote = await page.notes.create(
-      note,
-      page.pos.eventToWorld(event).sub(containerWorldTopLeft),
-    );
+    const newNote = await page.notes.create({
+      region: note,
+      worldPos: page.pos.eventToWorld(event).sub(containerWorldTopLeft),
+    });
 
     if (newNote != null) {
       page.arrowCreation.finish({ note: newNote, anchor: null });
@@ -132,10 +132,10 @@ async function onLeftClick(event: MouseEvent) {
       return;
     }
 
-    await page.notes.create(
-      note,
-      page.pos.eventToWorld(event).sub(containerWorldTopLeft),
-    );
+    await page.notes.create({
+      region: note,
+      worldPos: page.pos.eventToWorld(event).sub(containerWorldTopLeft),
+    });
   }
 }
 </script>
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteEditor.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteSection/NoteEditor.vue
@@ -18,6 +18,7 @@
 
 <script setup lang="ts">
 import { Y } from '@syncedstore/core';
+import { roundTimeToMinutes } from 'src/code/pages/page/notes/date';
 import type { NoteTextSection, PageNote } from 'src/code/pages/page/notes/note';
 import type { Page } from 'src/code/pages/page/page';
 import { useResizeObserver } from 'src/code/utils/misc';
@@ -99,8 +100,16 @@ const editor = internals.tiptap().useEditor({
     note.react[props.section].editor = null;
   },
 
-  onUpdate() {
+  onUpdate({ editor, transaction }) {
     void updateOverflow();
+
+    if (editor.isEditable && transaction.docChanged) {
+      const date = roundTimeToMinutes(Date.now());
+
+      if (date !== page.collab.store.notes[note.id]?.editedAt) {
+        page.collab.store.notes[note.id].editedAt = date;
+      }
+    }
   },
 
   onFocus() {
diff --git a/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayWorld.vue b/apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayWorld.vue
diff --git a/apps/client/src/layouts/PagesLayout/RightSidebar/ArrowProperties.vue b/apps/client/src/layouts/PagesLayout/RightSidebar/ArrowProperties.vue
diff --git a/apps/client/src/layouts/PagesLayout/RightSidebar/NoteProperties/NoteProperties.vue b/apps/client/src/layouts/PagesLayout/RightSidebar/NoteProperties/NoteProperties.vue
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@`
`7`	`7`	`"eslint.validate": ["javascript", "typescript"],`
`8`	`8`	`"typescript.tsdk": "node_modules/typescript/lib",`
`9`	`9`	`"vue.features.codeActions.enable": false,`
`10`		`- "java.configuration.updateBuildConfiguration": "interactive"`
	`10`	`+ "java.configuration.updateBuildConfiguration": "interactive",`
	`11`	`+ "testing.automaticallyOpenPeekView": "never"`
`11`	`12`	`}`