restoring eslint - updates not complete yet

1 files changed, 12 insertions, 8 deletions

diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx
index f4f879208..6b20b885b 100644
--- a/src/client/util/GroupManager.tsx
+++ b/src/client/util/GroupManager.tsx
@@ -5,19 +5,20 @@ import { observer } from 'mobx-react';
 import * as React from 'react';
 import Select from 'react-select';
 import * as RequestPromise from 'request-promise';
+import { ClientUtils } from '../../ClientUtils';
+import { Utils } from '../../Utils';
 import { DateField } from '../../fields/DateField';
 import { Doc, DocListCast, Opt } from '../../fields/Doc';
 import { Id } from '../../fields/FieldSymbols';
 import { listSpec } from '../../fields/Schema';
 import { Cast, StrCast } from '../../fields/Types';
-import { Utils } from '../../Utils';
 import { MainViewModal } from '../views/MainViewModal';
+import { ObservableReactComponent } from '../views/ObservableReactComponent';
 import { TaskCompletionBox } from '../views/nodes/TaskCompletedBox';
 import './GroupManager.scss';
 import { GroupMemberView } from './GroupMemberView';
 import { SettingsManager } from './SettingsManager';
 import { SharingManager, User } from './SharingManager';
-import { ObservableReactComponent } from '../views/ObservableReactComponent';
 
 /**
  * Interface for options for the react-select component
@@ -55,7 +56,7 @@ export class GroupManager extends ObservableReactComponent<{}> {
      */
     populateUsers = async () => {
         if (Doc.UserDoc()[Id] !== Utils.GuestID()) {
-            const userList = await RequestPromise.get(Utils.prepend('/getUsers'));
+            const userList = await RequestPromise.get(ClientUtils.prepend('/getUsers'));
             const raw = JSON.parse(userList) as User[];
             raw.map(action(user => !this.users.some(umail => umail === user.email) && this.users.push(user.email)));
         }
@@ -135,7 +136,7 @@ export class GroupManager extends ObservableReactComponent<{}> {
     hasEditAccess(groupDoc: Doc): boolean {
         if (!groupDoc) return false;
         const accessList: string[] = JSON.parse(StrCast(groupDoc.owners));
-        return accessList.includes(Doc.CurrentUserEmail) || this.adminGroupMembers?.includes(Doc.CurrentUserEmail);
+        return accessList.includes(ClientUtils.CurrentUserEmail) || this.adminGroupMembers?.includes(ClientUtils.CurrentUserEmail);
     }
 
     /**
@@ -147,7 +148,7 @@ export class GroupManager extends ObservableReactComponent<{}> {
         const name = groupName.toLowerCase() === 'admin' ? 'Admin' : groupName;
         const groupDoc = new Doc('GROUP:' + name, true);
         groupDoc.title = name;
-        groupDoc.owners = JSON.stringify([Doc.CurrentUserEmail]);
+        groupDoc.owners = JSON.stringify([ClientUtils.CurrentUserEmail]);
         groupDoc.members = JSON.stringify(memberEmails);
         this.addGroup(groupDoc);
     }
@@ -176,11 +177,11 @@ export class GroupManager extends ObservableReactComponent<{}> {
                 Doc.RemoveDocFromList(this.GroupManagerDoc, 'data', group);
                 SharingManager.Instance.removeGroup(group);
                 const members = JSON.parse(StrCast(group.members));
-                if (members.includes(Doc.CurrentUserEmail)) {
+                if (members.includes(ClientUtils.CurrentUserEmail)) {
                     const index = DocListCast(this.GroupManagerDoc.data).findIndex(grp => grp === group);
                     index !== -1 && Cast(this.GroupManagerDoc.data, listSpec(Doc), [])?.splice(index, 1);
                 }
-                this.GroupManagerDoc['data_modificationDate'] = new DateField();
+                this.GroupManagerDoc.data_modificationDate = new DateField();
                 if (group === this.currentGroup) {
                     this.currentGroup = undefined;
                 }
@@ -260,7 +261,10 @@ export class GroupManager extends ObservableReactComponent<{}> {
             alert('Please select a unique group name');
             return;
         }
-        this.createGroupDoc(value, this.selectedUsers?.map(user => user.value));
+        this.createGroupDoc(
+            value,
+            this.selectedUsers?.map(user => user.value)
+        );
         this.selectedUsers = null;
         this.inputRef.current!.value = '';
         this.buttonColour = '#979797';