Merge branch 'restoringEslint' into sarah-ai-visualization

1 files changed, 19 insertions, 14 deletions

diff --git a/src/client/views/nodes/formattedText/FormattedTextBoxComment.tsx b/src/client/views/nodes/formattedText/FormattedTextBoxComment.tsx
index ce17af6ca..01c46edeb 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBoxComment.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBoxComment.tsx
@@ -1,15 +1,16 @@
 import { Mark, ResolvedPos } from 'prosemirror-model';
-import { EditorState, NodeSelection } from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
+import { ClientUtils } from '../../../../ClientUtils';
 import { Doc } from '../../../../fields/Doc';
 import { DocServer } from '../../../DocServer';
-import { LinkDocPreview, LinkInfo } from '../LinkDocPreview';
+import { LinkInfo } from '../LinkDocPreview';
 import { FormattedTextBox } from './FormattedTextBox';
 import './FormattedTextBoxComment.scss';
 import { schema } from './schema_rts';
 
 export function findOtherUserMark(marks: readonly Mark[]): Mark | undefined {
-    return marks.find(m => m.attrs.userid && m.attrs.userid !== Doc.CurrentUserEmail);
+    return marks.find(m => m.attrs.userid && m.attrs.userid !== ClientUtils.CurrentUserEmail());
 }
 export function findUserMark(marks: readonly Mark[]): Mark | undefined {
     return marks.find(m => m.attrs.userid);
@@ -18,20 +19,22 @@ export function findLinkMark(marks: readonly Mark[]): Mark | undefined {
     return marks.find(m => m.type === schema.marks.autoLinkAnchor || m.type === schema.marks.linkAnchor);
 }
 export function findStartOfMark(rpos: ResolvedPos, view: EditorView, finder: (marks: readonly Mark[]) => Mark | undefined) {
-    let before = 0,
-        nbef = rpos.nodeBefore;
+    let before = 0;
+    let nbef = rpos.nodeBefore;
     while (nbef && finder(nbef.marks)) {
         before += nbef.nodeSize;
+        // eslint-disable-next-line no-param-reassign
         rpos = view.state.doc.resolve(rpos.pos - nbef.nodeSize);
         rpos && (nbef = rpos.nodeBefore);
     }
     return before;
 }
 export function findEndOfMark(rpos: ResolvedPos, view: EditorView, finder: (marks: readonly Mark[]) => Mark | undefined) {
-    let after = 0,
-        naft = rpos.nodeAfter;
+    let after = 0;
+    let naft = rpos.nodeAfter;
     while (naft && finder(naft.marks)) {
         after += naft.nodeSize;
+        // eslint-disable-next-line no-param-reassign
         rpos = view.state.doc.resolve(rpos.pos + naft.nodeSize);
         rpos && (naft = rpos.nodeAfter);
     }
@@ -49,7 +52,7 @@ export class FormattedTextBoxComment {
     static userMark: Mark;
     static textBox: FormattedTextBox | undefined;
 
-    constructor(view: any) {
+    constructor() {
         if (!FormattedTextBoxComment.tooltip) {
             const tooltip = (FormattedTextBoxComment.tooltip = document.createElement('div'));
             const tooltipText = (FormattedTextBoxComment.tooltipText = document.createElement('div'));
@@ -79,10 +82,10 @@ export class FormattedTextBoxComment {
     }
 
     static showCommentbox(view: EditorView, nbef: number) {
-        const state = view.state;
+        const { state } = view;
         // These are in screen coordinates
-        const start = view.coordsAtPos(state.selection.from - nbef),
-            end = view.coordsAtPos(state.selection.from - nbef);
+        const start = view.coordsAtPos(state.selection.from - nbef);
+        const end = view.coordsAtPos(state.selection.from - nbef);
         // The box in which the tooltip is positioned, to use as base
         const box = (document.getElementsByClassName('mainView-container') as any)[0].getBoundingClientRect();
         // Find a center-ish x position from the selection endpoints (when crossing lines, end may be more to the left)
@@ -109,14 +112,16 @@ export class FormattedTextBoxComment {
     }
 
     static setupPreview(view: EditorView, textBox: FormattedTextBox, hrefs?: string[], linkDoc?: string, noPreview?: boolean) {
-        const state = view.state;
+        const { state } = view;
         // this section checks to see if the insertion point is over text entered by a different user.  If so, it sets ths comment text to indicate the user and the modification date
         if (state.selection.$from) {
             const nbef = findStartOfMark(state.selection.$from, view, findOtherUserMark);
             const naft = findEndOfMark(state.selection.$from, view, findOtherUserMark);
             const noselection = state.selection.$from === state.selection.$to;
             let child: any = null;
-            state.doc.nodesBetween(state.selection.from, state.selection.to, (node: any, pos: number, parent: any) => !child && node.marks.length && (child = node));
+            state.doc.nodesBetween(state.selection.from, state.selection.to, (node: any /* , pos: number, parent: any */) => {
+                !child && node.marks.length && (child = node);
+            });
             const mark = child && findOtherUserMark(child.marks);
             if (mark && child && (nbef || naft) && (!mark.attrs.opened || noselection)) {
                 FormattedTextBoxComment.saveMarkRegion(textBox, state.selection.$from.pos - nbef, state.selection.$from.pos + naft, mark);
@@ -131,7 +136,7 @@ export class FormattedTextBoxComment {
         if (state.selection.$from && hrefs?.length) {
             const nbef = findStartOfMark(state.selection.$from, view, findLinkMark);
             const naft = findEndOfMark(state.selection.$from, view, findLinkMark) || nbef;
-            //nbef &&
+            // nbef &&
             naft &&
                 LinkInfo.SetLinkInfo({
                     DocumentView: textBox.DocumentView,