@electerm/electerm-react 1.39.103 → 1.39.109

package/client/components/sftp/sftp-entry.jsx

@@ -30,7 +30,6 @@ import deepCopy from 'json-deep-copy'
 import isValidPath from '../../common/is-valid-path'
 import memoizeOne from 'memoize-one'
 import postMessage from '../../common/post-msg'
-import { runCmd } from '../terminal/terminal-apis'
 import * as owner from './owner-list'
 import AddressBar from './address-bar'
 import getProxy from '../../common/get-proxy'
@@ -252,11 +251,7 @@ export default class Sftp extends Component {
     if (this.props.sftpPathFollowSsh && this.props.cwd) {
       return this.props.cwd
     }
-    const home = await runCmd(
-      this.props.pid,
-      this.props.sessionId,
-      'pwd'
-    ).catch(window.store.onError)
+    const home = await this.sftp.getHomeDir()
     if (home) {
       return home.trim()
     } else {

package/client/store/sync.js

@@ -117,8 +117,21 @@ export default (Store) => {
   }
 
   Store.prototype.handleClearSyncSetting = async function () {
-    window.store.setConfig({
-      syncSetting: {}
+    const { store } = window
+    const currentSyncType = store.syncType
+    const currentSettings = store.config.syncSetting || {}
+    console.log('currentSettings: ', currentSyncType, currentSettings)
+    // Create a new object without the current sync type's settings
+    const updatedSettings = Object.keys(currentSettings).reduce((acc, key) => {
+      if (!key.startsWith(currentSyncType)) {
+        acc[key] = currentSettings[key]
+      }
+      return acc
+    }, {})
+    console.log('updatedSettings: ', updatedSettings)
+
+    store.setConfig({
+      syncSetting: updatedSettings
     })
   }
 
@@ -346,7 +359,7 @@ export default (Store) => {
   Store.prototype.handleExportAllData = async function () {
     const { store } = window
     const objs = {}
-    const names = store.getDataSyncNames(true)
+    const { names } = store.getDataSyncNames(true)
     for (const n of names) {
       objs[n] = store.getItems(n)
       const order = await getData(`${n}:order`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.39.103",
+  "version": "1.39.109",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",