@electerm/electerm-react 2.1.16 → 2.1.26

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

@@ -145,7 +145,7 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
         />
       )
     case 'terminalBackground':
-      return <TerminalBackgroundField key={name} form={form} />
+      return <TerminalBackgroundField key={name} />
     case 'profileItem':
       return <ProfileItem key={name} store={ctxProps.store} profileFilter={item.profileFilter} />
     case 'quickCommands':

package/client/components/bookmark-form/common/init-values.js

@@ -1,7 +1,7 @@
 /**
  * Common utilities for config initValues
  */
-import { newBookmarkIdPrefix } from '../../../common/constants.js'
+import { newBookmarkIdPrefix, authTypeMap } from '../../../common/constants.js'
 import { getColorFromCategory } from '../../../common/get-category-color.js'
 import findBookmarkGroupId from '../../../common/find-bookmark-group-id.js'
 import deepCopy from 'json-deep-copy'
@@ -81,3 +81,12 @@ export function getTerminalBackgroundDefaults (defaultSetting) {
     }
   }
 }
+
+export function getAuthTypeDefault (props) {
+  const r = {}
+  if (window.store.defaultProfileId) {
+    r.profile = window.store.defaultProfileId
+    r.authType = authTypeMap.profiles
+  }
+  return r
+}

package/client/components/bookmark-form/common/terminal-background.jsx

@@ -11,7 +11,7 @@ const FormItem = Form.Item
 const e = window.translate
 
 // Custom form control that implements the antd form control interface
-const TerminalBgControl = ({ value = {}, onChange }) => {
+const TerminalBgControl = ({ value, onChange }) => {
   const handleChange = (newValue, name) => {
     const updatedValue = {
       ...value,
@@ -20,16 +20,25 @@ const TerminalBgControl = ({ value = {}, onChange }) => {
     onChange(updatedValue)
   }
 
+  const handleBatchUpdate = (updates) => {
+    const updatedValue = {
+      ...value,
+      ...updates
+    }
+    onChange(updatedValue)
+  }
+
   return (
     <TerminalBackgroundConfig
       config={value}
       onChangeValue={handleChange}
+      batchUpdate={handleBatchUpdate}
       name='terminalBackgroundImagePath'
     />
   )
 }
 
-export default function renderTermBg (form) {
+export default function renderTermBg () {
   const formProps = {
     ...formItemLayout,
     name: 'terminalBackground',

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

@@ -1,6 +1,6 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { terminalFtpType } from '../../../common/constants.js'
-import { createBaseInitValues } from '../common/init-values.js'
+import { createBaseInitValues, getAuthTypeDefault } from '../common/init-values.js'
 import { commonFields } from './common-fields.js'
 import { isEmpty } from 'lodash-es'
 
@@ -14,7 +14,8 @@ const ftpConfig = {
       port: 21,
       user: '',
       password: '',
-      secure: false
+      secure: false,
+      ...getAuthTypeDefault(props)
     })
   },
   layout: formItemLayout,

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

@@ -1,6 +1,11 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { terminalLocalType, terminalTypes } from '../../../common/constants.js'
-import { createBaseInitValues, getTerminalDefaults, getSshDefaults } from '../common/init-values.js'
+import {
+  createBaseInitValues,
+  getTerminalDefaults,
+  getSshDefaults,
+  getTerminalBackgroundDefaults
+} from '../common/init-values.js'
 import defaultSettings from '../../../common/default-setting.js'
 import { commonFields } from './common-fields.js'
 
@@ -13,7 +18,8 @@ const localConfig = {
     const { store } = props
     return createBaseInitValues(props, terminalLocalType, {
       ...getTerminalDefaults(store),
-      ...getSshDefaults()
+      ...getSshDefaults(),
+      ...getTerminalBackgroundDefaults(defaultSettings)
     })
   },
   layout: formItemLayout,

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

@@ -1,6 +1,6 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { terminalRdpType } from '../../../common/constants.js'
-import { createBaseInitValues } from '../common/init-values.js'
+import { createBaseInitValues, getAuthTypeDefault } from '../common/init-values.js'
 import { isEmpty } from 'lodash-es'
 import { commonFields } from './common-fields.js'
 
@@ -11,7 +11,8 @@ const rdpConfig = {
   type: terminalRdpType,
   initValues: (props) => {
     return createBaseInitValues(props, terminalRdpType, {
-      port: 3389
+      port: 3389,
+      ...getAuthTypeDefault(props)
     })
   },
   layout: formItemLayout,

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

@@ -2,7 +2,7 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { connectionMap, authTypeMap, defaultEnvLang } from '../../../common/constants.js'
 import defaultSetting from '../../../common/default-setting.js'
-import { createBaseInitValues, getTerminalDefaults, getSshDefaults, getTerminalBackgroundDefaults } from '../common/init-values.js'
+import { createBaseInitValues, getTerminalDefaults, getSshDefaults, getTerminalBackgroundDefaults, getAuthTypeDefault } from '../common/init-values.js'
 import { sshAuthFields, sshSettings, quickCommandsTab, sshTunnelTab, connectionHoppingTab } from './common-fields.js'
 
 const e = window.translate
@@ -24,7 +24,8 @@ const sshConfig = {
       cipher: [],
       ...getTerminalDefaults(store),
       ...getSshDefaults(),
-      ...getTerminalBackgroundDefaults(defaultSetting)
+      ...getTerminalBackgroundDefaults(defaultSetting),
+      ...getAuthTypeDefault(props)
     })
   },
   layout: formItemLayout,

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

@@ -1,7 +1,12 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { terminalTelnetType, authTypeMap } from '../../../common/constants.js'
 import defaultSettings from '../../../common/default-setting.js'
-import { createBaseInitValues, getSshDefaults, getTerminalBackgroundDefaults } from '../common/init-values.js'
+import {
+  createBaseInitValues,
+  getSshDefaults,
+  getTerminalBackgroundDefaults,
+  getAuthTypeDefault
+} from '../common/init-values.js'
 import { telnetAuthFields, terminalSettings, quickCommandsTab } from './common-fields.js'
 
 const e = window.translate
@@ -18,7 +23,8 @@ const telnetConfig = {
       authType: authTypeMap.password,
       term: defaultSettings.terminalType,
       ...getSshDefaults(),
-      ...getTerminalBackgroundDefaults(defaultSettings)
+      ...getTerminalBackgroundDefaults(defaultSettings),
+      ...getAuthTypeDefault(props)
     })
   },
   layout: formItemLayout,

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

@@ -1,6 +1,6 @@
 import { formItemLayout } from '../../../common/form-layout.js'
 import { terminalVncType } from '../../../common/constants.js'
-import { createBaseInitValues } from '../common/init-values.js'
+import { createBaseInitValues, getAuthTypeDefault } from '../common/init-values.js'
 import { isEmpty } from 'lodash-es'
 import { commonFields, connectionHoppingTab } from './common-fields.js'
 
@@ -14,7 +14,8 @@ const vncConfig = {
       port: 5900,
       viewOnly: false,
       scaleViewport: true,
-      connectionHoppings: []
+      connectionHoppings: [],
+      ...getAuthTypeDefault(props)
     })
   },
   layout: formItemLayout,

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

@@ -22,9 +22,10 @@ import { isValidIP } from '../../common/is-ip'
 import { action as manateAction } from 'manate'
 
 export default function FormRenderer ({ config, props }) {
+  const initialValues = config.initValues(props)
   const [form] = Form.useForm()
   const [ips, setIps] = useState([])
-  const [authType, setAuthType] = useState(props.formData.authType || authTypeMap.password)
+  const [authType, setAuthType] = useState(initialValues.authType || authTypeMap.password)
   const [testing, setTesting] = useState(false)
   const action = useRef('submit')
 
@@ -156,6 +157,9 @@ export default function FormRenderer ({ config, props }) {
       ...props.formData,
       ...res
     }
+    if (!obj.terminalBackground?.terminalBackgroundImagePath) {
+      delete obj.terminalBackground
+    }
     if (isTest) {
       return test(obj)
     }
@@ -266,7 +270,6 @@ export default function FormRenderer ({ config, props }) {
     setAuthType(newAuthType)
   }
 
-  // Context props for specialized components
   const ctxProps = {
     ...props,
     form,
@@ -282,7 +285,6 @@ export default function FormRenderer ({ config, props }) {
     useIp
   }
 
-  const initialValues = config.initValues(props)
   const tabs = typeof config.tabs === 'function' ? (config.tabs() || []) : (config.tabs || [])
   let content = null
 

package/client/components/profile/profile-form-elem.jsx

@@ -2,14 +2,16 @@ import { useState } from 'react'
 import {
   Form,
   message,
+  Switch,
   Button
 } from 'antd'
 import InputAutoFocus from '../common/input-auto-focus'
 import { formItemLayout } from '../../common/form-layout'
+import HelpIcon from '../common/help-icon'
 import {
   settingMap
 } from '../../common/constants'
-
+import { action } from 'manate'
 import ProfileTabs from './profile-tabs'
 
 const FormItem = Form.Item
@@ -28,13 +30,15 @@ export default function ProfileFormElem (props) {
     }
     return id
   }
-  async function handleSubmit (res) {
+  const handleSubmit = action(async function (res) {
     const { formData } = props
     const update1 = {
       ...res,
       id: genId()
     }
+    let defaultId = update1.id
     if (formData.id) {
+      defaultId = formData.id
       props.store.editItem(formData.id, res, settingMap.profiles)
     } else {
       props.store.addItem(update1, settingMap.profiles)
@@ -43,14 +47,21 @@ export default function ProfileFormElem (props) {
         name: e('profile')
       })
     }
+    window.store.makeSureProfileDefault(defaultId)
     message.success(e('saved'))
-  }
+  })
   const tabsProps = {
     activeTab,
     onChangeTab: setActiveTab,
     form,
     store: props.store
   }
+  const profileDefaultWikiLink = 'https://github.com/electerm/electerm/wiki/Default-Profile'
+  const defaultLabel = (
+    <span>
+      {e('default')} <HelpIcon link={profileDefaultWikiLink} />
+    </span>
+  )
   return (
     <Form
       form={form}
@@ -73,6 +84,14 @@ export default function ProfileFormElem (props) {
       >
         <InputAutoFocus />
       </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label={defaultLabel}
+        name='isDefault'
+        valuePropName='checked'
+      >
+        <Switch />
+      </FormItem>
       <ProfileTabs {...tabsProps} />
       <FormItem>
         <Button

package/client/components/profile/profile-tabs.jsx

@@ -5,32 +5,45 @@ import ProfileFormVnc from './profile-form-vnc'
 import ProfileFormFtp from './profile-form-ftp'
 import ProfileFormTelnet from './profile-form-telnet'
 
-const { TabPane } = Tabs
-
 export default function ProfileTabs (props) {
   const { activeTab, onChangeTab, form, store } = props
   const tabsProps = {
     activeKey: activeTab,
     onChange: onChangeTab
   }
+  const items = [
+    {
+      label: 'ssh',
+      key: 'ssh',
+      forceRender: true,
+      children: <ProfileFormSsh form={form} store={store} />
+    },
+    {
+      label: 'telnet',
+      key: 'telnet',
+      forceRender: true,
+      children: <ProfileFormTelnet form={form} store={store} />
+    },
+    {
+      label: 'vnc',
+      key: 'vnc',
+      forceRender: true,
+      children: <ProfileFormVnc />
+    },
+    {
+      label: 'rdp',
+      key: 'rdp',
+      forceRender: true,
+      children: <ProfileFormRdp />
+    },
+    {
+      label: 'ftp',
+      key: 'ftp',
+      forceRender: true,
+      children: <ProfileFormFtp />
+    }
+  ]
   return (
-    <Tabs {...tabsProps}>
-      <TabPane tab='ssh' key='ssh' forceRender>
-        <ProfileFormSsh form={form} store={store} />
-      </TabPane>
-      <TabPane tab='telnet' key='telnet' forceRender>
-        <ProfileFormTelnet form={form} store={store} />
-      </TabPane>
-      <TabPane tab='vnc' key='vnc' forceRender>
-        <ProfileFormVnc />
-      </TabPane>
-      <TabPane tab='rdp' key='rdp' forceRender>
-        <ProfileFormRdp />
-      </TabPane>
-      <TabPane tab='ftp' key='ftp' forceRender>
-        <ProfileFormFtp />
-      </TabPane>
-    </Tabs>
-
+    <Tabs {...tabsProps} items={items} />
   )
 }

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

@@ -424,7 +424,7 @@ export default class SettingCommon extends Component {
             {e('global')} {e('proxy')}
             <HelpIcon
               title={table}
-              overlayInnerStyle={style}
+              style={{ body: { style } }}
             />
           </span>
           <Switch

package/client/components/setting-panel/terminal-bg-config.jsx

@@ -20,7 +20,8 @@ export default function TerminalBackgroundConfig ({
   onChangeValue,
   name,
   config,
-  isGlobal = false
+  isGlobal = false,
+  batchUpdate
 }) {
   const [showTextModal, setShowTextModal] = useState(false)
   const value = config[name]
@@ -71,7 +72,7 @@ export default function TerminalBackgroundConfig ({
     // Show helpful text when text background is selected but no text is configured
     dataSource[2] = {
       value: textTerminalBgValue,
-      desc: `📝 ${e('clickToConfigureText') || 'Click to configure text'}`
+      desc: '📝 Click to configure text'
     }
   }
 
@@ -93,12 +94,24 @@ export default function TerminalBackgroundConfig ({
   }
 
   const handleTextBgModalOk = (textConfig) => {
-    // Store text configuration in the config
-    onChangeValue(textConfig.text, 'terminalBackgroundText')
-    onChangeValue(textConfig.fontSize, 'terminalBackgroundTextSize')
-    onChangeValue(textConfig.color, 'terminalBackgroundTextColor')
-    onChangeValue(textConfig.fontFamily, 'terminalBackgroundTextFontFamily')
-    onChange(textTerminalBgValue)
+    if (batchUpdate) {
+      // Use batch update if available
+      const updates = {
+        terminalBackgroundText: textConfig.text,
+        terminalBackgroundTextSize: textConfig.fontSize,
+        terminalBackgroundTextColor: textConfig.color,
+        terminalBackgroundTextFontFamily: textConfig.fontFamily,
+        [name]: textTerminalBgValue
+      }
+      batchUpdate(updates)
+    } else {
+      // Fall back to sequential updates
+      onChangeValue(textConfig.text, 'terminalBackgroundText')
+      onChangeValue(textConfig.fontSize, 'terminalBackgroundTextSize')
+      onChangeValue(textConfig.color, 'terminalBackgroundTextColor')
+      onChangeValue(textConfig.fontFamily, 'terminalBackgroundTextFontFamily')
+      onChange(textTerminalBgValue)
+    }
     setShowTextModal(false)
   }
 
@@ -204,7 +217,6 @@ export default function TerminalBackgroundConfig ({
       label: item.desc
     }
   }
-
   return (
     <div className='pd2b'>
       <div className='pd1b'>

package/client/components/ssh-config/ssh-config-load-notify.jsx

@@ -49,7 +49,8 @@ export default function SshConfigLoadNotify (props) {
       ignoreSshConfig !== 'yes' &&
       settingTab === 'bookmarks' &&
       showModal &&
-      sshConfigLoaded !== 'yes'
+      sshConfigLoaded !== 'yes' &&
+      window.store.hasNodePty
 
     if (shouldShow) {
       showNotification()

package/client/store/common.js

@@ -313,6 +313,15 @@ export default Store => {
     }
   }
 
+  Store.prototype.makeSureProfileDefault = function (defaultId) {
+    const { profiles } = window.store
+    for (const p of profiles) {
+      if (p.id !== defaultId) {
+        delete p.isDefault
+      }
+    }
+  }
+
   Store.prototype.aiConfigMissing = function () {
     return aiConfigsArr.slice(0, -1).some(k => !window.store.config[k])
   }

package/client/store/store.js

@@ -122,6 +122,12 @@ class Store {
       currentTab.pane === paneMap.terminal
   }
 
+  get defaultProfileId () {
+    const { profiles } = window.store
+    const defaultProfile = profiles.find(p => p.isDefault)
+    return defaultProfile?.id || ''
+  }
+
   get quickCommandTags () {
     const { quickCommands } = window.store
     return uniq(

package/package.json

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