Merge branch 'master' into Template-Changes

1 files changed, 5 insertions, 10 deletions

diff --git a/src/client/util/CalendarManager.tsx b/src/client/util/CalendarManager.tsx
index d28b3a2c9..b50e39c02 100644
--- a/src/client/util/CalendarManager.tsx
+++ b/src/client/util/CalendarManager.tsx
@@ -8,7 +8,6 @@ import { observer } from 'mobx-react';
 import * as React from 'react';
 import Select from 'react-select';
 import { Doc, DocListCast } from '../../fields/Doc';
-import { DocData } from '../../fields/DocSymbols';
 import { StrCast } from '../../fields/Types';
 import { Docs } from '../documents/Documents';
 import { MainViewModal } from '../views/MainViewModal';
@@ -51,8 +50,6 @@ export class CalendarManager extends ObservableReactComponent<object> {
     @observable private targetDocView: DocumentView | undefined = undefined; // the DocumentView of the target doc
     @observable private dialogueBoxOpacity = 1; // for the modal
 
-    @observable private layoutDocAcls: boolean = false; // whether the layout doc or data doc's acls are to be used
-
     @observable private creationType: CreationType = 'new-calendar';
 
     @observable private existingCalendars: Doc[] = DocListCast(Doc.MyCalendars?.data);
@@ -97,7 +94,6 @@ export class CalendarManager extends ObservableReactComponent<object> {
             }),
             500
         );
-        this.layoutDocAcls = false;
     });
 
     constructor(props: object) {
@@ -122,9 +118,8 @@ export class CalendarManager extends ObservableReactComponent<object> {
     // TODO: Make undoable
     private addToCalendar = () => {
         const docs = DocumentView.Selected().length < 2 ? [this.targetDoc] : DocumentView.Selected().map(docView => docView.Document);
-        const targetDoc = this.layoutDocAcls ? docs[0] : docs[0]?.[DocData]; // doc to add to calendar
+        const targetDoc = docs[0];
 
-        console.log(targetDoc);
         if (targetDoc) {
             let calendar: Doc;
             if (this.creationType === 'new-calendar') {
@@ -167,7 +162,7 @@ export class CalendarManager extends ObservableReactComponent<object> {
 
             console.log('my calendars: ', Doc.MyCalendars);
             if (this.creationType === 'new-calendar') {
-                Doc.AddDocToList(Doc.MyCalendars, 'data', calendar); // add to new calendar to dashboard calendars
+                Doc.MyCalendars && Doc.AddDocToList(Doc.MyCalendars, 'data', calendar); // add to new calendar to dashboard calendars
             }
         }
     };
@@ -234,14 +229,14 @@ export class CalendarManager extends ObservableReactComponent<object> {
     @computed
     get calendarInterface() {
         const docs = DocumentView.Selected().length < 2 ? [this.targetDoc] : DocumentView.Selected().map(docView => docView.Document);
-        const targetDoc = this.layoutDocAcls ? docs[0] : docs[0]?.[DocData];
+        const targetDoc = docs[0];
 
         return (
             <div
                 className="calendar-interface"
                 style={{
                     background: SnappingManager.userBackgroundColor,
-                    color: StrCast(Doc.UserDoc().userColor),
+                    color: SnappingManager.userColor,
                 }}>
                 <p className="selected-doc-title" style={{ color: SnappingManager.userColor }}>
                     <b>{this.focusOn(docs.length < 2 ? StrCast(targetDoc?.title, 'this document') : '-multiple-')}</b>
@@ -324,7 +319,7 @@ export class CalendarManager extends ObservableReactComponent<object> {
                 <div className="date-range-picker-container">
                     <div>Select a date range: </div>
                     <Provider theme={defaultTheme}>
-                        <DateRangePicker aria-label="Select a date range" value={this.selectedDateRange} onChange={v => this.setSelectedDateRange(v)} />
+                        <DateRangePicker aria-label="Select a date range" value={this.selectedDateRange} onChange={v => v && this.setSelectedDateRange(v)} />
                     </Provider>
                 </div>
                 {this.createButtonActive && (