Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 16 insertions, 18 deletions

diff --git a/src/client/views/collections/CollectionCalendarView.tsx b/src/client/views/collections/CollectionCalendarView.tsx
index cbcc980a9..a08a7c7c1 100644
--- a/src/client/views/collections/CollectionCalendarView.tsx
+++ b/src/client/views/collections/CollectionCalendarView.tsx
@@ -1,7 +1,8 @@
 import { computed, makeObservable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
-import { dateRangeStrToDates, emptyFunction, returnTrue } from '../../../Utils';
+import { emptyFunction } from '../../../Utils';
+import { dateRangeStrToDates, returnTrue } from '../../../ClientUtils';
 import { Doc, DocListCast } from '../../../fields/Doc';
 import { StrCast } from '../../../fields/Types';
 import { CollectionStackingView } from './CollectionStackingView';
@@ -24,16 +25,13 @@ export class CollectionCalendarView extends CollectionSubView() {
 
     removeCalendar = () => {};
 
-    addCalendar = (doc: Doc | Doc[], annotationKey?: string | undefined): boolean => {
+    addCalendar = (/* doc: Doc | Doc[], annotationKey?: string | undefined */): boolean =>
         // bring up calendar modal with option to create a calendar
-        return true;
-    };
+        true;
 
     _stackRef = React.createRef<CollectionStackingView>();
 
-    panelHeight = () => {
-        return this._props.PanelHeight() - 40; // this should be the height of the stacking view. For now, it's the hieight of the calendar view minus 40 to allow for a title
-    };
+    panelHeight = () => this._props.PanelHeight() - 40; // this should be the height of the stacking view. For now, it's the hieight of the calendar view minus 40 to allow for a title
 
     // most recent calendar should come first
     sortByMostRecentDate = (calendarA: Doc, calendarB: Doc) => {
@@ -45,18 +43,18 @@ export class CollectionCalendarView extends CollectionSubView() {
 
         if (aFromDate > bFromDate) {
             return -1; // a comes first
-        } else if (aFromDate < bFromDate) {
+        }
+        if (aFromDate < bFromDate) {
+            return 1; // b comes first
+        }
+        // start dates are the same
+        if (aToDate > bToDate) {
+            return -1; // a comes first
+        }
+        if (aToDate < bToDate) {
             return 1; // b comes first
-        } else {
-            // start dates are the same
-            if (aToDate > bToDate) {
-                return -1; // a comes first
-            } else if (aToDate < bToDate) {
-                return 1; // b comes first
-            } else {
-                return 0; // same start and end dates
-            }
         }
+        return 0; // same start and end dates
     };
 
     screenToLocalTransform = () =>
@@ -73,12 +71,12 @@ export class CollectionCalendarView extends CollectionSubView() {
         return (
             <div className="collectionCalendarView">
                 <CollectionStackingView
+                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...this._props}
                     setContentViewBox={emptyFunction}
                     ref={this._stackRef}
                     PanelHeight={this.panelHeight}
                     PanelWidth={this._props.PanelWidth}
-                    // childFilters={this.childFilters} DO I NEED THIS?
                     sortFunc={this.sortByMostRecentDate}
                     setHeight={undefined}
                     isAnnotationOverlay={false}