@electerm/electerm-react 2.3.190 → 2.3.198

package/client/components/bookmark-form/common/fields.jsx

@@ -10,6 +10,7 @@ import InputAutoFocus from '../../common/input-auto-focus.jsx'
 import ProxyField from './proxy.jsx'
 import X11Field from './x11.jsx'
 import SshTunnels from './ssh-tunnels.jsx'
+import SshAgent from './ssh-agent.jsx'
 import ConnectionHopping from './connection-hopping.jsx'
 import TerminalBackgroundField from './terminal-background.jsx'
 import useQuickCmds from './quick-commands.jsx'
@@ -145,6 +146,8 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
       return <X11Field key={name} form={form} />
     case 'sshTunnels':
       return <SshTunnels key={name} form={form} formData={ctxProps.formData} />
+    case 'sshAgent':
+      return <SshAgent key={name} />
     case 'connectionHopping':
       return (
         <ConnectionHopping

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

@@ -0,0 +1,33 @@
+import React from 'react'
+import { Form, Input, Switch, Space } from 'antd'
+import HelpIcon from '../../common/help-icon'
+import { formItemLayout } from '../../../common/form-layout'
+
+const FormItem = Form.Item
+const e = window.translate
+
+export default function SshAgent () {
+  return (
+    <FormItem
+      {...formItemLayout}
+      label={e('useSshAgent')}
+    >
+      <Space align='center'>
+        <FormItem
+          name='useSshAgent'
+          valuePropName='checked'
+          noStyle
+        >
+          <Switch />
+        </FormItem>
+        <FormItem
+          name='sshAgent'
+          noStyle
+        >
+          <Input placeholder={e('SSH Agent Path')} />
+        </FormItem>
+        <HelpIcon link='https://github.com/electerm/electerm/wiki/ssh-agent' />
+      </Space>
+    </FormItem>
+  )
+}

package/client/components/bookmark-form/config/common-fields.js

@@ -272,10 +272,8 @@ export const sshAuthFields = [
   { type: 'sshAuthSelector', name: '__auth__', label: '', formItemName: 'password' },
   commonFields.port,
   {
-    type: 'switch',
-    name: 'useSshAgent',
-    label: () => e('useSshAgent'),
-    valuePropName: 'checked'
+    type: 'sshAgent',
+    name: 'useSshAgent'
   },
   commonFields.runScripts,
   commonFields.description,
@@ -311,18 +309,18 @@ export const telnetAuthFields = [
 // Common tab configurations - functions to ensure translation happens at render time
 export const quickCommandsTab = () => ({
   key: 'quickCommands',
-  label: () => e('quickCommands'),
+  label: e('quickCommands'),
   fields: [commonFields.quickCommands]
 })
 
 export const sshTunnelTab = () => ({
   key: 'tunnel',
-  label: () => e('sshTunnel'),
+  label: e('sshTunnel'),
   fields: [commonFields.sshTunnels]
 })
 
 export const connectionHoppingTab = () => ({
   key: 'connectionHopping',
-  label: () => e('connectionHopping'),
+  label: e('connectionHopping'),
   fields: [commonFields.connectionHopping]
 })

package/client/components/bookmark-form/config/ftp.js

@@ -22,7 +22,7 @@ const ftpConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,

package/client/components/bookmark-form/config/local.js

@@ -26,7 +26,7 @@ const localConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,
@@ -37,7 +37,7 @@ const localConfig = {
     },
     {
       key: 'settings',
-      label: () => e('settings'),
+      label: e('settings'),
       fields: [
         {
           type: 'input',
@@ -91,7 +91,7 @@ const localConfig = {
     },
     {
       key: 'quickCommands',
-      label: () => e('quickCommands'),
+      label: e('quickCommands'),
       fields: [
         { type: 'quickCommands', name: '__quick__', label: '' }
       ]

package/client/components/bookmark-form/config/rdp.js

@@ -19,7 +19,7 @@ const rdpConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         { type: 'rdpWarning', name: 'rdpWarning' },
         commonFields.category,

package/client/components/bookmark-form/config/serial.js

@@ -31,7 +31,7 @@ const serialConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,
@@ -40,7 +40,7 @@ const serialConfig = {
           type: 'autocomplete',
           name: 'baudRate',
           label: 'baudRate',
-          options: commonBaudRates.map(d => ({ value: d })),
+          options: commonBaudRates.map(d => ({ value: d.toString(), label: d.toString() })),
           normalize: (value) => {
             if (value === '' || value == null) {
               return undefined
@@ -64,14 +64,14 @@ const serialConfig = {
     },
     {
       key: 'settings',
-      label: () => e('settings'),
+      label: e('settings'),
       fields: [
         { type: 'terminalBackground', name: 'terminalBackground', label: () => e('terminalBackgroundImage') }
       ]
     },
     {
       key: 'quickCommands',
-      label: () => e('quickCommands'),
+      label: e('quickCommands'),
       fields: [
         { type: 'quickCommands', name: '__quick__', label: '' }
       ]

package/client/components/bookmark-form/config/ssh.js

@@ -21,6 +21,7 @@ const sshConfig = {
       sshTunnels: [],
       connectionHoppings: [],
       useSshAgent: true,
+      sshAgent: '',
       serverHostKey: [],
       cipher: [],
       ...getTerminalDefaults(store),
@@ -33,12 +34,12 @@ const sshConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: sshAuthFields
     },
     {
       key: 'settings',
-      label: () => e('settings'),
+      label: e('settings'),
       fields: sshSettings
     },
     quickCommandsTab(),

package/client/components/bookmark-form/config/telnet.js

@@ -31,12 +31,12 @@ const telnetConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: telnetAuthFields
     },
     {
       key: 'settings',
-      label: () => e('settings'),
+      label: e('settings'),
       fields: terminalSettings
     },
     quickCommandsTab()

package/client/components/bookmark-form/config/vnc.js

@@ -23,7 +23,7 @@ const vncConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         { type: 'vncWarning', name: 'vncWarning' },
         commonFields.category,

package/client/components/bookmark-form/config/web.js

@@ -15,7 +15,7 @@ const webConfig = {
   tabs: () => [
     {
       key: 'main',
-      label: () => e('auth'),
+      label: e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,

package/client/components/setting-panel/deep-link-control.jsx

@@ -64,12 +64,12 @@ export default function DeepLinkControl () {
   }
 
   const renderTooltipContent = () => {
-    const protocols = ['ssh', 'telnet', 'rdp', 'vnc', 'serial']
+    const protocols = ['ssh', 'telnet']
 
     return (
       <div>
         <div className='pd1b'>
-          Register electerm to handle protocol URLs (ssh://, telnet://, rdp://, vnc://, serial://)
+          Register electerm to handle protocol URLs (ssh://, telnet://)
         </div>
 
         {registrationStatus && (

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

@@ -13,3 +13,4 @@
   top 100px
   right 5px
   z-index 200
+  background var(--main)

package/client/components/terminal/terminal.jsx

@@ -1184,7 +1184,7 @@ class Term extends Component {
         'execLinuxArgs',
         'debug'
       ]),
-      keepaliveInterval: tab.keepaliveInterval === undefined ? config.keepaliveInterval : tab.keepaliveInterval,
+      keepaliveInterval: tab.keepaliveInterval || config.keepaliveInterval,
       tabId: id,
       uid: id,
       srcTabId: tab.id,

package/client/store/mcp-handler.js

@@ -123,12 +123,6 @@ export default Store => {
         case 'get_settings':
           result = store.mcpGetSettings()
           break
-        case 'list_terminal_themes':
-          result = store.mcpListTerminalThemes()
-          break
-        case 'list_ui_themes':
-          result = store.mcpListUiThemes()
-          break
 
         default:
           throw new Error(`Unknown tool: ${toolName}`)

package/package.json

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