@electerm/electerm-react 1.51.1 → 1.51.8

package/client/components/tabs/tab.jsx

@@ -10,13 +10,14 @@ import {
 } from '@ant-design/icons'
 import { Tooltip, message } from 'antd'
 import classnames from 'classnames'
-import { findIndex, pick } from 'lodash-es'
+import { pick } from 'lodash-es'
 import Input from '../common/input-auto-focus'
 import createName from '../../common/create-title'
 import { addClass, removeClass } from '../../common/class'
 import {
   terminalSshConfigType
 } from '../../common/constants'
+import { action } from 'manate'
 import { shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
 
 const e = window.translate
@@ -47,9 +48,9 @@ class Tab extends Component {
   // }
 
   // shouldUpdate = (prevProps, nextProps) => {
-  //   // todo currentTabId still need improve
+  //   // todo activeTabId still need improve
   //   const pickKeys = [
-  //     'currentTabId',
+  //     'activeTabId',
   //     'height',
   //     'isLast',
   //     'isMaximized',
@@ -117,7 +118,13 @@ class Tab extends Component {
     }
 
     const fromTab = JSON.parse(e.dataTransfer.getData('fromFile'))
-    const onDropTab = document.querySelector('.' + onDragOverCls)
+    let onDropTab = target
+    while (onDropTab) {
+      if (onDropTab.classList && onDropTab.classList.contains('tab')) {
+        break
+      }
+      onDropTab = onDropTab.parentElement
+    }
     if (!onDropTab || !fromTab) {
       return
     }
@@ -129,29 +136,31 @@ class Tab extends Component {
 
     const { id } = fromTab
     const storeTabs = window.store.tabs
-    const indexFrom = findIndex(storeTabs, t => t.id === id)
-    let indexDrop = findIndex(storeTabs, t => t.id === dropId)
+    const indexFrom = storeTabs.findIndex(t => t.id === id)
+    let indexDrop = storeTabs.findIndex(t => t.id === dropId)
 
     if (indexFrom >= 0 && indexDrop >= 0) {
       const targetTab = storeTabs[indexDrop]
       const fromBatch = fromTab.batch
 
       // Handle currentTab change if needed
-      if (window.store[`currentTabId${fromBatch}`] === id && fromBatch !== targetTab.batch) {
+      if (window.store[`activeTabId${fromBatch}`] === id && fromBatch !== targetTab.batch) {
         // Find next tab in the same batch
         const nextTab = storeTabs.find((t, i) =>
           i !== indexFrom && t.batch === fromBatch
         )
-        window.store[`currentTabId${fromBatch}`] = nextTab ? nextTab.id : ''
+        window.store[`activeTabId${fromBatch}`] = nextTab ? nextTab.id : ''
       }
 
       // Reorder tabs and update batch
-      const [tab] = storeTabs.splice(indexFrom, 1)
-      tab.batch = targetTab.batch // Update the batch to match target tab's batch
-      if (indexFrom < indexDrop) {
-        indexDrop = indexDrop - 1
-      }
-      storeTabs.splice(indexDrop, 0, tab)
+      action(function () {
+        const [tab] = storeTabs.splice(indexFrom, 1)
+        tab.batch = targetTab.batch // Update the batch to match target tab's batch
+        if (indexFrom < indexDrop) {
+          indexDrop = indexDrop - 1
+        }
+        storeTabs.splice(indexDrop, 0, tab)
+      })()
       window.store.focus()
     }
   }

package/client/components/terminal/index.jsx

@@ -271,7 +271,7 @@ clear\r`
   }
 
   isActiveTerminal = () => {
-    return this.props.tab.id === this.props.currentTabId &&
+    return this.props.tab.id === this.props.activeTabId &&
     this.props.pane === paneMap.terminal
   }
 
@@ -333,14 +333,14 @@ clear\r`
       type,
       cmd,
       selectedTabIds = [],
-      currentTabId,
+      activeTabId,
       pid,
       inputOnly,
       zoomValue
     } = e?.data || {}
 
-    const { id: currentTabIdProp } = this.props.tab
-    const tabIdMatch = selectedTabIds.includes(currentTabIdProp) || currentTabId === currentTabIdProp
+    const { id: activeTabIdProp } = this.props.tab
+    const tabIdMatch = selectedTabIds.includes(activeTabIdProp) || activeTabId === activeTabIdProp
     if (
       action === terminalActions.zoom &&
       tabIdMatch
@@ -357,9 +357,7 @@ clear\r`
       this.batchInput(cmd)
     } else if (
       action === terminalActions.showInfoPanel &&
-      (
-        tabIdMatch
-      )
+      tabIdMatch
     ) {
       this.handleShowInfo()
     } else if (
@@ -404,7 +402,7 @@ clear\r`
       this.searchAddon.clearDecorations()
     } else if (
       action === commonActions.getTermLogState &&
-      pid === currentTabIdProp
+      pid === activeTabIdProp
     ) {
       postMessage({
         action: commonActions.returnTermLogState,
@@ -412,11 +410,11 @@ clear\r`
           saveTerminalLogToFile: this.state.saveTerminalLogToFile,
           addTimeStampToTermLog: this.state.addTimeStampToTermLog
         },
-        pid: currentTabIdProp
+        pid: activeTabIdProp
       })
     } else if (
       action === commonActions.setTermLogState &&
-      pid === currentTabIdProp
+      pid === activeTabIdProp
     ) {
       this.setState({
         addTimeStampToTermLog,
@@ -1046,10 +1044,10 @@ clear\r`
   }
 
   setActive = () => {
-    const name = `currentTabId${this.props.batch}`
+    const name = `activeTabId${this.props.batch}`
     const tabId = this.props.tab.id
     window.store.storeAssign({
-      currentTabId: tabId,
+      activeTabId: tabId,
       [name]: tabId
     })
   }
@@ -1319,12 +1317,11 @@ clear\r`
   }
 
   handleShowInfo = () => {
-    const { id, sessionId, logName } = this.props
-    const { pid } = this.state
+    const { id, sessionId, logName, tab } = this.props
     const infoProps = {
       logName,
       id,
-      pid,
+      pid: tab.id,
       sessionId,
       isRemote: this.isRemote(),
       isActive: this.isActiveTerminal()

package/client/components/terminal/term-search.jsx

@@ -68,14 +68,14 @@ class TermSearch extends PureComponent {
 
   prev = () => {
     const {
-      currentTabId,
+      activeTabId,
       termSearch,
       termSearchOptions
     } = this.props
     postMessage({
       action: terminalActions.doSearchPrev,
       keyword: termSearch,
-      currentTabId,
+      activeTabId,
       options: copy(termSearchOptions)
     })
   }
@@ -83,7 +83,7 @@ class TermSearch extends PureComponent {
   next = () => {
     postMessage({
       action: terminalActions.doSearchNext,
-      currentTabId: this.props.currentTabId,
+      activeTabId: this.props.activeTabId,
       keyword: this.props.termSearch,
       options: copy(this.props.termSearchOptions)
     })
@@ -97,7 +97,7 @@ class TermSearch extends PureComponent {
   clearSearch = () => {
     postMessage({
       action: terminalActions.clearSearch,
-      currentTabId: this.props.currentTabId
+      activeTabId: this.props.activeTabId
     })
   }
 

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

@@ -21,7 +21,7 @@ import {
 } from 'antd'
 import createName from '../../common/create-title'
 import InputAutoFocus from '../common/input-auto-focus'
-import { find, uniq, findIndex, isEqual, filter, pick } from 'lodash-es'
+import { find, uniq, isEqual, filter, pick } from 'lodash-es'
 import {
   maxBookmarkGroupTitleLength,
   defaultBookmarkGroupId,
@@ -597,13 +597,13 @@ export default class ItemListTree extends Component {
     } = window.store
 
     if (!pidDragged && !pidDrop) {
-      const indexDrag = findIndex(bookmarkGroups, item => item.id === idDragged)
+      const indexDrag = bookmarkGroups.findIndex(item => item.id === idDragged)
       if (indexDrag < 0) {
         return
       }
       const dragItem = bookmarkGroups.splice(indexDrag, 1)[0]
       dragItem.level = 1
-      const indexDrop = findIndex(bookmarkGroups, item => item.id === idDrop)
+      const indexDrop = bookmarkGroups.findIndex(item => item.id === idDrop)
       if (indexDrop < 0) {
         return
       }
@@ -653,7 +653,7 @@ export default class ItemListTree extends Component {
         )
       } else {
         const arr = parentDrop.bookmarkGroupIds || []
-        let index = findIndex(arr, item => item === idDrop)
+        let index = arr.findIndex(item => item === idDrop)
         if (index < 0) {
           index = 0
         }
@@ -704,7 +704,7 @@ export default class ItemListTree extends Component {
         )
       } else {
         const arr = parentDrop.bookmarkIds || []
-        let index = findIndex(arr, item => item === idDrop)
+        let index = arr.findIndex(item => item === idDrop)
         if (index < 0) {
           index = 0
         }
@@ -724,7 +724,7 @@ export default class ItemListTree extends Component {
       pidDrop &&
       !pidDragged
     ) {
-      const i = findIndex(bookmarkGroups, item => item.id === idDragged)
+      const i = bookmarkGroups.findIndex(item => item.id === idDragged)
       if (i >= 0) {
         const item = bookmarkGroups[i]
         item.level = 2
@@ -795,13 +795,11 @@ export default class ItemListTree extends Component {
   }
 
   updateBookmarkGroups = (bookmarkGroups, bookmark, categoryId) => {
-    let index = findIndex(
-      bookmarkGroups,
+    let index = bookmarkGroups.findIndex(
       bg => bg.id === categoryId
     )
     if (index < 0) {
-      index = findIndex(
-        bookmarkGroups,
+      index = bookmarkGroups.findIndex(
         bg => bg.id === defaultBookmarkGroupId
       )
     }

package/client/entry/worker.js

@@ -136,6 +136,8 @@ async function onMsg (e) {
 }
 
 self.addEventListener('message', onMsg)
-send({
-  action: 'worker-init'
-})
+setTimeout(() => {
+  send({
+    action: 'worker-init'
+  })
+}, 10)

package/client/store/bookmark-group.js

@@ -2,7 +2,7 @@
  * bookmark group functions
  */
 
-import { find, findIndex } from 'lodash-es'
+import { find } from 'lodash-es'
 import {
   defaultBookmarkGroupId,
   settingMap,
@@ -82,12 +82,10 @@ export default Store => {
     const groupIds = groups.map(g => g.id)
     const updates = []
     const defaultCatIndex = tobeDel.level !== 2
-      ? findIndex(
-        bookmarkGroups,
+      ? bookmarkGroups.findIndex(
         g => g.id === defaultBookmarkGroupId
       )
-      : findIndex(
-        bookmarkGroups,
+      : bookmarkGroups.findIndex(
         g => (g.bookmarkGroupIds || []).includes(tobeDel.id)
       )
     for (const g of groups) {

package/client/store/common.js

@@ -12,7 +12,8 @@ import {
   leftSidebarWidthKey,
   rightSidebarWidthKey,
   dismissDelKeyTipLsKey,
-  connectionMap
+  connectionMap,
+  terminalActions
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 
@@ -46,6 +47,15 @@ export default Store => {
     })
   }
 
+  Store.prototype.openInfoPanel = function () {
+    const { store } = window
+    store.rightPanelVisible = true
+    postMessage({
+      action: terminalActions.showInfoPanel,
+      activeTabId: store.activeTabId
+    })
+  }
+
   Store.prototype.onResize = debounce(async function () {
     const { width, height } = await window.pre.runGlobalAsync('getScreenSize')
     const isMaximized = window.pre.runSync('isMaximized')

package/client/store/db-upgrade.js

@@ -4,7 +4,6 @@
 
 import { Modal } from 'antd'
 import delay from '../common/wait'
-import initWatch from './watch'
 
 export default (Store) => {
   Store.prototype.checkForDbUpgrade = async function () {
@@ -14,7 +13,6 @@ export default (Store) => {
     }
     const shouldUpgrade = await window.pre.runGlobalAsync('checkDbUpgrade')
     if (!shouldUpgrade) {
-      initWatch(store)
       return false
     }
     const {

package/client/store/event.js

@@ -57,7 +57,7 @@ export default Store => {
     document.activeElement.select()
     postMessage({
       event: 'selectall',
-      id: window.store.currentTabId
+      id: window.store.activeTabId
     })
   }
 

package/client/store/index.js

@@ -88,10 +88,10 @@ class Store {
 
   get currentTab () {
     const {
-      currentTabId
+      activeTabId
     } = this
     const { tabs } = window.store
-    const tab = tabs.find(t => t.id === currentTabId)
+    const tab = tabs.find(t => t.id === activeTabId)
     if (!tab) {
       return false
     }
@@ -238,12 +238,9 @@ const arrGetterProps = [
   'addressBookmarksLocal',
   'sshConfigItems',
   'itermThemes',
-  'history',
   'bookmarks',
   'bookmarkGroups',
   'profiles',
-  'fileTransfers',
-  'transferHistory',
   'quickCommands',
   'terminalThemes',
   'serials',

package/client/store/init-state.js

@@ -47,9 +47,10 @@ export default () => {
     loadTime: 0,
     lastDataUpdateTime: 0,
     tabs: [],
-    currentTabId: '',
-    _history: '[]',
+    activeTabId: '',
+    history: ls.getItemJSON('history', []),
     _bookmarks: '[]',
+    sidebarPanelTab: 'bookmarks',
     _profiles: '[]',
     _bookmarkGroups: JSON.stringify(
       getDefaultBookmarkGroups([])
@@ -78,8 +79,8 @@ export default () => {
     fileOperation: fileOperationsMap.cp, // cp or mv
     pauseAllTransfer: false,
     transferTab: 'transfer',
-    _transferHistory: '[]',
-    _fileTransfers: '[]',
+    transferHistory: [],
+    fileTransfers: [],
     _transferToConfirm: '{}',
     _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
       local: {
@@ -95,10 +96,10 @@ export default () => {
     prevLayout: layout,
     resizeTrigger: 0,
     currentLayoutBatch: 0,
-    currentTabId0: '',
-    currentTabId1: '',
-    currentTabId2: '',
-    currentTabId3: '',
+    activeTabId0: '',
+    activeTabId1: '',
+    activeTabId2: '',
+    activeTabId3: '',
     _terminalInfoProps: '{}',
     rightPanelVisible: false,
     rightPanelPinned: false,

package/client/store/item.js

@@ -4,24 +4,12 @@
 
 import { find } from 'lodash-es'
 import {
-  maxHistory,
   settingMap
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import { update, remove, dbNames } from '../common/db'
-import copy from 'json-deep-copy'
 
 export default Store => {
-  Store.prototype.removeOldHistoryFromDb = function (items) {
-    const arr = items.slice(maxHistory).map(k => {
-      return {
-        db: 'history',
-        id: k.id
-      }
-    })
-    window.store.batchDbDel(arr)
-  }
-
   Store.prototype.addItem = function (item, type) {
     return window.store.addItems([item], type)
   }
@@ -33,12 +21,6 @@ export default Store => {
       ...objs,
       ...items
     ]
-    if (type === settingMap.history && items.length > maxHistory) {
-      store.removeOldHistoryFromDb(
-        copy(items)
-      )
-      items.slice(0, maxHistory)
-    }
     store.setItems(type, items)
     if (dbNames.includes(type)) {
       store.batchDbAdd(
@@ -59,7 +41,6 @@ export default Store => {
     if (!item) {
       return
     }
-    // let index = findIndex(items, t => t.id === id)
     Object.assign(item, updates)
     store.setItems(type, items)
     if (dbNames.includes(type)) {

package/client/store/load-data.js

@@ -12,6 +12,7 @@ import encodes from '../components/bookmark-form/encodes'
 import runIdle from '../common/run-idle'
 import { initWsCommon } from '../common/fetch-from-server'
 import safeParse from '../common/parse-json-safe'
+import initWatch from './watch'
 
 function getHost (argv, opts) {
   const arr = argv
@@ -201,6 +202,7 @@ export default (Store) => {
       store.fetchSshConfigItems()
     }
     store.initCommandLine().catch(store.onError)
+    initWatch(store)
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate(false)
     }

package/client/store/quick-command.js

@@ -38,7 +38,7 @@ export default Store => {
       action: terminalActions.quickCommand,
       cmd,
       inputOnly,
-      currentTabId: window.store.currentTabId
+      activeTabId: window.store.activeTabId
     })
   }
 

package/client/store/session.js

@@ -11,7 +11,7 @@ export default Store => {
     postMsg({
       action: terminalActions.zoom,
       zoomValue: delta > 0 ? 1 : -1,
-      currentTabId: window.store.currentTabId
+      activeTabId: window.store.activeTabId
     })
   }, 500)
 }

package/client/store/setting.js

@@ -6,7 +6,6 @@ import { find } from 'lodash-es'
 import {
   message
 } from 'antd'
-import generate from '../common/uid'
 import copy from 'json-deep-copy'
 import {
   settingMap,
@@ -40,16 +39,6 @@ export default Store => {
       }
     )
   }
-  Store.prototype.handleEditHistory = function () {
-    const { store } = window
-    const all = store.history
-    store.storeAssign({
-      settingTab: settingMap.history,
-      autofocustrigger: Date.now()
-    })
-    store.setSettingItem(all[0] || getInitItem([], settingMap.history))
-    store.openSettingModal()
-  }
 
   Store.prototype.openBookmarkEdit = function (item) {
     const { store } = window
@@ -71,14 +60,10 @@ export default Store => {
     store.openSettingModal()
   }
 
-  Store.prototype.onSelectHistory = function (id) {
+  Store.prototype.onSelectHistory = function (tab) {
     const { store } = window
-    const history = store.history
-    const item = find(history, it => it.id === id)
     store.addTab({
-      ...copy(item),
-      from: 'history',
-      srcId: item.id,
+      ...copy(tab),
       ...newTerm(true, true),
       batch: window.openTabBatch ?? store.currentLayoutBatch
     })
@@ -87,7 +72,6 @@ export default Store => {
 
   Store.prototype.onSelectBookmark = function (id) {
     const { store } = window
-    const history = store.history
     const bookmarks = store.bookmarks
     const item = copy(
       find(bookmarks, it => it.id === id) ||
@@ -105,39 +89,6 @@ export default Store => {
     })
 
     delete window.openTabBatch
-
-    if (store.config.disableSshHistory) {
-      return
-    }
-
-    // Critical Change: Use bookmarkId for matching instead of history id
-    const bookmarkId = item.id
-    const existingIndex = history.findIndex(h => h.bookmarkId === bookmarkId)
-    if (existingIndex >= 0) {
-      history[existingIndex].count = (history[existingIndex].count || 0) + 1
-      history[existingIndex].lastUse = Date.now()
-      const updatedItem = history.splice(existingIndex, 1)[0]
-      history.unshift(updatedItem)
-    } else {
-      const historyItem = {
-        ...item,
-        id: generate(),
-        bookmarkId,
-        count: 1,
-        lastUse: Date.now()
-      }
-      history.unshift(historyItem)
-    }
-
-    history.sort((a, b) => b.count - a.count || b.lastUse - a.lastUse)
-
-    // Optional: Consider max history length
-    const maxHistoryLength = store.config.maxHistoryLength || 50
-    if (history.length > maxHistoryLength) {
-      history.length = maxHistoryLength
-    }
-
-    store.setItems('history', history)
   }
 
   Store.prototype.openSetting = function () {

package/client/store/sidebar.js

@@ -3,7 +3,6 @@
  */
 
 import {
-  settingMap,
   openedSidebarKey,
   sidebarPinnedKey
 } from '../common/constants'
@@ -26,11 +25,6 @@ export default Store => {
     )
   }
 
-  Store.prototype.setOpenedSideBar = function (bar) {
-    ls.setItem(openedSidebarKey, bar)
-    window.store.openedSideBar = bar
-  }
-
   Store.prototype.handlePin = function (pinned) {
     const { store } = window
     const current = !store.pinned
@@ -42,7 +36,12 @@ export default Store => {
     window.store.onNewSsh()
   }
 
-  Store.prototype.onClickHistory = function () {
-    window.store.handleChangeSettingTab(settingMap.history)
+  Store.prototype.handleSidebarPanelTab = function (tab) {
+    window.store.sidebarPanelTab = tab
+  }
+
+  Store.prototype.setOpenedSideBar = function (v) {
+    ls.setItem(openedSidebarKey, v)
+    window.store.openedSideBar = v
   }
 }

package/client/store/sync.js

@@ -2,7 +2,7 @@
  * sync data to github gist related
  */
 
-import { get, pick, debounce, findIndex } from 'lodash-es'
+import { get, pick, debounce } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes, syncDataMaps
@@ -186,8 +186,8 @@ export default (Store) => {
       const order = await getData(`${n}:order`)
       if (order && order.length) {
         str.sort((a, b) => {
-          const ai = findIndex(order, r => r === a.id)
-          const bi = findIndex(order, r => r === b.id)
+          const ai = order.findIndex(r => r === a.id)
+          const bi = order.findIndex(r => r === b.id)
           return ai - bi
         })
       }
@@ -285,8 +285,8 @@ export default (Store) => {
       if (isJSON(strOrder)) {
         strOrder = JSON.parse(strOrder)
         arr.sort((a, b) => {
-          const ai = findIndex(strOrder, r => r === a.id)
-          const bi = findIndex(strOrder, r => r === b.id)
+          const ai = strOrder.findIndex(r => r === a.id)
+          const bi = strOrder.findIndex(r => r === b.id)
           return ai - bi
         })
       }
@@ -372,8 +372,8 @@ export default (Store) => {
       const order = await getData(`${n}:order`)
       if (order && order.length) {
         objs[n].sort((a, b) => {
-          const ai = findIndex(order, r => r === a.id)
-          const bi = findIndex(order, r => r === b.id)
+          const ai = order.findIndex(r => r === a.id)
+          const bi = order.findIndex(r => r === b.id)
           return ai - bi
         })
       }