@abtnode/ux 1.16.19-beta-630ac853 → 1.16.19-beta-626e4d43

package/es/blocklet/component/add-component-core.js

@@ -322,6 +322,7 @@ export default function AddComponentCore({
     component.current = {};
     onClose();
   };
+  const alreadyInstalled = did => (blocklet?.children || []).some(x => x.meta.did === did);
   const onInstall = async payload => {
     const {
       pathPrefix: mountPoint,
@@ -522,7 +523,7 @@ export default function AddComponentCore({
     } = meta;
 
     // deleted history list
-    const list = (blocklet.settings?.children || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
+    const deletedList = (blocklet.settings?.children || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
     const componentDid = componentDidValue || '';
     const newConfigs = meta.environments?.map(item => {
       const {
@@ -613,21 +614,29 @@ export default function AddComponentCore({
     const hasRootPath = blocklet.children.some(x => x.mountPoint === '/');
 
     // use deleted history
-    const config = list.find(x => x.meta.bundleDid === bundleDid);
-    if (config) {
+    const deletedConfig = deletedList.find(x => x.meta.bundleDid === bundleDid);
+    const installedConfig = blocklet.children.find(x => x.meta.bundleDid === bundleDid);
+    doc.title = title || '';
+    if (deletedConfig) {
       doc = {
         ...doc,
-        pathPrefix: config.mountPoint || '',
-        title: title || '',
-        componentName: config.meta.name,
+        pathPrefix: deletedConfig.mountPoint || '',
+        componentName: deletedConfig.meta.name,
         // use history's environments
         hasEnvironmentsStep: false
       };
+    } else if (installedConfig) {
+      doc = {
+        ...doc,
+        pathPrefix: installedConfig.mountPoint || '',
+        componentName: installedConfig.meta.name,
+        // use current's environments
+        hasEnvironmentsStep: false
+      };
     } else {
       doc = {
         ...doc,
         pathPrefix: hasRootPath ? `/${urlPathFriendly(title) || urlPathFriendly(name)}` : '/',
-        title: title || '',
         componentName: '',
         hasEnvironmentsStep: component.current.meta?.environments?.length > 0
       };
@@ -852,7 +861,7 @@ export default function AddComponentCore({
     onCancel: () => {
       onCancel();
     }
-  }, hasStartEngine(meta) && {
+  }, hasStartEngine(meta) && !alreadyInstalled(meta.did) && {
     key: 'config',
     name: t('common.config'),
     error,
@@ -900,7 +909,7 @@ export default function AddComponentCore({
     onConfirm: () => {
       onNext();
     }
-  }, meta && params?.hasEnvironmentsStep && {
+  }, meta && !alreadyInstalled(meta.did) && params?.hasEnvironmentsStep && {
     key: 'environment',
     name: /*#__PURE__*/_jsxs(_Fragment, {
       children: [t('common.environment'), " ", params.hasRequiredEnvironments && /*#__PURE__*/_jsx(Required, {})]
@@ -945,7 +954,7 @@ export default function AddComponentCore({
     confirm: t('common.next'),
     onCancel,
     onConfirm: onNext
-  }, meta && params?.didSpaceCapability && {
+  }, meta && !alreadyInstalled(meta.did) && params?.didSpaceCapability && {
     key: 'didSpace',
     name: /*#__PURE__*/_jsxs(_Fragment, {
       children: [t('blocklet.component.didSpaceConfig'), " ", params.didSpaceCapability === 'required' && /*#__PURE__*/_jsx(Required, {})]
@@ -985,7 +994,7 @@ export default function AddComponentCore({
     onConfirm: onNext
   }, {
     key: 'install',
-    name: t('common.install'),
+    name: alreadyInstalled(meta?.did) ? t('common.upgrade') : t('common.install'),
     disabled: false,
     loading: false,
     body: /*#__PURE__*/_jsx(TypographyWrapper, {

package/es/blocklet/component/domain-list.js

@@ -58,11 +58,18 @@ export default function DomainListWithPermission(props) {
     loadingRuntimeInfo: loadingRuntimeInfo
   });
 }
+DomainListWithPermission.propTypes = {
+  listOnly: PropTypes.bool
+};
+DomainListWithPermission.defaultProps = {
+  listOnly: false
+};
 function DomainList({
   hasPermission,
   blocklet,
   loadingRuntimeInfo,
-  inService
+  inService,
+  listOnly
 }) {
   const {
     t
@@ -94,46 +101,48 @@ function DomainList({
     }
   });
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsxs(Box, {
-      className: "title first",
-      display: "flex",
-      justifyContent: "space-between",
-      alignItems: "center",
-      children: [/*#__PURE__*/_jsx(Box, {
-        children: t('common.domain')
-      }), hasMutatePermission && /*#__PURE__*/_jsx(AddDomainAlias, {
-        id: site.id,
-        title: t('router.domain.add.title'),
-        teamDid: blocklet.meta?.did,
-        appId: blocklet.appPid,
-        appPk: appPk,
-        systemDomains: systemDomains?.map(x => x.value),
-        children: ({
-          open
-        }) => /*#__PURE__*/_jsxs(Button, {
-          style: {
-            marginLeft: 16
-          },
-          variant: "contained",
-          color: "primary",
-          "data-cy": "add-domain-alias",
-          onClick: open,
-          disabled: isInProgress(blocklet.status),
-          children: [/*#__PURE__*/_jsx(AddIcon, {
+    children: [!listOnly && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsxs(Box, {
+        className: "title first",
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Box, {
+          children: t('common.domain')
+        }), hasMutatePermission && /*#__PURE__*/_jsx(AddDomainAlias, {
+          id: site.id,
+          title: t('router.domain.add.title'),
+          teamDid: blocklet.meta?.did,
+          appId: blocklet.appPid,
+          appPk: appPk,
+          systemDomains: systemDomains?.map(x => x.value),
+          children: ({
+            open
+          }) => /*#__PURE__*/_jsxs(Button, {
             style: {
-              fontSize: '1.3em',
-              marginRight: 4
-            }
-          }), t('common.add')]
+              marginLeft: 16
+            },
+            variant: "contained",
+            color: "primary",
+            "data-cy": "add-domain-alias",
+            onClick: open,
+            disabled: isInProgress(blocklet.status),
+            children: [/*#__PURE__*/_jsx(AddIcon, {
+              style: {
+                fontSize: '1.3em',
+                marginRight: 4
+              }
+            }), t('common.add')]
+          })
+        })]
+      }), isAccessible(blocklet.status) === false && /*#__PURE__*/_jsx(Box, {
+        mt: 1.5,
+        mb: 1.5,
+        children: /*#__PURE__*/_jsx(Alert, {
+          severity: "warning",
+          children: t('blocklet.router.noRunning')
         })
       })]
-    }), isAccessible(blocklet.status) === false && /*#__PURE__*/_jsx(Box, {
-      mt: 1.5,
-      mb: 1.5,
-      children: /*#__PURE__*/_jsx(Alert, {
-        severity: "warning",
-        children: t('blocklet.router.noRunning')
-      })
     }), /*#__PURE__*/_jsx(Box, {
       sx: {
         display: 'flex',
@@ -248,11 +257,13 @@ DomainList.propTypes = {
   hasPermission: PropTypes.bool,
   blocklet: PropTypes.object.isRequired,
   loadingRuntimeInfo: PropTypes.bool,
-  inService: PropTypes.bool.isRequired
+  inService: PropTypes.bool.isRequired,
+  listOnly: PropTypes.bool
 };
 DomainList.defaultProps = {
   hasPermission: false,
-  loadingRuntimeInfo: false
+  loadingRuntimeInfo: false,
+  listOnly: false
 };
 function DomainLink({
   domain,

package/es/blocklet/component/environment.js

@@ -80,14 +80,16 @@ export default function ComponentEnvironment({
       return;
     }
     data.custom = true;
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [data]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [data]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      Toast.error(formatError(err));
     }
   };
   const onEditConfig = async (newData, oldData) => {
@@ -125,9 +127,7 @@ export default function ComponentEnvironment({
           configs
         }
       });
-      if (result.code === 'ok') {
-        onConfigChanged(result.blocklet);
-      }
+      onConfigChanged(result.blocklet);
     } catch (err) {
       Toast.error(formatError(err));
     }
@@ -141,17 +141,19 @@ export default function ComponentEnvironment({
       Toast.error('Only key of custom env can be changed');
       return;
     }
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [{
-          key: data.key,
-          custom: true
-        }]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [{
+            key: data.key,
+            custom: true
+          }]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      Toast.error(formatError(err));
     }
   };
 

package/es/blocklet/component/index.js

@@ -276,26 +276,39 @@ function ComponentItem({
         ancestors: ancestors
       }), /*#__PURE__*/_jsxs(Box, {
         ml: "16px",
-        children: [/*#__PURE__*/_jsx(Box, {
-          className: "component-name",
+        children: [/*#__PURE__*/_jsxs(Box, {
+          className: "component-header",
           onClick: () => setComponentInfo(blocklet),
-          children: getDisplayName(blocklet, true)
+          children: [/*#__PURE__*/_jsx(Box, {
+            className: "component-name",
+            children: getDisplayName(blocklet, true)
+          }), /*#__PURE__*/_jsx(Box, {
+            className: "component-version",
+            children: blocklet?.meta?.version
+          })]
         }), /*#__PURE__*/_jsxs(Box, {
           display: "flex",
           alignItems: "center",
-          children: [!hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ResourceType, {
-            blocklet: blocklet
-          }), /*#__PURE__*/_jsx(BlockletMode, {
+          sx: {
+            mt: '2px',
+            ml: -0.5
+          },
+          children: [status !== 'unknown' && /*#__PURE__*/_jsx(BlockletStatus, {
             style: {
               marginLeft: 4
             },
-            mode: blocklet.mode || ''
-          }), status !== 'unknown' && /*#__PURE__*/_jsx(BlockletStatus, {
+            status: status,
+            source: blocklet.source
+          }), !hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ResourceType, {
             style: {
               marginLeft: 4
             },
-            status: status,
-            source: blocklet.source
+            blocklet: blocklet
+          }), /*#__PURE__*/_jsx(BlockletMode, {
+            style: {
+              marginLeft: 4
+            },
+            mode: blocklet.mode || ''
           }), !!blocklet.dependents?.length && /*#__PURE__*/_jsx(Tooltip, {
             title: [`${t('common.dependents')}: `, blocklet.dependents.map(x => /*#__PURE__*/_jsx(Box, {
               pl: 1,
@@ -497,10 +510,21 @@ const StyledBadge = styled(Badge)`
   }
 `;
 const StyledComponentRow = styled(Box)`
+  .component-header {
+    display: flex;
+    align-items: center;
+    align-items: flex-end;
+    cursor: pointer;
+  }
   .component-name {
     color: #222;
     font-size: 16px;
-    cursor: pointer;
+  }
+  .component-version {
+    color: #999;
+    font-size: 12px;
+    margin-left: 4px;
+    transform: translateY(-1px);
   }
 `;
 export default function BlockletComponent({

package/es/blocklet/router/add-domain.js

@@ -1,14 +1,12 @@
 import Connect from '@arcblock/did-connect/lib/Connect';
+import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import DiamondIcon from '@mui/icons-material/Diamond';
-import EditIcon from '@mui/icons-material/Edit';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import Box from '@mui/material/Box';
-import Button from '@arcblock/ux/lib/Button';
 import Link from '@mui/material/Link';
 import TextField from '@mui/material/TextField';
-import useTheme from '@mui/material/styles/useTheme';
 import noop from 'lodash/noop';
+import trim from 'lodash/trim';
 import PropTypes from 'prop-types';
 import useSetState from 'react-use/lib/useSetState';
 import joinURL from 'url-join';
@@ -19,6 +17,7 @@ import { axios } from '../../util/api';
 import DNSTip from './dns-tip';
 import { parseDomainFromURL } from './util';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function AddDomain({
   siteId,
@@ -29,9 +28,10 @@ export default function AddDomain({
   appId,
   appPk,
   onSuccess,
+  disabled,
+  autoFocus,
   ...props
 }) {
-  const theme = useTheme();
   const {
     t,
     locale
@@ -84,23 +84,18 @@ export default function AddDomain({
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),
-      icon: /*#__PURE__*/_jsx(EditIcon, {}),
-      component: /*#__PURE__*/_jsxs(Box, {
+      component: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(TextField, {
-          style: {
-            marginTop: '8px'
-          },
           label: t('router.domainAlias.add.domainDescription'),
           helperText: state.error || t('router.domainAlias.add.helperText'),
           inputProps: {
             'data-cy': 'domain-name-input'
           },
           fullWidth: true,
+          disabled: disabled,
           value: state.domain,
           onChange: e => {
-            const {
-              value
-            } = e.target;
+            const value = trim(e.target?.value);
             setState({
               domain: value
             });
@@ -114,7 +109,14 @@ export default function AddDomain({
               error: errMessage
             });
           },
-          autoFocus: true,
+          autoFocus: autoFocus,
+          onBlur: () => {
+            if (!state.domain) {
+              setState({
+                error: null
+              });
+            }
+          },
           size: "small",
           variant: "outlined",
           error: !!state.error
@@ -131,11 +133,7 @@ export default function AddDomain({
   if (info?.nftDomainUrl) {
     domainTypes.nftDomain = {
       name: t('router.domainAlias.nftDomain'),
-      icon: /*#__PURE__*/_jsx(DiamondIcon, {}),
-      component: /*#__PURE__*/_jsxs(Box, {
-        sx: {
-          marginTop: '12px'
-        },
+      component: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsxs(Box, {
           sx: {
             maxWidth: '640px',
@@ -164,6 +162,7 @@ export default function AddDomain({
           sx: {
             marginTop: '8px'
           },
+          disabled: disabled,
           onClick: () => setState({
             showNFTDomainAuth: true
           }),
@@ -206,37 +205,26 @@ export default function AddDomain({
     }
     return -1;
   });
-  return /*#__PURE__*/_jsxs(Box, {
+  return /*#__PURE__*/_jsx(Box, {
     ...props,
-    children: [/*#__PURE__*/_jsx(Box, {
+    children: /*#__PURE__*/_jsx(Box, {
       sx: {
         display: 'flex',
+        flexDirection: 'column',
         justifyContent: 'flex-start',
-        gap: '16px'
+        gap: '1em'
       },
-      children: inputDomainTypes.map(type => /*#__PURE__*/_jsxs(Box, {
-        sx: {
-          width: '128px',
-          height: '64px',
-          padding: '8px',
-          cursor: 'pointer',
-          borderRadius: '8px',
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'center',
-          alignItems: 'flex-start',
-          color: type === state.type ? theme.palette.primary.main : theme.palette.common.main,
-          border: `1px solid ${type === state.type ? theme.palette.primary.main : '#E0E0E0'}`
-        },
-        onClick: () => setState({
-          type
-        }),
-        children: [domainTypes[type].icon, domainTypes[type].name]
+      children: inputDomainTypes.map((type, index) => /*#__PURE__*/_jsxs(Box, {
+        children: [/*#__PURE__*/_jsx(Box, {
+          children: `${t(`optionsOrder.${index + 1}`)}: ${domainTypes[type]?.name}`
+        }), /*#__PURE__*/_jsx(Box, {
+          sx: {
+            marginTop: '8px'
+          },
+          children: domainTypes[type]?.component
+        })]
       }, type))
-    }), /*#__PURE__*/_jsx(Box, {
-      marginTop: "12px",
-      children: domainTypes[state.type]?.component
-    })]
+    })
   });
 }
 AddDomain.propTypes = {
@@ -247,12 +235,16 @@ AddDomain.propTypes = {
   onInputDomain: PropTypes.func,
   onSuccess: PropTypes.func,
   appId: PropTypes.string,
-  appPk: PropTypes.string
+  appPk: PropTypes.string,
+  disabled: PropTypes.bool,
+  autoFocus: PropTypes.bool
 };
 AddDomain.defaultProps = {
   defaultCustomDomain: '',
   onInputDomain: noop,
   onSuccess: noop,
   appId: '',
-  appPk: ''
+  appPk: '',
+  disabled: false,
+  autoFocus: true
 };

package/es/locales/en.js

@@ -922,8 +922,8 @@ module.exports = {
         recordValue: 'Record Value'
       },
       verify: {
-        ok: 'This site is resolved',
-        notResolved: 'This site neither resolved nor accessible, please check your DNS configuration'
+        ok: 'The domain resolution is normal',
+        notResolved: 'This domain neither resolved nor accessible, please check your DNS configuration'
       },
       https: {
         ok: 'This domain has https enabled',
@@ -936,8 +936,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: 'Input Domain',
-      nftDomain: 'NFT Domain',
+      inputDomain: 'Manually config domain',
+      nftDomain: 'Automatic config with DID Domain',
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
@@ -1594,13 +1594,23 @@ module.exports = {
     federated: 'Federated Login'
   },
   expiration: {
-    tips: {
-      success: 'Subscription will expire after {validity}',
-      warning: 'Subscription will expire after {validity}',
-      error: 'Subscription Expired'
+    mobile: {
+      tips: {
+        success: '{validity}',
+        warning: '{validity}',
+        error: 'Expired'
+      },
+      loadFailed: 'Retry!'
     },
-    loading: 'Load subscription...',
-    loadFailed: 'Failed to load subscription info, please retry!'
+    desktop: {
+      tips: {
+        success: 'Subscription will expire after {validity}',
+        warning: 'Subscription will expire after {validity}',
+        error: 'Subscription Expired'
+      },
+      loading: 'Load subscription...',
+      loadFailed: 'Failed to load subscription info, please retry!'
+    }
   },
   analytics: {
     trend: 'Trends',
@@ -1665,5 +1675,9 @@ module.exports = {
     },
     disbandFederatedLogin: 'Disband federated login',
     disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
+  },
+  optionsOrder: {
+    1: 'Option One',
+    2: 'Option Two'
   }
 };

package/es/locales/zh.js

@@ -925,8 +925,8 @@ module.exports = {
         recordValue: '记录值'
       },
       verify: {
-        ok: '该站点解析正常',
-        notResolved: '改站点解析异常，请检查你域名服务商的 DNS 配置'
+        ok: '该域名解析正常',
+        notResolved: '该域名解析异常，请检查你域名服务商的 DNS 配置'
       },
       https: {
         ok: '该域名已启用 HTTPS',
@@ -939,8 +939,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: '输入域名',
-      nftDomain: 'NFT 域名',
+      inputDomain: '手动配置域名',
+      nftDomain: '通过 DID Domain 自动配置域名',
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
@@ -1598,13 +1598,23 @@ module.exports = {
     federated: '统一登录'
   },
   expiration: {
-    tips: {
-      success: '订阅将在{validity}后到期',
-      warning: '订阅将在{validity}后到期',
-      error: '订阅已过期'
+    mobile: {
+      tips: {
+        success: '{validity}',
+        warning: '{validity}',
+        error: '订阅已过期'
+      },
+      loadFailed: '请重试!'
     },
-    loadFailed: '加载订阅信息失败，请重试!',
-    loading: '加载订阅信息...'
+    desktop: {
+      tips: {
+        success: '订阅将在{validity}后到期',
+        warning: '订阅将在{validity}后到期',
+        error: '订阅已过期'
+      },
+      loadFailed: '加载订阅信息失败，请重试!',
+      loading: '加载订阅信息...'
+    }
   },
   analytics: {
     trend: '趋势',
@@ -1669,5 +1679,9 @@ module.exports = {
     },
     disbandFederatedLogin: '解散统一登录',
     disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
+  },
+  optionsOrder: {
+    1: '选择一',
+    2: '选择二'
   }
 };

package/es/schema-form/index.js

@@ -16,6 +16,14 @@ import Uploader from '../blocklet/logo-uploader';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+const componentMap = {
+  input: TextInput,
+  color: ColorInput,
+  passport: PassportInput,
+  uploader: props => /*#__PURE__*/_jsx(Uploader, {
+    ...props.componentProps
+  })
+};
 function getComponent(item, {
   editing = false
 }) {
@@ -24,6 +32,7 @@ function getComponent(item, {
     render,
     renderFormItem
   } = item;
+
   // if provided renderItem and editing is true, use it
   if (editing && renderFormItem) {
     return renderFormItem;
@@ -33,14 +42,6 @@ function getComponent(item, {
   if (!editing && render) {
     return render;
   }
-  const componentMap = {
-    input: TextInput,
-    color: ColorInput,
-    passport: PassportInput,
-    uploader: props => /*#__PURE__*/_jsx(Uploader, {
-      ...props.componentProps
-    })
-  };
   return componentMap[componentType?.toLowerCase()];
 }
 export default function SchemaForm({