From 0c1f6d2a80661489f4aa064c4e70596a9b9c6e5d Mon Sep 17 00:00:00 2001 From: vaidankarswapnil Date: Mon, 18 Oct 2021 13:39:56 +0530 Subject: [PATCH] Fix eslint issues for NotebookContentLient and other files --- .eslintignore | 10 ++--- .../GremlinSimpleClient.ts | 39 +++++++++++-------- .../Notebook/NotebookComponent/reducers.ts | 1 + .../Notebook/NotebookContentClient.ts | 3 +- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/.eslintignore b/.eslintignore index c1e8c4948..9358fb44d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -54,8 +54,8 @@ src/Explorer/Graph/GraphExplorerComponent/GraphData.ts src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts -src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts -src/Explorer/Menus/ContextMenu.ts +# src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts +# src/Explorer/Menus/ContextMenu.ts src/Explorer/MostRecentActivity/MostRecentActivity.ts src/Explorer/Notebook/NotebookClientV2.ts src/Explorer/Notebook/NotebookComponent/NotebookContentProvider.ts @@ -64,11 +64,11 @@ src/Explorer/Notebook/NotebookComponent/actions.ts src/Explorer/Notebook/NotebookComponent/epics.test.ts src/Explorer/Notebook/NotebookComponent/epics.ts src/Explorer/Notebook/NotebookComponent/loadTransform.ts -src/Explorer/Notebook/NotebookComponent/reducers.ts +# src/Explorer/Notebook/NotebookComponent/reducers.ts src/Explorer/Notebook/NotebookComponent/store.ts -src/Explorer/Notebook/NotebookComponent/types.ts +# src/Explorer/Notebook/NotebookComponent/types.ts src/Explorer/Notebook/NotebookContainerClient.ts -src/Explorer/Notebook/NotebookContentClient.ts +# src/Explorer/Notebook/NotebookContentClient.ts src/Explorer/Notebook/NotebookContentItem.ts src/Explorer/Notebook/NotebookUtil.ts src/Explorer/OpenActionsStubs.ts diff --git a/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts b/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts index e61f81964..9e97231d8 100644 --- a/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts +++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts @@ -18,6 +18,7 @@ export interface GremlinSimpleClientParameters { export interface Result { requestId: string; // Can be null + //eslint-disable-next-line data: any; requestCharge: number; // RU cost } @@ -30,6 +31,7 @@ export interface GremlinRequestMessage { args: | { gremlin: string; + //eslint-disable-next-line bindings: {}; language: string; } @@ -54,6 +56,7 @@ export interface GremlinResponseMessage { message: string; }; result: { + //eslint-disable-next-line data: any; }; } @@ -74,7 +77,7 @@ export class GremlinSimpleClient { this.requestsToSend = {}; } - public connect() { + public connect(): void { if (this.ws) { if (this.ws.readyState === WebSocket.CONNECTING) { // Wait until it connects to execute all requests @@ -106,9 +109,10 @@ export class GremlinSimpleClient { return new WebSocket(endpoint); } - public close() { + public close(): void { if (this.ws && this.ws.readyState !== WebSocket.CLOSING && this.ws.readyState !== WebSocket.CLOSED) { const msg = `Disconnecting from ${this.params.endpoint} as ${this.params.user}`; + //eslint-disable-next-line console.log(msg); if (this.params.infoCallback) { this.params.infoCallback(msg); @@ -143,7 +147,7 @@ export class GremlinSimpleClient { } } - public onMessage(msg: MessageEvent) { + public onMessage(msg: MessageEvent): void { if (!msg) { if (this.params.failureCallback) { this.params.failureCallback(null, "onMessage called with no message"); @@ -194,8 +198,10 @@ export class GremlinSimpleClient { } break; case 407: // Request authentication - const challengeResponse = this.buildChallengeResponse(this.pendingRequests[requestId]); - this.sendGremlinMessage(challengeResponse); + { + const challengeResponse = this.buildChallengeResponse(this.pendingRequests[requestId]); + this.sendGremlinMessage(challengeResponse); + } break; case 401: // Unauthorized delete this.pendingRequests[requestId]; @@ -267,7 +273,7 @@ export class GremlinSimpleClient { } public buildChallengeResponse(request: GremlinRequestMessage): GremlinRequestMessage { - var args = { + const args = { SASL: GremlinSimpleClient.utf8ToB64("\0" + this.params.user + "\0" + this.params.password), }; return { @@ -278,9 +284,9 @@ export class GremlinSimpleClient { }; } - public static utf8ToB64(utf8Str: string) { + public static utf8ToB64(utf8Str: string): string { return btoa( - encodeURIComponent(utf8Str).replace(/%([0-9A-F]{2})/g, function (match, p1) { + encodeURIComponent(utf8Str).replace(/%([0-9A-F]{2})/g, (match, p1) => { return String.fromCharCode(parseInt(p1, 16)); }) ); @@ -291,12 +297,13 @@ export class GremlinSimpleClient { * mimeLength + mimeType + serialized message * @param requestMessage */ + //eslint-disable-next-line public static buildGremlinMessage(requestMessage: {}): Uint8Array { const mimeType = "application/json"; - let serializedMessage = mimeType + JSON.stringify(requestMessage); + const serializedMessage = mimeType + JSON.stringify(requestMessage); const encodedMessage = new TextEncoder().encode(serializedMessage); - let binaryMessage = new Uint8Array(1 + encodedMessage.length); + const binaryMessage = new Uint8Array(1 + encodedMessage.length); binaryMessage[0] = mimeType.length; for (let i = 0; i < encodedMessage.length; i++) { @@ -305,19 +312,19 @@ export class GremlinSimpleClient { return binaryMessage; } - private onOpen(event: any) { + private onOpen() { this.executeRequestsToSend(); } private executeRequestsToSend() { - for (let requestId in this.requestsToSend) { + for (const requestId in this.requestsToSend) { const request = this.requestsToSend[requestId]; this.sendGremlinMessage(request); this.pendingRequests[request.requestId] = request; delete this.requestsToSend[request.requestId]; } } - + //eslint-disable-next-line private onError(err: any) { if (this.params.failureCallback) { this.params.failureCallback(null, err); @@ -339,9 +346,9 @@ export class GremlinSimpleClient { * RFC4122 version 4 compliant UUID */ private static uuidv4() { - return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) { - var r = (Math.random() * 16) | 0, - v = c == "x" ? r : (r & 0x3) | 0x8; + return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { + const r = (Math.random() * 16) | 0, + v = c === "x" ? r : (r & 0x3) | 0x8; return v.toString(16); }); } diff --git a/src/Explorer/Notebook/NotebookComponent/reducers.ts b/src/Explorer/Notebook/NotebookComponent/reducers.ts index e97a55304..41e0b74c4 100644 --- a/src/Explorer/Notebook/NotebookComponent/reducers.ts +++ b/src/Explorer/Notebook/NotebookComponent/reducers.ts @@ -50,6 +50,7 @@ export const coreReducer = (state: CoreRecord, action: Action) => { .setIn(path.concat("language"), kernelspecs.language); } default: + //eslint-disable-next-line return nteractReducers.core(state as any, action as any); } }; diff --git a/src/Explorer/Notebook/NotebookContentClient.ts b/src/Explorer/Notebook/NotebookContentClient.ts index a0e368020..2cd70d7e9 100644 --- a/src/Explorer/Notebook/NotebookContentClient.ts +++ b/src/Explorer/Notebook/NotebookContentClient.ts @@ -228,11 +228,12 @@ export class NotebookContentClient { public async readFileContent(filePath: string): Promise { const xhr = await this.contentProvider.get(this.getServerConfig(), filePath, { content: 1 }).toPromise(); + //eslint-disable-next-line const content = (xhr.response as any).content; if (!content) { throw new Error("No content read"); } - + //eslint-disable-next-line const format = (xhr.response as any).format; switch (format) { case "text":