@electerm/electerm-react 3.0.18 → 3.1.16

package/client/components/setting-sync/setting-sync-form.jsx

@@ -41,6 +41,10 @@ export default function SyncForm (props) {
     if (syncType === syncTypes.cloud) {
       return !props.formData.token
     }
+    if (syncType === syncTypes.webdav) {
+      const { serverUrl, username, password } = props.formData
+      return !serverUrl || !username || !password
+    }
     const {
       token,
       gistId
@@ -70,6 +74,14 @@ export default function SyncForm (props) {
     } else {
       up[syncType + 'Proxy'] = ''
     }
+
+    // Handle WebDAV specific fields
+    if (syncType === syncTypes.webdav) {
+      up[syncType + 'ServerUrl'] = res.serverUrl || ''
+      up[syncType + 'Username'] = res.username || ''
+      up[syncType + 'Password'] = res.password || ''
+    }
+
     window.store.updateSyncSetting(up)
     const test = await window.store.testSyncToken(syncType, res.gistId)
     if (isError(test)) {
@@ -180,6 +192,9 @@ export default function SyncForm (props) {
         </p>
       )
     }
+    if (syncType === syncTypes.webdav) {
+      return createWebdavItems()
+    }
     if (syncType !== syncTypes.custom) {
       return null
     }
@@ -199,18 +214,73 @@ export default function SyncForm (props) {
       </FormItem>
     )
   }
+  function createWebdavItems () {
+    return (
+      <div>
+        <FormItem
+          label={createLabel('URL')}
+          name='serverUrl'
+          normalize={trim}
+          rules={[{
+            max: 500, message: '500 chars max'
+          }, {
+            required: true, message: 'Server URL is required'
+          }]}
+        >
+          <Input
+            placeholder='https://your-webdav-server.com/remote.php/dav/files/username'
+            id='sync-input-webdav-server-url'
+          />
+        </FormItem>
+        <FormItem
+          label={createLabel(e('username'))}
+          name='username'
+          normalize={trim}
+          rules={[{
+            max: 200, message: '200 chars max'
+          }, {
+            required: true, message: 'Username is required'
+          }]}
+        >
+          <Input
+            placeholder='WebDAV username'
+            id='sync-input-webdav-username'
+          />
+        </FormItem>
+        <FormItem
+          label={createLabel(e('password'))}
+          name='password'
+          normalize={trim}
+          rules={[{
+            max: 200, message: '200 chars max'
+          }, {
+            required: true, message: 'Password is required'
+          }]}
+        >
+          <Password
+            placeholder='WebDAV password'
+            id='sync-input-webdav-password'
+          />
+        </FormItem>
+      </div>
+    )
+  }
   const desc = syncType === syncTypes.custom
     ? 'jwt secret'
-    : 'personal access token'
+    : syncType === syncTypes.webdav
+      ? 'WebDAV credentials'
+      : 'personal access token'
   const idDesc = syncType === syncTypes.custom
     ? 'user id'
-    : 'gist ID'
+    : syncType === syncTypes.webdav
+      ? 'WebDAV server'
+      : 'gist ID'
   const tokenLabel = createLabel('token', desc)
   const gistLabel = createLabel('gist', idDesc)
   const syncPasswordName = e('encrypt') + ' ' + e('password')
   const syncPasswordLabel = createLabel(syncPasswordName, '')
   function createIdItem () {
-    if (syncType === syncTypes.cloud) {
+    if (syncType === syncTypes.cloud || syncType === syncTypes.webdav) {
       return null
     }
     return (
@@ -231,7 +301,7 @@ export default function SyncForm (props) {
     )
   }
   function createPasswordItem () {
-    if (syncType === syncTypes.cloud) {
+    if (syncType === syncTypes.cloud || syncType === syncTypes.webdav) {
       return null
     }
     return (
@@ -271,17 +341,11 @@ export default function SyncForm (props) {
     type: syncType,
     status: props.serverStatus
   }
-  return (
-    <Form
-      onFinish={save}
-      form={form}
-      className='form-wrap pd1x'
-      name={'setting-sync-form' + syncType}
-      layout='vertical'
-      initialValues={props.formData}
-    >
-      {renderWarning()}
-      {createUrlItem()}
+  function createTokenItem () {
+    if (syncType === syncTypes.webdav) {
+      return null
+    }
+    return (
       <FormItem
         label={tokenLabel}
         hasFeedback
@@ -298,6 +362,20 @@ export default function SyncForm (props) {
           id={createId('token')}
         />
       </FormItem>
+    )
+  }
+  return (
+    <Form
+      onFinish={save}
+      form={form}
+      className='form-wrap pd1x'
+      name={'setting-sync-form' + syncType}
+      layout='vertical'
+      initialValues={props.formData}
+    >
+      {renderWarning()}
+      {createUrlItem()}
+      {createTokenItem()}
       {
         createIdItem()
       }

package/client/components/setting-sync/setting-sync.jsx

@@ -44,7 +44,11 @@ export default auto(function SyncSettingEntry (props) {
       apiUrl: syncSetting[type + 'ApiUrl'],
       lastSyncTime: syncSetting[type + 'LastSyncTime'],
       syncPassword: syncSetting[type + 'SyncPassword'],
-      proxy: syncSetting[type + 'Proxy']
+      proxy: syncSetting[type + 'Proxy'],
+      // WebDAV specific fields
+      serverUrl: syncSetting[type + 'ServerUrl'],
+      username: syncSetting[type + 'Username'],
+      password: syncSetting[type + 'Password']
     }
     return (
       <SyncForm

package/client/components/sidebar/transfer-history-modal.jsx

@@ -98,8 +98,8 @@ export default memo(function TransferHistoryModal (props) {
       pageSize,
       showSizeChanger: true,
       pageSizeOptions: [5, 10, 20, 50, 100],
-      onChange: handlePageSizeChange,
-      position: ['topRight']
+      placement: 'topEnd',
+      onChange: handlePageSizeChange
     },
     size: 'small',
     rowKey: 'id'

package/client/components/tabs/tabs.styl

@@ -168,6 +168,7 @@
   border-radius 0 0 3px 3px
   padding 0
   background var(--main)
+  -webkit-app-region no-drag
 
 .window-control-box
   display inline-block

package/client/components/tabs/window-control.jsx

@@ -23,9 +23,11 @@ export default auto(function WindowControl (props) {
   }
   const maximize = () => {
     window.pre.runGlobalAsync('maximize')
+    window.store.isMaximized = true
   }
   const unmaximize = () => {
     window.pre.runGlobalAsync('unmaximize')
+    window.store.isMaximized = false
   }
   const closeApp = () => {
     window.store.exit()

package/client/components/terminal/terminal-command-dropdown.jsx

@@ -164,7 +164,7 @@ export default class TerminalCmdSuggestions extends Component {
   }
 
   handleDelete = (item) => {
-    window.store.terminalCommandHistory.delete(item.command)
+    window.store.deleteCmdHistory(item.command)
   }
 
   handleSelect = (item) => {

package/client/components/terminal/terminal.jsx

@@ -484,9 +484,22 @@ class Term extends Component {
   }
 
   onClear = () => {
+    const shouldClear = this.searchAddon &&
+      window.store.termSearchOpen &&
+      window.store.termSearch
+    if (
+      shouldClear
+    ) {
+      this.searchAddon.clearDecorations()
+    }
     this.term.clear()
     this.term.focus()
-    // this.notifyOnData('')
+    if (shouldClear) {
+      this.searchAddon._linesCache = undefined
+      this.timers.clearSearchTimer = setTimeout(() => {
+        refsStatic.get('term-search')?.next()
+      }, 100)
+    }
   }
 
   isRemote = () => {

package/client/components/terminal/transfer-client-base.js

@@ -4,7 +4,7 @@
  */
 
 // import { transferTypeMap } from '../../common/constants.js'
-import { safeGetItem, safeSetItem } from '../../common/safe-local-storage.js'
+import { getItem, setItem } from '../../common/safe-local-storage.js'
 import { getLocalFileInfo } from '../sftp/file-read.js'
 
 /**
@@ -176,6 +176,8 @@ export class TransferClientBase {
 
   /**
    * Open file select dialog
+   * Supports window._apiControlSelectFile for e2e testing
+   * Set window._apiControlSelectFile = ['/path/to/file1', '/path/to/file2'] to bypass native dialog
    * @param {Object} options - Options for file selection
    * @returns {Promise<Array>} - Selected files
    */
@@ -186,20 +188,28 @@ export class TransferClientBase {
       message = 'Choose some files to send'
     } = options
 
-    const properties = [
-      directory ? 'openDirectory' : 'openFile',
-      'multiSelections',
-      'showHiddenFiles',
-      'noResolveAliases',
-      'treatPackageAsDirectory',
-      'dontAddToRecent'
-    ]
-
-    const files = await window.api.openDialog({
-      title,
-      message,
-      properties
-    }).catch(() => false)
+    let files
+    if (window._apiControlSelectFile) {
+      files = Array.isArray(window._apiControlSelectFile)
+        ? window._apiControlSelectFile
+        : [window._apiControlSelectFile]
+      delete window._apiControlSelectFile
+    } else {
+      const properties = [
+        directory ? 'openDirectory' : 'openFile',
+        'multiSelections',
+        'showHiddenFiles',
+        'noResolveAliases',
+        'treatPackageAsDirectory',
+        'dontAddToRecent'
+      ]
+
+      files = await window.api.openDialog({
+        title,
+        message,
+        properties
+      }).catch(() => false)
+    }
 
     if (!files || !files.length) {
       return null
@@ -215,11 +225,22 @@ export class TransferClientBase {
 
   /**
    * Open save folder select dialog
+   * Supports window._apiControlSelectFolder for e2e testing
+   * Set window._apiControlSelectFolder = '/path/to/folder' to bypass native dialog
    * @returns {Promise<string>} - Selected folder path
    */
   openSaveFolderSelect = async () => {
+    if (window._apiControlSelectFolder) {
+      const folder = window._apiControlSelectFolder
+      delete window._apiControlSelectFolder
+      if (this.storageKey) {
+        setItem(this.storageKey, folder)
+      }
+      return folder
+    }
+
     // Try to use last saved path
-    const lastPath = this.storageKey ? safeGetItem(this.storageKey) : null
+    const lastPath = this.storageKey ? getItem(this.storageKey) : null
 
     const savePaths = await window.api.openDialog({
       title: 'Choose a folder to save file(s)',
@@ -240,7 +261,7 @@ export class TransferClientBase {
     }
 
     if (this.storageKey) {
-      safeSetItem(this.storageKey, savePaths[0])
+      setItem(this.storageKey, savePaths[0])
     }
     return savePaths[0]
   }

package/client/components/terminal-info/network.jsx

@@ -92,7 +92,6 @@ export default function TerminalInfoDisk (props) {
       },
       render: (v) => {
         if (k === 'up' || k === 'down') {
-          console.log('render traffic', k, v)
           return filesize(v || 0)
         }
         return v

package/client/components/tree-list/tree-list-item.jsx

@@ -171,6 +171,10 @@ export default function TreeListItem (props) {
     props.onDragStart(e)
   }
 
+  const onDragEnter = e => {
+    props.onDragEnter(e)
+  }
+
   const onDragLeave = e => {
     props.onDragLeave(e)
   }
@@ -224,6 +228,7 @@ export default function TreeListItem (props) {
     'data-is-group': isGroup ? 'true' : 'false',
     onDragOver,
     onDragStart,
+    onDragEnter,
     onDragLeave,
     onDrop
   }

package/client/components/tree-list/tree-list.jsx

@@ -381,6 +381,18 @@ export default class ItemListTree extends Component {
       )
   }
 
+  onDragEnter = e => {
+    e.preventDefault()
+    let {
+      target
+    } = e
+    const tar = findParentBySel(target, '.tree-item')
+    if (tar) {
+      target = tar
+    }
+    target.classList.add('item-dragover-top')
+  }
+
   onDragLeave = e => {
     e.preventDefault()
     let {
@@ -390,7 +402,7 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
-    target.classList.remove('item-dragover')
+    target.classList.remove('item-dragover-top')
   }
 
   onDragOver = e => {
@@ -401,14 +413,14 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
-    target.classList.add('item-dragover')
+    target.classList.add('item-dragover-top')
   }
 
   onDrop = action(e => {
     e.preventDefault()
-    const elems = document.querySelectorAll('.tree-item.item-dragover')
+    const elems = document.querySelectorAll('.tree-item.item-dragover-top')
     elems.forEach(elem => {
-      elem.classList.remove('item-dragover')
+      elem.classList.remove('item-dragover-top')
     })
     let {
       target
@@ -662,6 +674,7 @@ export default class ItemListTree extends Component {
           'duplicateItem',
           'onDragStart',
           'onDrop',
+          'onDragEnter',
           'onDragLeave',
           'onDragOver'
         ]

package/client/components/tree-list/tree-list.styl

@@ -30,7 +30,7 @@
       vertical-align middle
       line-height 26px
   &.item-dragover-top
-    border-top 1px solid #18d551
+    border 2px solid var(--primary)
 .tree-item-title
   flex-grow 1
   line-height 26px

package/client/store/common.js

@@ -18,6 +18,7 @@ import {
 import * as ls from '../common/safe-local-storage'
 import { refs, refsStatic } from '../components/common/ref'
 import { action } from 'manate'
+import uid from '../common/uid'
 import deepCopy from 'json-deep-copy'
 import { aiConfigsArr } from '../components/ai/ai-config-props'
 import settingList from '../common/setting-list'
@@ -345,36 +346,35 @@ export default Store => {
       return
     }
     const { terminalCommandHistory } = window.store
-    const existing = terminalCommandHistory.get(cmd)
+    const existing = terminalCommandHistory.find(item => item.cmd === cmd)
     if (existing) {
-      // Use set() to trigger reactivity
-      terminalCommandHistory.set(cmd, {
-        count: existing.count + 1,
-        lastUseTime: new Date().toISOString()
-      })
+      existing.count = existing.count + 1
+      existing.lastUseTime = new Date().toISOString()
     } else {
-      terminalCommandHistory.set(cmd, {
+      terminalCommandHistory.push({
+        id: uid(),
+        cmd,
         count: 1,
         lastUseTime: new Date().toISOString()
       })
     }
-    if (terminalCommandHistory.size > 100) {
+    if (terminalCommandHistory.length > 200) {
       // Delete oldest 20 items when history exceeds 100
-      const entries = Array.from(terminalCommandHistory.entries())
-      entries.sort((a, b) => new Date(a[1].lastUseTime).getTime() - new Date(b[1].lastUseTime).getTime())
-      for (let i = 0; i < 20 && i < entries.length; i++) {
-        terminalCommandHistory.delete(entries[i][0])
-      }
+      terminalCommandHistory.sort((a, b) => new Date(a.lastUseTime).getTime() - new Date(b.lastUseTime).getTime())
+      terminalCommandHistory.splice(0, 20)
     }
   })
 
   Store.prototype.deleteCmdHistory = function (cmd) {
     const { terminalCommandHistory } = window.store
-    terminalCommandHistory.delete(cmd)
+    const idx = terminalCommandHistory.findIndex(item => item.cmd === cmd)
+    if (idx !== -1) {
+      terminalCommandHistory.splice(idx, 1)
+    }
   }
 
   Store.prototype.clearAllCmdHistory = function () {
-    window.store.terminalCommandHistory = new Map()
+    window.store.terminalCommandHistory = []
   }
 
   Store.prototype.runCmdFromHistory = function (cmd) {

package/client/store/init-state.js

@@ -21,10 +21,8 @@ import {
   dismissDelKeyTipLsKey,
   qmSortByFrequencyKey,
   resolutionsLsKey,
-  aiChatHistoryKey,
   syncServerDataKey,
-  splitMap,
-  cmdHistoryKey
+  splitMap
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { exclude } from 'manate'
@@ -54,7 +52,7 @@ export default () => {
     lastDataUpdateTime: 0,
     tabs: [],
     activeTabId: '',
-    history: ls.safeGetItemJSON('history', []),
+    history: [],
     sshConfigs: [],
     bookmarks: [],
     bookmarksMap: new Map(),
@@ -74,32 +72,9 @@ export default () => {
     addressBookmarksLocal: ls.getItemJSON(localAddrBookmarkLsKey, []),
     openResolutionEdit: false,
     resolutions: ls.getItemJSON(resolutionsLsKey, []),
-    // terminalCommandHistory: Map<cmdString, {count: Number, lastUseTime: DateString}>
-    // Load from localStorage and migrate from old format (Set of strings) if needed
-    terminalCommandHistory: (() => {
-      const savedData = ls.safeGetItemJSON(cmdHistoryKey, [])
-      const map = new Map()
-      if (Array.isArray(savedData)) {
-        // Check if old format (array of strings) or new format (array of objects)
-        if (savedData.length > 0 && typeof savedData[0] === 'string') {
-          // Old format: migrate to new format
-          savedData.forEach(cmd => {
-            map.set(cmd, { count: 1, lastUseTime: new Date().toISOString() })
-          })
-        } else {
-          // New format: array of {cmd, count, lastUseTime}
-          savedData.forEach(item => {
-            if (item.cmd) {
-              map.set(item.cmd, {
-                count: item.count || 1,
-                lastUseTime: item.lastUseTime || new Date().toISOString()
-              })
-            }
-          })
-        }
-      }
-      return map
-    })(),
+    // terminalCommandHistory: [{ id, cmd, count, lastUseTime }]
+    // Loaded from DB in initData
+    terminalCommandHistory: [],
 
     // workspaces
     workspaces: [],
@@ -111,7 +86,7 @@ export default () => {
 
     // batch input selected tab ids
     _batchInputSelectedTabIds: new Set(),
-    aiChatHistory: ls.safeGetItemJSON(aiChatHistoryKey, []),
+    aiChatHistory: [],
 
     // sftp
     fileOperation: fileOperationsMap.cp, // cp or mv