Fix lint warnings

This commit fixes the following lint warnings: - no-unused-vars - prefer-destructuring - unicorn/no-for-loop - unicorn/prefer-includes - unicorn/prefer-string-slice - unicorn/prefer-query-selector - no-negated-condition Signed-off-by: VitikaSoni <[email protected]>
zaproxy · May 14, 2023 · 8b46716 · 8b46716
1 parent c3a4e6f
commit 8b46716
Show file tree

Hide file tree

Showing 32 changed files with 230 additions and 236 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
       "no-unsanitized"
     ],
     "rules": {
-      "no-negated-condition": "warn",
+      "no-negated-condition": "error",
       "no-unsanitized/method": [
         "error",
         {
@@ -76,13 +76,13 @@
           }
         }
       ],
-      "no-unused-vars": "warn",
-      "prefer-destructuring": "warn",
-      "unicorn/no-for-loop": "warn",
-      "unicorn/prefer-includes": "warn",
-      "unicorn/prefer-string-slice": "warn",
+      "no-unused-vars": "error",
+      "prefer-destructuring": "error",
+      "unicorn/no-for-loop": "error",
+      "unicorn/prefer-includes": "error",
+      "unicorn/prefer-string-slice": "error",
       "unicorn/filename-case": "warn",
-      "unicorn/prefer-query-selector": "warn"
+      "unicorn/prefer-query-selector": "error"
     }
   },
   "repository": {

diff --git a/src/main/zapHomeFiles/hud/display.js b/src/main/zapHomeFiles/hud/display.js
@@ -27,7 +27,7 @@ Vue.component('modal', {
 		close() {
 			this.$emit('close');
 		},
-		afterLeave(element) {
+		afterLeave(_element) {
 			if (!app.keepShowing) {
 				app.backStack = [];
 				hideDisplayFrame();
@@ -402,13 +402,13 @@ Vue.component('http-message-modal', {
 			let header = '';
 			let body = '';
 
-			if (!this.response.isReadonly) {
-				header = this.response.header;
-				body = this.response.body;
-			} else {
+			if (this.response.isReadonly) {
 				method = this.request.method;
 				header = this.request.header;
 				body = this.request.body;
+			} else {
+				header = this.response.header;
+				body = this.response.body;
 			}
 
 			return {method, header, body};
@@ -529,7 +529,7 @@ Vue.component('history-message-modal', {
 			}, [channel.port2]);
 		},
 		ascanRequest() {
-			const request = this.request;
+			const {request} = this;
 			this.$emit('close');
 			navigator.serviceWorker.controller.postMessage(
 				{
@@ -582,7 +582,7 @@ Vue.component('ws-message-modal', {
 	},
 	computed: {
 		currentMessage() {
-			const payload = this.payload;
+			const {payload} = this;
 			return {payload};
 		}
 	}
@@ -736,10 +736,9 @@ Vue.component('site-tree-node', {
 			channel.port1.addEventListener('message', event => {
 				// Remove the ..loading.. child
 				Vue.set(treeNode.model, 'children', []);
-				for (let i = 0; i < event.data.childNodes.length; i++) {
-					const child = event.data.childNodes[i];
+				event.data.childNodes.forEach(child => {
 					treeNode.addChild(child.name, child.method, child.isLeaf, child.hrefId);
-				}
+				});
 			});
 
 			navigator.serviceWorker.controller.postMessage({
@@ -755,7 +754,7 @@ Vue.component('site-tree-node', {
 			if ((name.match(/\//g) || []).length > 2) {
 				// If there are more than 2 slashes just show last url element
 				// The first 2 slashes will be http(s)://...
-				name = name.substring(name.lastIndexOf('/') + 1);
+				name = name.slice(name.lastIndexOf('/') + 1);
 			}
 
 			if (isLeaf) {
@@ -921,8 +920,8 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 
 navigator.serviceWorker.addEventListener('message', event => {
-	const action = event.data.action;
-	const config = event.data.config;
+	const {data: {action}} = event;
+	const {data: {config}} = event;
 	const port = event.ports[0];
 	let show;
 

diff --git a/src/main/zapHomeFiles/hud/drawer.js b/src/main/zapHomeFiles/hud/drawer.js
@@ -1,4 +1,5 @@
 // App is the main Vue object controlling everything
+
 let app;
 const eventBus = new Vue();
 let frameId = '';
@@ -55,7 +56,7 @@ Vue.component('history', {
 					return re.test(message.url);
 				}
 
-				return message.url.indexOf(self.filter) >= 0;
+				return message.url.includes(self.filter);
 			});
 		}
 	},
@@ -72,12 +73,12 @@ Vue.component('history', {
 	},
 	watch: {
 		regexEnabled() {
-			this.isRegExError = !this.regexEnabled ? false : this.isRegExError;
+			this.isRegExError = this.regexEnabled ? this.isRegExError : false;
 		},
 		filteredMessages() {
 			this.$nextTick(function () {
 				const visibleMessages = document.querySelectorAll('#history-messages .message-tr');
-				this.hiddenMessageCount = (!this.messages) ? 0 : this.messages.length - visibleMessages.length;
+				this.hiddenMessageCount = this.messages ? this.messages.length - visibleMessages.length : 0;
 				this.historyItemsFiltered();
 			});
 		}
@@ -104,7 +105,7 @@ Vue.component('history', {
 		if (this.messages.length > 0) {
 			const lastMessage = this.messages[this.messages.length - 1];
 			const lastid = 'message-tr-' + lastMessage.id;
-			const lastIdElement = document.getElementById(lastid);
+			const lastIdElement = document.querySelector('#' + lastid);
 
 			if (lastIdElement) {
 				lastIdElement.scrollIntoView({block: 'end', behavior: 'smooth'});
@@ -169,7 +170,7 @@ Vue.component('websockets', {
 					return re.test(message.messageSummary);
 				}
 
-				return message.messageSummary.indexOf(self.filter) >= 0;
+				return message.messageSummary.includes(self.filter);
 			});
 		}
 	},
@@ -186,12 +187,12 @@ Vue.component('websockets', {
 	},
 	watch: {
 		regexEnabled() {
-			this.isRegExError = !this.regexEnabled ? false : this.isRegExError;
+			this.isRegExError = this.regexEnabled ? this.isRegExError : false;
 		},
 		filteredMessages() {
 			this.$nextTick(function () {
 				const visibleMessages = document.querySelectorAll('#websockets-messages .message-tr');
-				this.hiddenMessageCount = (!this.messages) ? 0 : this.messages.length - visibleMessages.length;
+				this.hiddenMessageCount = this.messages ? this.messages.length - visibleMessages.length : 0;
 				this.websocketsItemsFiltered();
 			});
 		}
@@ -315,10 +316,10 @@ Vue.component('tabs', {
 			})
 			.catch(utils.errorHandler);
 
-		eventBus.$on('showTabs', data => {
+		eventBus.$on('showTabs', _data => {
 			this.tabsVisible = true;
 		});
-		eventBus.$on('hideTabs', data => {
+		eventBus.$on('hideTabs', _data => {
 			this.tabsVisible = false;
 			if (this.isOpen) {
 				this.closeDrawer();
@@ -431,7 +432,7 @@ Vue.component('drawer-button-showhide', {
 		showHud() {
 			this.isHudVisible = true;
 			localforage.setItem('settings.isHudVisible', true)
-				.then(function (value) {
+				.then(function (_value) {
 					this.icon = utils.getZapImagePath('radar.png');
 					parent.postMessage({tabId, frameId, action: 'showHudPanels'}, context.url);
 					eventBus.$emit('showTabs', {});
@@ -441,7 +442,7 @@ Vue.component('drawer-button-showhide', {
 		hideHud() {
 			this.isHudVisible = false;
 			localforage.setItem('settings.isHudVisible', false)
-				.then(function (value) {
+				.then(function (_value) {
 					this.icon = utils.getZapImagePath('radar-grey.png');
 					parent.postMessage({tabId, frameId, action: 'hideHudPanels'}, context.url);
 					eventBus.$emit('hideTabs', {});
@@ -477,6 +478,7 @@ document.addEventListener('DOMContentLoaded', () => {
 	tabId = parameters.get('tabId');
 
 	/* Vue app */
+	// eslint-disable-next-line no-unused-vars
 	app = new Vue({
 		i18n: I18n.i18n,
 		el: '#app',
@@ -485,7 +487,7 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 
 navigator.serviceWorker.addEventListener('message', event => {
-	const action = event.data.action;
+	const {data: {action}} = event;
 	const port = event.ports[0];
 
 	switch (action) {

diff --git a/src/main/zapHomeFiles/hud/management.js b/src/main/zapHomeFiles/hud/management.js
@@ -15,7 +15,6 @@ const ZAP_SHARED_SECRET = '<<ZAP_SHARED_SECRET>>';
 
 let app;
 let tabId = '';
-let frameId = '';
 const urlParameter = utils.getParameter(document.location.href, 'url');
 const context = {
 	url: urlParameter,
@@ -56,7 +55,6 @@ function showTutorial() {
 document.addEventListener('DOMContentLoaded', () => {
 	const parameters = new URL(document.location).searchParams;
 
-	frameId = parameters.get('frameId');
 	tabId = parameters.get('tabId');
 
 	app = new Vue({

diff --git a/src/main/zapHomeFiles/hud/panel.js b/src/main/zapHomeFiles/hud/panel.js
@@ -212,6 +212,7 @@ document.addEventListener('DOMContentLoaded', () => {
 	window.name = panelKey;
 
 	// Initialize vue app
+	// eslint-disable-next-line no-unused-vars
 	app = new Vue({
 		i18n: I18n.i18n,
 		el: '#app',

diff --git a/src/main/zapHomeFiles/hud/serviceworker.js b/src/main/zapHomeFiles/hud/serviceworker.js
@@ -97,7 +97,7 @@ function initWebSockets() {
 			self.dispatchEvent(ev);
 		} else if ('id' in jevent && 'response' in jevent) {
 			const pFunctions = webSocketCallbacks[jevent.id];
-			const response = jevent.response;
+			const {response} = jevent;
 			if ('code' in response && 'message' in response) {
 				// These always indicate a failure
 				const error = new Error(I18n.t('error_with_message', [response.message]));
@@ -234,6 +234,7 @@ self.addEventListener('error', utils.errorHandler);
 self.addEventListener('hud.log', logHandler);
 self.addEventListener('hud.backup', backupHandler);
 
+// eslint-disable-next-line no-unused-vars
 function registerForZapEvents(publisher) {
 	apiCall('event', 'register', publisher);
 }