from last

5 files changed, 3 insertions, 84 deletions

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 = () => {