From a774c879d4cf08a76fc404771883807d27465265 Mon Sep 17 00:00:00 2001
From: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Date: Thu, 7 Dec 2023 22:37:37 -0700
Subject: refactor: code cleanup (#1476)

- auto update `settings.json` due to new vscode version
- replace deprecated `e.keyCode` with `e.key`
- fix various code snippets with sonarlint and other lint plugins
---
 src/components/services/content/ServiceView.tsx     |  2 +-
 .../settings/settings/EditSettingsForm.tsx          |  2 +-
 src/components/ui/AppLoader/index.tsx               |  2 +-
 src/components/ui/input/scorePassword.ts            |  2 +-
 src/components/ui/select/index.tsx                  | 21 ++++-----------------
 5 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'src/components')

diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index 37dcafbe4..d89cd0610 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -64,7 +64,7 @@ class ServiceView extends Component<IProps, IState> {
 
   componentWillUnmount() {
     this.autorunDisposer!();
-    clearTimeout(this.forceRepaintTimeout!);
+    clearTimeout(this.forceRepaintTimeout);
     // clearTimeout(this.hibernationTimer); // TODO: [TS DEBT] class property not reassigned, need to find its purpose
   }
 
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 210c8d9e9..1672a1411 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -397,7 +397,7 @@ class EditSettingsForm extends Component<IProps, IState> {
         debug('cacheSize:', cacheSize);
         notCleared =
           this.state.clearCacheButtonClicked &&
-          isClearingAllCache === false &&
+          !isClearingAllCache &&
           cacheSizeBytes !== 0;
       } else {
         cacheSize = '…';
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx
index 64c840aaa..4b5828ef4 100644
--- a/src/components/ui/AppLoader/index.tsx
+++ b/src/components/ui/AppLoader/index.tsx
@@ -61,7 +61,7 @@ class AppLoader extends Component<IProps, IState> {
         className={classes.component}
         spinnerColor={theme.colorAppLoaderSpinner}
       >
-        {texts?.map((text, i) => (
+        {texts.map((text, i) => (
           <span
             key={text}
             className={classnames({
diff --git a/src/components/ui/input/scorePassword.ts b/src/components/ui/input/scorePassword.ts
index 59502e2b0..4a9f67265 100644
--- a/src/components/ui/input/scorePassword.ts
+++ b/src/components/ui/input/scorePassword.ts
@@ -33,7 +33,7 @@ export function scorePasswordFunc(password: string): number {
 
   let variationCount = 0;
   for (const key of Object.keys(variations)) {
-    variationCount += variations[key] === true ? 1 : 0;
+    variationCount += variations[key] ? 1 : 0;
   }
 
   score += (variationCount - 1) * 10;
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index c06ac59b0..0d8520f58 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -282,23 +282,23 @@ class SelectComponent extends Component<IProps, IState> {
 
     if (!open) return;
 
-    if (e.keyCode === 38 || e.keyCode === 40) {
+    if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
       e.preventDefault();
     }
 
     if (this.componentRef?.current) {
-      if (e.keyCode === 38 && selected > 0) {
+      if (e.key === 'ArrowUp' && selected > 0) {
         this.setState((state: IState) => ({
           selected: state.selected - 1,
         }));
       } else if (
-        e.keyCode === 40 &&
+        e.key === 'ArrowDown' &&
         selected < Object.keys(options!).length - 1
       ) {
         this.setState((state: IState) => ({
           selected: state.selected + 1,
         }));
-      } else if (e.keyCode === 13) {
+      } else if (e.key === 'Enter') {
         this.select(Object.keys(options!)[selected]);
       }
 
@@ -311,19 +311,6 @@ class SelectComponent extends Component<IProps, IState> {
         this.scrollContainerRef.current.scrollTop = topOffset - 35;
       }
     }
-
-    switch (e.keyCode) {
-      case 37:
-      case 39:
-      case 38:
-      case 40: // Arrow keys
-      case 32: {
-        break;
-      } // Space
-      default: {
-        break;
-      } // do not block other keys
-    }
   }
 
   render(): ReactElement {
-- 
cgit v1.2.3-70-g09d2