From 405f3dbee598bb1a93c963007b41a452fed81e99 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Wed, 19 May 2021 11:40:51 +0300
Subject: [PATCH] Cleaning up

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../+extensions/extension-install.store.ts    | 16 ++++-----
 .../components/+extensions/extensions.tsx     |  2 +-
 .../+extensions/installed-extensions.tsx      | 36 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/renderer/components/+extensions/extension-install.store.ts b/src/renderer/components/+extensions/extension-install.store.ts
index 32bdb21f56..ca185651de 100644
--- a/src/renderer/components/+extensions/extension-install.store.ts
+++ b/src/renderer/components/+extensions/extension-install.store.ts
@@ -212,42 +212,42 @@ export class ExtensionInstallationStateStore {
   /**
    * The current number of extensions uninstalling
    */
-   @computed static get uninstalling(): number {
+  static get uninstalling(): number {
     return ExtensionInstallationStateStore.UninstallingExtensions.size;
   }
 
   /**
    * If there is at least one extension currently installing
    */
-  @computed static get anyInstalling(): boolean {
+  static get anyInstalling(): boolean {
     return ExtensionInstallationStateStore.installing > 0;
   }
 
   /**
    * If there is at least one extension currently ininstalling
    */
-   @computed static get anyUninstalling(): boolean {
+  static get anyUninstalling(): boolean {
     return ExtensionInstallationStateStore.uninstalling > 0;
   }
 
   /**
    * The current number of extensions preinstalling
    */
-  @computed static get preinstalling(): number {
+  static get preinstalling(): number {
     return ExtensionInstallationStateStore.PreInstallIds.size;
   }
 
   /**
    * If there is at least one extension currently downloading
    */
-  @computed static get anyPreinstalling(): boolean {
+  static get anyPreinstalling(): boolean {
     return ExtensionInstallationStateStore.preinstalling > 0;
   }
 
   /**
-   * If there is at least one installing or preinstalling step taking place
-   */
-  @computed static get anyPreInstallingOrInstalling(): boolean {
+    * If there is at least one installing or preinstalling step taking place
+    */
+  static get anyPreInstallingOrInstalling(): boolean {
     return ExtensionInstallationStateStore.anyInstalling || ExtensionInstallationStateStore.anyPreinstalling;
   }
 }
diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx
index 8f9585165b..a751a8130f 100644
--- a/src/renderer/components/+extensions/extensions.tsx
+++ b/src/renderer/components/+extensions/extensions.tsx
@@ -534,7 +534,7 @@ export class Extensions extends React.Component {
               installPath={this.installPath}
             />
 
-            {extensions.length && <hr/>}
+            {extensions.length > 0 && <hr/>}
 
             <InstalledExtensions
               extensions={extensions}
diff --git a/src/renderer/components/+extensions/installed-extensions.tsx b/src/renderer/components/+extensions/installed-extensions.tsx
index a2fb3f290f..f896f410fd 100644
--- a/src/renderer/components/+extensions/installed-extensions.tsx
+++ b/src/renderer/components/+extensions/installed-extensions.tsx
@@ -29,7 +29,7 @@ import { Spinner } from "../spinner";
 import { ExtensionInstallationStateStore } from "./extension-install.store";
 import { cssNames } from "../../utils";
 import { observer } from "mobx-react";
-import type { Column, Row } from "react-table";
+import type { Row } from "react-table";
 import type { LensExtensionId } from "../../../extensions/lens-extension";
 
 interface Props {
@@ -44,29 +44,13 @@ function getStatus(isEnabled: boolean) {
 }
 
 export const InstalledExtensions = observer(({ extensions, uninstall, enable, disable }: Props) => {
-  if (!ExtensionDiscovery.getInstance().isLoaded) {
-    return <div><Spinner center /></div>;
-  }
-
-  if (extensions.length == 0) {
-    return (
-      <div className="flex column h-full items-center justify-center">
-        <Icon material="extension" className={styles.noItemsIcon}/>
-        <h3 className="font-medium text-3xl mt-5 mb-2">
-          There are no extensions installed.
-        </h3>
-        <p>Please use the form above to install or drag tarbar-file here.</p>
-      </div>
-    );
-  }
-
   const filters = [
     (extension: InstalledExtension) => extension.manifest.name,
     (extension: InstalledExtension) => getStatus(extension.isEnabled),
     (extension: InstalledExtension) => extension.manifest.version,
   ];
 
-  const columns: Column<any>[] = useMemo(
+  const columns = useMemo(
     () => [
       {
         Header: "Name",
@@ -155,6 +139,22 @@ export const InstalledExtensions = observer(({ extensions, uninstall, enable, di
     }, [extensions, ExtensionInstallationStateStore.anyUninstalling]
   );
 
+  if (!ExtensionDiscovery.getInstance().isLoaded) {
+    return <div><Spinner center /></div>;
+  }
+
+  if (extensions.length == 0) {
+    return (
+      <div className="flex column h-full items-center justify-center">
+        <Icon material="extension" className={styles.noItemsIcon}/>
+        <h3 className="font-medium text-3xl mt-5 mb-2">
+          There are no extensions installed.
+        </h3>
+        <p>Please use the form above to install or drag tarbar-file here.</p>
+      </div>
+    );
+  }
+
   return (
     <section data-testid="extensions-table">
       <List