@electerm/electerm-react 3.6.16 → 3.7.9

package/client/common/parse-quick-connect.js

@@ -370,7 +370,12 @@ function parseQuickConnect (str) {
         opts.port = parseInt(port, 10)
       }
       if (username !== undefined && username !== '') {
-        opts.username = username
+        // FTP form uses 'user' instead of 'username'
+        if (finalProtocol === 'ftp') {
+          opts.user = username
+        } else {
+          opts.username = username
+        }
       }
       if (password !== undefined && password !== '') {
         opts.password = password

package/client/components/bookmark-form/ai-bookmark-form.jsx

@@ -80,8 +80,18 @@ export default function AIBookmarkForm (props) {
 
       let bookmarkData
       if (aiResponse && aiResponse.response) {
+        // Normalize response payload to string before JSON extraction.
+        const rawResponse = aiResponse.response
+        let jsonStr = ''
+        if (typeof rawResponse === 'string') {
+          jsonStr = rawResponse
+        } else if (typeof rawResponse === 'object') {
+          jsonStr = JSON.stringify(rawResponse)
+        } else {
+          jsonStr = String(rawResponse)
+        }
         // Parse the JSON response
-        let jsonStr = aiResponse.response.trim()
+        jsonStr = jsonStr.trim()
         // Remove markdown code blocks if present
         if (jsonStr.startsWith('```json')) {
           jsonStr = jsonStr.slice(7)
@@ -93,7 +103,7 @@ export default function AIBookmarkForm (props) {
         }
         jsonStr = jsonStr.trim()
 
-        bookmarkData = JSON.parse(jsonStr)
+        bookmarkData = getGeneratedData(jsonStr)
         const pretty = JSON.stringify(bookmarkData, null, 2)
         setEditorText(pretty)
         // set default category when preview opens
@@ -103,22 +113,23 @@ export default function AIBookmarkForm (props) {
       }
     } catch (error) {
       console.error('AI bookmark generation error:', error)
-      message.error(e('aiGenerateError') || 'AI generation failed: ' + error.message)
+      message.error('Can not generate bookmarks from AI response: ' + error.message)
     } finally {
       setLoading(false)
     }
   }
 
-  function getGeneratedData () {
-    if (!editorText) return []
+  function getGeneratedData (txt = editorText) {
+    if (!txt) return []
     let parsed = null
     try {
-      parsed = fixBookmarkData(JSON.parse(editorText))
+      parsed = JSON.parse(txt)
     } catch (err) {
       return []
     }
     if (!parsed) return []
-    return Array.isArray(parsed) ? parsed : [parsed]
+    const arr = Array.isArray(parsed) ? parsed : [parsed]
+    return arr.map(d => fixBookmarkData(d))
   }
 
   const createBookmark = async (bm) => {
@@ -228,6 +239,7 @@ export default function AIBookmarkForm (props) {
     }
     return (
       <SimpleEditor
+        key='editor'
         {...editorProps}
       />
     )
@@ -238,7 +250,7 @@ export default function AIBookmarkForm (props) {
       return renderEditor()
     }
     return (
-      <pre className='ai-bookmark-json-preview'>
+      <pre key='preview' className='ai-bookmark-json-preview'>
         {editorText}
       </pre>
     )

package/client/components/bookmark-form/common/proxy.jsx

@@ -17,17 +17,13 @@ export default function renderProxy (props) {
       }
       return prev
     }, {})
-  const opts = {
-    options: Object.keys(proxyTree)
-      .map(d => {
-        return {
-          label: d,
-          value: d
-        }
-      }),
-    placeholder: 'socks5://127.0.0.1:1080',
-    allowClear: true
-  }
+  const options = Object.keys(proxyTree)
+    .map(d => {
+      return {
+        label: d,
+        value: d
+      }
+    })
   return (
     <FormItem
       {...formItemLayout}
@@ -38,10 +34,8 @@ export default function renderProxy (props) {
         max: 1024, message: '1024 chars max'
       }]}
     >
-      <AutoComplete
-        {...opts}
-      >
-        <Input />
+      <AutoComplete options={options}>
+        <Input allowClear placeholder='socks5://127.0.0.1:1080' />
       </AutoComplete>
     </FormItem>
   )

package/client/components/bookmark-form/fix-bookmark-default.js

@@ -9,8 +9,10 @@ const defaultValues = {
     x11: false,
     term: 'xterm-256color',
     displayRaw: false,
+    authType: 'password',
     encode: 'utf8',
-    envLang: 'en_US.UTF-8'
+    envLang: 'en_US.UTF-8',
+    username: 'root'
   },
   telnet: {
     port: 23
@@ -44,7 +46,7 @@ const defaultValues = {
 }
 
 const requiredFields = {
-  ssh: ['host', 'username', 'term'],
+  ssh: ['host'],
   telnet: ['host'],
   serial: ['path'],
   vnc: ['host'],

package/client/components/bookmark-form/tree-select.jsx

@@ -113,6 +113,7 @@ export default function BookmarkTreeSelect (props) {
   const [expandedKeys, setExpandedKeys] = useState(() => deepCopy(propExpandedKeys || []))
   const [checkedKeys, setCheckedKeys] = useState(() => deepCopy(propCheckedKeys || []))
   const [searchText, setSearchText] = useState('')
+  const [refreshKey, setRefreshKey] = useState(0)
 
   const onCheck = setCheckedKeys
 
@@ -122,6 +123,7 @@ export default function BookmarkTreeSelect (props) {
     if (type === 'delete') {
       store.delItems(arr, settingMap.bookmarks)
       store.delItems(arr, settingMap.bookmarkGroups)
+      setRefreshKey(k => k + 1)
     } else {
       store.openBookmarks(arr)
       if (props.onClose) {
@@ -141,7 +143,7 @@ export default function BookmarkTreeSelect (props) {
     setCheckedKeys([])
   }
 
-  const treeData = useMemo(() => buildData(bookmarks, bookmarkGroups, searchText), [bookmarks, bookmarkGroups, searchText])
+  const treeData = useMemo(() => buildData(bookmarks, bookmarkGroups, searchText), [bookmarks, bookmarkGroups, searchText, refreshKey])
 
   // Auto expand parent nodes when searching
   const handleExpand = (keys) => {

package/client/components/file-transfer/transfer.jsx

@@ -71,9 +71,6 @@ export default class TransportAction extends Component {
     this.transport = null
     this.fromFile = null
     refsTransfers.remove(this.id)
-    if (this.isFtp) {
-      window.initingFtpTabIds?.delete(this.tabId)
-    }
   }
 
   localCheckExist = (path) => {
@@ -241,10 +238,11 @@ export default class TransportAction extends Component {
       operation // 'mv' or 'cp'
     } = transfer
 
-    let finalToPath = toPath
+    // Use this.newPath when set (e.g. user chose rename from conflict modal)
+    let finalToPath = this.newPath || toPath
 
-    // Check if it's a copy operation to the same path
-    if (fromPath === toPath && operation === fileOperationsMap.cp) {
+    // Check if it's a copy operation to the same path (no rename decision pending)
+    if (!this.newPath && fromPath === toPath && operation === fileOperationsMap.cp) {
       finalToPath = this.handleRename(toPath, typeFrom === typeMap.remote).newPath
       transfer.toPath = finalToPath
       this.update({
@@ -410,6 +408,10 @@ export default class TransportAction extends Component {
       this.newName = newName
     }
 
+    const { typeFrom, typeTo } = this.props.transfer
+    if (typeFrom === typeTo) {
+      return this.mvOrCp()
+    }
     this.startTransfer()
   }
 
@@ -758,9 +760,9 @@ export default class TransportAction extends Component {
 
     const list = await this.list(typeFrom, fromPath, tabId)
     const bigFileSize = 1024 * 1024
-    const smallFilesBatch = this.isFtp ? 1 : 30
-    const BigFilesBatch = this.isFtp ? 1 : 3
-    const foldersBatch = this.isFtp ? 1 : 50
+    const smallFilesBatch = 30
+    const BigFilesBatch = 3
+    const foldersBatch = 50
 
     const {
       folders,

package/client/components/file-transfer/transports-action-store.jsx

@@ -9,8 +9,6 @@ import { maxTransport } from '../../common/constants'
 import { refsStatic } from '../common/ref'
 // import { action } from 'manate'
 
-window.initingFtpTabIds = new Set()
-
 export default class TransportsActionStore extends Component {
   constructor (props) {
     super(props)
@@ -84,9 +82,7 @@ export default class TransportsActionStore extends Component {
         typeTo,
         typeFrom,
         inited,
-        id,
-        tabType,
-        tabId
+        id
       } = tr
 
       const isTransfer = typeTo !== typeFrom
@@ -95,15 +91,6 @@ export default class TransportsActionStore extends Component {
         continue
       }
 
-      // For ftp transfers, ensure only one per tabId is inited
-      if (tabType === 'ftp') {
-        const hasInited = fileTransfers.some(t => t.tabId === tabId && t.inited && t.id !== id)
-        if (hasInited || window.initingFtpTabIds.has(tabId)) {
-          continue
-        }
-        window.initingFtpTabIds.add(tabId)
-      }
-
       if (count < maxTransport) {
         count++
         this.pendingInitIds.add(id)

package/client/components/main/main.jsx

@@ -34,7 +34,6 @@ import InputContextMenu from '../common/input-context-menu'
 import WorkspaceSaveModal from '../tabs/workspace-save-modal'
 import BookmarkFromHistoryModal from '../bookmark-form/bookmark-from-history-modal'
 import AutoSync from '../setting-sync/auto-sync'
-import AutoCheckUpdate from '../common/auto-check-update'
 import BatchOpRunner from '../batch-op/batch-op-runner'
 import { pick } from 'lodash-es'
 import deepCopy from 'json-deep-copy'
@@ -292,7 +291,6 @@ export default auto(function Index (props) {
         <TerminalCmdSuggestions {...cmdSuggestionsProps} />
         <TransferQueue />
         <AutoSync config={config} />
-        <AutoCheckUpdate config={config} />
         <WorkspaceSaveModal store={store} />
         <BookmarkFromHistoryModal />
         <NotificationContainer />

package/client/components/sftp/list-table-ui.jsx

@@ -214,10 +214,10 @@ export default class FileListTable extends Component {
     this.currentFileId = id
   }
 
-  renderItem = (item) => {
+  renderItem = (item, index) => {
     const { type } = this.props
     const cls = item.isParent ? 'parent-file-item' : 'real-file-item'
-    const key = item.id
+    const key = item.id ?? index + 'file-item'
     const fileProps = {
       ...this.props.getFileProps(item, type),
       cls,

package/client/components/sftp/paged-list.jsx

@@ -28,7 +28,7 @@ export default class ScrollFiles extends Component {
     const arr = hasPager
       ? list.slice(start, end)
       : list
-    return arr.map(this.props.renderItem)
+    return arr.map((item, index) => this.props.renderItem(item, index))
   }
 
   renderPager () {

package/package.json

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

package/client/components/common/auto-check-update.jsx

@@ -1,31 +0,0 @@
-import { useEffect, useRef } from 'react'
-
-export default function AutoCheckUpdate ({ config }) {
-  const lastCheckTimeRef = useRef(0)
-  const intervalIdRef = useRef(null)
-
-  useEffect(() => {
-    if (!config.checkUpdateOnStart) {
-      clearInterval(intervalIdRef.current)
-      return
-    }
-
-    const checkForUpdate = () => {
-      const { store } = window
-      if (store.config.checkUpdateOnStart) {
-        store.onCheckUpdate(false)
-      }
-      lastCheckTimeRef.current = Date.now()
-    }
-
-    intervalIdRef.current = setInterval(checkForUpdate, 60 * 60 * 1000)
-
-    return () => {
-      if (intervalIdRef.current) {
-        clearInterval(intervalIdRef.current)
-      }
-    }
-  }, [config.checkUpdateOnStart])
-
-  return null
-}