@electerm/electerm-react 1.51.1 → 1.51.8

package/client/common/constants.js

@@ -38,7 +38,7 @@ export const contextMenuPaddingTop = 10
 export const sftpControlHeight = 42 + 30
 export const sidebarWidth = 43
 export const maxHistory = 50
-export const maxTransport = 1
+export const maxTransport = 5
 export const maxSftpHistory = 20
 export const maxZoom = 8
 export const minZoom = 0.5
@@ -98,7 +98,6 @@ export const paneMap = buildConst([
 export const settingMap = buildConst([
   'setting',
   'bookmarks',
-  'history',
   'terminalThemes',
   'bookmarkGroups',
   'quickCommands',

package/client/common/db.js

@@ -5,7 +5,7 @@
 import {
   settingMap
 } from '../common/constants'
-import { without, isArray, findIndex } from 'lodash-es'
+import { without, isArray } from 'lodash-es'
 import handleError from './error-handler'
 import generate from './uid'
 import safeParse from './to-simple-obj'
@@ -30,8 +30,7 @@ export const dbNames = without(
 
 export const dbNamesForWatch = without(
   Object.keys(settingMap),
-  settingMap.setting,
-  settingMap.history
+  settingMap.setting
 )
 
 /**
@@ -146,10 +145,12 @@ export async function getData (name) {
 export async function fetchInitData (dbName) {
   const res = await find(dbName)
   const order = await getData(`${dbName}:order`)
-  const r = res.sort((a, b) => {
-    const ai = findIndex(order, r => r === a.id)
-    const bi = findIndex(order, r => r === b.id)
-    return ai - bi
-  })
-  return JSON.stringify(r)
+  if (order && order.length) {
+    res.sort((a, b) => {
+      const ai = order.findIndex(r => r === a.id)
+      const bi = order.findIndex(r => r === b.id)
+      return ai - bi
+    })
+  }
+  return JSON.stringify(res)
 }

package/client/components/batch-op/batch-op.jsx

@@ -173,11 +173,15 @@ export default class BatchOp extends PureComponent {
   run = async (conf, index) => {
     this.updateState('working', index)
     let tab = await this.createTab(conf)
-      .then(r => r)
       .catch(err => {
+        console.log('create tab error', err)
+        if (this.ref) {
+          this.ref.stop()
+          delete this.ref
+        }
         return 'Error: ' + err.message
       })
-    if (!tab) {
+    if (typeof tab === 'string') {
       return this.updateState(tab, index)
     }
 
@@ -189,9 +193,16 @@ export default class BatchOp extends PureComponent {
     }
     if (conf.remotePath) {
       this.updateState('creating sftp', index)
-      tab = await this.createSftp(tab)
-      if (!tab) {
-        return this.updateState('Error: ' + tab, index)
+      tab = await this.createSftp(tab).catch(err => {
+        console.log('create sftp error', err)
+        if (this.ref2) {
+          this.ref2.stop()
+          delete this.ref2
+        }
+        return 'Error: ' + err.message
+      })
+      if (typeof tab === 'string') {
+        return this.updateState(tab, index)
       }
       this.updateState('sftp created', index)
       this.updateState('transferring file', index)

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

@@ -125,7 +125,7 @@ export default class BookmarkIndex extends PureComponent {
     const {
       type
     } = this.props
-    if (type !== settingMap.bookmarks && type !== settingMap.history) {
+    if (type !== settingMap.bookmarks) {
       return null
     }
     const { ready } = this.state

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

@@ -5,7 +5,7 @@ import { PureComponent } from 'react'
 import {
   message
 } from 'antd'
-import { findIndex, uniq, isEqual, pick } from 'lodash-es'
+import { uniq, isEqual, pick } from 'lodash-es'
 import copy from 'json-deep-copy'
 import generate from '../../common/uid'
 import {
@@ -96,13 +96,11 @@ export default class BookmarkForm extends PureComponent {
   }
 
   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
       )
     }
@@ -167,19 +165,6 @@ export default class BookmarkForm extends PureComponent {
     const bookmarkGroups = copy(
       this.props.bookmarkGroups
     )
-    if (type === settingMap.history) {
-      obj.id = generate()
-      runIdle(() => {
-        addItem(obj, settingMap.bookmarks)
-      })
-      this.updateBookmarkGroups(
-        bookmarkGroups,
-        obj,
-        categoryId
-      )
-      message.success('OK', 3)
-      return
-    }
     if (!obj.id.startsWith(newBookmarkIdPrefix)) {
       const tar = copy(obj)
       delete tar.id
@@ -196,11 +181,6 @@ export default class BookmarkForm extends PureComponent {
       }
     } else {
       obj.id = generate()
-      if (evt !== 'save' && evt !== 'saveAndCreateNew') {
-        runIdle(() => {
-          addItem(obj, settingMap.history)
-        })
-      }
       runIdle(() => {
         addItem(obj, settingMap.bookmarks)
       })

package/client/components/bookmark-form/use-submit.jsx

@@ -10,9 +10,6 @@ import {
   Button,
   Form
 } from 'antd'
-import {
-  settingMap
-} from '../../common/constants'
 import { tailFormItemLayout } from '../../common/form-layout'
 import useFuncs from './use-form-funcs'
 
@@ -37,18 +34,12 @@ export default function useBookmarkSubmit (props) {
           className='mg1r mg1b'
         >{e('saveAndConnect')}
         </Button>
-        {
-          settingMap.history === props.type
-            ? null
-            : (
-              <Button
-                type='primary'
-                className='mg1r mg1b'
-                onClick={saveAndCreateNew}
-              >{e('saveAndCreateNew')}
-              </Button>
-              )
-        }
+        <Button
+          type='primary'
+          className='mg1r mg1b'
+          onClick={saveAndCreateNew}
+        >{e('saveAndCreateNew')}
+        </Button>
         <Button
           type='dashed'
           className='mg1r mg1b'

package/client/components/context-menu/context-menu.styl

@@ -2,7 +2,7 @@
 .context-menu
   position: absolute
   width 280px
-  background main-dark
+  background main
   box-shadow 0px 0px 3px 3px alpha(main-dark, .35)
   padding 10px 0
   z-index 999
@@ -20,7 +20,7 @@
   line-height 28px
   padding 0 16px
   &:hover
-    background #000
+    background #08c
     color #eee
     cursor pointer
   &.disabled
@@ -47,7 +47,7 @@
   position absolute
   left 100%
   top 0
-  background main-dark
+  background main
   box-shadow 0px 0px 3px 3px alpha(main, .35)
   max-height 300px
   overflow-y scroll
@@ -62,8 +62,8 @@
   white-space nowrap
   text-overflow ellipsis
   &:hover, &.active
-    background-color primary
-    color contrastColor(primary)
+    background-color #08c
+    color #eee
 .bookmarks-sub-context-menu
   width 380px
   padding 20px 10px 10px 20px

package/client/components/context-menu/history.jsx

@@ -1,21 +1,12 @@
-import { createTitleWithTag } from '../../common/create-title'
+import HistoryItem from '../sidebar/history-item'
 
 export default function HistorySubMenu (props) {
-  const { store } = window
   return (
     <div className='sub-context-menu'>
       {
         props.history.map(item => {
-          const title = createTitleWithTag(item)
           return (
-            <div
-              className='sub-context-menu-item'
-              title={title}
-              key={item.id}
-              onClick={() => store.onSelectHistory(item.id)}
-            >
-              {title}
-            </div>
+            <HistoryItem key={item.id} item={item} />
           )
         })
       }

package/client/components/context-menu/sub-tab-menu.jsx

@@ -3,7 +3,7 @@ import { createTitleWithTag } from '../../common/create-title'
 
 export default class TabsSubMenuChild extends PureComponent {
   handleClick = () => {
-    window.store.onChangeTabId(this.props.item.id)
+    window.store.changeActiveTabId(this.props.item.id)
   }
 
   render () {

package/client/components/footer/batch-input.jsx

@@ -26,19 +26,19 @@ export default class BatchInput extends Component {
     super(props)
     this.state = {
       cmd: '',
-      selectedTabIds: [props.currentTabId],
+      selectedTabIds: [props.activeTabId],
       open: false,
       enter: false
     }
   }
 
   componentDidUpdate (prevProps) {
-    if (prevProps.currentTabId !== this.props.currentTabId) {
+    if (prevProps.activeTabId !== this.props.activeTabId) {
       this.setState(prevState => {
         const newSelectedTabIds = prevState.selectedTabIds.filter(
-          id => id !== this.props.currentTabId
+          id => id !== this.props.activeTabId
         )
-        newSelectedTabIds.unshift(this.props.currentTabId)
+        newSelectedTabIds.unshift(this.props.activeTabId)
         return {
           selectedTabIds: newSelectedTabIds
         }
@@ -72,7 +72,7 @@ export default class BatchInput extends Component {
 
   onSelectNone = () => {
     this.setState({
-      selectedTabIds: [this.props.currentTabId]
+      selectedTabIds: [this.props.activeTabId]
     })
   }
 
@@ -91,7 +91,7 @@ export default class BatchInput extends Component {
       // Ensure at least the current tab is selected
       if (selectedTabIds.length === 0) {
         return {
-          selectedTabIds: [this.props.currentTabId]
+          selectedTabIds: [this.props.activeTabId]
         }
       }
 
@@ -178,15 +178,15 @@ export default class BatchInput extends Component {
   }
 
   getTabs = () => {
-    const { currentTabId } = this.props
+    const { activeTabId } = this.props
     return deepCopy(this.props.tabs.filter(tab => {
       return tab.type !== terminalWebType &&
         tab.type !== terminalRdpType &&
         tab.type !== terminalVncType
     })).sort((a, b) => {
       // Current tab goes first
-      if (a.id === currentTabId) return -1
-      if (b.id === currentTabId) return 1
+      if (a.id === activeTabId) return -1
+      if (b.id === activeTabId) return 1
       return 0
     })
   }
@@ -215,7 +215,7 @@ export default class BatchInput extends Component {
       className: 'batch-input-holder'
     }
     const tabSelectProps = {
-      currentTabId: this.props.currentTabId,
+      activeTabId: this.props.activeTabId,
       tabs: this.getTabs(),
       selectedTabIds,
       onSelectAll: this.onSelectAll,

package/client/components/footer/footer-entry.jsx

@@ -18,12 +18,7 @@ const e = window.translate
 
 export default auto(function FooterEntry (props) {
   function handleInfoPanel () {
-    const { store } = window
-    store.rightPanelVisible = !store.rightPanelVisible
-    postMessage({
-      action: terminalActions.showInfoPanel,
-      currentTabId: store.currentTabId
-    })
+    window.store.openInfoPanel()
   }
 
   function batchInput (cmd, selectedTabIds) {
@@ -38,7 +33,7 @@ export default auto(function FooterEntry (props) {
     postMessage({
       encode,
       action: terminalActions.changeEncode,
-      currentTabId: props.store.currentTabId
+      activeTabId: props.store.activeTabId
     })
   }
 
@@ -58,7 +53,7 @@ export default auto(function FooterEntry (props) {
       input: batchInput,
       batchInputs: props.store.batchInputs,
       tabs: props.store.tabs,
-      currentTabId: props.store.currentTabId
+      activeTabId: props.store.activeTabId
     }
     return (
       <div className='terminal-footer-unit terminal-footer-center'>

package/client/components/footer/tab-select.jsx

@@ -7,7 +7,7 @@ import {
 } from '@ant-design/icons'
 
 export default function TabSelect (props) {
-  const { selectedTabIds, tabs, currentTabId } = props
+  const { selectedTabIds, tabs, activeTabId } = props
   function renderTabs () {
     return tabs.map(tab => {
       const selected = selectedTabIds.includes(tab.id)
@@ -16,7 +16,7 @@ export default function TabSelect (props) {
         selected,
         onSelect: props.onSelect,
         id: tab.id,
-        isCurrent: tab.id === currentTabId
+        isCurrent: tab.id === activeTabId
       }
       return (
         <TabItem

package/client/components/layout/layout-item.jsx

@@ -18,8 +18,8 @@ export default function LayoutItem (props) {
     }
     let currentElement = target
     while (currentElement) {
-      if (currentElement.classList && currentElement.classList.contains('tab')) {
-        return
+      if (currentElement.classList && currentElement.classList.contains('layout-item')) {
+        break
       }
       currentElement = currentElement.parentElement
     }

package/client/components/layout/layout.jsx

@@ -102,7 +102,7 @@ export default auto(function Layout (props) {
       const sessProps = {
         batch: i,
         layout,
-        currentBatchTabId: store[`currentTabId${i}`],
+        currentBatchTabId: store[`activeTabId${i}`],
         ...v,
         tabs: tabsBatch[i] || [],
         ...pick(store, [
@@ -132,7 +132,7 @@ export default auto(function Layout (props) {
     currentTab,
     config,
     ...pick(store, [
-      'currentTabId',
+      'activeTabId',
       'termSearchOpen',
       'termSearch',
       'termSearchOptions',
@@ -161,11 +161,11 @@ export default auto(function Layout (props) {
     height,
     layoutStyle: pixedLayoutStyle,
     ...pick(store, [
-      'currentTabId',
-      'currentTabId0',
-      'currentTabId1',
-      'currentTabId2',
-      'currentTabId3',
+      'activeTabId',
+      'activeTabId0',
+      'activeTabId1',
+      'activeTabId2',
+      'activeTabId3',
       'batch',
       'resolutions',
       'hideDelKeyTip',

package/client/components/main/main.jsx

@@ -27,6 +27,7 @@ import { ConfigProvider, notification, message } from 'antd'
 import InfoModal from '../sidebar/info-modal.jsx'
 import RightSidePanel from '../side-panel-r/side-panel-r'
 import { pick } from 'lodash-es'
+import deepCopy from 'json-deep-copy'
 import './wrapper.styl'
 
 function setupGlobalMessageDismiss () {
@@ -131,6 +132,8 @@ export default auto(function Index (props) {
       opacity: config.opacity
     }
   }
+  const copiedTransfer = deepCopy(fileTransfers)
+  const copiedHistory = deepCopy(transferHistory)
   const sidebarProps = {
     ...pick(store, [
       'activeItemId',
@@ -143,10 +146,11 @@ export default auto(function Index (props) {
       'settingItem',
       'isSyncingSetting',
       'leftSidebarWidth',
-      'transferTab'
+      'transferTab',
+      'sidebarPanelTab'
     ]),
-    fileTransfers,
-    transferHistory,
+    fileTransfers: copiedTransfer,
+    transferHistory: copiedHistory,
     upgradeInfo,
     pinned
   }
@@ -161,8 +165,8 @@ export default auto(function Index (props) {
     upgradeInfo
   }
   const conflictStoreProps = {
-    fileTransfers,
-    _fileTransfers: store._fileTransfers
+    fileTransferChanged: JSON.stringify(copiedTransfer),
+    fileTransfers: copiedTransfer
   }
   const batchOpProps = {
     transferHistory,

package/client/components/session/session.jsx

@@ -61,13 +61,22 @@ export default class SessionWrapper extends Component {
     return document.getElementById(`is-${this.props.tab.id}`)
   }
 
+  handleClick = () => {
+    window.store.activeTabId = this.props.tab.id
+  }
+
   onDrop = (e) => {
     e.preventDefault()
     const { target } = e
     if (!target) {
       return
     }
-    const fromTab = JSON.parse(e.dataTransfer.getData('fromFile'))
+    let fromTab
+    try {
+      fromTab = JSON.parse(e.dataTransfer.getData('fromFile'))
+    } catch (e) {
+      return
+    }
     const onDropElem = this.getDom()
     const { batch } = this.props.tab
     if (!onDropElem || !fromTab || fromTab.batch === batch) {
@@ -79,6 +88,15 @@ export default class SessionWrapper extends Component {
     if (!t) {
       return
     }
+    // Handle currentTab change if needed
+    const fromBatch = fromTab.batch
+    if (window.store[`activeTabId${fromBatch}`] === fromTab.id && fromBatch !== batch) {
+      // Find next tab in the same batch
+      const nextTab = tabs.find((t, i) =>
+        t.id !== fromTab.id && t.batch === fromBatch
+      )
+      window.store[`activeTabId${fromBatch}`] = nextTab ? nextTab.id : ''
+    }
     t.batch = batch
     this.clearCls()
   }
@@ -337,7 +355,7 @@ export default class SessionWrapper extends Component {
   handleOpenSearch = () => {
     postMessage({
       action: terminalActions.openTerminalSearch,
-      currentTabId: this.props.tab.id
+      activeTabId: this.props.tab.id
     })
   }
 
@@ -501,7 +519,8 @@ export default class SessionWrapper extends Component {
       onDragEnter: this.onDragEnter,
       onDragLeave: this.onDragLeave,
       onDrop: this.onDrop,
-      onDragEnd: this.onDragEnd
+      onDragEnd: this.onDragEnd,
+      onClick: this.handleClick
     }
     return (
       <div

package/client/components/session/session.styl

@@ -57,8 +57,9 @@
   overflow hidden
   z-index 3
   padding-top 36px
-.session-batch-active
-  display block
+  box-shadow 0px 0px 1px 1px alpha(main, .3)
+  &.session-batch-active
+    display block
 
 .web-session-wrap
   height 100vh

package/client/components/session/sessions.jsx

@@ -42,17 +42,17 @@ export default class Sessions extends Component {
     const {
       config,
       tabs,
-      currentTabId,
+      activeTabId,
       sizes
     } = this.props
     return tabs.map((tab) => {
       const { id, batch } = tab
       const { height, width } = sizes[batch]
-      const currentBatchTabId = this.props['currentTabId' + batch]
+      const currentBatchTabId = this.props['activeTabId' + batch]
       const cls = classNames(
         `session-wrap session-${id}`,
         {
-          'session-current': id === currentTabId,
+          'session-current': id === activeTabId,
           'session-batch-active': id === currentBatchTabId
         }
       )
@@ -61,7 +61,7 @@ export default class Sessions extends Component {
         className: cls
       }
       const sessProps = {
-        currentTabId,
+        activeTabId,
         tab,
         width,
         height,

package/client/components/setting-panel/list.styl

@@ -21,7 +21,6 @@
   margin-bottom 1px
   cursor pointer
   line-height 1.8
-  cu
   &.active
     background primary
     color contrastColor(primary)

package/client/components/setting-panel/on-tree-drop.js

@@ -5,7 +5,7 @@
 import {
   defaultBookmarkGroupId
 } from '../../common/constants'
-import { isEqual, find, findIndex, last, remove } from 'lodash-es'
+import { isEqual, find, last, remove } from 'lodash-es'
 import copy from 'json-deep-copy'
 
 export default (info, props) => {
@@ -129,7 +129,7 @@ export default (info, props) => {
       ? toGroup.bookmarkIds || []
       : toGroup.bookmarkGroupIds || []
     nodeIndex = dropToGap
-      ? findIndex(pool, d => d === toId)
+      ? pool.findIndex(d => d === toId)
       : pool.length
     if (dropToGap) {
       if (fromLeaf) {
@@ -143,7 +143,7 @@ export default (info, props) => {
       }
     }
   } else {
-    nodeIndex = findIndex(bookmarkGroups, d => {
+    nodeIndex = bookmarkGroups.findIndex(d => {
       return d.id === toId
     })
     if (fromLeaf) {
@@ -165,7 +165,7 @@ export default (info, props) => {
   }
   const updates = []
   if (toFirstLevel) {
-    fromIndex = findIndex(bookmarkGroups, d => d.id === fromId)
+    fromIndex = bookmarkGroups.findIndex(d => d.id === fromId)
     from = copy(from)
     bookmarkGroups.splice(fromIndex, 1, 'tobedel')
     bookmarkGroups.splice(nodeIndex, 0, from)
@@ -177,7 +177,7 @@ export default (info, props) => {
     const arr = fromLeaf
       ? fromGroup.bookmarkIds
       : fromGroup.bookmarkGroupIds
-    fromIndex = findIndex(arr, d => d === fromId)
+    fromIndex = arr.findIndex(d => d === fromId)
     isSameCat
       ? arr.splice(fromIndex, 1, 'tobedel')
       : remove(arr, d => d === fromId)

package/client/components/setting-panel/setting-modal.jsx

@@ -11,7 +11,6 @@ import {
   modals
 } from '../../common/constants'
 import TabBookmarks from './tab-bookmarks'
-import TabHistory from './tab-history'
 import TabQuickCommands from './tab-quick-commands'
 import TabSettings from './tab-settings'
 import TabThemes from './tab-themes'
@@ -68,11 +67,6 @@ export default auto(function SettingModalWrap (props) {
       ])
     }
     const items = [
-      {
-        key: settingMap.history,
-        label: e(settingMap.history),
-        children: null
-      },
       {
         key: settingMap.bookmarks,
         label: e(settingMap.bookmarks),
@@ -113,12 +107,6 @@ export default auto(function SettingModalWrap (props) {
         <Tabs
           {...tabsProps}
         />
-        <TabHistory
-          listProps={props0}
-          settingItem={settingItem}
-          formProps={formProps}
-          settingTab={settingTab}
-        />
         <TabQuickCommands
           listProps={props0}
           settingItem={settingItem}