Merge branch 'feature/up' into develop

oldj · oldj · commit 2b1b51363398 · 2026-05-09T12:20:50.000+08:00
diff --git a/e2e/data-transfer.spec.ts b/e2e/data-transfer.spec.ts
@@ -17,17 +17,29 @@ test.describe('data transfer', () => {
     await expect
       .poll(async () => (await getMockCalls(page)).some((call) => call.cmd === 'export_data'))
       .toBe(true)
+
+    await expect(page.getByText('The export is complete.')).toBeVisible()
+    await expect
+      .poll(async () => {
+        const calls = await getMockCalls(page)
+        const revealCall = calls.find((call) => call.cmd === 'show_item_in_folder')
+        return revealCall ? firstInvokeArg(revealCall) : null
+      })
+      .toBe('/Users/e2e/exports/switchhosts_20260509_121436.789.json')
   })
 
   test('imports backup data from a file', async ({ page }) => {
     await clearMockCalls(page)
+    await page.evaluate(() => window.__SWITCHHOSTS_E2E__.delayNextImport(600))
 
     await page.getByLabel('Settings').click()
     await page.getByRole('menuitem', { name: /^Import$/ }).click()
 
+    await expect(page.getByText('Loading...').first()).toBeVisible()
     await expect(page.locator('[data-id="imported-local"]')).toContainText('Imported Backup')
     await expect(page.locator('[data-id="imported-folder"]')).toContainText('Imported Folder')
     await expect(page.locator('[data-id="imported-group"]')).toContainText('Imported Group')
+    await expect(page.getByText('The import is complete.')).toBeVisible()
     await expect
       .poll(async () => {
         const state = await getMockState(page)
@@ -47,6 +59,19 @@ test.describe('data transfer', () => {
     expect(calls.some((call) => call.cmd === 'import_data')).toBe(true)
   })
 
+  test('shows an error notification when file import fails', async ({ page }) => {
+    await clearMockCalls(page)
+    await page.evaluate(() => window.__SWITCHHOSTS_E2E__.failNextImport('mock_import_error'))
+
+    await page.getByLabel('Settings').click()
+    await page.getByRole('menuitem', { name: /^Import$/ }).click()
+
+    await expect(page.getByText('Import failed! [mock_import_error]')).toBeVisible()
+
+    const calls = await getMockCalls(page)
+    expect(calls.some((call) => call.cmd === 'import_data')).toBe(true)
+  })
+
   test('imports backup data from a URL', async ({ page }) => {
     await clearMockCalls(page)
 
@@ -62,6 +87,7 @@ test.describe('data transfer', () => {
     await expect(page.locator('[data-id="imported-url"]')).toContainText('Imported From URL')
     await page.locator('[data-id="imported-url"]').click()
     await expect(page.getByText(importUrl)).toBeVisible()
+    await expect(page.getByText('The import is complete.')).toBeVisible()
     await expect
       .poll(async () => {
         const state = await getMockState(page)
@@ -77,4 +103,24 @@ test.describe('data transfer', () => {
     expect(importCall).toBeDefined()
     expect(firstInvokeArg(importCall!)).toBe(importUrl)
   })
+
+  test('shows an error notification when URL import fails', async ({ page }) => {
+    await clearMockCalls(page)
+    await page.evaluate(() => window.__SWITCHHOSTS_E2E__.failNextImportFromUrl('mock_url_error'))
+
+    const importUrl = 'https://example.test/swh_data.json'
+    await page.getByLabel('Settings').click()
+    await page.getByRole('menuitem', { name: 'Import from URL' }).click()
+
+    const dialog = page.getByRole('dialog')
+    await dialog.locator('input').fill(importUrl)
+    await dialog.getByRole('button', { name: 'OK' }).click()
+
+    await expect(page.getByText('Import failed! [mock_url_error]')).toBeVisible()
+
+    const calls = await getMockCalls(page)
+    const importCall = calls.find((call) => call.cmd === 'import_data_from_url')
+    expect(importCall).toBeDefined()
+    expect(firstInvokeArg(importCall!)).toBe(importUrl)
+  })
 })
diff --git a/e2e/support/tauri-mock.js b/e2e/support/tauri-mock.js
@@ -4,6 +4,8 @@
 
   const normalizeLineEndings = (value) => value.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
 
+  const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
   const flatten = (items) =>
     items.flatMap((item) => [item, ...flatten(Array.isArray(item.children) ? item.children : [])])
 
@@ -253,6 +255,18 @@
         ...result,
       }
     },
+    delayNextImport: (ms = 300) => {
+      state.nextImportDelayMs = ms
+    },
+    failNextImport: (result = 'mock_import_error') => {
+      state.nextImportResult = result
+    },
+    delayNextImportFromUrl: (ms = 300) => {
+      state.nextImportFromUrlDelayMs = ms
+    },
+    failNextImportFromUrl: (result = 'mock_import_url_error') => {
+      state.nextImportFromUrlResult = result
+    },
   }
 
   window.__TAURI_EVENT_PLUGIN_INTERNALS__ = {
@@ -393,8 +407,18 @@
           }
           return refreshRemote(params[0])
         case 'export_data':
-          return '/Users/e2e/exports/swh_data.json'
+          return '/Users/e2e/exports/switchhosts_20260509_121436.789.json'
         case 'import_data':
+          if (state.nextImportDelayMs) {
+            const ms = state.nextImportDelayMs
+            state.nextImportDelayMs = 0
+            await delay(ms)
+          }
+          if (Object.prototype.hasOwnProperty.call(state, 'nextImportResult')) {
+            const result = state.nextImportResult
+            delete state.nextImportResult
+            return result
+          }
           state.list = [
             {
               id: 'imported-local',
@@ -430,6 +454,16 @@
           state.trashcan = []
           return true
         case 'import_data_from_url':
+          if (state.nextImportFromUrlDelayMs) {
+            const ms = state.nextImportFromUrlDelayMs
+            state.nextImportFromUrlDelayMs = 0
+            await delay(ms)
+          }
+          if (Object.prototype.hasOwnProperty.call(state, 'nextImportFromUrlResult')) {
+            const result = state.nextImportFromUrlResult
+            delete state.nextImportFromUrlResult
+            return result
+          }
           state.list = [
             {
               id: 'imported-url',
@@ -457,6 +491,7 @@
         case 'hide_main_window':
         case 'quit_app':
         case 'open_url':
+        case 'show_item_in_folder':
         case 'popup_menu':
           return true
         case 'check_update':
diff --git a/e2e/support/test.ts b/e2e/support/test.ts
@@ -50,6 +50,10 @@ declare global {
       clearCalls: () => void
       failNextApply: (result?: { code?: string; message?: string }) => void
       failNextRefresh: (result?: { code?: string; message?: string }) => void
+      delayNextImport: (ms?: number) => void
+      failNextImport: (result?: string | false | null) => void
+      delayNextImportFromUrl: (ms?: number) => void
+      failNextImportFromUrl: (result?: string | false | null) => void
     }
   }
 }
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
@@ -1040,6 +1040,14 @@ pub async fn show_item_in_folder(args: Args) -> Value {
 // come back as Ok(Value::String("error_code")) the renderer can
 // display.
 
+fn export_file_name_for(now: chrono::DateTime<chrono::Local>) -> String {
+    format!("switchhosts_{}.json", now.format("%Y%m%d_%H%M%S%.3f"))
+}
+
+fn default_export_file_name() -> String {
+    export_file_name_for(chrono::Local::now())
+}
+
 #[tauri::command]
 pub async fn export_data<R: Runtime>(
     app: AppHandle<R>,
@@ -1050,7 +1058,7 @@ pub async fn export_data<R: Runtime>(
         .dialog()
         .file()
         .add_filter("JSON", &["json"])
-        .set_file_name("swh_data.json")
+        .set_file_name(&default_export_file_name())
         .blocking_save_file();
 
     let Some(dest) = picked else {
@@ -1070,6 +1078,28 @@ pub async fn export_data<R: Runtime>(
     Ok(Value::String(dest_path.display().to_string()))
 }
 
+#[cfg(test)]
+mod export_file_name_tests {
+    use chrono::{TimeZone, Timelike};
+
+    use super::export_file_name_for;
+
+    #[test]
+    fn includes_millisecond_timestamp() {
+        let now = chrono::Local
+            .with_ymd_and_hms(2026, 5, 9, 12, 14, 36)
+            .single()
+            .expect("test timestamp should be representable")
+            .with_nanosecond(789_000_000)
+            .expect("test nanosecond should be valid");
+
+        assert_eq!(
+            export_file_name_for(now),
+            "switchhosts_20260509_121436.789.json"
+        );
+    }
+}
+
 #[tauri::command]
 pub async fn import_data<R: Runtime>(
     app: AppHandle<R>,
diff --git a/src/renderer/components/TopBar/ConfigMenu.tsx b/src/renderer/components/TopBar/ConfigMenu.tsx
@@ -8,7 +8,15 @@ import events from '@common/events'
 import { ActionIcon, Menu, type MenuProps, ScrollArea, Tooltip } from '@mantine/core'
 import ImportFromUrl from '@renderer/components/TopBar/ImportFromUrl'
 import { actions, agent } from '@renderer/core/agent'
-import { getErrorMessage, showErrorNotification, showSuccessNotification } from '@renderer/core/notify'
+import {
+  getErrorMessage,
+  hideAppNotification,
+  showErrorNotification,
+  showLoadingNotification,
+  showSuccessNotification,
+  updateErrorNotification,
+  updateSuccessNotification,
+} from '@renderer/core/notify'
 import useHostsData from '@renderer/models/useHostsData'
 import useI18n from '@renderer/models/useI18n'
 import {
@@ -118,13 +126,32 @@ const ConfigMenu = (props: IProps) => {
             <Menu.Item
               leftSection={<IconUpload size={iconSize} stroke={strokeWidth} />}
               onClick={async () => {
-                const r = await actions.exportData()
-                if (r === null) {
-                  return
-                } else if (r === false) {
-                  console.error(lang.import_fail)
-                } else {
-                  console.log(lang.export_done)
+                try {
+                  const r = await actions.exportData()
+                  if (r === null) {
+                    return
+                  } else if (r === false) {
+                    showErrorNotification({
+                      title: lang.export,
+                      message: lang.fail,
+                    })
+                  } else if (typeof r === 'string') {
+                    showSuccessNotification({
+                      title: lang.export,
+                      message: lang.export_done,
+                    })
+
+                    try {
+                      await actions.showItemInFolder(r)
+                    } catch (error) {
+                      console.error(error)
+                    }
+                  }
+                } catch (error) {
+                  showErrorNotification({
+                    title: lang.export,
+                    message: getErrorMessage(error, lang.fail),
+                  })
                 }
               }}
             >
@@ -133,20 +160,39 @@ const ConfigMenu = (props: IProps) => {
             <Menu.Item
               leftSection={<IconDownload size={iconSize} stroke={strokeWidth} />}
               onClick={async () => {
-                const r = await actions.importData()
-                if (r === null) {
-                  return
-                } else if (r === true) {
-                  console.log(lang.import_done)
-                  await loadHostsData()
-                  setCurrentHosts(null)
-                } else {
-                  let description = lang.import_fail
-                  if (typeof r === 'string') {
-                    description += ` [${r}]`
-                  }
+                const notificationId = showLoadingNotification({
+                  title: lang.import,
+                  message: lang.loading,
+                })
 
-                  console.error(description)
+                try {
+                  const r = await actions.importData()
+                  if (r === null) {
+                    hideAppNotification(notificationId)
+                    return
+                  } else if (r === true) {
+                    await loadHostsData()
+                    setCurrentHosts(null)
+                    updateSuccessNotification(notificationId, {
+                      title: lang.import,
+                      message: lang.import_done,
+                    })
+                  } else {
+                    let description = lang.import_fail
+                    if (typeof r === 'string') {
+                      description += ` [${r}]`
+                    }
+
+                    updateErrorNotification(notificationId, {
+                      title: lang.import,
+                      message: description,
+                    })
+                  }
+                } catch (error) {
+                  updateErrorNotification(notificationId, {
+                    title: lang.import,
+                    message: getErrorMessage(error, lang.import_fail),
+                  })
                 }
               }}
             >
diff --git a/src/renderer/components/TopBar/ImportFromUrl.tsx b/src/renderer/components/TopBar/ImportFromUrl.tsx
@@ -5,6 +5,12 @@
 
 import { Button, Group, Modal, TextInput } from '@mantine/core'
 import { actions } from '@renderer/core/agent'
+import {
+  getErrorMessage,
+  showLoadingNotification,
+  updateErrorNotification,
+  updateSuccessNotification,
+} from '@renderer/core/notify'
 import useHostsData from '@renderer/models/useHostsData'
 import useI18n from '@renderer/models/useI18n'
 import React, { useState } from 'react'
@@ -29,24 +35,39 @@ const ImportFromUrl = (props: Props) => {
 
   const onOk = async () => {
     setIsShow(false)
-    console.log(`url: ${url}`)
 
     if (url) {
-      const r = await actions.importDataFromUrl(url)
-      console.log(r)
+      const notificationId = showLoadingNotification({
+        title: lang.import_from_url,
+        message: lang.loading,
+      })
 
-      if (r === true) {
-        // import success
-        console.log(lang.import_done)
-        await loadHostsData()
-        setCurrentHosts(null)
-      } else {
-        let description = lang.import_fail
-        if (typeof r === 'string') {
-          description += ` [${r}]`
-        }
+      try {
+        const r = await actions.importDataFromUrl(url)
+
+        if (r === true) {
+          await loadHostsData()
+          setCurrentHosts(null)
+          updateSuccessNotification(notificationId, {
+            title: lang.import_from_url,
+            message: lang.import_done,
+          })
+        } else {
+          let description = lang.import_fail
+          if (typeof r === 'string') {
+            description += ` [${r}]`
+          }
 
-        console.error(description)
+          updateErrorNotification(notificationId, {
+            title: lang.import_from_url,
+            message: description,
+          })
+        }
+      } catch (error) {
+        updateErrorNotification(notificationId, {
+          title: lang.import_from_url,
+          message: getErrorMessage(error, lang.import_fail),
+        })
       }
     }
     setUrl('')
diff --git a/src/renderer/core/notify.ts b/src/renderer/core/notify.ts

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ declare global {`
`50`	`50`	`clearCalls: () => void`
`51`	`51`	`failNextApply: (result?: { code?: string; message?: string }) => void`
`52`	`52`	`failNextRefresh: (result?: { code?: string; message?: string }) => void`
	`53`	`+ delayNextImport: (ms?: number) => void`
	`54`	`+ failNextImport: (result?: string \| false \| null) => void`
	`55`	`+ delayNextImportFromUrl: (ms?: number) => void`
	`56`	`+ failNextImportFromUrl: (result?: string \| false \| null) => void`
`53`	`57`	`}`
`54`	`58`	`}`
`55`	`59`	`}`