@electerm/electerm-react 1.51.3 → 1.51.8

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/index.js

@@ -238,12 +238,9 @@ const arrGetterProps = [
   'addressBookmarksLocal',
   'sshConfigItems',
   'itermThemes',
-  'history',
   'bookmarks',
   'bookmarkGroups',
   'profiles',
-  'fileTransfers',
-  'transferHistory',
   'quickCommands',
   'terminalThemes',
   'serials',

package/client/store/init-state.js

@@ -48,8 +48,9 @@ export default () => {
     lastDataUpdateTime: 0,
     tabs: [],
     activeTabId: '',
-    _history: '[]',
+    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: {

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/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
         })
       }

package/client/store/tab.js

@@ -2,16 +2,19 @@
  * tabs related functions
  */
 
-import { debounce } from 'lodash-es'
+import { debounce, isEqual } from 'lodash-es'
 import {
   splitConfig,
   statusMap,
-  paneMap
+  paneMap,
+  maxHistory
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import deepCopy from 'json-deep-copy'
 import generate from '../common/id-with-stamp'
+import uid from '../common/uid'
 import newTerm from '../common/new-terminal.js'
+import { action } from 'manate'
 
 export default Store => {
   Store.prototype.getTabs = function () {
@@ -82,6 +85,7 @@ export default Store => {
     }
 
     const oldTab = tabs[index]
+    const oldBatch = oldTab.batch
 
     // Create copy of old tab with new ID
     const newTab = {
@@ -92,6 +96,7 @@ export default Store => {
 
     // Add new tab at next index
     tabs.splice(index + 1, 0, newTab)
+    store.updateHistory(newTab)
 
     // Remove old tab
     tabs.splice(index, 1)
@@ -102,7 +107,7 @@ export default Store => {
     }
 
     // Update batch current tab ID if needed
-    const batchProp = `activeTabId${oldTab.batch}`
+    const batchProp = `activeTabId${oldBatch}`
     if (store[batchProp] === tabId) {
       store[batchProp] = newTab.id
     }
@@ -128,6 +133,7 @@ export default Store => {
 
     // Insert the duplicated tab after the source tab
     tabs.splice(targetIndex + 1, 0, duplicatedTab)
+    store.updateHistory(duplicatedTab)
 
     // Set the duplicated tab as current
     store.activeTabId = duplicatedTab.id
@@ -307,6 +313,7 @@ export default Store => {
     store[`activeTabId${batchNum}`] = newTab.id
     store.activeTabId = newTab.id
     store.currentLayoutBatch = batchNum
+    store.updateHistory(newTab)
   }
 
   Store.prototype.clickNextTab = debounce(function () {
@@ -380,7 +387,7 @@ export default Store => {
 
     // If layout hasn't changed, do nothing
     if (prevLayout === layout) {
-      return
+      return store.focus()
     }
 
     // Update layout related properties
@@ -413,4 +420,65 @@ export default Store => {
     }
     store.focus()
   }
+
+  Store.prototype.changeActiveTabId = function (id) {
+    const { store } = window
+    const { tabs } = store
+    const tab = tabs.find(t => t.id === id)
+    if (!tab) {
+      return
+    }
+    store.activeTabId = id
+    store[`activeTabId${tab.batch}`] = id
+    store.focus()
+  }
+
+  Store.prototype.updateHistory = function (tab) {
+    if (!tab.type && !tab.host) {
+      return
+    }
+    const { store } = window
+    const tabPropertiesExcludes = [
+      'id',
+      'from',
+      'srcId',
+      'status',
+      'pane',
+      'batch'
+    ]
+    const { history } = store
+    const index = history.findIndex(d => {
+      for (const key in tab) {
+        if (tabPropertiesExcludes.includes(key)) {
+          continue
+        }
+        if (!isEqual(d.tab[key], tab[key])) {
+          return false
+        }
+      }
+      return true
+    })
+    if (index === -1) {
+      const copiedTab = deepCopy(tab)
+      tabPropertiesExcludes.forEach(d => {
+        delete copiedTab[d]
+      })
+      return history.unshift({
+        tab: copiedTab,
+        time: Date.now(),
+        count: 1,
+        id: uid()
+      })
+    }
+    const match = history[index]
+    match.count = (match.count || 0) + 1
+    match.time = Date.now()
+    action(function () {
+      const [m] = history.splice(index, 1)
+      history.unshift(m)
+      if (history.length > maxHistory) {
+        history.pop()
+      }
+    })()
+  }
 }

package/client/store/transfer-history.js

@@ -4,20 +4,14 @@
 
 export default Store => {
   Store.prototype.clearTransferHistory = function () {
-    window.store.setItems('transferHistory', [])
+    window.store.transferHistory = []
   }
 
   Store.prototype.getTransferHistory = function () {
-    return window.store.getItems('transferHistory')
+    return window.store.transferHistory
   }
 
   Store.prototype.addTransferHistory = function (item) {
-    const { store } = window
-    const transferHistory = store.getItems('transferHistory')
-    transferHistory.unshift(item)
-    store.setItems(
-      'transferHistory',
-      transferHistory
-    )
+    window.store.transferHistory.unshift(item)
   }
 }