@electerm/electerm-react 2.3.176 → 2.3.190

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

@@ -101,7 +101,7 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
     const formItemProps = {
       ...formItemLayout,
       className: cls,
-      label,
+      label: typeof label === 'string' ? label : label(),
       name,
       rules,
       valuePropName,

package/client/components/bookmark-form/common/ssh-auth-selector.jsx

@@ -26,14 +26,44 @@ export default function renderAuth (props) {
     formItemName = 'password',
     profileFilter = (d) => d
   } = props
-  const beforeUpload = async (file) => {
+  const commonBeforeUpload = (fieldName) => async (file) => {
     const filePath = getFilePath(file)
-    const privateKey = await window.fs.readFile(filePath)
+    const content = await window.fs.readFile(filePath)
     form.setFieldsValue({
-      privateKey
+      [fieldName]: content
     })
     return false
   }
+  const renderKeyField = (key, label, desc) => (
+    <FormItem
+      {...formItemLayout}
+      label={e(label)}
+      hasFeedback
+      key={key}
+      className='mg1b'
+      rules={[{
+        max: 13000, message: '13000 chars max'
+      }]}
+    >
+      <FormItem noStyle name={key}>
+        <TextArea
+          placeholder={e(desc)}
+          autoSize={{ minRows: 1 }}
+        />
+      </FormItem>
+      <Upload
+        beforeUpload={commonBeforeUpload(key)}
+        fileList={[]}
+      >
+        <Button
+          type='dashed'
+          className='mg2b mg1t'
+        >
+          {e('importFromFile')}
+        </Button>
+      </Upload>
+    </FormItem>
+  )
   if (authType === 'password') {
     const opts = {
       options: uniqBy(
@@ -95,34 +125,7 @@ export default function renderAuth (props) {
     )
   }
   return [
-    <FormItem
-      {...formItemLayout}
-      label={e('privateKey')}
-      hasFeedback
-      key='privateKey'
-      className='mg1b'
-      rules={[{
-        max: 13000, message: '13000 chars max'
-      }]}
-    >
-      <FormItem noStyle name='privateKey'>
-        <TextArea
-          placeholder={e('privateKeyDesc')}
-          autoSize={{ minRows: 1 }}
-        />
-      </FormItem>
-      <Upload
-        beforeUpload={beforeUpload}
-        fileList={[]}
-      >
-        <Button
-          type='dashed'
-          className='mg2b mg1t'
-        >
-          {e('importFromFile')}
-        </Button>
-      </Upload>
-    </FormItem>,
+    renderKeyField('privateKey', 'privateKey', 'privateKeyDesc'),
     <FormItem
       key='passphrase'
       {...formItemLayout}
@@ -136,6 +139,7 @@ export default function renderAuth (props) {
       <Password
         placeholder={e('passphraseDesc')}
       />
-    </FormItem>
+    </FormItem>,
+    renderKeyField('certificate', 'certificate', 'certificate')
   ]
 }

package/client/components/bookmark-form/common/ssh-auth-type-selector.jsx

@@ -25,9 +25,12 @@ export default function SshAuthTypeSelector ({ handleChangeAuthType, filterAuthT
       >
         {
           authTypesFiltered.map(t => {
+            const str = t === 'privateKey'
+              ? e(t) + '/' + e('certificate')
+              : e(t)
             return (
               <RadioButton value={t} key={t}>
-                {e(t)}
+                {str}
               </RadioButton>
             )
           })

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

@@ -15,65 +15,65 @@ export const commonFields = {
   host: {
     type: 'colorTitle',
     name: 'host',
-    label: e('host'),
+    label: () => e('host'),
     rules: [{ required: true, message: e('host') + ' required' }]
   },
 
   colorTitle: {
     type: 'colorTitle',
     name: 'title',
-    label: e('title')
+    label: () => e('title')
   },
 
   title: {
     type: 'input',
     name: 'title',
-    label: e('title')
+    label: () => e('title')
   },
 
   username: {
     type: 'input',
     name: 'username',
-    label: e('username')
+    label: () => e('username')
   },
 
   password: {
     type: 'password',
     name: 'password',
-    label: e('password')
+    label: () => e('password')
   },
 
   loginPrompt: {
     type: 'input',
     name: 'loginPrompt',
-    label: e('loginPrompt'),
+    label: () => e('loginPrompt'),
     props: { placeholder: '/login[: ]*$/i' }
   },
 
   passwordPrompt: {
     type: 'input',
     name: 'passwordPrompt',
-    label: e('passwordPrompt'),
+    label: () => e('passwordPrompt'),
     props: { placeholder: '/password[: ]*$/i' }
   },
 
   port: {
     type: 'number',
     name: 'port',
-    label: e('port'),
+    label: () => e('port'),
     rules: [{ required: true, message: 'port required' }]
   },
 
   description: {
     type: 'textarea',
     name: 'description',
-    label: e('description')
+    label: () => e('description')
   },
 
   category: {
     type: 'categorySelect',
     name: 'category',
-    label: e('category')
+    label: () => e('category')
   },
 
   type: {
@@ -106,13 +106,13 @@ export const commonFields = {
   interactiveValues: {
     type: 'textarea',
     name: 'interactiveValues',
-    label: e('interactiveValues')
+    label: () => e('interactiveValues')
   },
 
   encode: {
     type: 'select',
     name: 'encode',
-    label: e('encode'),
+    label: () => e('encode'),
     options: encodes.map(k => ({ label: k.toUpperCase(), value: k }))
   },
 
@@ -128,7 +128,7 @@ export const commonFields = {
   terminalType: {
     type: 'autocomplete',
     name: 'term',
-    label: e('terminalType'),
+    label: () => e('terminalType'),
     rules: [{ required: true, message: 'terminal type required' }],
     options: terminalTypes.map(t => ({ label: t, value: t }))
   },
@@ -136,14 +136,14 @@ export const commonFields = {
   displayRaw: {
     type: 'switch',
     name: 'displayRaw',
-    label: e('displayRaw'),
+    label: () => e('displayRaw'),
     valuePropName: 'checked'
   },
 
   fontFamily: {
     type: 'input',
     name: 'fontFamily',
-    label: e('fontFamily'),
+    label: () => e('fontFamily'),
     rules: [{ max: 130, message: '130 chars max' }],
     props: { placeholder: defaultSettings.fontFamily }
   },
@@ -151,7 +151,7 @@ export const commonFields = {
   fontSize: {
     type: 'number',
     name: 'fontSize',
-    label: e('fontSize'),
+    label: () => e('fontSize'),
     props: {
       min: 9,
       max: 65535,
@@ -163,7 +163,7 @@ export const commonFields = {
   keepaliveInterval: {
     type: 'number',
     name: 'keepaliveInterval',
-    label: e('keepaliveIntervalDesc'),
+    label: () => e('keepaliveIntervalDesc'),
     props: {
       min: 0,
       max: 20000000,
@@ -174,13 +174,13 @@ export const commonFields = {
   terminalBackground: {
     type: 'terminalBackground',
     name: 'terminalBackground',
-    label: e('terminalBackgroundImage')
+    label: () => e('terminalBackgroundImage')
   },
 
   proxy: {
     type: 'proxy',
     name: '__proxy__',
-    label: e('proxy')
+    label: () => e('proxy')
   },
 
   x11: {
@@ -243,11 +243,10 @@ export const sshSettings = [
   {
     type: 'switch',
     name: 'ignoreKeyboardInteractive',
-    label: e('ignoreKeyboardInteractive'),
+    label: () => e('ignoreKeyboardInteractive'),
     valuePropName: 'checked'
   },
   ...terminalSettings.slice(0, -1), // All except terminalBackground
-  commonFields.proxy,
   commonFields.x11,
   commonFields.terminalBackground
 ]
@@ -272,6 +271,12 @@ export const sshAuthFields = [
   { type: 'sshAuthTypeSelector', name: 'authType', label: '' },
   { type: 'sshAuthSelector', name: '__auth__', label: '', formItemName: 'password' },
   commonFields.port,
+  {
+    type: 'switch',
+    name: 'useSshAgent',
+    label: () => e('useSshAgent'),
+    valuePropName: 'checked'
+  },
   commonFields.runScripts,
   commonFields.description,
   commonFields.setEnv,
@@ -306,18 +311,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,16 +22,16 @@ const ftpConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: e('auth'),
+      label: () => e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,
-        { type: 'input', name: 'host', label: e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
+        { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
         commonFields.port,
         { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.ftp) },
-        { type: 'input', name: 'user', label: e('username') },
-        { type: 'password', name: 'password', label: e('password') },
-        { type: 'switch', name: 'secure', label: e('secure'), valuePropName: 'checked' },
+        { type: 'input', name: 'user', label: () => e('username') },
+        { type: 'password', name: 'password', label: () => e('password') },
+        { type: 'switch', name: 'secure', label: () => e('secure'), valuePropName: 'checked' },
         commonFields.type
       ]
     }

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',
@@ -48,27 +48,27 @@ const localConfig = {
         {
           type: 'autocomplete',
           name: 'term',
-          label: e('terminalType'),
+          label: () => e('terminalType'),
           rules: [{ required: true, message: 'terminal type required' }],
           options: terminalTypes.map(t => ({ label: t, value: t }))
         },
         {
           type: 'switch',
           name: 'displayRaw',
-          label: e('displayRaw'),
+          label: () => e('displayRaw'),
           valuePropName: 'checked'
         },
         {
           type: 'input',
           name: 'fontFamily',
-          label: e('fontFamily'),
+          label: () => e('fontFamily'),
           rules: [{ max: 130, message: '130 chars max' }],
           props: { placeholder: defaultSettings.fontFamily }
         },
         {
           type: 'number',
           name: 'fontSize',
-          label: e('fontSize'),
+          label: () => e('fontSize'),
           props: {
             min: 9,
             max: 65535,
@@ -79,19 +79,19 @@ const localConfig = {
         {
           type: 'number',
           name: 'keepaliveInterval',
-          label: e('keepaliveIntervalDesc'),
+          label: () => e('keepaliveIntervalDesc'),
           props: {
             min: 0,
             max: 20000000,
             step: 1000
           }
         },
-        { type: 'terminalBackground', name: 'terminalBackground', label: e('terminalBackgroundImage') }
+        { 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/rdp.js

@@ -19,18 +19,18 @@ const rdpConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: e('auth'),
+      label: () => e('auth'),
       fields: [
         { type: 'rdpWarning', name: 'rdpWarning' },
         commonFields.category,
         commonFields.colorTitle,
-        { type: 'input', name: 'host', label: e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
+        { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
         commonFields.port,
         { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.rdp) },
         { ...commonFields.username, rules: [{ required: true, message: e('username') + ' required' }] },
         { ...commonFields.password, rules: [{ required: true, message: e('password') + ' required' }] },
         commonFields.description,
-        { type: 'input', name: 'domain', label: e('domain') },
+        { type: 'input', name: 'domain', label: () => e('domain') },
         commonFields.type
       ]
     }

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,
@@ -64,14 +64,14 @@ const serialConfig = {
     },
     {
       key: 'settings',
-      label: e('settings'),
+      label: () => e('settings'),
       fields: [
-        { type: 'terminalBackground', name: 'terminalBackground', label: e('terminalBackgroundImage') }
+        { 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

@@ -20,6 +20,7 @@ const sshConfig = {
       enableSftp: true,
       sshTunnels: [],
       connectionHoppings: [],
+      useSshAgent: true,
       serverHostKey: [],
       cipher: [],
       ...getTerminalDefaults(store),
@@ -32,12 +33,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,16 +23,16 @@ const vncConfig = {
   tabs: () => [
     {
       key: 'auth',
-      label: e('auth'),
+      label: () => e('auth'),
       fields: [
         { type: 'vncWarning', name: 'vncWarning' },
         commonFields.category,
         commonFields.colorTitle,
-        { type: 'input', name: 'host', label: e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
+        { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
         commonFields.port,
-        { type: 'switch', name: 'viewOnly', label: e('viewOnly'), valuePropName: 'checked' },
-        { type: 'switch', name: 'clipViewport', label: e('clipViewport'), valuePropName: 'checked' },
-        { type: 'switch', name: 'scaleViewport', label: e('scaleViewport'), valuePropName: 'checked' },
+        { type: 'switch', name: 'viewOnly', label: () => e('viewOnly'), valuePropName: 'checked' },
+        { type: 'switch', name: 'clipViewport', label: () => e('clipViewport'), valuePropName: 'checked' },
+        { type: 'switch', name: 'scaleViewport', label: () => e('scaleViewport'), valuePropName: 'checked' },
         { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.vnc) },
         commonFields.username,
         commonFields.password,

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

@@ -15,14 +15,14 @@ const webConfig = {
   tabs: () => [
     {
       key: 'main',
-      label: e('auth'),
+      label: () => e('auth'),
       fields: [
         commonFields.category,
         commonFields.colorTitle,
         {
           type: 'input',
           name: 'url',
-          label: e('URL'),
+          label: () => e('URL'),
           rules: [
             { required: true, message: e('Please input URL') },
             {
@@ -34,7 +34,7 @@ const webConfig = {
           ]
         },
         commonFields.description,
-        { type: 'input', name: 'useragent', label: e('useragent') },
+        { type: 'input', name: 'useragent', label: () => e('useragent') },
         { type: 'switch', name: 'hideAddressBar', label: 'hideAddressBar', valuePropName: 'checked' },
         commonFields.type
       ]