fix

Author: devchenyan

packages/neuron-ui/src/components/DataSetting/hooks.ts

@@ -47,6 +47,11 @@ export const useDataPath = (network?: State.Network) => {
     })
   }, [setIsDialogOpen, type])
 
+  const onResync = useCallback(async () => {
+    await stopProcessMonitor(type)
+    return startProcessMonitor(type)
+  }, [type])
+
   const onConfirm = useCallback(
     (dataPath: string) => {
       setPrevPath(dataPath)
@@ -68,6 +73,7 @@ export const useDataPath = (network?: State.Network) => {
     onConfirm,
     isDialogOpen,
     openDialog,
+    onResync,
   }
 }
 

packages/neuron-ui/src/components/DataSetting/index.tsx

@@ -1,12 +1,15 @@
-import React, { useCallback, useMemo } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ClearCache from 'components/ClearCache'
 import { useDispatch, useState as useGlobalState } from 'states'
 import { shell } from 'electron'
 import Tooltip from 'widgets/Tooltip'
 import { NetworkType } from 'utils/const'
 import { Attention, More } from 'widgets/Icons/icon'
+import Toast from 'widgets/Toast'
 import ModifyPathDialog from 'components/ModifyPathDialog'
+import AlertDialog from 'widgets/AlertDialog'
+import { isSuccessResponse } from 'utils'
 import { useDataPath } from './hooks'
 
 import styles from './dataSetting.module.scss'
@@ -66,17 +69,31 @@ const DataSetting = () => {
     chain: { networkID },
     settings: { networks = [] },
   } = useGlobalState()
+  const [notice, setNotice] = useState('')
+  const [showLostDialog, setShowLostDialog] = useState(false)
   const network = useMemo(() => networks.find(n => n.id === networkID), [networkID, networks])
-  const { isDialogOpen, openDialog, onSetting, prevPath, currentPath, onCancel, onConfirm } = useDataPath(network)
+  const { isDialogOpen, openDialog, onSetting, prevPath, currentPath, onCancel, onConfirm, onResync } =
+    useDataPath(network)
 
   const openPath = useCallback(() => {
-    if (prevPath) {
-      shell.openPath(prevPath!)
-    }
-  }, [prevPath])
+    shell.openPath(prevPath).then(res => {
+      if (res) {
+        setShowLostDialog(true)
+      }
+    })
+  }, [prevPath, onResync])
   const isLightClient = network?.type === NetworkType.Light
   const hiddenDataPath = isLightClient || !network?.readonly
 
+  const handleResync = useCallback(() => {
+    setShowLostDialog(false)
+    onResync().then(res => {
+      if (isSuccessResponse(res)) {
+        openPath()
+      }
+    })
+  }, [openPath])
+
   return (
     <>
       <div className={styles.root}>
@@ -119,8 +136,24 @@ const DataSetting = () => {
           onCancel={onCancel}
           onConfirm={onConfirm}
           onSetting={onSetting}
+          setNotice={setNotice}
         />
       )}
+
+      {showLostDialog && (
+        <AlertDialog
+          show
+          title={t('settings.data.sync-file-lost')}
+          message={t('settings.data.sync-file-lost-notice')}
+          type="warning"
+          cancelText={t('settings.data.resync')}
+          onCancel={handleResync}
+          okText={t('settings.data.retry')}
+          onOk={() => setShowLostDialog(false)}
+        />
+      )}
+
+      <Toast content={notice} onDismiss={() => setNotice('')} />
     </>
   )
 }

packages/neuron-ui/src/components/ModifyPathDialog/index.tsx

@@ -1,7 +1,6 @@
 import React, { useState, useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import Dialog from 'widgets/Dialog'
-import Button from 'widgets/Button'
 import AlertDialog from 'widgets/AlertDialog'
 import MigrateCkbDataDialog from 'widgets/MigrateCkbDataDialog'
 import { setCkbNodeDataPath, getCkbNodeDataNeedSize } from 'services/remote'
@@ -15,12 +14,14 @@ const ModifyPathDialog = ({
   onCancel,
   onConfirm,
   onSetting,
+  setNotice,
 }: {
   onCancel?: () => void
   prevPath: string
   currentPath: string
   onConfirm: (dataPath: string) => void
   onSetting: (onSuccess?: (path: string) => void) => void
+  setNotice: (notice: string) => void
 }) => {
   const [t] = useTranslation()
   const [isMigrateOpen, setIsMigrateOpen] = useState(false)
@@ -36,7 +37,7 @@ const ModifyPathDialog = ({
     })
   }, [])
 
-  const handleResynchronize = useCallback(async () => {
+  const handleResync = useCallback(async () => {
     setFailureMessage('')
     onSetting(path => {
       setCkbNodeDataPath({
@@ -50,7 +51,7 @@ const ModifyPathDialog = ({
         }
       })
     })
-  }, [onSetting, onConfirm])
+  }, [onSetting, onConfirm, setFailureMessage])
 
   if (isMigrateOpen) {
     return (
@@ -59,6 +60,8 @@ const ModifyPathDialog = ({
         currentPath={currentPath}
         onCancel={() => setIsMigrateOpen(false)}
         onConfirm={onConfirm}
+        onClose={onCancel}
+        setNotice={setNotice}
       />
     )
   }
@@ -74,6 +77,7 @@ const ModifyPathDialog = ({
         confirmText={t('wizard.next')}
         className={styles.dialog}
         disabled={!currentPath}
+        onClose={onCancel}
       >
         <div>
           <div className={styles.tip}>
@@ -82,7 +86,7 @@ const ModifyPathDialog = ({
           </div>
 
           <div className={styles.pathItem}>
-            <p>{currentPath}</p>
+            <p>{currentPath || 'path/to/ckb_node_data'}</p>
             <button type="button" onClick={() => onSetting()}>
               {t('settings.data.browse')}
             </button>
@@ -97,25 +101,21 @@ const ModifyPathDialog = ({
       <Dialog
         show={!failureMessage}
         title={t('settings.data.modify-path')}
-        showFooter={false}
-        onCancel={onCancel}
         className={styles.dialog}
+        onClose={onCancel}
+        confirmText={t('settings.data.retain-previous-data')}
+        onConfirm={() => setIsRetainPreviousData(true)}
+        confirmProps={{ type: 'dashed' }}
+        cancelText={t('settings.data.resync')}
+        onCancel={handleResync}
+        cancelProps={{ type: 'dashed' }}
       >
         <div>
           <div className={styles.tip}>
             <Attention />
             {t('settings.data.modify-path-notice', { needSize })}
           </div>
           <p className={styles.modifyTip}>{t('settings.data.modify-path-content')}</p>
-
-          <div className={styles.footer}>
-            <Button type="dashed" label={t('settings.data.resynchronize')} onClick={handleResynchronize} />
-            <Button
-              type="dashed"
-              label={t('settings.data.retain-previous-data')}
-              onClick={() => setIsRetainPreviousData(true)}
-            />
-          </div>
         </div>
       </Dialog>
       <AlertDialog

packages/neuron-ui/src/components/ModifyPathDialog/modifyPathDialog.module.scss

@@ -48,20 +48,6 @@
   color: var(--main-text-color);
 }
 
-.footer {
-  background: var(--secondary-background-color);
-  padding: 24px 0 20px;
-  @include dialog-footer;
-
-  button {
-    padding: 0 20px;
-  }
-
-  button:nth-child(2) {
-    margin-left: 24px;
-  }
-}
-
 .pathItem {
   display: flex;
   align-items: center;

packages/neuron-ui/src/components/Settings/index.tsx

@@ -116,7 +116,7 @@ const Settings = () => {
 
   useOnLocalStorageChange(onChange)
   return (
-    <PageContainer head={t('navbar.settings')} notice={globalState.app.pageNotice}>
+    <PageContainer head={t('navbar.settings')}>
       <div className={styles.container}>
         {items.map(([title, marginTop, ItemCmp]) => (
           <div className={styles.item} key={title}>

packages/neuron-ui/src/locales/ar.json

@@ -504,7 +504,6 @@
         "modify-path": "تعديل المسار",
         "modify-path-notice": "يرجى التأكد من أن المساحة المتبقية على القرص أكبر من {{needSize}} جيجابايت لتخزين بيانات عقدة CKB.",
         "modify-path-content": "يمكنك اختيار مسار جديد لإعادة المزامنة أو نقل البيانات السابقة لمتابعة المزامنة.",
-        "resynchronize": "إعادة المزامنة",
         "retain-previous-data": "احتفظ بالبيانات السابقة",
         "set-a-new-path": "تعيين مسار جديد",
         "browse": "تصفح",
@@ -515,7 +514,11 @@
         "migrate-step-2": "افتح المسار الذي تم تعيينه حديثًا.",
         "migrate-step-3": "نسخ جميع الملفات إلى المسار الجديد.",
         "click-here": "انقر هنا",
-        "migrate-data-successful": "تم نقل البيانات بنجاح"
+        "migrate-data-successful": "تم نقل البيانات بنجاح",
+        "resync": "إعادة المزامنة",
+        "retry": "إعادة المحاولة",
+        "sync-file-lost": "تم فقدان ملف المزامنة",
+        "sync-file-lost-notice": "يرجى استعادة الملف والمحاولة مرة أخرى، أو إعادة المزامنة."
       }
     },
     "password-request": {

packages/neuron-ui/src/locales/en.json

@@ -504,7 +504,6 @@
         "modify-path": "Modify Path",
         "modify-path-notice": "Please ensure the remaining disk space is greater than {{needSize}} G for storing CKB Node Data.",
         "modify-path-content": "You can choose a new path to resynchronize or migrate previous data to continue synchronization.",
-        "resynchronize": "Resynchronize",
         "retain-previous-data": "Retain previous data",
         "set-a-new-path": "Set a new path",
         "browse": "Browse",
@@ -515,7 +514,10 @@
         "migrate-step-2": "Open the newly set path.",
         "migrate-step-3": "Copy all files to the new path.",
         "click-here": "Click Here",
-        "migrate-data-successful": "Migrate data successful"
+        "resync": "Resync",
+        "retry": "Retry",
+        "sync-file-lost": "Sync file lost",
+        "sync-file-lost-notice": "Please recover and retry, or resync."
       }
     },
     "password-request": {

packages/neuron-ui/src/locales/es.json

@@ -487,7 +487,6 @@
         "modify-path": "Modificar ruta",
         "modify-path-notice": "Por favor, asegúrese de que el espacio disponible en el disco sea mayor a {{needSize}} GB para almacenar los datos del Nodo CKB.",
         "modify-path-content": "Puedes elegir una nueva ruta para volver a sincronizar o migrar los datos anteriores para continuar la sincronización.",
-        "resynchronize": "Volver a sincronizar",
         "retain-previous-data": "Conservar datos anteriores",
         "set-a-new-path": "Establecer una nueva ruta",
         "browse": "Explorar",
@@ -498,7 +497,11 @@
         "migrate-step-2": "Abrir la nueva ruta establecida.",
         "migrate-step-3": "Copiar todos los archivos al nuevo camino.",
         "click-here": "Haz clic aquí",
-        "migrate-data-successful": "Migración de datos exitosa"
+        "migrate-data-successful": "Migración de datos exitosa",
+        "resync": "Reiniciar sincronización",
+        "retry": "Reintentar",
+        "sync-file-lost": "Archivo de sincronización perdido",
+        "sync-file-lost-notice": "Por favor, recupere el archivo e intente de nuevo, o reinicie la sincronización."
       }
     },
     "password-request": {

packages/neuron-ui/src/locales/fr.json

@@ -494,7 +494,6 @@
         "modify-path": "Modifier le chemin",
         "modify-path-notice": "Veuillez vous assurer que l'espace disque restant est supérieur à {{needSize}} Go pour stocker les données du nœud CKB.",
         "modify-path-content": "Vous pouvez choisir un nouveau chemin pour resynchroniser ou migrer les données précédentes afin de continuer la synchronisation.",
-        "resynchronize": "Resynchroniser",
         "retain-previous-data": "Conserver les données précédentes",
         "set-a-new-path": "Définir un nouveau chemin",
         "browse": "Parcourir",
@@ -505,7 +504,11 @@
         "migrate-step-2": "Ouvrir le nouveau chemin défini.",
         "migrate-step-3": "Copier tous les fichiers vers le nouveau chemin.",
         "click-here": "Cliquez ici",
-        "migrate-data-successful": "Migration des données réussie"
+        "migrate-data-successful": "Migration des données réussie",
+        "resync": "Resynchroniser",
+        "retry": "Réessayer",
+        "sync-file-lost": "Fichier de synchronisation perdu",
+        "sync-file-lost-notice": "Veuillez récupérer le fichier et réessayer, ou resynchroniser."
       }
     },
     "password-request": {

packages/neuron-ui/src/locales/zh-tw.json

@@ -498,7 +498,6 @@
         "modify-path": "修改路徑",
         "modify-path-notice": "請確保剩餘的磁碟空間大於 {{needSize}} GB 以存儲 CKB 節點資料。",
         "modify-path-content": "您可以選擇一個新路徑重新同步或遷移以前的資料以繼續同步。",
-        "resynchronize": "重新同步",
         "retain-previous-data": "保留先前的資料",
         "set-a-new-path": "設置新路徑",
         "browse": "瀏覽",
@@ -509,7 +508,11 @@
         "migrate-step-2": "打開新設置的路徑。",
         "migrate-step-3": "將所有檔案複製到新路徑。",
         "click-here": "點擊這裡",
-        "migrate-data-successful": "資料遷移成功"
+        "migrate-data-successful": "資料遷移成功",
+        "resync": "重新同步",
+        "retry": "重試",
+        "sync-file-lost": "同步文件遺失",
+        "sync-file-lost-notice": "請恢復文件並重試，或重新同步。"
       }
     },
     "password-request": {