@electerm/electerm-react 1.51.3 → 1.51.18

package/client/store/tab.js

@@ -2,18 +2,25 @@
  * 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 newTerm from '../common/new-terminal.js'
+import uid from '../common/uid'
+import newTerm, { updateCount } from '../common/new-terminal.js'
+import { action } from 'manate'
 
 export default Store => {
+  Store.prototype.nextTabCount = function () {
+    return updateCount()
+  }
+
   Store.prototype.getTabs = function () {
     return window.store.tabs
   }
@@ -33,7 +40,10 @@ export default Store => {
       store.fileTransfers.map(d => d.tabId)
     )
     store.tabs.forEach(tab => {
-      tab.isTransporting = tabIdSet.has(tab.id)
+      const t = tabIdSet.has(tab.id)
+      if (Boolean(tab.isTransporting) !== t) {
+        tab.isTransporting = t
+      }
     })
   }
 
@@ -82,30 +92,34 @@ export default Store => {
     }
 
     const oldTab = tabs[index]
+    const oldBatch = oldTab.batch
 
     // Create copy of old tab with new ID
     const newTab = {
       ...oldTab,
+      tabCount: store.nextTabCount(),
       id: generate(), // Need to create new ID
       status: statusMap.processing // Reset status
     }
 
     // Add new tab at next index
     tabs.splice(index + 1, 0, newTab)
+    store.updateHistory(newTab)
 
     // Remove old tab
     tabs.splice(index, 1)
 
-    // Update current tab ID if needed
-    if (store.activeTabId === tabId) {
-      store.activeTabId = newTab.id
-    }
+    setTimeout(() => {
+      if (store.activeTabId === tabId) {
+        store.activeTabId = newTab.id
+      }
 
-    // Update batch current tab ID if needed
-    const batchProp = `activeTabId${oldTab.batch}`
-    if (store[batchProp] === tabId) {
-      store[batchProp] = newTab.id
-    }
+      // Update batch current tab ID if needed
+      const batchProp = `activeTabId${oldBatch}`
+      if (store[batchProp] === tabId) {
+        store[batchProp] = newTab.id
+      }
+    }, 0)
   }
 
   Store.prototype.duplicateTab = function (tabId) {
@@ -122,12 +136,14 @@ export default Store => {
     const duplicatedTab = {
       ...deepCopy(sourceTab),
       id: generate(),
+      tabCount: store.nextTabCount(),
       status: statusMap.processing,
       isTransporting: undefined
     }
 
     // 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
@@ -297,6 +313,7 @@ export default Store => {
   ) {
     const { store } = window
     const { tabs } = store
+    newTab.tabCount = store.nextTabCount()
     newTab.batch = batch ?? newTab.batch ?? window.openTabBatch ?? window.store.currentLayoutBatch
     if (typeof index === 'number' && index >= 0 && index <= tabs.length) {
       tabs.splice(index, 0, newTab)
@@ -307,6 +324,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 +398,7 @@ export default Store => {
 
     // If layout hasn't changed, do nothing
     if (prevLayout === layout) {
-      return
+      return store.focus()
     }
 
     // Update layout related properties
@@ -413,4 +431,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/terminal-theme.js

@@ -65,7 +65,7 @@ export default Store => {
   }
 
   Store.prototype.setItermThemes = function (arr) {
-    window.store._itermThemes = JSON.stringify(arr)
+    window.store.itermThemes = arr
   }
 
   Store.prototype.fetchItermThemes = async function () {

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

package/client/store/transfer-list.js

@@ -1,103 +1,95 @@
-import { findIndex } from 'lodash-es'
+/**
+ * file transfer list related functions
+ */
+const { assign } = Object
+
 export default Store => {
   Store.prototype.handleTransferTab = function (tab) {
     window.store.transferTab = tab
   }
 
-  Store.prototype.setTransfers = function (list, _sessId) {
-    const { store } = window
-    let oldList = store.fileTransfers
-    const sessId = _sessId || list[0].sessionId
-    const arr2 = oldList.filter(t => {
-      return t.sessionId === sessId
-    })
-    const idsToRm = arr2.reduce((prev, curr) => {
-      if (!list.find(l => l.id === curr.id)) {
-        prev.push(curr.id)
-      }
-      return prev
-    }, [])
-    if (idsToRm.length) {
-      oldList = oldList.filter(t => {
-        return !idsToRm.includes(t.id)
-      })
-    }
-    for (const ntm of list) {
-      const index = findIndex(oldList, t => {
-        return t.id === ntm.id
-      })
-      if (index >= 0) {
-        oldList[index] = ntm
-        continue
-      } else {
-        oldList.unshift(ntm)
-      }
+  Store.prototype.updateTransfer = function (id, update) {
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === id)
+    if (index < 0) {
+      return
     }
-    store.setItems('fileTransfers', oldList)
-  }
-  Store.prototype.getTransfers = function () {
-    return window.store.getItems('fileTransfers')
-  }
-  Store.prototype.delTransfers = function (ids) {
-    return window.store.delItems(ids, 'fileTransfers')
-  }
-  Store.prototype.editTransfer = function (id, updates) {
-    return window.store.editItem(id, updates, 'fileTransfers')
-  }
-  Store.prototype.addTransfers = function (objs) {
-    return window.store.addItems(objs, 'fileTransfers')
+    assign(fileTransfers[index], update)
   }
-  Store.prototype.setFileTransfers = function (objs) {
-    return window.store.setState('fileTransfers', objs.filter(d => !d.cancel))
-  }
-  Store.prototype.addTransferList = function (objs) {
-    const { store } = window
-    store.setFileTransfers([
-      ...store.fileTransfers,
-      ...objs
-    ])
+
+  Store.prototype.addTransferList = function (items) {
+    const { fileTransfers } = window.store
+    fileTransfers.push(...items)
   }
+
   Store.prototype.toggleTransfer = function (itemId) {
-    const { store } = window
-    const { fileTransfers } = store
-    const index = findIndex(fileTransfers, t => t.id === itemId)
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === itemId)
     if (index < 0) {
       return
     }
     fileTransfers[index].pausing = !fileTransfers[index].pausing
-    store.setFileTransfers(fileTransfers)
   }
 
   Store.prototype.pauseAll = function () {
-    const { store } = window
-    store.pauseAllTransfer = true
-    store.setFileTransfers(store.fileTransfers.map(t => {
-      t.pausing = true
-      return t
-    }))
+    const { fileTransfers } = window.store
+    window.store.pauseAllTransfer = true
+    const len = fileTransfers.length
+    for (let i = 0; i < len; i++) {
+      fileTransfers[i].pausing = true
+    }
   }
+
   Store.prototype.resumeAll = function () {
-    const { store } = window
-    store.pauseAllTransfer = false
-    store.setFileTransfers(store.fileTransfers.map(t => {
-      t.pausing = false
-      return t
-    }))
+    const { fileTransfers } = window.store
+    window.store.pauseAllTransfer = false
+    const len = fileTransfers.length
+    for (let i = 0; i < len; i++) {
+      fileTransfers[i].pausing = false
+    }
   }
+
   Store.prototype.cancelAll = function () {
-    const arr = document.querySelectorAll('.sftp-transport .transfer-control-cancel')
-    arr.forEach(d => {
-      d.click()
-    })
+    const { fileTransfers } = window.store
+    const len = fileTransfers.length
+    for (let i = len - 1; i >= 0; i--) {
+      fileTransfers[i].cancel = true
+      fileTransfers.splice(i, 1)
+    }
   }
+
   Store.prototype.cancelTransfer = function (itemId) {
-    const { store } = window
-    const { fileTransfers } = store
-    const index = findIndex(fileTransfers, t => t.id === itemId)
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === itemId)
     if (index < 0) {
       return
     }
     fileTransfers[index].cancel = true
-    store.setFileTransfers(fileTransfers)
+    fileTransfers.splice(index, 1)
+  }
+
+  Store.prototype.skipAllTransfersSinceIndex = function (index) {
+    window.store.fileTransfers.splice(index)
+  }
+
+  Store.prototype.updateTransfersFromIndex = function (index, update) {
+    const { fileTransfers } = window.store
+    if (index < 0 || index >= fileTransfers.length) {
+      return
+    }
+    const len = fileTransfers.length
+    for (let i = index; i < len; i++) {
+      assign(fileTransfers[i], update)
+    }
+  }
+
+  // Add a new method to find index by ID and then update
+  Store.prototype.updateTransfersFromId = function (id, update) {
+    const { fileTransfers } = window.store
+    const index = fileTransfers.findIndex(t => t.id === id)
+    if (index < 0) {
+      return
+    }
+    window.store.updateTransfersFromIndex(index, update)
   }
 }

package/client/store/ui-theme.js

@@ -15,15 +15,6 @@ import {
 import copy from 'json-deep-copy'
 
 export default Store => {
-  // Store.prototype.toCss = async function (stylus) {
-  //   const { host, port } = window._config
-  //   const url = `http://${host}:${port}/to-css`
-  //   const data = await fetch.post(url, {
-  //     stylus
-  //   })
-  //   return data
-  // }
-
   Store.prototype.getDefaultUiThemeConfig = function (stylus) {
     const reg = /[^\n]+ = [^\n]+\n/g
     const arr = stylus.match(reg)

package/client/store/watch.js

@@ -43,12 +43,12 @@ export default store => {
         await store.uploadSettingAll()
       }
       return store['_' + name]
-    }, func => debounce(func, 100)).start()
+    }).start()
   }
 
   autoRun(async () => {
-    ls.setItem(resolutionsLsKey, store._resolutions)
-    return store._resolutions
+    ls.setItemJSON(resolutionsLsKey, store.resolutions)
+    return store.resolutions
   }).start()
 
   autoRun(() => {
@@ -64,7 +64,7 @@ export default store => {
     if (!isEmpty(store.config)) {
       window.pre.runGlobalAsync('saveUserConfig', store.config)
     }
-    return store._config
+    return store.config
   }, func => debounce(func, 100)).start()
 
   autoRun(() => {
@@ -74,17 +74,17 @@ export default store => {
 
   autoRun(() => {
     store.updateTabsStatus()
-    return store.fileTransfers
-  }, func => debounce(func, 100)).start()
+    return store.transferCount
+  }).start()
 
   autoRun(() => {
     ls.setItemJSON(sftpDefaultSortSettingKey, store.sftpSortSetting)
-    return store._sftpSortSetting
+    return store.sftpSortSetting
   }).start()
 
   autoRun(() => {
     ls.setItemJSON(expandedKeysLsKey, store.expandedKeys)
-    return store._expandedKeys
+    return store.expandedKeys
   }).start()
 
   autoRun(() => {
@@ -94,7 +94,12 @@ export default store => {
 
   autoRun(() => {
     ls.setItemJSON(checkedKeysLsKey, store.checkedKeys)
-    return store._checkedKeys
+    return store.checkedKeys
+  }).start()
+
+  autoRun(() => {
+    ls.setItemJSON('history', store.history)
+    return store.history
   }).start()
 
   autoRun(() => {
@@ -106,6 +111,9 @@ export default store => {
       window.pre.runGlobalAsync('setTitle', title)
       window.store.currentLayoutBatch = tab.batch
     }
+    if (tab && store.rightPanelVisible) {
+      window.store.openInfoPanel()
+    }
     return store.activeTabId
   }).start()
 }

package/package.json

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

package/client/components/setting-panel/tab-history.jsx

@@ -1,43 +0,0 @@
-import SettingCol from './col'
-import BookmarkForm from '../bookmark-form'
-import List from './list'
-import {
-  settingMap
-} from '../../common/constants'
-
-const e = window.translate
-
-export default function TabHistory (props) {
-  const {
-    settingTab
-  } = props
-  if (settingTab !== settingMap.history) {
-    return null
-  }
-  const {
-    settingItem,
-    listProps,
-    formProps
-  } = props
-  return (
-    <div
-      className='setting-tabs-history'
-    >
-      <SettingCol>
-        <List
-          {...listProps}
-        />
-        {
-          settingItem.id
-            ? (
-              <BookmarkForm
-                key={settingItem.id}
-                {...formProps}
-              />
-              )
-            : <div className='form-wrap pd2 aligncenter'>{e('notFoundContent')}</div>
-        }
-      </SettingCol>
-    </div>
-  )
-}