@abtnode/ux 1.16.18-beta-7aa6be5a → 1.16.18-beta-bb4ebacc

package/es/locales/en.js

@@ -81,6 +81,7 @@ module.exports = {
     instances: 'Number of instances'
   },
   common: {
+    invalid: 'Invalid',
     about: 'About',
     access: 'Access',
     accessKey: 'Access Keys',
@@ -100,6 +101,7 @@ module.exports = {
     back: 'Back',
     basic: 'Basic',
     basicInfo: 'Basic Information',
+    profile: 'Profile',
     bind: 'Bind',
     blocklet: 'Blocklet',
     blocklets: 'Blocklets',
@@ -153,6 +155,7 @@ module.exports = {
     downloading: 'Downloading',
     edit: 'Edit',
     email: 'Email',
+    phone: 'Phone',
     empty: 'Empty',
     emptyData: 'No results found',
     enable: 'Enable',
@@ -394,9 +397,9 @@ module.exports = {
       securityError: 'SecurityError: Can not open the admin url from accessing a cross-origin frame'
     },
     config: {
-      name: 'Blocklet Name',
-      description: 'Blocklet Description',
-      sk: 'Secret key for the blocklet wallet',
+      name: 'App Name',
+      description: 'App Description',
+      sk: 'Secret key for the app wallet',
       logoSquare: 'App Logo',
       logoRect: 'Rect logo',
       logoRectDesc: 'Usually displayed at the top of the page, default to app logo',
@@ -417,7 +420,7 @@ module.exports = {
       languages: 'Supported Languages',
       selectLanguagesTip: 'Adjust the order by removing and re-adding',
       passportColor: 'Passport Color',
-      appUrl: 'Blocklet URL',
+      appUrl: 'App URL',
       access: {
         title: 'Who Can Access',
         description: 'Who can access the blocklet',
@@ -568,6 +571,7 @@ module.exports = {
         fromUrl: 'Add Component From Url'
       },
       addNext: 'Add {name}',
+      upgradeNext: 'Upgrade {name}',
       setting: 'Settings'
     },
     router: {
@@ -1106,7 +1110,24 @@ module.exports = {
         passportEmpty: 'Passport should not be empty'
       },
       connectedAccounts: 'Connected Accounts',
-      federated: 'Federated'
+      connections: 'Connections',
+      federated: 'Federated',
+      switch: {
+        did: 'Switch DID',
+        profile: 'Switch Profile',
+        passport: 'Switch Passport'
+      },
+      settings: {
+        notification: 'Notifications',
+        email: 'Send email to me when some events happen',
+        wallet: 'Send notification to my wallet when some events happen',
+        phone: 'Send text message to me when some events happen',
+        webhook: 'Webhooks',
+        add: 'Add new webhook',
+        url: 'Custom URL',
+        slack: 'Slack Webhook',
+        tested: 'Test message sent'
+      }
     },
     transferNode: {
       name: 'Transfer Ownership',

package/es/locales/zh.js

@@ -84,6 +84,7 @@ module.exports = {
     instances: '实例数'
   },
   common: {
+    invalid: '无效',
     about: '关于',
     access: '访问',
     accessKey: '访问秘钥',
@@ -103,6 +104,7 @@ module.exports = {
     back: '返回',
     basic: '基础',
     basicInfo: '基础信息',
+    profile: '信息',
     bind: '绑定',
     blocklet: '基石程序',
     blocklets: '基石程序',
@@ -157,6 +159,7 @@ module.exports = {
     downloading: '下载中',
     edit: '编辑',
     email: '邮箱',
+    phone: '电话',
     empty: '暂无',
     emptyData: '未找到结果',
     enable: '启用',
@@ -575,6 +578,7 @@ module.exports = {
         fromUrl: '通过 URL 选择组件'
       },
       addNext: '添加 {name}',
+      upgradeNext: '升级 {name}',
       setting: '参数设置'
     },
     router: {
@@ -1109,7 +1113,24 @@ module.exports = {
         passportEmpty: '通行证不能为空'
       },
       connectedAccounts: '已连接账号',
-      federated: '统一登录'
+      connections: '账号绑定',
+      federated: '统一登录',
+      switch: {
+        did: '添加账户',
+        profile: '更新身份',
+        passport: '切换通行证'
+      },
+      settings: {
+        notification: '通知设置',
+        email: '当有动态时给我发送邮件',
+        wallet: '当有动态时给我发送钱包通知',
+        phone: '当有动态时给我发送短信',
+        webhook: '外部钩子',
+        add: '添加新钩子',
+        url: '自定义 URL',
+        slack: 'Slack 通知',
+        tested: '测试消息已经发送'
+      }
     },
     transferNode: {
       name: '转移所有者',

package/es/logs/log-terminal.js

@@ -34,7 +34,8 @@ export function LogTerminalGroup({
     error: 'Error',
     access: 'Access',
     stdout: 'stdout',
-    stderr: 'stderr'
+    stderr: 'stderr',
+    pm2: 'PM2'
   };
   const isMobile = useMediaQuery(theme => theme.breakpoints.down('md'));
   const [currentType, setCurrentType] = useState(types[defaultTypeIndex || 0]);

package/es/schema-form/index.js

@@ -12,6 +12,7 @@ import TextInput from './text-input';
 import PassportInput from './passport-input';
 import Required from '../form/required';
 import FormWrapper from '../form/form-wrapper';
+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";
@@ -35,7 +36,10 @@ function getComponent(item, {
   const componentMap = {
     input: TextInput,
     color: ColorInput,
-    passport: PassportInput
+    passport: PassportInput,
+    uploader: props => /*#__PURE__*/_jsx(Uploader, {
+      ...props.componentProps
+    })
   };
   return componentMap[componentType?.toLowerCase()];
 }
@@ -119,6 +123,7 @@ export default function SchemaForm({
         key,
         description,
         required,
+        solo = false,
         hidden = false,
         componentProps = {}
       } = x;
@@ -146,7 +151,7 @@ export default function SchemaForm({
       };
       return /*#__PURE__*/_jsxs(Box, {
         className: "form-item",
-        children: [/*#__PURE__*/_jsxs(Box, {
+        children: [!solo && /*#__PURE__*/_jsxs(Box, {
           className: "form-item-label",
           style: {
             color: required && !currentValue ? '#ff0000' : '#333'
@@ -156,10 +161,13 @@ export default function SchemaForm({
           className: "form-item-body",
           children: [/*#__PURE__*/_jsx(Box, {
             className: "form-item-input",
+            sx: {
+              textAlign: solo ? 'center' : 'left'
+            },
             children: /*#__PURE__*/_jsx(CurrentComponent, {
               ...renderComponentProps
             })
-          }), /*#__PURE__*/_jsx(Box, {
+          }), !solo && /*#__PURE__*/_jsx(Box, {
             className: "form-item-action",
             children: editing ? /*#__PURE__*/_jsxs(_Fragment, {
               children: [/*#__PURE__*/_jsx(IconButton, {

package/es/team/members/connections.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import InfoRow from '@arcblock/ux/lib/InfoRow';
+import DidAddress from '../../did-address';
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function UserConnections({
+  user
+}) {
+  const connectedAccounts = user.connectedAccounts || [];
+  return connectedAccounts.map(account => {
+    return /*#__PURE__*/_jsx(InfoRow, {
+      style: {
+        alignItems: 'flex-start'
+      },
+      valueComponent: "div",
+      nameWidth: 120,
+      name: account.provider,
+      children: /*#__PURE__*/_jsx(DidAddress, {
+        did: account.did
+      })
+    }, account.did);
+  });
+}
+UserConnections.propTypes = {
+  user: PropTypes.object.isRequired
+};
+UserConnections.defaultProps = {};

package/es/team/members/member.js

@@ -26,6 +26,7 @@ import PassportIssuances from './passport-issuances';
 import Passports from './passports';
 import ToggleUserApproval from './toggle-user-approval';
 import { parseAvatar } from './util';
+import UserConnections from './connections';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function LinkUser({
@@ -47,31 +48,6 @@ function LinkUser({
 LinkUser.propTypes = {
   name: PropTypes.string.isRequired
 };
-function TabOAuth({
-  user
-}) {
-  const connectedAccounts = user.connectedAccounts || [];
-  return connectedAccounts.map(account => {
-    return /*#__PURE__*/_jsx(InfoRow, {
-      style: {
-        alignItems: 'flex-start'
-      },
-      valueComponent: "div",
-      nameWidth: 120,
-      name: account.provider,
-      children: /*#__PURE__*/_jsx(DidAddress, {
-        did: account.did
-      })
-    }, account.did);
-  });
-}
-TabOAuth.propTypes = {
-  user: PropTypes.object.isRequired,
-  onChangeUser: PropTypes.func
-};
-TabOAuth.defaultProps = {
-  onChangeUser: () => {}
-};
 const defaultTab = 'info';
 export default function Member({
   userDid,
@@ -232,7 +208,7 @@ export default function Member({
     oauth: {
       label: t('team.member.connectedAccounts'),
       value: 'oauth',
-      component: () => /*#__PURE__*/_jsx(TabOAuth, {
+      component: () => /*#__PURE__*/_jsx(UserConnections, {
         user: pageState.user,
         onChangeUser: handleChangeUser
       })

package/es/team/members/passport-item.js

@@ -0,0 +1,104 @@
+/* eslint-disable prettier/prettier */
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from '@emotion/styled';
+import upperFirst from 'lodash/upperFirst';
+import Box from '@mui/material/Box';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import RevokeIcon from '@arcblock/icons/lib/RevokeIcon';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function PassportItem({
+  passport,
+  user,
+  color,
+  width,
+  icon,
+  children,
+  createPassportSvg,
+  ...rest
+}) {
+  const {
+    t
+  } = useLocaleContext();
+  return /*#__PURE__*/_jsxs(Root, {
+    display: "flex",
+    alignItems: "center",
+    ...rest,
+    children: [/*#__PURE__*/_jsx("div", {
+      // eslint-disable-next-line react/no-danger
+      dangerouslySetInnerHTML: {
+        __html: createPassportSvg({
+          title: passport.title || passport.name,
+          issuer: passport.issuer && passport.issuer.name,
+          issuerDid: passport.issuer && passport.issuer.id,
+          ownerName: user.fullName,
+          ownerDid: user.did,
+          ownerAvatarUrl: user.avatar,
+          revoked: passport.revoked,
+          preferredColor: color,
+          width
+        })
+      }
+    }), /*#__PURE__*/_jsxs("div", {
+      className: "body",
+      children: [/*#__PURE__*/_jsxs(Box, {
+        className: "title",
+        display: "flex",
+        alignItems: "center",
+        children: [upperFirst(passport.title), /*#__PURE__*/_jsxs("div", {
+          className: "status-icons",
+          children: [icon, passport.revoked && /*#__PURE__*/_jsx(RevokeIcon, {})]
+        })]
+      }), passport.expirationDate && /*#__PURE__*/_jsx(Box, {
+        className: "title",
+        display: "flex",
+        alignItems: "center",
+        children: t('team.passport.validUntil', {
+          date: passport.expirationDate
+        })
+      }), children]
+    })]
+  });
+}
+PassportItem.propTypes = {
+  passport: PropTypes.any.isRequired,
+  user: PropTypes.any.isRequired,
+  color: PropTypes.string.isRequired,
+  createPassportSvg: PropTypes.func.isRequired,
+  icon: PropTypes.any,
+  children: PropTypes.any,
+  width: PropTypes.number
+};
+PassportItem.defaultProps = {
+  icon: null,
+  children: null,
+  width: 150
+};
+const Root = styled(Box)`
+  .body {
+    padding: 0;
+    margin-left: 24px;
+    margin-top: 0;
+  }
+  .title {
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 19px;
+    color: #222222;
+  }
+  .tip {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    margin-top: 6px;
+    color: #bbb;
+  }
+  .status-icons {
+    svg {
+      fill: #bfbfbf;
+      height: 1.2em;
+      margin-left: 0.4em;
+    }
+  }
+`;

package/es/team/members/passports.js

@@ -1,9 +1,8 @@
 /* eslint-disable prettier/prettier */
-import { useState } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import get from 'lodash/get';
-import upperFirst from 'lodash/upperFirst';
 import Toast from '@arcblock/ux/lib/Toast';
 import AddIcon from '@mui/icons-material/Add';
 import Box from '@mui/material/Box';
@@ -26,6 +25,7 @@ import Permission from '../../permission';
 import SearchInput from '../search-input';
 import ListHeader from '../styles/list-header';
 import IssuePassport from './issue-passport';
+import PassportItem from './passport-item';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function ConfirmDescription({
@@ -210,60 +210,30 @@ export default function Passports({
           justifyContent: "space-between",
           alignItems: "center",
           mt: 3,
-          children: [/*#__PURE__*/_jsxs(Box, {
-            display: "flex",
-            alignItems: "center",
-            children: [/*#__PURE__*/_jsx("div", {
-              // eslint-disable-next-line react/no-danger
-              dangerouslySetInnerHTML: {
-                __html: createPassportSvg({
-                  title: x.title || x.name,
-                  issuer: x.issuer && x.issuer.name,
-                  issuerDid: x.issuer && x.issuer.id,
-                  ownerName: user.fullName,
-                  ownerDid: user.did,
-                  ownerAvatarUrl: user.avatar,
-                  revoked: x.revoked,
-                  preferredColor: passportColor,
-                  width: '150px'
+          children: [/*#__PURE__*/_jsx(PassportItem, {
+            passport: x,
+            user: user,
+            color: passportColor,
+            createPassportSvg: createPassportSvg,
+            icon: !!appIdList.length && !appIdList.includes(x.issuer.id) ? /*#__PURE__*/_jsx(ExternalIssuerIcon, {}) : null,
+            children: !!appIdList.length && !appIdList.includes(x.issuer.id) && /*#__PURE__*/_jsxs("div", {
+              className: "tip",
+              children: [x.issuer.id !== teamIssuerDid && !trustedPassports.some(y => y.issuerDid === x.issuer.id) && /*#__PURE__*/_jsx(Tooltip, {
+                title: t('team.passport.notTrustedIssuerTip'),
+                children: /*#__PURE__*/_jsx(Box, {
+                  component: ErrorOutlineIcon,
+                  style: {
+                    fontSize: '1.3em'
+                  },
+                  color: "error.main",
+                  mr: 0.5
                 })
-              }
-            }), /*#__PURE__*/_jsxs("div", {
-              className: "body",
-              children: [/*#__PURE__*/_jsxs(Box, {
-                className: "title",
-                display: "flex",
-                alignItems: "center",
-                children: [upperFirst(x.title), /*#__PURE__*/_jsxs("div", {
-                  className: "status-icons",
-                  children: [!!appIdList.length && !appIdList.includes(x.issuer.id) && /*#__PURE__*/_jsx(ExternalIssuerIcon, {}), x.revoked && /*#__PURE__*/_jsx(RevokeIcon, {})]
-                })]
-              }), x.expirationDate && /*#__PURE__*/_jsx(Box, {
-                className: "title",
-                display: "flex",
-                alignItems: "center",
-                children: t('team.passport.validUntil', {
-                  date: x.expirationDate
+              }), /*#__PURE__*/_jsx("span", {
+                children: t('team.passport.issueBy', {
+                  name: x.issuer.name
                 })
-              }), !!appIdList.length && !appIdList.includes(x.issuer.id) && /*#__PURE__*/_jsxs("div", {
-                className: "tip",
-                children: [x.issuer.id !== teamIssuerDid && !trustedPassports.some(y => y.issuerDid === x.issuer.id) && /*#__PURE__*/_jsx(Tooltip, {
-                  title: t('team.passport.notTrustedIssuerTip'),
-                  children: /*#__PURE__*/_jsx(Box, {
-                    component: ErrorOutlineIcon,
-                    style: {
-                      fontSize: '1.3em'
-                    },
-                    color: "error.main",
-                    mr: 0.5
-                  })
-                }), /*#__PURE__*/_jsx("span", {
-                  children: t('team.passport.issueBy', {
-                    name: x.issuer.name
-                  })
-                })]
               })]
-            })]
+            })
           }), /*#__PURE__*/_jsx(Box, {
             children: revokeInfo(can, x).revokable ? /*#__PURE__*/_jsxs(Button, {
               variant: "outlined",
@@ -326,31 +296,6 @@ Passports.defaultProps = {
 };
 const Div = styled.div`
   .passport-item {
-    .body {
-      padding: 0;
-      margin-left: 24px;
-      margin-top: 0;
-    }
-    .title {
-      font-weight: 400;
-      font-size: 16px;
-      line-height: 19px;
-      color: #222222;
-    }
-    .tip {
-      display: flex;
-      align-items: center;
-      font-size: 14px;
-      margin-top: 6px;
-      color: #bbb;
-    }
-    .status-icons {
-      svg {
-        fill: #bfbfbf;
-        height: 1.2em;
-        margin-left: 0.4em;
-      }
-    }
     .MuiButton-outlinedSecondary {
       color: #f16e6e;
       fill: #f16e6e;

package/lib/blocklet/actions.js

@@ -94,7 +94,6 @@ function BlockletActions(_ref) {
         });
         setLoading(true);
         setCurrentAction(action);
-        setConfirmSetting(null);
         let isRemoved = false;
         try {
           if (action === 'remove') {
@@ -151,6 +150,7 @@ function BlockletActions(_ref) {
           if (action === 'reload') {
             _Toast.default.success(t('blocklet.reloadSuccess'));
           }
+          setConfirmSetting(null);
           onComplete({
             action,
             blocklet
@@ -162,6 +162,7 @@ function BlockletActions(_ref) {
             blocklet,
             error: new Error(errMsg)
           });
+          throw new Error(errMsg);
         } finally {
           if (!isRemoved) {
             setLoading(false);
@@ -276,7 +277,6 @@ function BlockletActions(_ref) {
       e.preventDefault();
       // eslint-disable-next-line no-empty
     } catch (_unused3) {}
-    setAnchorEl(null);
     if (typeof action.handler === 'function') {
       try {
         setLoading(true);
@@ -287,7 +287,10 @@ function BlockletActions(_ref) {
         console.error("Blocklet ".concat(action.name, " failed: "), err);
       } finally {
         setLoading(false);
+        setAnchorEl(null);
       }
+    } else {
+      setAnchorEl(null);
     }
   };
   const removeAction = !inService && (0, _util.isDeletableBlocklet)(blocklet) ? {
@@ -413,13 +416,18 @@ function BlockletActions(_ref) {
           return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
             dense: true,
             onClick: e => onAction(action, e),
-            disabled: action.disabled,
+            disabled: loading || action.disabled,
             "data-cy": "".concat(action.action, "-blocklet"),
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemIcon.default, {
               style: {
                 minWidth: 24
               },
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(action.icon, {
+              children: currentAction === action.action && loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+                size: 16,
+                sx: {
+                  marginRight: 1
+                }
+              }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(action.icon, {
                 fontSize: "small"
               })
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemText.default, {
@@ -447,8 +455,11 @@ function BlockletActions(_ref) {
         "data-cy": "".concat(action.action, "-blocklet"),
         onClick: () => onAction(action),
         disabled: Boolean(action.disabled) || loading,
-        children: [currentAction === action.action && loading && inProgress ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [currentAction === action.action && loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16,
+          sx: {
+            marginRight: 1
+          }
         }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(action.icon, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: "blocklet-action-text",
           children: action.name

package/lib/blocklet/add-cert.js

@@ -19,6 +19,7 @@ var _blocklet = require("../contexts/blocklet");
 var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["domain", "domainStatus"];
+/* eslint-disable react/no-unused-prop-types */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }