From 4574b7f03ccc85c4bebdbfd9475788456086704f Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Thu, 8 Aug 2024 12:27:40 -0400
Subject: many changes to add typing in place of 'any's etc

---
 src/client/documents/DocUtils.ts | 64 +++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

(limited to 'src/client/documents/DocUtils.ts')

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 0c9fe0315..a503d732b 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -35,14 +35,16 @@ import { TaskCompletionBox } from '../views/nodes/TaskCompletedBox';
 import { DocumentType } from './DocumentTypes';
 import { Docs, DocumentOptions } from './Documents';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { DFLT_IMAGE_NATIVE_DIM } = require('../views/global/globalCssVariables.module.scss'); // prettier-ignore
 
 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: any): boolean {
+    function matchFieldValue(doc: Doc, key: string, valueIn: unknown): boolean {
         let value = valueIn;
-        const hasFunctionFilter = ClientUtils.HasFunctionFilter(value);
+        const hasFunctionFilter = ClientUtils.HasFunctionFilter(value as string);
         if (hasFunctionFilter) {
             return hasFunctionFilter(StrCast(doc[key]));
         }
@@ -57,8 +59,8 @@ export namespace DocUtils {
             // prettier-ignore
             return  (value === Doc.FilterNone && !allLinks.length) || 
                     (value === Doc.FilterAny && !!allLinks.length) ||
-                    (allLinks.some(link => matchLink(value,DocCast(link.link_anchor_1)) || 
-                                           matchLink(value,DocCast(link.link_anchor_2)) ));
+                    (allLinks.some(link => matchLink(value as string, DocCast(link.link_anchor_1)) || 
+                                           matchLink(value as string, DocCast(link.link_anchor_2)) ));
         }
         if (typeof value === 'string') {
             value = value.replace(`,${ClientUtils.noRecursionHack}`, '');
@@ -71,9 +73,9 @@ export namespace DocUtils {
         }
         const vals = StrListCast(fieldVal); // list typing is very imperfect.  casting to a string list doesn't mean that the entries will actually be strings
         if (vals.length) {
-            return vals.some(v => typeof v === 'string' && v.includes(value)); // bcz: arghh: Todo: comparison should be parameterized as exact, or substring
+            return vals.some(v => typeof v === 'string' && v.includes(value as string)); // bcz: arghh: Todo: comparison should be parameterized as exact, or substring
         }
-        return Field.toString(fieldVal as FieldType).includes(value); // bcz: arghh: Todo: comparison should be parameterized as exact, or substring
+        return Field.toString(fieldVal as FieldType).includes(value as string); // bcz: arghh: Todo: comparison should be parameterized as exact, or substring
     }
     /**
      * @param docs
@@ -215,13 +217,13 @@ export namespace DocUtils {
                 {
                     acl_Guest: SharingPermissions.Augment,
                     _acl_Guest: SharingPermissions.Augment,
-                    title: ComputedField.MakeFunction('generateLinkTitle(this)') as any,
+                    title: ComputedField.MakeFunction('generateLinkTitle(this)') as unknown as string, // title can accept functions even though type says it can't
                     link_anchor_1_useSmallAnchor: source.useSmallAnchor ? true : undefined,
                     link_anchor_2_useSmallAnchor: target.useSmallAnchor ? true : undefined,
                     link_relationship: linkSettings.link_relationship,
                     link_description: linkSettings.link_description,
-                    x: ComputedField.MakeFunction(`((this.${a}?.x||0)+(this.${b}?.x||0))/2`) as any,
-                    y: ComputedField.MakeFunction(`((this.${a}?.y||0)+(this.${b}?.y||0))/2`) as any,
+                    x: ComputedField.MakeFunction(`((this.${a}?.x||0)+(this.${b}?.x||0))/2`) as unknown as number, // x can accept functions even though type says it can't
+                    y: ComputedField.MakeFunction(`((this.${a}?.y||0)+(this.${b}?.y||0))/2`) as unknown as number, // y can accept functions even though type says it can't
                     link_autoMoveAnchors: true,
                     _lockedPosition: true,
                     _layout_showCaption: '', // removed since they conflict with showing a link with a LinkBox (ie, line, not comparison box)
@@ -235,10 +237,10 @@ export namespace DocUtils {
         );
     }
 
-    export function AssignScripts(doc: Doc, scripts?: { [key: string]: string | undefined }, funcs?: { [key: string]: string }) {
+    export function AssignScripts(doc: Doc, scripts?: { [key: string]: string | undefined }, funcs?: { [key: string]: string | undefined }) {
         scripts &&
             Object.keys(scripts).forEach(key => {
-                const script = scripts[key];
+                const script = scripts[key] as string;
                 if (ScriptCast(doc[key])?.script.originalScript !== scripts[key] && script) {
                     (key.startsWith('_') ? doc : Doc.GetProto(doc))[key] = ScriptField.MakeScript(script, {
                         this: Doc.name,
@@ -261,16 +263,17 @@ export namespace DocUtils {
                 .filter(key => !key.endsWith('-setter'))
                 .forEach(key => {
                     const cfield = ComputedField.WithoutComputed(() => FieldValue(doc[key]));
-                    if (ScriptCast(cfield)?.script.originalScript !== funcs[key]) {
+                    const func = funcs[key];
+                    if (ScriptCast(cfield)?.script.originalScript !== func) {
                         const setFunc = Cast(funcs[key + '-setter'], 'string', null);
-                        (key.startsWith('_') ? doc : Doc.GetProto(doc))[key] = funcs[key] ? ComputedField.MakeFunction(funcs[key], { dragData: Doc.DocDragDataName }, { _readOnly_: true }, setFunc) : undefined;
+                        (key.startsWith('_') ? doc : Doc.GetProto(doc))[key] = func ? ComputedField.MakeFunction(func, { dragData: Doc.DocDragDataName }, { _readOnly_: true }, setFunc) : undefined;
                     }
                 });
         return doc;
     }
     export function AssignOpts(doc: Doc | undefined, reqdOpts: DocumentOptions, items?: Doc[]) {
         if (doc) {
-            const compareValues = (val1: any, val2: any) => {
+            const compareValues = (val1: unknown, val2: unknown) => {
                 if (val1 instanceof List && val2 instanceof List && val1.length === val2.length) {
                     return !val1.some(v => !val2.includes(v)) || !val2.some(v => val1.includes(v));
                 }
@@ -334,7 +337,7 @@ export namespace DocUtils {
             if (path.includes(window.location.hostname)) {
                 const s = path.split('/');
                 const id = s[s.length - 1];
-                return DocServer.GetRefField(id).then(field => {
+                return DocServer.GetRefField(id)?.then(field => {
                     if (field instanceof Doc) {
                         const embedding = Doc.MakeEmbedding(field);
                         embedding.x = (options.x as number) || 0;
@@ -354,7 +357,7 @@ export namespace DocUtils {
         return ctor ? ctor(path, overwriteDoc ? { ...options, title: StrCast(overwriteDoc.title, path) } : options, overwriteDoc) : undefined;
     }
 
-    export function addDocumentCreatorMenuItems(docTextAdder: (d: Doc) => void, docAdder: (d: Doc) => void, x: number, y: number, simpleMenu: boolean = false, pivotField?: string, pivotValue?: string): void {
+    export function addDocumentCreatorMenuItems(docTextAdder: (d: Doc) => void, docAdder: (d: Doc) => void, x: number, y: number, simpleMenu: boolean = false, pivotField?: string, pivotValue?: string | number | boolean): void {
         const documentList: ContextMenuProps[] = DocListCast(DocListCast(Doc.MyTools?.data)[0]?.data)
             .filter(btnDoc => !btnDoc.hidden)
             .map(btnDoc => Cast(btnDoc?.dragFactory, Doc, null))
@@ -451,7 +454,7 @@ export namespace DocUtils {
         batch.end();
         return doc;
     }
-    export function findTemplate(templateName: string, type: string) {
+    export function findTemplate(templateName: string, doc: Doc) {
         let docLayoutTemplate: Opt<Doc>;
         const iconViews = DocListCast(Cast(Doc.UserDoc().template_icons, Doc, null)?.data);
         const templBtns = DocListCast(Cast(Doc.UserDoc().template_buttons, Doc, null)?.data);
@@ -469,7 +472,8 @@ export namespace DocUtils {
         // first try to find a template that matches the specific document type (<typeName>_<templateName>).  otherwise, fallback to a general match on <templateName>
         !docLayoutTemplate &&
             allTemplates.forEach(tempDoc => {
-                StrCast(tempDoc.title) === templateName + '_' + type && (docLayoutTemplate = tempDoc);
+                const templateType = StrCast(doc[templateName + '_fieldKey'] || doc.type);
+                StrCast(tempDoc.title) === templateName + '_' + templateType && (docLayoutTemplate = tempDoc);
             });
         !docLayoutTemplate &&
             allTemplates.forEach(tempDoc => {
@@ -481,7 +485,7 @@ export namespace DocUtils {
         const templateName = templateSignature.replace(/\(.*\)/, '');
         doc.layout_fieldKey = 'layout_' + (templateSignature || (docLayoutTemplate?.title ?? ''));
         // eslint-disable-next-line no-param-reassign
-        docLayoutTemplate = docLayoutTemplate || findTemplate(templateName, StrCast(doc.isGroup && doc.transcription ? 'transcription' : doc.type));
+        docLayoutTemplate = docLayoutTemplate || findTemplate(templateName, doc);
 
         const customName = 'layout_' + templateSignature;
         const _width = NumCast(doc._width);
@@ -619,7 +623,7 @@ export namespace DocUtils {
         const proto = protoIn;
         if (Upload.isImageInformation(result)) {
             const maxNativeDim = Math.min(Math.max(result.nativeHeight, result.nativeWidth), defaultNativeImageDim);
-            const exifRotation = StrCast((result.exifData?.data as any)?.Orientation).toLowerCase();
+            const exifRotation = StrCast(result.exifData?.data?.Orientation).toLowerCase();
             proto.data_nativeOrientation = result.exifData?.data?.image?.Orientation ?? (exifRotation.includes('rotate 90') || exifRotation.includes('rotate 270') ? 5 : undefined);
             proto.data_nativeWidth = result.nativeWidth < result.nativeHeight ? (maxNativeDim * result.nativeWidth) / result.nativeHeight : maxNativeDim;
             proto.data_nativeHeight = result.nativeWidth < result.nativeHeight ? maxNativeDim : maxNativeDim / (result.nativeWidth / result.nativeHeight);
@@ -697,10 +701,10 @@ export namespace DocUtils {
                 source: { newFilename, mimetype },
                 result,
             } = upfiles.lastElement();
-            if ((result as any).message) {
+            if (result instanceof Error) {
                 if (overwriteDoc) {
                     overwriteDoc.isLoading = false;
-                    overwriteDoc.loadingError = (result as any).message;
+                    overwriteDoc.loadingError = result.message;
                     Doc.removeCurrentlyLoading(overwriteDoc);
                 }
             } else newFilename && processFileupload(generatedDocuments, newFilename, mimetype ?? '', result, options, overwriteDoc);
@@ -736,9 +740,9 @@ export namespace DocUtils {
                 source: { newFilename, mimetype },
                 result,
             } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: { message: 'upload failed' } };
-            if ((result as any).message) {
+            if (result instanceof Error) {
                 if (overwriteDoc) {
-                    overwriteDoc.loadingError = (result as any).message;
+                    overwriteDoc.loadingError = result.message;
                     Doc.removeCurrentlyLoading(overwriteDoc);
                 }
             } else newFilename && mimetype && processFileupload(generatedDocuments, newFilename, mimetype, result, options, overwriteDoc);
@@ -768,7 +772,7 @@ export namespace DocUtils {
     export async function Zip(doc: Doc, zipFilename = 'dashExport.zip') {
         const { clone, map, linkMap } = await Doc.MakeClone(doc);
         const proms = new Set<string>();
-        function replacer(key: any, value: any) {
+        function replacer(key: string, value: { url: string; [key: string]: unknown }) {
             if (key && ['branchOf', 'cloneOf', 'cursors'].includes(key)) return undefined;
             if (value?.__type === 'image') {
                 const extension = value.url.replace(/.*\./, '');
@@ -804,8 +808,8 @@ export namespace DocUtils {
             return value;
         }
 
-        const docs: { [id: string]: any } = {};
-        const links: { [id: string]: any } = {};
+        const docs: { [id: string]: unknown } = {};
+        const links: { [id: string]: unknown } = {};
         Array.from(map.entries()).forEach(f => {
             docs[f[0]] = f[1];
         });
@@ -826,13 +830,13 @@ export namespace DocUtils {
         } else
             promArr.forEach((url, i) => {
                 // loading a file and add it in a zip file
-                JSZipUtils.getBinaryContent(window.location.origin + '/' + url, (err: any, data: any) => {
+                JSZipUtils.getBinaryContent(window.location.origin + '/' + url, (err: unknown, data: unknown) => {
                     if (err) throw err; // or handle the error
                     // // Generate a directory within the Zip file structure
                     // const assets = zip.folder("assets");
                     // assets.file(filename, data, {binary: true});
                     const assetPathOnServer = promArr[i].replace(window.location.origin + '/', '').replace(/\//g, '%%%');
-                    zip.file(assetPathOnServer, data, { binary: true });
+                    zip.file(assetPathOnServer, data as string, { binary: true });
                     console.log(' => ' + url);
                     if (++count === promArr.length) {
                         zip.file('docs.json', jsonDocs);
@@ -862,7 +866,7 @@ ScriptingGlobals.add(function copyDragFactory(dragFactory: Doc, asDelegate?: boo
     return dragFactory instanceof Doc ? (asDelegate ? DocUtils.delegateDragFactory(dragFactory) : DocUtils.copyDragFactory(dragFactory)) : dragFactory;
 });
 // eslint-disable-next-line prefer-arrow-callback
-ScriptingGlobals.add(function makeDelegate(proto: any) {
+ScriptingGlobals.add(function makeDelegate(proto: Doc) {
     const d = Docs.Create.DelegateDocument(proto, { title: 'child of ' + proto.title });
     return d;
 });
-- 
cgit v1.2.3-70-g09d2


From cdb21e036ff65d63991a53798133407be1d5755f Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 20 Aug 2024 21:30:32 -0400
Subject: fixed error handling of images too big to load.  cleaned up
 facecollectionbox.  changed metadata field naming to match conventions.

---
 src/client/Network.ts                              | 11 +--
 src/client/documents/DocUtils.ts                   |  2 +-
 .../collectionFreeForm/FaceCollectionBox.tsx       | 88 ++++++++------------
 .../collections/collectionFreeForm/MarqueeView.tsx | 97 +++-------------------
 src/client/views/nodes/FaceRectangles.tsx          |  3 +-
 src/client/views/search/FaceRecognitionHandler.tsx | 64 +++++++-------
 6 files changed, 87 insertions(+), 178 deletions(-)

(limited to 'src/client/documents/DocUtils.ts')

diff --git a/src/client/Network.ts b/src/client/Network.ts
index 8876d8190..17f8a6534 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -1,3 +1,4 @@
+import formidable from 'formidable';
 import * as requestPromise from 'request-promise';
 import { ClientUtils } from '../ClientUtils';
 import { Utils } from '../Utils';
@@ -49,15 +50,9 @@ export namespace Networking {
             if (!fileguidpairs.length) {
                 return [];
             }
-            const maxFileSize = 5000000;
+            const maxFileSize = 6000000;
             if (fileguidpairs.some(f => f.file.size > maxFileSize)) {
-                return new Promise<Upload.FileResponse<T>[]>(res => {
-                    res([{
-                            source:        { size: 0, filepath: '', mimetype: '', originalFilename: '', newFilename: '',hashAlgorithm: false, 
-                            toJSON: () => ({ size: 0, filepath: '', mimetype: '', originalFilename: '', newFilename: '',name: '', length: 0,  mtime: new Date(), type: '' }) },
-                            result: { name: '', message: `max file size (${maxFileSize / 1000000}MB) exceeded` }
-                        }]) // prettier-ignore
-                });
+                return new Promise<Upload.FileResponse<T>[]>(res => res([{ source: { newFilename: '', mimetype: '' } as formidable.File, result: new Error(`max file size (${maxFileSize / 1000000}MB) exceeded`) }]));
             }
             formData.set('fileguids', fileguidpairs.map(pair => pair.guid).join(';'));
             formData.set('filesize', fileguidpairs.reduce((sum, pair) => sum + pair.file.size, 0).toString());
diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index a503d732b..35d835f1f 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -739,7 +739,7 @@ export namespace DocUtils {
             const {
                 source: { newFilename, mimetype },
                 result,
-            } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: { message: 'upload failed' } };
+            } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: new Error('upload failed') };
             if (result instanceof Error) {
                 if (overwriteDoc) {
                     overwriteDoc.loadingError = result.message;
diff --git a/src/client/views/collections/collectionFreeForm/FaceCollectionBox.tsx b/src/client/views/collections/collectionFreeForm/FaceCollectionBox.tsx
index 50b91e8fe..d5a2809dc 100644
--- a/src/client/views/collections/collectionFreeForm/FaceCollectionBox.tsx
+++ b/src/client/views/collections/collectionFreeForm/FaceCollectionBox.tsx
@@ -11,17 +11,20 @@ import { Doc, DocListCast } from '../../../../fields/Doc';
 import { DocData } from '../../../../fields/DocSymbols';
 import { Id } from '../../../../fields/FieldSymbols';
 import { List } from '../../../../fields/List';
-import { ImageCast, StrCast } from '../../../../fields/Types';
+import { listSpec } from '../../../../fields/Schema';
+import { Cast, ImageCast, StrCast } from '../../../../fields/Types';
 import { DocumentType } from '../../../documents/DocumentTypes';
 import { Docs } from '../../../documents/Documents';
 import { DragManager } from '../../../util/DragManager';
 import { SnappingManager } from '../../../util/SnappingManager';
+import { undoable } from '../../../util/UndoManager';
 import { ViewBoxBaseComponent } from '../../DocComponent';
 import { ObservableReactComponent } from '../../ObservableReactComponent';
 import { DocumentView } from '../../nodes/DocumentView';
 import { FieldView, FieldViewProps } from '../../nodes/FieldView';
 import './FaceCollectionBox.scss';
 import { MarqueeOptionsMenu } from './MarqueeOptionsMenu';
+import { FaceRecognitionHandler } from '../../search/FaceRecognitionHandler';
 
 interface FaceDocumentProps {
     faceDoc: Doc;
@@ -32,17 +35,15 @@ interface FaceDocumentProps {
  */
 @observer
 export class FaceDocumentItem extends ObservableReactComponent<FaceDocumentProps> {
-    private ref: React.RefObject<HTMLDivElement>;
-    @observable _displayImages: boolean = true;
     private _dropDisposer?: DragManager.DragDropDisposer;
-    private _inputRef = React.createRef<HTMLInputElement>();
 
     constructor(props: FaceDocumentProps) {
         super(props);
         makeObservable(this);
-        this.ref = React.createRef();
     }
 
+    @observable _displayImages: boolean = true;
+
     protected createDropTarget = (ele: HTMLDivElement) => {
         this._dropDisposer?.();
         ele && (this._dropDisposer = DragManager.MakeDropTarget(ele, this.onInternalDrop.bind(this), this._props.faceDoc));
@@ -54,20 +55,20 @@ export class FaceDocumentItem extends ObservableReactComponent<FaceDocumentProps
             const filteredDocs = docDragData.droppedDocuments.filter(doc => doc.type === DocumentType.IMG);
             filteredDocs.forEach(doc => {
                 // If the current Face Document has no items, and the doc has more than one face descriptor, don't let the user add the document first.
-                if ((this._props.faceDoc[DocData].faceDescriptors as List<List<number>>).length === 0 && (doc[DocData].faces as List<List<number>>).length > 1) {
+                if ((this._props.faceDoc[DocData].face_descriptors as List<List<number>>).length === 0 && (doc[DocData][FaceRecognitionHandler.FacesField(doc)] as List<List<number>>).length > 1) {
                     alert('Cannot add a document with multiple faces as the first item!');
                 } else {
                     // Loop through the documents' face descriptors.
                     // Choose the face with the smallest distance to add.
-                    const float32Array = (this._props.faceDoc[DocData].faceDescriptors as List<List<number>>).map(faceDescriptor => new Float32Array(Array.from(faceDescriptor)));
-                    const labeledFaceDescriptor = new faceapi.LabeledFaceDescriptors(StrCast(this._props.faceDoc[DocData].label), float32Array);
+                    const float32Array = (this._props.faceDoc[DocData].face_descriptors as List<List<number>>).map(faceDescriptor => new Float32Array(Array.from(faceDescriptor)));
+                    const labeledFaceDescriptor = new faceapi.LabeledFaceDescriptors(StrCast(this._props.faceDoc[DocData].face_label), float32Array);
                     const faceDescriptors: faceapi.LabeledFaceDescriptors[] = [labeledFaceDescriptor];
 
                     const faceMatcher = new FaceMatcher(faceDescriptors, 1);
                     let cur_lowest_distance = 1;
                     let cur_matching_face = new List<number>();
 
-                    (doc[DocData].faces as List<List<number>>).forEach(face => {
+                    (doc[DocData][FaceRecognitionHandler.FacesField(doc)] as List<List<number>>).forEach(face => {
                         // If the face has the current lowest distance, mark it as such
                         // Once that lowest distance is found, add the face descriptor to the faceDoc, and add the associated doc
                         const convered_32_array: Float32Array = new Float32Array(Array.from(face));
@@ -79,16 +80,15 @@ export class FaceDocumentItem extends ObservableReactComponent<FaceDocumentProps
                         }
                     });
 
-                    if (doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`]) {
-                        doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`] = new List<List<number>>([...(doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`] as List<List<number>>), cur_matching_face]);
+                    const faceFieldKey = FaceRecognitionHandler.FaceField(doc, this._props.faceDoc);
+                    if (doc[DocData][faceFieldKey]) {
+                        Cast(doc[DocData][faceFieldKey], listSpec('number'), null).push(cur_matching_face as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
                     } else {
-                        doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`] = new List<List<number>>([cur_matching_face]);
+                        doc[DocData][faceFieldKey] = new List<List<number>>([cur_matching_face]);
                     }
 
-                    this._props.faceDoc[DocData].associatedDocs = new List<Doc>([...DocListCast(this._props.faceDoc[DocData].associatedDocs), doc]);
-                    this._props.faceDoc[DocData].faceDescriptors = new List<List<number>>([...(this._props.faceDoc[DocData].faceDescriptors as List<List<number>>), cur_matching_face]);
-
-                    //const match = faceMatcher.findBestMatch(cur_descriptor);
+                    Doc.AddDocToList(this._props.faceDoc[DocData], 'face_docList', doc);
+                    Cast(this._props.faceDoc[DocData].face_descriptors, listSpec('number'), null).push(cur_matching_face as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
                 }
             });
             return false;
@@ -107,12 +107,11 @@ export class FaceDocumentItem extends ObservableReactComponent<FaceDocumentProps
     /**
      * Deletes a Face Document.
      */
-    @action
-    deleteFaceDocument = () => {
+    deleteFaceDocument = undoable(() => {
         if (Doc.ActiveDashboard) {
-            Doc.ActiveDashboard[DocData].faceDocuments = new List<Doc>(DocListCast(Doc.ActiveDashboard[DocData].faceDocuments).filter(doc => doc !== this._props.faceDoc));
+            Doc.RemoveDocFromList(Doc.ActiveDashboard[DocData], 'faceDocuments', this._props.faceDoc);
         }
-    };
+    }, 'remove face');
 
     /**
      * Deletes a document from a Face Document's associated docs list.
@@ -120,60 +119,44 @@ export class FaceDocumentItem extends ObservableReactComponent<FaceDocumentProps
      */
     @action
     deleteAssociatedDoc = (doc: Doc) => {
-        this._props.faceDoc[DocData].faceDescriptors = new List<List<number>>(
-            (this._props.faceDoc[DocData].faceDescriptors as List<List<number>>).filter(fd => !(doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`] as List<List<number>>).includes(fd))
+        this._props.faceDoc[DocData].face_descriptors = new List<List<number>>(
+            (this._props.faceDoc[DocData].face_descriptors as List<List<number>>).filter(fd => !(doc[DocData][FaceRecognitionHandler.FaceField(doc, this._props.faceDoc)] as List<List<number>>).includes(fd))
         );
-        doc[DocData][`FACE DESCRIPTOR - ${this._props.faceDoc[DocData].label}`] = new List<List<number>>();
-        this._props.faceDoc[DocData].associatedDocs = new List<Doc>(DocListCast(this._props.faceDoc[DocData].associatedDocs).filter(associatedDoc => associatedDoc !== doc));
+        doc[DocData][FaceRecognitionHandler.FaceField(doc, this._props.faceDoc)] = new List<List<number>>();
+        Doc.RemoveDocFromList(this._props.faceDoc[DocData], 'face_docList', doc);
     };
 
     render() {
         return (
             <div className="face-document-item" ref={ele => this.createDropTarget(ele!)}>
                 <div className="face-collection-buttons">
-                    <IconButton tooltip={'Delete Face From Collection'} onPointerDown={this.deleteFaceDocument} icon={'x'} style={{ width: '4px' }} size={Size.XSMALL} />
+                    <IconButton tooltip="Delete Face From Collection" onPointerDown={this.deleteFaceDocument} icon={'x'} style={{ width: '4px' }} size={Size.XSMALL} />
                 </div>
                 <div className="face-document-top">
-                    <h1>{StrCast(this._props.faceDoc[DocData].label)}</h1>
+                    <h1>{StrCast(this._props.faceDoc[DocData].face_label)}</h1>
                 </div>
                 <IconButton
-                    tooltip={'See image information'}
+                    tooltip="See image information"
                     onPointerDown={() => this.onDisplayClick()}
-                    icon={this._displayImages ? <FontAwesomeIcon icon="caret-up" /> : <FontAwesomeIcon icon="caret-down" />}
+                    icon={<FontAwesomeIcon icon={this._displayImages ? 'caret-up' : 'caret-down'} />}
                     color={MarqueeOptionsMenu.Instance.userColor}
                     style={{ width: '19px' }}
                 />
                 {this._displayImages ? (
                     <div className="face-document-image-container">
-                        {DocListCast(this._props.faceDoc[DocData].associatedDocs).map(doc => {
+                        {DocListCast(this._props.faceDoc[DocData].face_docList).map(doc => {
                             const [name, type] = ImageCast(doc[Doc.LayoutFieldKey(doc)]).url.href.split('.');
                             return (
                                 <div className="image-wrapper" key={Utils.GenerateGuid()}>
-                                    <img
-                                        onClick={async () => {
-                                            await DocumentView.showDocument(doc, { willZoomCentered: true });
-                                        }}
-                                        style={{ maxWidth: '60px', margin: '10px' }}
-                                        src={`${name}_o.${type}`}
-                                    />
+                                    <img onClick={() => DocumentView.showDocument(doc, { willZoomCentered: true })} style={{ maxWidth: '60px', margin: '10px' }} src={`${name}_o.${type}`} />
                                     <div className="remove-item">
-                                        <IconButton
-                                            tooltip={'Remove Doc From Face Collection'}
-                                            onPointerDown={() => {
-                                                this.deleteAssociatedDoc(doc);
-                                            }}
-                                            icon={'x'}
-                                            style={{ width: '4px' }}
-                                            size={Size.XSMALL}
-                                        />
+                                        <IconButton tooltip={'Remove Doc From Face Collection'} onPointerDown={() => this.deleteAssociatedDoc(doc)} icon={'x'} style={{ width: '4px' }} size={Size.XSMALL} />
                                     </div>
                                 </div>
                             );
                         })}
                     </div>
-                ) : (
-                    <div></div>
-                )}
+                ) : null}
             </div>
         );
     }
@@ -190,9 +173,8 @@ export class FaceCollectionBox extends ViewBoxBaseComponent<FieldViewProps>() {
     @computed get currentDocs() {
         if (Doc.ActiveDashboard) {
             return DocListCast(Doc.ActiveDashboard[DocData].faceDocuments);
-        } else {
-            return [];
         }
+        return [];
     }
 
     constructor(props: FieldViewProps) {
@@ -204,9 +186,9 @@ export class FaceCollectionBox extends ViewBoxBaseComponent<FieldViewProps>() {
     render() {
         return (
             <div className="searchBox-container" style={{ pointerEvents: 'all', color: SnappingManager.userColor, background: SnappingManager.userBackgroundColor }}>
-                {this.currentDocs.map(doc => {
-                    return <FaceDocumentItem key={doc[Id]} faceDoc={doc} />;
-                })}
+                {this.currentDocs.map(doc => (
+                    <FaceDocumentItem key={doc[Id]} faceDoc={doc} />
+                ))}
             </div>
         );
     }
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index d7a41df64..6fee076ee 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -1,28 +1,24 @@
-/* eslint-disable jsx-a11y/no-static-element-interactions */
-import similarity from 'compute-cosine-similarity';
 import { action, computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { ClientUtils, lightOrDark, returnFalse } from '../../../../ClientUtils';
-import { intersectRect, numberRange } from '../../../../Utils';
-import { Doc, DocListCast, NumListCast, Opt } from '../../../../fields/Doc';
+import { intersectRect } from '../../../../Utils';
+import { Doc, DocListCast, Opt } from '../../../../fields/Doc';
 import { AclAdmin, AclAugment, AclEdit, DocData } from '../../../../fields/DocSymbols';
 import { Id } from '../../../../fields/FieldSymbols';
-import { InkData, InkField, InkTool } from '../../../../fields/InkField';
+import { InkTool } from '../../../../fields/InkField';
 import { List } from '../../../../fields/List';
-import { RichTextField } from '../../../../fields/RichTextField';
-import { Cast, FieldValue, ImageCast, NumCast, StrCast } from '../../../../fields/Types';
+import { Cast, NumCast, StrCast } from '../../../../fields/Types';
 import { ImageField } from '../../../../fields/URLField';
 import { GetEffectiveAcl } from '../../../../fields/util';
-import { gptGetEmbedding, gptImageLabel } from '../../../apis/gpt/GPT';
-import { CognitiveServices } from '../../../cognitive_services/CognitiveServices';
 import { DocUtils } from '../../../documents/DocUtils';
-import { CollectionViewType, DocumentType } from '../../../documents/DocumentTypes';
+import { DocumentType } from '../../../documents/DocumentTypes';
 import { Docs, DocumentOptions } from '../../../documents/Documents';
 import { SnappingManager, freeformScrollMode } from '../../../util/SnappingManager';
 import { Transform } from '../../../util/Transform';
 import { UndoManager, undoBatch } from '../../../util/UndoManager';
 import { ContextMenu } from '../../ContextMenu';
+import { MainView } from '../../MainView';
 import { ObservableReactComponent } from '../../ObservableReactComponent';
 import { MarqueeViewBounds } from '../../PinFuncs';
 import { PreviewCursor } from '../../PreviewCursor';
@@ -30,15 +26,10 @@ import { DocumentView } from '../../nodes/DocumentView';
 import { OpenWhere } from '../../nodes/OpenWhere';
 import { pasteImageBitmap } from '../../nodes/WebBoxRenderer';
 import { FormattedTextBox } from '../../nodes/formattedText/FormattedTextBox';
-import { CollectionCardView } from '../CollectionCardDeckView';
 import { SubCollectionViewProps } from '../CollectionSubView';
-import { CollectionFreeFormView } from './CollectionFreeFormView';
-import { ImageLabelHandler } from './ImageLabelHandler';
+import { ImageLabelBoxData } from './ImageLabelBox';
 import { MarqueeOptionsMenu } from './MarqueeOptionsMenu';
 import './MarqueeView.scss';
-import { MainView } from '../../MainView';
-import { ImageLabelBox, ImageLabelBoxData } from './ImageLabelBox';
-import { SearchBox } from '../../search/SearchBox';
 
 interface MarqueeViewProps {
     getContainerTransform: () => Transform;
@@ -68,7 +59,7 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
 
     static Instance: MarqueeView;
 
-    constructor(props: any) {
+    constructor(props: SubCollectionViewProps & MarqueeViewProps) {
         super(props);
         makeObservable(this);
         MarqueeView.Instance = this;
@@ -495,71 +486,6 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
         //this._props.Document.pivotField = 'data_label'; // Sets the pivot to be the 'data_label'.
     });
 
-    @undoBatch
-    syntaxHighlight = action((e: KeyboardEvent | React.PointerEvent | undefined) => {
-        const selected = this.marqueeSelect(false);
-        if (e instanceof KeyboardEvent ? e.key === 'i' : true) {
-            const inks = selected.filter(s => s.type === DocumentType.INK);
-            const setDocs = selected.filter(s => s.type === DocumentType.RTF && s.color);
-            const sets = setDocs.map(sd => Cast(sd.data, RichTextField)?.Text as string);
-            const colors = setDocs.map(sd => FieldValue(sd.color) as string);
-            const wordToColor = new Map<string, string>();
-            sets.forEach((st: string, i: number) => st.split(',').forEach(word => wordToColor.set(word, colors[i])));
-            const strokes: InkData[] = [];
-            inks.filter(i => Cast(i.data, InkField)).forEach(i => {
-                const d = Cast(i.data, InkField, null);
-                const left = Math.min(...(d?.inkData.map(pd => pd.X) ?? [0]));
-                const top = Math.min(...(d?.inkData.map(pd => pd.Y) ?? [0]));
-                strokes.push(d.inkData.map(pd => ({ X: pd.X + NumCast(i.x) - left, Y: pd.Y + NumCast(i.y) - top })));
-            });
-            CognitiveServices.Inking.Appliers.InterpretStrokes(strokes).then(results => {
-                // const wordResults = results.filter((r: any) => r.category === "inkWord");
-                // for (const word of wordResults) {
-                //     const indices: number[] = word.strokeIds;
-                //     indices.forEach(i => {
-                //         if (wordToColor.has(word.recognizedText.toLowerCase())) {
-                //             inks[i].color = wordToColor.get(word.recognizedText.toLowerCase());
-                //         }
-                //         else {
-                //             for (const alt of word.alternates) {
-                //                 if (wordToColor.has(alt.recognizedString.toLowerCase())) {
-                //                     inks[i].color = wordToColor.get(alt.recognizedString.toLowerCase());
-                //                     break;
-                //                 }
-                //             }
-                //         }
-                //     })
-                // }
-                // const wordResults = results.filter((r: any) => r.category === "inkWord");
-                // for (const word of wordResults) {
-                //     const indices: number[] = word.strokeIds;
-                //     indices.forEach(i => {
-                //         const otherInks: Doc[] = [];
-                //         indices.forEach(i2 => i2 !== i && otherInks.push(inks[i2]));
-                //         inks[i].relatedInks = new List<Doc>(otherInks);
-                //         const uniqueColors: string[] = [];
-                //         Array.from(wordToColor.values()).forEach(c => uniqueColors.indexOf(c) === -1 && uniqueColors.push(c));
-                //         inks[i].alternativeColors = new List<string>(uniqueColors);
-                //         if (wordToColor.has(word.recognizedText.toLowerCase())) {
-                //             inks[i].color = wordToColor.get(word.recognizedText.toLowerCase());
-                //         }
-                //         else if (word.alternates) {
-                //             for (const alt of word.alternates) {
-                //                 if (wordToColor.has(alt.recognizedString.toLowerCase())) {
-                //                     inks[i].color = wordToColor.get(alt.recognizedString.toLowerCase());
-                //                     break;
-                //                 }
-                //             }
-                //         }
-                //     });
-                // }
-                const lines = results.filter((r: any) => r.category === 'line');
-                const text = lines.map((l: any) => l.recognizedText).join('\r\n');
-                this._props.addDocument?.(Docs.Create.TextDocument(text, { _width: this.Bounds.width, _height: this.Bounds.height, x: this.Bounds.left + this.Bounds.width, y: this.Bounds.top, title: text }));
-            });
-        }
-    });
-
     @undoBatch
     summary = action(() => {
         const selected = this.marqueeSelect(false).map(d => {
@@ -704,8 +630,8 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
                     transform: `translate(${p[0]}px, ${p[1]}px)`,
                     width: Math.abs(v[0]),
                     height: Math.abs(v[1]),
-                    color: lightOrDark(this._props.Document?.backgroundColor ?? 'white'),
-                    borderColor: lightOrDark(this._props.Document?.backgroundColor ?? 'white'),
+                    color: lightOrDark((this._props.Document?.backgroundColor as string) ?? 'white'),
+                    borderColor: lightOrDark((this._props.Document?.backgroundColor as string) ?? 'white'),
                     zIndex: 2000,
                 }}>
                 {' '}
@@ -714,7 +640,7 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
                         <polyline //
                             points={this._lassoPts.reduce((s, pt) => s + pt[0] + ',' + pt[1] + ' ', '')}
                             fill="none"
-                            stroke={lightOrDark(this._props.Document?.backgroundColor ?? 'white')}
+                            stroke={lightOrDark((this._props.Document?.backgroundColor as string) ?? 'white')}
                             strokeWidth="1"
                             strokeDasharray="3"
                         />
@@ -753,7 +679,6 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
     };
     render() {
         return (
-            // eslint-disable-next-line jsx-a11y/click-events-have-key-events
             <div
                 className="marqueeView"
                 ref={r => {
diff --git a/src/client/views/nodes/FaceRectangles.tsx b/src/client/views/nodes/FaceRectangles.tsx
index ade4225d9..19aa90a8b 100644
--- a/src/client/views/nodes/FaceRectangles.tsx
+++ b/src/client/views/nodes/FaceRectangles.tsx
@@ -4,6 +4,7 @@ import { Doc, DocListCast } from '../../../fields/Doc';
 import { Id } from '../../../fields/FieldSymbols';
 import { Cast, NumCast } from '../../../fields/Types';
 import FaceRectangle from './FaceRectangle';
+import { FaceRecognitionHandler } from '../search/FaceRecognitionHandler';
 
 interface FaceRectanglesProps {
     document: Doc;
@@ -19,7 +20,7 @@ export interface RectangleTemplate {
 @observer
 export class FaceRectangles extends React.Component<FaceRectanglesProps> {
     render() {
-        const faces = DocListCast(this.props.document.faces);
+        const faces = DocListCast(this.props.document[FaceRecognitionHandler.FacesField(this.props.document)]);
         const templates: RectangleTemplate[] = faces.map(faceDoc => {
             const rectangle = Cast(faceDoc.faceRectangle, Doc) as Doc;
             const style = {
diff --git a/src/client/views/search/FaceRecognitionHandler.tsx b/src/client/views/search/FaceRecognitionHandler.tsx
index 29ca6e797..dc271fe73 100644
--- a/src/client/views/search/FaceRecognitionHandler.tsx
+++ b/src/client/views/search/FaceRecognitionHandler.tsx
@@ -1,42 +1,46 @@
 import * as faceapi from 'face-api.js';
 import { FaceMatcher } from 'face-api.js';
+import { computed } from 'mobx';
 import { Doc, DocListCast } from '../../../fields/Doc';
 import { DocData } from '../../../fields/DocSymbols';
 import { List } from '../../../fields/List';
+import { listSpec } from '../../../fields/Schema';
 import { Cast, ImageCast, NumCast, StrCast } from '../../../fields/Types';
-import { DocumentManager } from '../../util/DocumentManager';
-import { computed } from 'mobx';
 import { DocumentType } from '../../documents/DocumentTypes';
-import { listSpec } from '../../../fields/Schema';
+import { DocumentManager } from '../../util/DocumentManager';
 
 /**
  * A class that handles face recognition.
  */
 export class FaceRecognitionHandler {
     static _instance: FaceRecognitionHandler;
-    private loadedModels: boolean = false;
-    @computed get examinedFaceDocs() {
-        return DocListCast(Doc.UserDoc().examinedFaceDocs);
-    }
-    processingDocs: Set<Doc> = new Set();
-    pendingLoadDocs: Doc[] = [];
+    private _loadedModels: boolean = false;
+    private _processingDocs: Set<Doc> = new Set();
+    private _pendingLoadDocs: Doc[] = [];
+
+    public static FaceField = (target: Doc, doc: Doc) => `${Doc.LayoutFieldKey(target)}_${doc.face_label}`;
+    public static FacesField = (target: Doc) => `${Doc.LayoutFieldKey(target)}_Faces`;
 
     constructor() {
         FaceRecognitionHandler._instance = this;
-        this.loadModels().then(() => this.pendingLoadDocs.forEach(this.findMatches));
+        this.loadModels().then(() => this._pendingLoadDocs.forEach(this.findMatches));
         DocumentManager.Instance.AddAnyViewRenderedCB(dv => FaceRecognitionHandler.Instance.findMatches(dv.Document));
     }
 
+    @computed get examinedFaceDocs() {
+        return DocListCast(Doc.UserDoc().examinedFaceDocs);
+    }
+
     /**
      * Loads the face detection models.
      */
-    async loadModels() {
+    loadModels = async () => {
         const MODEL_URL = `/models`;
         await faceapi.loadFaceDetectionModel(MODEL_URL);
         await faceapi.loadFaceLandmarkModel(MODEL_URL);
         await faceapi.loadFaceRecognitionModel(MODEL_URL);
-        this.loadedModels = true;
-    }
+        this._loadedModels = true;
+    };
 
     public static get Instance() {
         return FaceRecognitionHandler._instance ?? new FaceRecognitionHandler();
@@ -47,8 +51,8 @@ export class FaceRecognitionHandler {
      * @param doc The document being analyzed.
      */
     public findMatches = async (doc: Doc) => {
-        if (!this.loadedModels || !Doc.ActiveDashboard) {
-            this.pendingLoadDocs.push(doc);
+        if (!this._loadedModels || !Doc.ActiveDashboard) {
+            this._pendingLoadDocs.push(doc);
             return;
         }
 
@@ -59,12 +63,12 @@ export class FaceRecognitionHandler {
 
         const imgUrl = ImageCast(doc[Doc.LayoutFieldKey(doc)]);
         // If the doc isn't an image or currently already been examined or is being processed, stop examining the document.
-        if (!imgUrl || this.examinedFaceDocs.includes(doc) || this.processingDocs.has(doc)) {
+        if (!imgUrl || this.examinedFaceDocs.includes(doc) || this._processingDocs.has(doc)) {
             return;
         }
 
         // Mark the document as being processed.
-        this.processingDocs.add(doc);
+        this._processingDocs.add(doc);
 
         // Get the image the document contains and analyze for faces.
         const [name, type] = imgUrl.url.href.split('.');
@@ -74,7 +78,7 @@ export class FaceRecognitionHandler {
 
         const fullFaceDescriptions = await faceapi.detectAllFaces(img).withFaceLandmarks().withFaceDescriptors();
 
-        doc[DocData].faces = new List<List<number>>();
+        doc[DocData][FaceRecognitionHandler.FacesField(doc)] = new List<List<number>>();
 
         // For each face detected, find a match.
         for (const fd of fullFaceDescriptions) {
@@ -84,34 +88,36 @@ export class FaceRecognitionHandler {
             if (match) {
                 // If a matching Face Document has been found, add the document to the Face Document's associated docs and append the face
                 // descriptor to the Face Document's descriptor list.
-                Doc.AddDocToList(match, 'associatedDocs', doc);
-                Cast(match.faceDescriptors, listSpec('number'), null).push(converted_list as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
+                Doc.AddDocToList(match, 'face_docList', doc);
+                Cast(match.face_descriptors, listSpec('number'), null).push(converted_list as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
             } else {
                 // If a matching Face Document has not been found, create a new Face Document.
                 Doc.UserDoc().faceDocNum = NumCast(Doc.UserDoc().faceDocNum) + 1;
 
                 const newFaceDocument = new Doc();
-                newFaceDocument.label = `Face ${Doc.UserDoc().faceDocNum}`;
-                newFaceDocument.associatedDocs = new List<Doc>([doc]);
-                newFaceDocument.faceDescriptors = new List<List<number>>([converted_list]);
+                newFaceDocument.title = `Face ${Doc.UserDoc().faceDocNum}`;
+                newFaceDocument.face = ''; // just to make prettyprinting look better
+                newFaceDocument.face_label = `Face${Doc.UserDoc().faceDocNum}`;
+                newFaceDocument.face_docList = new List<Doc>([doc]);
+                newFaceDocument.face_descriptors = new List<List<number>>([converted_list]);
 
                 Doc.AddDocToList(Doc.ActiveDashboard[DocData], 'faceDocuments', newFaceDocument);
                 match = newFaceDocument;
             }
 
             // Assign a field in the document of the matching Face Document.
-            const faceDescripField = `FACE DESCRIPTOR - ${match[DocData].label}`;
+            const faceDescripField = FaceRecognitionHandler.FaceField(doc, match);
             if (doc[DocData][faceDescripField]) {
                 Cast(doc[DocData][faceDescripField], listSpec('number'), null).push(converted_list as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
             } else {
                 doc[DocData][faceDescripField] = new List<List<number>>([converted_list]);
             }
 
-            Cast(doc[DocData].faces, listSpec('number'), null).push(converted_list as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
+            Cast(doc[DocData][FaceRecognitionHandler.FacesField(doc)], listSpec('number'), null).push(converted_list as unknown as number); // items are lists of numbers, not numbers, but type system can't handle that
 
             Doc.AddDocToList(Doc.UserDoc(), 'examinedFaceDocs', doc);
         }
-        this.processingDocs.delete(doc);
+        this._processingDocs.delete(doc);
     };
 
     /**
@@ -125,14 +131,14 @@ export class FaceRecognitionHandler {
         }
 
         const faceDescriptors: faceapi.LabeledFaceDescriptors[] = DocListCast(Doc.ActiveDashboard[DocData].faceDocuments).map(faceDocument => {
-            const float32Array = (faceDocument[DocData].faceDescriptors as List<List<number>>).map(faceDescriptor => new Float32Array(Array.from(faceDescriptor)));
-            return new faceapi.LabeledFaceDescriptors(StrCast(faceDocument[DocData].label), float32Array);
+            const float32Array = (faceDocument[DocData].face_descriptors as List<List<number>>).map(faceDescriptor => new Float32Array(Array.from(faceDescriptor)));
+            return new faceapi.LabeledFaceDescriptors(StrCast(faceDocument[DocData].face_label), float32Array);
         });
         const faceMatcher = new FaceMatcher(faceDescriptors, 0.6);
         const match = faceMatcher.findBestMatch(cur_descriptor);
         if (match.label !== 'unknown') {
             for (const doc of DocListCast(Doc.ActiveDashboard[DocData].faceDocuments)) {
-                if (doc[DocData].label === match.label) {
+                if (doc[DocData].face_label === match.label) {
                     return doc;
                 }
             }
-- 
cgit v1.2.3-70-g09d2


From 19a947cbd253ff7fb9da88c27af7645219446d0a Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 20 Aug 2024 22:02:54 -0400
Subject: from last

---
 .eslintrc.json                            |  2 +-
 src/client/documents/DocUtils.ts          |  2 +-
 src/client/views/nodes/FaceRectangle.tsx  | 34 ----------------------
 src/client/views/nodes/FaceRectangles.tsx | 47 -------------------------------
 src/server/server_Initialization.ts       |  2 +-
 5 files changed, 3 insertions(+), 84 deletions(-)
 delete mode 100644 src/client/views/nodes/FaceRectangle.tsx
 delete mode 100644 src/client/views/nodes/FaceRectangles.tsx

(limited to 'src/client/documents/DocUtils.ts')

diff --git a/.eslintrc.json b/.eslintrc.json
index 6202561d5..d4f43f04c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -40,6 +40,7 @@
         "react/jsx-filename-extension": [2, { "extensions": [".js", ".jsx", ".ts", ".tsx"] }],
         "import/prefer-default-export": "off",
         "no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-expressions": "off",
         "prefer-template": "off",
         "no-inner-declarations": "off",
         "no-plusplus": "off",
@@ -54,7 +55,6 @@
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/no-namespace": 0,
-        "@typescript-eslint/no-unused-expressions": "off",
         "react/destructuring-assignment": 0,
         "no-restricted-globals": ["error", "event"],
         "no-param-reassign": ["error", { "props": false }],
diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 35d835f1f..0168e0a3b 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -35,7 +35,7 @@ import { TaskCompletionBox } from '../views/nodes/TaskCompletedBox';
 import { DocumentType } from './DocumentTypes';
 import { Docs, DocumentOptions } from './Documents';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
 const { DFLT_IMAGE_NATIVE_DIM } = require('../views/global/globalCssVariables.module.scss'); // prettier-ignore
 
 const defaultNativeImageDim = Number(DFLT_IMAGE_NATIVE_DIM.replace('px', ''));
diff --git a/src/client/views/nodes/FaceRectangle.tsx b/src/client/views/nodes/FaceRectangle.tsx
deleted file mode 100644
index 2b66b83fe..000000000
--- a/src/client/views/nodes/FaceRectangle.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { observable, runInAction } from 'mobx';
-import { observer } from 'mobx-react';
-import * as React from 'react';
-import { RectangleTemplate } from './FaceRectangles';
-
-@observer
-export default class FaceRectangle extends React.Component<{ rectangle: RectangleTemplate }> {
-    @observable private opacity = 0;
-
-    componentDidMount() {
-        setTimeout(
-            () =>
-                runInAction(() => {
-                    this.opacity = 1;
-                }),
-            500
-        );
-    }
-
-    render() {
-        const { rectangle } = this.props;
-        return (
-            <div
-                style={{
-                    ...rectangle.style,
-                    opacity: this.opacity,
-                    transition: '1s ease opacity',
-                    position: 'absolute',
-                    borderRadius: 5,
-                }}
-            />
-        );
-    }
-}
diff --git a/src/client/views/nodes/FaceRectangles.tsx b/src/client/views/nodes/FaceRectangles.tsx
deleted file mode 100644
index 19aa90a8b..000000000
--- a/src/client/views/nodes/FaceRectangles.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { observer } from 'mobx-react';
-import * as React from 'react';
-import { Doc, DocListCast } from '../../../fields/Doc';
-import { Id } from '../../../fields/FieldSymbols';
-import { Cast, NumCast } from '../../../fields/Types';
-import FaceRectangle from './FaceRectangle';
-import { FaceRecognitionHandler } from '../search/FaceRecognitionHandler';
-
-interface FaceRectanglesProps {
-    document: Doc;
-    color: string;
-    backgroundColor: string;
-}
-
-export interface RectangleTemplate {
-    id: string;
-    style: Partial<React.CSSProperties>;
-}
-
-@observer
-export class FaceRectangles extends React.Component<FaceRectanglesProps> {
-    render() {
-        const faces = DocListCast(this.props.document[FaceRecognitionHandler.FacesField(this.props.document)]);
-        const templates: RectangleTemplate[] = faces.map(faceDoc => {
-            const rectangle = Cast(faceDoc.faceRectangle, Doc) as Doc;
-            const style = {
-                top: NumCast(rectangle.top),
-                left: NumCast(rectangle.left),
-                width: NumCast(rectangle.width),
-                height: NumCast(rectangle.height),
-                backgroundColor: `${this.props.backgroundColor}33`,
-                border: `solid 2px ${this.props.color}`,
-            } as React.CSSProperties;
-            return {
-                id: rectangle[Id],
-                style: style,
-            };
-        });
-        return (
-            <div>
-                {templates.map(rectangle => (
-                    <FaceRectangle key={rectangle.id} rectangle={rectangle} />
-                ))}
-            </div>
-        );
-    }
-}
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 8d3afc3ad..97c63a93e 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -115,7 +115,7 @@ function registerEmbeddedBrowseRelativePathHandler(server: express.Express) {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function proxyServe(req: any, requrl: string, response: any) {
-    // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
+    // eslint-disable-next-line global-require, @typescript-eslint/no-require-imports
     const htmlBodyMemoryStream = new (require('memorystream'))();
     let wasinBrFormat = false;
     const sendModifiedBody = () => {
-- 
cgit v1.2.3-70-g09d2


From 166d40bd856b85bd4bbde9f9ffe2c1ec0fb648d5 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 21 Aug 2024 10:57:53 -0400
Subject: more lint fixes after update

---
 eslint.config.mjs                              | 45 ++++++++++++++++++++++++-
 package-lock.json                              | 46 ++++++++++----------------
 src/ClientUtils.ts                             |  1 -
 src/ServerUtils.ts                             |  1 -
 src/client/Network.ts                          |  2 +-
 src/client/documents/DocUtils.ts               |  3 +-
 src/client/documents/Documents.ts              |  4 +--
 src/client/util/DictationManager.ts            |  4 ---
 src/client/util/DragManager.ts                 |  1 -
 src/client/util/History.ts                     |  1 -
 src/client/util/InteractionUtils.tsx           |  1 -
 src/client/util/ScriptingGlobals.ts            |  2 +-
 src/client/util/SearchUtil.ts                  |  1 -
 src/client/util/SerializationHelper.ts         |  1 -
 src/client/util/UndoManager.ts                 |  1 -
 src/client/views/DocViewUtils.ts               |  1 -
 src/pen-gestures/GestureUtils.ts               |  1 -
 src/server/DashStats.ts                        |  2 +-
 src/server/DashUploadUtils.ts                  |  1 -
 src/server/Message.ts                          |  1 -
 src/server/Search.ts                           |  1 -
 src/server/SharedMediaTypes.ts                 |  2 --
 src/server/apis/google/GoogleApiServerUtils.ts |  2 +-
 src/server/server_Initialization.ts            |  9 +++++
 src/server/websocket.ts                        |  1 -
 25 files changed, 77 insertions(+), 58 deletions(-)

(limited to 'src/client/documents/DocUtils.ts')

diff --git a/eslint.config.mjs b/eslint.config.mjs
index b35601abd..04655ce13 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -3,4 +3,47 @@ import pluginReactConfig from 'eslint-plugin-react/configs/recommended.js';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
 
-export default [{ languageOptions: { globals: { ...globals.browser, ...globals.node } } }, pluginJs.configs.recommended, ...tseslint.configs.recommended, pluginReactConfig];
+export default [
+    {
+        languageOptions: { globals: { ...globals.browser, ...globals.node } },
+    },
+    pluginJs.configs.recommended,
+    ...tseslint.configs.recommended,
+    {
+        rules: {
+            'node/no-missing-import': 0,
+            'no-console': 'off',
+            'func-names': 'off',
+            'no-process-exit': 'off',
+            'object-shorthand': 'off',
+            'class-methods-use-this': 'off',
+            'single-quote': 'off',
+            'max-classes-per-file': 0,
+
+            'react/jsx-filename-extension': [
+                2,
+                {
+                    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+                },
+            ],
+
+            'import/prefer-default-export': 'off',
+            'no-unused-expressions': 'off',
+            'prefer-template': 'off',
+            'no-inner-declarations': 'off',
+            'no-plusplus': 'off',
+            'no-multi-assign': 'off',
+            'no-underscore-dangle': 'off',
+            'no-nested-ternary': 'off',
+            'lines-between-class-members': 'off',
+            'no-shadow': 'off',
+            '@typescript-eslint/no-shadow': 'warn',
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-unused-vars': 'error',
+            '@typescript-eslint/no-namespace': 'off',
+            'react/destructuring-assignment': 0,
+            'no-restricted-globals': ['error', 'event'],
+        },
+    },
+    pluginReactConfig,
+];
diff --git a/package-lock.json b/package-lock.json
index 41922228a..565463980 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2423,14 +2423,14 @@
             "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ=="
         },
         "node_modules/@emotion/react": {
-            "version": "11.13.0",
-            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz",
-            "integrity": "sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==",
+            "version": "11.13.3",
+            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz",
+            "integrity": "sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==",
             "dependencies": {
                 "@babel/runtime": "^7.18.3",
                 "@emotion/babel-plugin": "^11.12.0",
                 "@emotion/cache": "^11.13.0",
-                "@emotion/serialize": "^1.3.0",
+                "@emotion/serialize": "^1.3.1",
                 "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
                 "@emotion/utils": "^1.4.0",
                 "@emotion/weak-memoize": "^0.4.0",
@@ -2446,13 +2446,13 @@
             }
         },
         "node_modules/@emotion/serialize": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz",
-            "integrity": "sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.1.tgz",
+            "integrity": "sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA==",
             "dependencies": {
                 "@emotion/hash": "^0.9.2",
                 "@emotion/memoize": "^0.9.0",
-                "@emotion/unitless": "^0.9.0",
+                "@emotion/unitless": "^0.10.0",
                 "@emotion/utils": "^1.4.0",
                 "csstype": "^3.0.2"
             }
@@ -2491,9 +2491,9 @@
             "peer": true
         },
         "node_modules/@emotion/unitless": {
-            "version": "0.9.0",
-            "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz",
-            "integrity": "sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ=="
+            "version": "0.10.0",
+            "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz",
+            "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg=="
         },
         "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
             "version": "1.1.0",
@@ -17245,9 +17245,9 @@
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.12",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz",
-            "integrity": "sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA=="
+            "version": "1.5.13",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
+            "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q=="
         },
         "node_modules/elkjs": {
             "version": "0.9.3",
@@ -20304,14 +20304,6 @@
                 "node": ">= 12.20"
             }
         },
-        "node_modules/formdata-node/node_modules/web-streams-polyfill": {
-            "version": "4.0.0-beta.3",
-            "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
-            "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/formidable": {
             "version": "3.5.1",
             "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz",
@@ -41328,13 +41320,11 @@
             }
         },
         "node_modules/web-streams-polyfill": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0.tgz",
-            "integrity": "sha512-0zJXHRAYEjM2tUfZ2DiSOHAa2aw1tisnnhU3ufD57R8iefL+DcdJyRBRyJpG+NUimDgbTI/lH+gAE1PAvV3Cgw==",
-            "optional": true,
-            "peer": true,
+            "version": "4.0.0-beta.3",
+            "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
+            "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
             "engines": {
-                "node": ">= 8"
+                "node": ">= 14"
             }
         },
         "node_modules/web-worker": {
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 8876d8190..6c60c4151 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -8,7 +8,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 a503d732b..5ee7d0f9c 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 b108b73db..41c6ce39b 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -487,9 +487,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 = {
@@ -647,7 +645,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/server_Initialization.ts b/src/server/server_Initialization.ts
index 2190e27c7..8d3afc3ad 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -113,6 +113,7 @@ function registerEmbeddedBrowseRelativePathHandler(server: express.Express) {
     });
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function proxyServe(req: any, requrl: string, response: any) {
     // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
     const htmlBodyMemoryStream = new (require('memorystream'))();
@@ -137,8 +138,10 @@ function proxyServe(req: any, requrl: string, response: any) {
                     response.send(header?.includes('gzip') ? zlib.gzipSync(htmlText) : htmlText);
                 } else {
                     req.pipe(request(requrl))
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         .on('error', (e: any) => console.log('requrl ', e))
                         .pipe(response)
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         .on('error', (e: any) => console.log('response pipe error', e));
                     console.log('EMPTY body:' + req.url);
                 }
@@ -147,14 +150,17 @@ function proxyServe(req: any, requrl: string, response: any) {
             }
         } else {
             req.pipe(htmlBodyMemoryStream)
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 .on('error', (e: any) => console.log('html body memorystream error', e))
                 .pipe(response)
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 .on('error', (e: any) => console.log('html body memory stream response error', e));
         }
     };
     const retrieveHTTPBody = () => {
         // req.headers.cookie = '';
         req.pipe(request(requrl))
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .on('error', (e: any) => {
                 console.log(`CORS url error: ${requrl}`, e);
                 response.send(`<html><body bgcolor="red" link="006666" alink="8B4513" vlink="006666">
@@ -163,6 +169,7 @@ function proxyServe(req: any, requrl: string, response: any) {
                                     <p>${e}</p>
                                 </body></html>`);
             })
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .on('response', (res: any) => {
                 res.headers;
                 const headers = Object.keys(res.headers);
@@ -187,6 +194,7 @@ function proxyServe(req: any, requrl: string, response: any) {
             })
             .on('end', sendModifiedBody)
             .pipe(htmlBodyMemoryStream)
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .on('error', (e: any) => console.log('http body pipe error', e));
     };
     retrieveHTTPBody();
@@ -244,6 +252,7 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     app.use(whm(compiler));
     app.get(/^\/+$/, (req, res) => res.redirect(req.user ? '/home' : '/login')); // target urls that consist of one or more '/'s with nothing in between
     app.use(express.static(publicDirectory, { setHeaders: res => res.setHeader('Access-Control-Allow-Origin', '*') })); // all urls that start with dash's public directory: /files/  (e.g., /files/images, /files/audio, etc)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     app.use(cors({ origin: (_origin: any, callback: any) => callback(null, true) }));
     registerAuthenticationRoutes(app); // this adds routes to authenticate a user (login, etc)
     registerCorsProxy(app); // this adds a /corsProxy/ route to allow clients to get to urls that would otherwise be blocked by cors policies
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;
-- 
cgit v1.2.3-70-g09d2