Merge branch 'master' into keanu-comments

22 files changed, 6 insertions, 29 deletions

diff --git a/src/ClientUtils.ts b/src/ClientUtils.ts
index fc048b155..55801df81 100644
--- a/src/ClientUtils.ts
+++ b/src/ClientUtils.ts
@@ -82,7 +82,6 @@ export function returnEmptyFilter() {
     return [] as string[];
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ClientUtils {
     export const CLICK_TIME = 300;
     export const DRAG_THRESHOLD = 4;
diff --git a/src/ServerUtils.ts b/src/ServerUtils.ts
index 8b2d0b9f6..715341ab3 100644
--- a/src/ServerUtils.ts
+++ b/src/ServerUtils.ts
@@ -2,7 +2,6 @@ import { Socket } from 'socket.io';
 import { Message } from './server/Message';
 import { Utils } from './Utils';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ServerUtils {
     export function Emit<T>(socket: Socket, message: Message<T>, args: T) {
         Utils.log('Emit', message.Name, args, false);
diff --git a/src/client/Network.ts b/src/client/Network.ts
index 17f8a6534..204fcf0ac 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -9,7 +9,7 @@ import { Upload } from '../server/SharedMediaTypes';
  * mainly provides methods that the client can use to begin the process of
  * interacting with the server, such as fetching or uploading files.
  */
-// eslint-disable-next-line @typescript-eslint/no-namespace
+
 export namespace Networking {
     export async function FetchFromServer(relativeRoute: string) {
         return (await fetch(relativeRoute)).text();
diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 0168e0a3b..30b71a09b 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -40,7 +40,6 @@ const { DFLT_IMAGE_NATIVE_DIM } = require('../views/global/globalCssVariables.mo
 
 const defaultNativeImageDim = Number(DFLT_IMAGE_NATIVE_DIM.replace('px', ''));
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DocUtils {
     function matchFieldValue(doc: Doc, key: string, valueIn: unknown): boolean {
         let value = valueIn;
@@ -467,7 +466,7 @@ export namespace DocUtils {
             .concat(userTypes)
             .concat(clickFuncs)
             .map(btnDoc => (btnDoc.dragFactory as Doc) || btnDoc)
-            .filter(doc => doc.isTemplateDoc);
+            .filter(d => d.isTemplateDoc);
         // bcz: this is hacky -- want to have different templates be applied depending on the "type" of a document.  but type is not reliable and there could be other types of template searches so this should be generalized
         // first try to find a template that matches the specific document type (<typeName>_<templateName>).  otherwise, fallback to a general match on <templateName>
         !docLayoutTemplate &&
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 9ce465538..6b5469cca 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -494,9 +494,7 @@ export class DocumentOptions {
 
 export const DocOptions = new DocumentOptions();
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Docs {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
     export namespace Prototypes {
         type LayoutSource = { LayoutString: (key: string) => string };
         type PrototypeTemplate = {
@@ -654,7 +652,7 @@ export namespace Docs {
      * Encapsulates the factory used to create new document instances
      * delegated from top-level prototypes
      */
-    // eslint-disable-next-line @typescript-eslint/no-namespace
+
     export namespace Create {
         /**
          * This function receives the relevant document prototype and uses
diff --git a/src/client/util/DictationManager.ts b/src/client/util/DictationManager.ts
index 16a0df120..a0e1413b6 100644
--- a/src/client/util/DictationManager.ts
+++ b/src/client/util/DictationManager.ts
@@ -32,14 +32,12 @@ import { UndoManager } from './UndoManager';
  * to add new commands as classes or components are constructed.
  */
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DictationManager {
     /**
      * Some type maneuvering to access Webkit's built-in
      * speech recognizer.
      */
 
-    // eslint-disable-next-line @typescript-eslint/no-namespace
     namespace CORE {
         export interface IWindow extends Window {
             webkitSpeechRecognition: { new (): SpeechRecognition };
@@ -48,7 +46,6 @@ export namespace DictationManager {
     const { webkitSpeechRecognition }: CORE.IWindow = window as unknown as CORE.IWindow;
     export const placeholder = 'Listening...';
 
-    // eslint-disable-next-line @typescript-eslint/no-namespace
     export namespace Controls {
         export const Infringed = 'unable to process: dictation manager still involved in previous session';
         const browser = (() => {
@@ -230,7 +227,6 @@ export namespace DictationManager {
         };
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-namespace
     export namespace Commands {
         export const dictationFadeDuration = 2000;
 
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index c237a75de..7db13689d 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -70,7 +70,6 @@ export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: ()
     return onItemDown;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DragManager {
     export const dragClassName = 'collectionFreeFormDocumentView-container';
     let dragDiv: HTMLDivElement;
diff --git a/src/client/util/History.ts b/src/client/util/History.ts
index 067c28c6b..0d0c056a4 100644
--- a/src/client/util/History.ts
+++ b/src/client/util/History.ts
@@ -10,7 +10,6 @@ import { OmitKeys, ClientUtils } from '../../ClientUtils';
 import { DocServer } from '../DocServer';
 import { DashboardView } from '../views/DashboardView';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace HistoryUtil {
     export interface DocInitializerList {
         [key: string]: string | number;
diff --git a/src/client/util/InteractionUtils.tsx b/src/client/util/InteractionUtils.tsx
index f3ede596d..4231c2ca8 100644
--- a/src/client/util/InteractionUtils.tsx
+++ b/src/client/util/InteractionUtils.tsx
@@ -4,7 +4,6 @@ import { Utils } from '../../Utils';
 import { Gestures } from '../../pen-gestures/GestureTypes';
 import './InteractionUtils.scss';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace InteractionUtils {
     export const MOUSETYPE = 'mouse';
     export const TOUCHTYPE = 'touch';
diff --git a/src/client/util/ScriptingGlobals.ts b/src/client/util/ScriptingGlobals.ts
index 4a1a70633..444e8fc0a 100644
--- a/src/client/util/ScriptingGlobals.ts
+++ b/src/client/util/ScriptingGlobals.ts
@@ -6,7 +6,7 @@ const _scriptingGlobals: { [name: string]: unknown } = {};
 const _scriptingDescriptions: { [name: string]: string } = {};
 const _scriptingParams: { [name: string]: string } = {};
 export let scriptingGlobals: { [name: string]: unknown } = _scriptingGlobals;
-// eslint-disable-next-line @typescript-eslint/no-namespace
+
 export namespace ScriptingGlobals {
     export function getGlobals()      { return Object.keys(_scriptingGlobals); } // prettier-ignore
     export function getGlobalObj()    { return _scriptingGlobals; } // prettier-ignore
diff --git a/src/client/util/SearchUtil.ts b/src/client/util/SearchUtil.ts
index 6cad7060b..733eae5f4 100644
--- a/src/client/util/SearchUtil.ts
+++ b/src/client/util/SearchUtil.ts
@@ -5,7 +5,6 @@ import { StrCast } from '../../fields/Types';
 import { DocumentType } from '../documents/DocumentTypes';
 import { DocOptions, FInfo } from '../documents/Documents';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace SearchUtil {
     export type HighlightingResult = { [id: string]: { [key: string]: string[] } };
 
diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts
index 0386b2455..ccb02fb79 100644
--- a/src/client/util/SerializationHelper.ts
+++ b/src/client/util/SerializationHelper.ts
@@ -12,7 +12,6 @@ export function afterDocDeserialize(cb: (err: unknown, val: unknown) => void, er
 const serializationTypes: { [name: string]: { ctor: { new (): unknown }; afterDeserialize?: (obj: unknown) => void | Promise<unknown> } } = {};
 const reverseMap: { [ctor: string]: string } = {};
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace SerializationHelper {
     export function IsSerializing() {
         return serializing > 0;
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 5fd935370..ce0e7768b 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -83,7 +83,6 @@ export function undoBatch(target: any, key?: string | symbol, descriptor?: Typed
     return descriptor;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace UndoManager {
     export interface UndoEvent {
         undo: () => void;
diff --git a/src/client/views/DocViewUtils.ts b/src/client/views/DocViewUtils.ts
index 49a30aa08..1f5f29c7e 100644
--- a/src/client/views/DocViewUtils.ts
+++ b/src/client/views/DocViewUtils.ts
@@ -6,7 +6,6 @@ import { Doc, SetActiveAudioLinker } from '../../fields/Doc';
 import { DocUtils } from '../documents/DocUtils';
 import { FieldViewProps } from './nodes/FieldView';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DocViewUtils {
     export const ActiveRecordings: { props: FieldViewProps; getAnchor: (addAsAnnotation: boolean) => Doc }[] = [];
 
diff --git a/src/pen-gestures/GestureUtils.ts b/src/pen-gestures/GestureUtils.ts
index bf5475042..c7051c87c 100644
--- a/src/pen-gestures/GestureUtils.ts
+++ b/src/pen-gestures/GestureUtils.ts
@@ -2,7 +2,6 @@ import { Rect } from 'react-measure';
 import { Gestures, PointData } from './GestureTypes';
 import { NDollarRecognizer } from './ndollar';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace GestureUtils {
     export class GestureEvent {
         readonly gesture: Gestures;
diff --git a/src/server/DashStats.ts b/src/server/DashStats.ts
index 6b9fb8971..8e1d4661f 100644
--- a/src/server/DashStats.ts
+++ b/src/server/DashStats.ts
@@ -9,7 +9,7 @@ import { socketMap, timeMap, userOperations } from './SocketData';
  * This includes time connected, number of operations, and
  * the rate of their operations
  */
-// eslint-disable-next-line @typescript-eslint/no-namespace
+
 export namespace DashStats {
     export const SAMPLING_INTERVAL = 1000; // in milliseconds (ms) - Time interval to update the frontend.
     export const RATE_INTERVAL = 10; // in seconds (s) - Used to calculate rate
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 5e58db103..8f012f783 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -47,7 +47,6 @@ function usingAzure() {
     return process.env.USE_AZURE === 'true';
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DashUploadUtils {
     export interface Size {
         width: number;
diff --git a/src/server/Message.ts b/src/server/Message.ts
index b904a5ba3..01a42fc68 100644
--- a/src/server/Message.ts
+++ b/src/server/Message.ts
@@ -43,7 +43,6 @@ export interface RoomMessage {
     readonly room: string;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace MessageStore {
     export const Foo = new Message<string>('Foo');
     export const Bar = new Message<string>('Bar');
diff --git a/src/server/Search.ts b/src/server/Search.ts
index 06af18776..b21ee853a 100644
--- a/src/server/Search.ts
+++ b/src/server/Search.ts
@@ -3,7 +3,6 @@ import * as rp from 'request-promise';
 
 const pathTo = (relative: string) => `http://localhost:8983/solr/dash/${relative}`;
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Search {
     export async function updateDocument(document: any) {
         try {
diff --git a/src/server/SharedMediaTypes.ts b/src/server/SharedMediaTypes.ts
index 680db9cd0..9aa4b120f 100644
--- a/src/server/SharedMediaTypes.ts
+++ b/src/server/SharedMediaTypes.ts
@@ -1,7 +1,6 @@
 import { ExifData } from 'exif';
 import { File } from 'formidable';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace AcceptableMedia {
     export const gifs = ['.gif'];
     export const pngs = ['.png'];
@@ -19,7 +18,6 @@ export enum AudioAnnoState {
     playing = 'playing',
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Upload {
     export function isImageInformation(uploadResponse: Upload.FileInformation): uploadResponse is Upload.ImageInformation {
         return 'nativeWidth' in uploadResponse;
diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 47206f415..21c405bee 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -21,7 +21,7 @@ const scope = ['documents.readonly', 'documents', 'presentations', 'presentation
  * This namespace manages server side authentication for Google API queries, either
  * from the standard v1 APIs or the Google Photos REST API.
  */
-// eslint-disable-next-line @typescript-eslint/no-namespace
+
 export namespace GoogleApiServerUtils {
     /**
      * As we expand out to more Google APIs that are accessible from
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index ccbcb1c5f..1e25a8a27 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -15,7 +15,6 @@ import { resolvedPorts, socketMap, timeMap, userOperations } from './SocketData'
 import { initializeGuest } from './authentication/DashUserModel';
 import { Database } from './database';
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace WebSocket {
     let CurUser: string | undefined;
     export let _socket: Socket;