fix: Optimization for updater component.

Signed-off-by: The1111mp <The1111mp@outlook.com>
1111mp · Oct 30, 2023 · 4135c27 · 4135c27
1 parent 31ac51c
commit 4135c27
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 19 deletions.
diff --git a/src/__tests__/specs/nvmd.spec.ts b/src/__tests__/specs/nvmd.spec.ts
@@ -3,8 +3,8 @@ import { platform } from 'node:process';
 import { pathExists } from 'fs-extra';
 import { browser, expect } from '@wdio/globals';
 
-describe('nvmd', () => {
-  it('file should be existed', async () => {
+describe('module nvmd', async () => {
+  it('nvmd file should be existed', async () => {
     const HOMEDIR = (await browser.electron.app('getPath', 'home')) as string;
     const nvmdPath = join(
       HOMEDIR,
@@ -15,4 +15,66 @@ describe('nvmd', () => {
 
     expect(await pathExists(nvmdPath)).toBeTruthy();
   });
+
+  it('node file should be existed', async () => {
+    const HOMEDIR = (await browser.electron.app('getPath', 'home')) as string;
+    const nodePath = join(
+      HOMEDIR,
+      '.nvmd',
+      'bin',
+      platform === 'win32' ? 'node.exe' : 'node',
+    );
+
+    expect(await pathExists(nodePath)).toBeTruthy();
+  });
+
+  it('npm file should be existed', async () => {
+    const HOMEDIR = (await browser.electron.app('getPath', 'home')) as string;
+    const npmPath = join(
+      HOMEDIR,
+      '.nvmd',
+      'bin',
+      platform === 'win32' ? 'npm.exe' : 'npm',
+    );
+
+    expect(await pathExists(npmPath)).toBeTruthy();
+
+    if (platform === 'win32') {
+      const npmCmdPath = join(HOMEDIR, '.nvmd', 'bin', 'npm.cmd');
+      expect(await pathExists(npmCmdPath)).toBeTruthy();
+    }
+  });
+
+  it('npx file should be existed', async () => {
+    const HOMEDIR = (await browser.electron.app('getPath', 'home')) as string;
+    const npxPath = join(
+      HOMEDIR,
+      '.nvmd',
+      'bin',
+      platform === 'win32' ? 'npx.exe' : 'npx',
+    );
+
+    expect(await pathExists(npxPath)).toBeTruthy();
+
+    if (platform === 'win32') {
+      const npxCmdPath = join(HOMEDIR, '.nvmd', 'bin', 'npx.cmd');
+      expect(await pathExists(npxCmdPath)).toBeTruthy();
+    }
+  });
+
+  it('corepack file should be existed', async () => {
+    const HOMEDIR = (await browser.electron.app('getPath', 'home')) as string;
+    const corepackPath = join(
+      HOMEDIR,
+      '.nvmd',
+      'bin',
+      platform === 'win32' ? 'corepack.exe' : 'corepack',
+    );
+    expect(await pathExists(corepackPath)).toBeTruthy();
+
+    if (platform === 'win32') {
+      const corepackCmdPath = join(HOMEDIR, '.nvmd', 'bin', 'corepack.cmd');
+      expect(await pathExists(corepackCmdPath)).toBeTruthy();
+    }
+  });
 });
diff --git a/src/renderer/pages/home/index.tsx b/src/renderer/pages/home/index.tsx
@@ -2,16 +2,7 @@ import './styles.scss';
 
 import { useState, useRef, lazy, Suspense, useEffect } from 'react';
 import { Outlet, Link, useLocation } from 'react-router-dom';
-import {
-  App,
-  Button,
-  Layout,
-  Menu,
-  Space,
-  Tour,
-  Typography,
-  message,
-} from 'antd';
+import { App, Button, Layout, Menu, Space, Tour, Typography } from 'antd';
 import {
   InfoCircleOutlined,
   SettingOutlined,
@@ -383,6 +374,7 @@ const Home: React.FC = () => {
                   tipDrawer.current?.show();
                 }}
               />
+              <Updater />
               {platform === 'win32' ? <Updater /> : null}
               <Button
                 type="text"

diff --git a/src/renderer/pages/home/updater.tsx b/src/renderer/pages/home/updater.tsx
@@ -24,14 +24,20 @@ export const Updater: React.FC = () => {
   const { message } = App.useApp();
   const updateInfo = useRef<UpdateInfo>();
 
+  const onCheckUpdate = useRef<
+    (info: UpdateInfo | 'update-not-available') => void
+  >((info) => {
+    if (info === 'update-not-available') {
+      return message.success(i18n('Up-to-date'));
+    }
+
+    updateInfo.current = info;
+    setOpen({ visible: true, type: ModalType.Check });
+  });
+
   useEffect(() => {
     window.Context.onCheckUpdateResultCallback((info) => {
-      if (info === 'update-not-available') {
-        return message.success(i18n('Up-to-date'));
-      }
-
-      updateInfo.current = info;
-      setOpen({ visible: true, type: ModalType.Check });
+      onCheckUpdate.current?.(info);
     });
 
     window.Context.onRegistUpdateProgress((progress) => {
@@ -120,7 +126,8 @@ export const Updater: React.FC = () => {
               />
             }
             onClick={() => {
-              setOpen({ visible: true, type: ModalType.Complete });
+              progress.percent >= 100 &&
+                setOpen({ visible: true, type: ModalType.Complete });
             }}
           />
         </Popover>