Merge branch 'master' of https://github.com/brown-dash/Dash-Web into DocCreatorMenu-work

1 files changed, 8 insertions, 11 deletions

diff --git a/src/client/apis/google_docs/GoogleApiClientUtils.ts b/src/client/apis/google_docs/GoogleApiClientUtils.ts
index 0b303eacf..c1ac352b1 100644
--- a/src/client/apis/google_docs/GoogleApiClientUtils.ts
+++ b/src/client/apis/google_docs/GoogleApiClientUtils.ts
@@ -1,7 +1,5 @@
-/* eslint-disable no-restricted-syntax */
 /* eslint-disable no-use-before-define */
 import { docs_v1 as docsV1 } from 'googleapis';
-// eslint-disable-next-line node/no-deprecated-api
 import { isArray } from 'util';
 import { EditorState } from 'prosemirror-state';
 import { Opt } from '../../../fields/Doc';
@@ -37,7 +35,7 @@ export namespace GoogleApiClientUtils {
             text: string | string[];
             requests: docsV1.Schema$Request[];
         }
-        export type IdHandler = (id: DocumentId) => any;
+        export type IdHandler = (id: DocumentId) => unknown;
         export type CreationResult = Opt<DocumentId>;
         export type ReadLinesResult = Opt<{ title?: string; bodyLines?: string[] }>;
         export type ReadResult = { title: string; body: string };
@@ -145,7 +143,7 @@ export namespace GoogleApiClientUtils {
                     if (paragraphs.length) {
                         const target = paragraphs[paragraphs.length - 1];
                         if (target.paragraph && target.paragraph.elements) {
-                            length = target.paragraph.elements.length;
+                            const length = target.paragraph.elements.length;
                             if (length) {
                                 const final = target.paragraph.elements[length - 1];
                                 return final.endIndex ? final.endIndex - 1 : undefined;
@@ -208,13 +206,13 @@ export namespace GoogleApiClientUtils {
             });
 
         export const setStyle = async (options: UpdateOptions) => {
-            const replies: any = await update({
+            const replies = await update({
                 documentId: options.documentId,
                 requests: options.requests,
             });
-            if ('errors' in replies) {
+            if (replies && 'errors' in replies) {
                 console.log('Write operation failed:');
-                console.log(replies.errors.map((error: any) => error.message));
+                console.log(replies); //.errors.map((error: any) => error.message));
             }
             return replies;
         };
@@ -229,7 +227,6 @@ export namespace GoogleApiClientUtils {
             const { mode } = options;
             if (!(index && mode === WriteMode.Insert)) {
                 const schema = await retrieve({ documentId });
-                // eslint-disable-next-line no-cond-assign
                 if (!schema || !(index = Utils.endOf(schema))) {
                     return undefined;
                 }
@@ -258,10 +255,10 @@ export namespace GoogleApiClientUtils {
                 return undefined;
             }
             requests.push(...options.content.requests);
-            const replies: any = await update({ documentId, requests });
-            if ('errors' in replies) {
+            const replies = await update({ documentId, requests });
+            if (replies && 'errors' in replies) {
                 console.log('Write operation failed:');
-                console.log(replies.errors.map((error: any) => error.message));
+                console.log(replies); // .errors.map((error: any) => error.message));
             }
             return replies;
         };