@abtnode/ux 1.8.37 → 1.8.38

package/lib/blocklet/access/config-access.js

@@ -0,0 +1,299 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = ConfigAccess;
+exports.getComponentWhoCanAccess = void 0;
+var _react = require("react");
+var _get = _interopRequireDefault(require("lodash/get"));
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
+var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
+var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
+var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
+var _Group = _interopRequireDefault(require("@mui/icons-material/Group"));
+var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
+var _ListItemText = _interopRequireDefault(require("@mui/material/ListItemText"));
+var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
+var _constant = require("@blocklet/constant");
+var _constant2 = require("@abtnode/constant");
+var _util = require("@blocklet/meta/lib/util");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _node = require("../../contexts/node");
+var _team = require("../../contexts/team");
+var _util2 = require("../../util");
+var _toast = _interopRequireDefault(require("../../toast"));
+var _config = _interopRequireDefault(require("../../who-can-access/config"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _templateObject, _templateObject2;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+const CONFIG_ROLE = 'roles';
+const Configs = [..._config.default, {
+  value: CONFIG_ROLE,
+  icon: _Group.default,
+  title: {
+    zh: '指定通行证可访问',
+    en: 'Accessible to passports'
+  },
+  description: {
+    zh: '只有指定的通行证可以访问',
+    en: 'Only specified passports can access'
+  }
+}];
+const getAccess = (whoCanAccess, roleStore) => {
+  if (whoCanAccess && whoCanAccess.startsWith(_constant2.WHO_CAN_ACCESS_PREFIX_ROLES)) {
+    const roleNames = (0, _util.getRolesFromAuthConfig)({
+      whoCanAccess
+    });
+    const filterRoles = roleStore.filter(x => roleNames.includes(x.name));
+    return {
+      access: CONFIG_ROLE,
+      roles: filterRoles
+    };
+  }
+  return {
+    access: whoCanAccess,
+    roles: []
+  };
+};
+const getComponentWhoCanAccess = function getComponentWhoCanAccess(component, app) {
+  let {
+    roles = []
+  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const access = (component.configs || []).find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.COMPONENT_ACCESS_WHO);
+  if (access) {
+    return getAccess(access.value, roles);
+  }
+  if (app && (0, _get.default)(app, 'settings.whoCanAccess') && (0, _get.default)(app, 'settings.whoCanAccess') !== _constant2.WHO_CAN_ACCESS.ALL) {
+    return getAccess((0, _get.default)(app, 'settings.whoCanAccess'), roles);
+  }
+  const service = (0, _util.findServiceFromMeta)(component.meta, _constant2.NODE_SERVICES.AUTH);
+  if ((0, _get.default)(service, 'config.whoCanAccess')) {
+    return getAccess(service.config.whoCanAccess, roles);
+  }
+  return {
+    access: _constant2.WHO_CAN_ACCESS.ALL,
+    roles: []
+  };
+};
+exports.getComponentWhoCanAccess = getComponentWhoCanAccess;
+function ConfigAccess(_ref) {
+  let {
+    blocklet,
+    ancestors,
+    children
+  } = _ref;
+  const theme = (0, _useTheme.default)();
+  const [showDialog, setShowDialog] = (0, _react.useState)('');
+  const {
+    t,
+    locale
+  } = (0, _context.useLocaleContext)();
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const {
+    roles: roleList
+  } = (0, _team.useTeamContext)();
+  const [loading, setLoading] = (0, _react.useState)('');
+  const root = ancestors[0] || blocklet;
+  const {
+    access: defaultValue,
+    roles: defaultRoles
+  } = getComponentWhoCanAccess(blocklet, root, {
+    roles: roleList
+  });
+  const [whoCanAccess, setWhoCanAccess] = (0, _react.useState)(defaultValue);
+  const [roles, setRoles] = (0, _react.useState)(defaultRoles);
+  const dids = [...ancestors.map(x => x.meta.did), blocklet.meta.did];
+  const iconStyle = {
+    marginRight: 4,
+    fontSize: 18,
+    verticalAlign: 'text-bottom',
+    color: theme.palette.text.secondary
+  };
+  const componentName = ancestors.concat(blocklet).map(x => (0, _util.getDisplayName)(x, true)).join(' / ');
+  if ((0, _util2.isInstalling)(blocklet.status)) {
+    return null;
+  }
+  if (blocklet.status === 'unknown' && (0, _util2.isInstalling)(blocklet.status)) {
+    return null;
+  }
+  const onClose = () => {
+    setShowDialog(false);
+  };
+  const onOpen = e => {
+    e.stopPropagation();
+    // eslint-disable-next-line no-unused-expressions
+    setShowDialog(true);
+  };
+  const onWhoCanAccessChange = e => {
+    const {
+      value
+    } = e.target;
+    setWhoCanAccess(value);
+  };
+  const onRolesChange = e => {
+    setRoles(roleList.filter(x => (e.target.value || []).includes(x.name)));
+  };
+  const onConfirm = async () => {
+    if (loading) {
+      return;
+    }
+    setLoading(true);
+    try {
+      let value = whoCanAccess;
+      if (value === CONFIG_ROLE) {
+        value = "".concat(_constant2.WHO_CAN_ACCESS_PREFIX_ROLES).concat(roles.map(x => x.name).join(','));
+      }
+      await api.updateWhoCanAccess({
+        input: {
+          did: dids,
+          whoCanAccess: value
+        }
+      });
+      _toast.default.success(t('blocklet.config.access.updatedTip'));
+      onClose();
+      setLoading(false);
+    } catch (err) {
+      setLoading(false);
+      _toast.default.error((0, _util2.formatError)(err));
+    }
+  };
+  const disabled = loading || whoCanAccess === CONFIG_ROLE && !roles.length;
+  return [typeof children === 'function' ? children({
+    open: onOpen
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+    onClick: onOpen,
+    "data-cy": "action-config-component",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Edit.default, {})
+  }), showDialog && /*#__PURE__*/(0, _jsxRuntime.jsxs)(StyledDialog, {
+    open: true,
+    fullWidth: true,
+    title: componentName,
+    onClose: onClose,
+    PaperProps: {
+      style: {
+        minHeight: 'auto'
+      }
+    },
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        onClick: onClose,
+        color: "inherit",
+        children: t('common.cancel')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+        onClick: onConfirm,
+        color: "primary",
+        disabled: disabled,
+        variant: "contained",
+        autoFocus: true,
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
+        }), t('common.confirm')]
+      })]
+    }),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mt: 4,
+      mb: 3,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
+        label: t('blocklet.config.access.description'),
+        select: true,
+        fullWidth: true,
+        value: whoCanAccess,
+        onChange: onWhoCanAccessChange,
+        SelectProps: {
+          renderValue: selected => {
+            const d = Configs.find(x => x.value === selected);
+            return d ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(d.icon, {
+                style: iconStyle
+              }), d.title[locale]]
+            }) : null;
+          }
+        },
+        children: Configs.map(d => {
+          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(StyledMenuItem, {
+            value: d.value,
+            sx: {
+              display: 'block'
+            },
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+              display: "flex",
+              alignItems: "center",
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(d.icon, {
+                style: iconStyle
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                children: d.title[locale]
+              })]
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                className: "tip",
+                children: d.description[locale]
+              })
+            })]
+          });
+        })
+      })
+    }), whoCanAccess === CONFIG_ROLE && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mt: 4,
+      mb: 3,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
+        label: t('blocklet.config.access.description'),
+        select: true,
+        fullWidth: true,
+        value: roles.map(x => x.name),
+        onChange: onRolesChange,
+        SelectProps: {
+          multiple: true,
+          renderValue: selected => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            sx: {
+              display: 'flex',
+              flexWrap: 'wrap',
+              gap: 0.5
+            },
+            children: selected.map(value => {
+              const role = roleList.find(x => x.name === value);
+              return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
+                label: role.title
+              }, role.text);
+            })
+          })
+        },
+        children: roleList.map(_ref2 => {
+          let {
+            name,
+            title
+          } = _ref2;
+          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
+            value: name,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+              checked: roles.some(x => x.name === name)
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemText.default, {
+              primary: title
+            })]
+          }, name);
+        })
+      })
+    })]
+  })];
+}
+ConfigAccess.propTypes = {
+  blocklet: _propTypes.default.object.isRequired,
+  ancestors: _propTypes.default.array,
+  children: _propTypes.default.any
+};
+ConfigAccess.defaultProps = {
+  ancestors: [],
+  children: null
+};
+const StyledDialog = (0, _styled.default)(_Dialog.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .MuiDialogContent-root {\n    padding-top: 0;\n    margin-top: -32px;\n  }\n  .MuiToolbar-root {\n    padding-right: 12px;\n  }\n  .ux-dialog_right {\n    padding-right: 20px;\n  }\n"])));
+const StyledMenuItem = (0, _styled.default)(_MenuItem.default)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .tip {\n    font-size: 12px;\n    color: ", ";\n  }\n"])), props => props.theme.palette.text.secondary);

package/lib/blocklet/access/index.js

@@ -0,0 +1,220 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = BlockletAccess;
+var _react = require("react");
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
+var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
+var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
+var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
+var _Collapse = _interopRequireDefault(require("@mui/material/Collapse"));
+var _Launch = _interopRequireDefault(require("@mui/icons-material/Launch"));
+var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
+var _util = require("@blocklet/meta/lib/util");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
+var _blocklet = require("../../contexts/blocklet");
+var _team = require("../../contexts/team");
+var _util2 = require("../../util");
+var _line = _interopRequireDefault(require("../component/line"));
+var _avatar = _interopRequireDefault(require("../avatar"));
+var _configAccess = _interopRequireWildcard(require("./config-access"));
+var _config = _interopRequireDefault(require("../../who-can-access/config"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _templateObject;
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function ComponentItem(_ref) {
+  var _blocklet$children;
+  let {
+    blocklet,
+    ancestors,
+    depth
+  } = _ref;
+  const theme = (0, _useTheme.default)();
+  const {
+    t,
+    locale
+  } = (0, _context.useLocaleContext)();
+  const {
+    roles: roleList
+  } = (0, _team.useTeamContext)();
+  const [expand, setExpand] = (0, _react.useState)(true);
+  const {
+    recommendedDomain: domain
+  } = (0, _blocklet.useBlockletContext)();
+  const app = ancestors[0] || blocklet;
+  const mountPoint = "/".concat(ancestors.map(x => x.mountPoint || '/').join('/'), "/").concat(blocklet.mountPoint || '/').replace(/\/+/g, '/');
+  const href = (0, _util2.getBlockletUrl)({
+    blocklet: app,
+    domain: {
+      value: domain
+    },
+    mountPoint,
+    params: (0, _util2.getBlockletUrlParams)(app, locale)
+  });
+  const iconStyle = {
+    fill: theme.palette.text.secondary
+  };
+  const canExpand = depth > 0 && blocklet.children.length > 0;
+  const expandIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+    size: "small",
+    children: expand ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {
+      fontSize: "inherit"
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChevronRight.default, {
+      fontSize: "inherit"
+    })
+  });
+  const {
+    access: whoCanAccess,
+    roles
+  } = (0, _configAccess.getComponentWhoCanAccess)(blocklet, app, {
+    roles: roleList
+  });
+  let accessConfig;
+  if (whoCanAccess !== 'roles') {
+    accessConfig = _config.default.find(x => x.value === whoCanAccess) || _config.default[2];
+  } else {
+    const str = roles.map(x => x.title).join('/');
+    accessConfig = {
+      title: {
+        zh: "\u53EA\u6709 ".concat(str, " \u53EF\u4EE5\u8BBF\u95EE"),
+        en: "Only ".concat(str, " can access")
+      }
+    };
+  }
+  return [(depth > 0 || blocklet.meta.group !== 'gateway') && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+    display: "flex",
+    py: 2,
+    className: "component-item",
+    justifyContent: "space-between",
+    alignItems: "center",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      pl: Math.max((depth - 1) * 2, 0),
+      width: {
+        xs: 300,
+        md: 400
+      },
+      display: "flex",
+      alignItems: "center",
+      style: {
+        cursor: canExpand ? 'pointer' : 'cursor'
+      },
+      onClick: () => canExpand && setExpand(!expand),
+      children: [canExpand ? expandIcon : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        width: 28
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.default, {
+        blocklet: blocklet,
+        ancestors: ancestors
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+        ml: "16px",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          style: {
+            color: '#222',
+            fontSize: 18
+          },
+          children: (0, _util.getDisplayName)(blocklet, true)
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          display: "flex",
+          alignItems: "center",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            color: "text.secondary",
+            children: accessConfig.title[locale]
+          })
+        })]
+      })]
+    }, blocklet), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+        title: t('common.visit'),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+          target: "_blank",
+          href: href,
+          rel: "noopener noreferrer",
+          title: href,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Launch.default, {})
+          })
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_configAccess.default, {
+        blocklet: blocklet,
+        ancestors: ancestors,
+        children: _ref2 => {
+          let {
+            open
+          } = _ref2;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+            title: t('common.edit'),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+              onClick: open,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_EditIcon.default, {
+                style: iconStyle
+              })
+            })
+          });
+        }
+      })]
+    }, "actions")]
+  }, "group-not-gateway-box"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_line.default, {
+    depth: depth
+  }), (_blocklet$children = blocklet.children) !== null && _blocklet$children !== void 0 && _blocklet$children.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Collapse.default, {
+    in: expand,
+    children: blocklet.children.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(ComponentItem, {
+      blocklet: x,
+      ancestors: [...ancestors, blocklet],
+      depth: depth + 1
+    }, "".concat(depth + 1, "-").concat(x.meta.did)))
+  }, "blocklet-collapse") : null];
+}
+ComponentItem.propTypes = {
+  blocklet: _propTypes.default.object.isRequired,
+  ancestors: _propTypes.default.array,
+  depth: _propTypes.default.number
+};
+ComponentItem.defaultProps = {
+  ancestors: [],
+  depth: 0
+};
+function BlockletAccess() {
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const components = [...blocklet.children] || [];
+  if (blocklet.meta.group !== 'gateway') {
+    // add root blocklet to table list
+    components.unshift(blocklet);
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Div, {
+    component: "div",
+    children: components && components.length ? [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mt: 2,
+      ml: {
+        xs: '-12px',
+        md: '-24px'
+      },
+      style: {
+        maxWidth: 1080
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ComponentItem, {
+        blocklet: blocklet
+      }, "0-".concat(blocklet.meta.did))
+    }, "top-blocklet-".concat(blocklet.meta.did))] : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mt: 8,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
+        children: t('blocklet.component.noComponent')
+      })
+    })
+  });
+}
+BlockletAccess.propTypes = {};
+const Div = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .title {\n    font-size: 1.2rem;\n    font-weight: bold;\n    margin-top: ", ";\n    margin-bottom: ", ";\n    &.first {\n      margin-top: 0;\n    }\n  }\n"])), props => props.theme.spacing(5), props => props.theme.spacing(3));

package/lib/blocklet/avatar.js

@@ -32,18 +32,18 @@ function BlockletAvatar(_ref) {
   const {
     inService
   } = node;
-  let logoUrl = inService ? (0, _urlJoin.default)(_util.APP_PREFIX, _constant.WELLKNOWN_SERVICE_PATH_PREFIX, "/blocklet/logo?version=".concat(blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.version)) : (0, _urlJoin.default)(node.prefix, 'blocklet.png');
+  const search = "?version=".concat(blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.version);
+  let logoUrl = inService ? (0, _urlJoin.default)(_util.APP_PREFIX, _constant.WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo', search) : (0, _urlJoin.default)(node.prefix, 'blocklet.png');
   const {
     variant
   } = rest;
-  if (!inService) {
-    if (blocklet.source === 'registry' && blocklet.meta.logo) {
-      const deployedFrom = blocklet.deployedFrom || '/';
-      logoUrl = (0, _urlJoin.default)(deployedFrom, (0, _util.formatRegistryLogoPath)(blocklet.meta.bundleDid, blocklet.meta.logo));
-    } else {
-      const prefix = window.env.apiPrefix || '/';
-      logoUrl = (0, _urlJoin.default)(prefix, "/blocklet/logo".concat(ancestors.map(x => "/".concat(x.meta.did)).join(''), "/").concat(blocklet.meta.did));
-    }
+  if (blocklet.source === 'registry' && blocklet.deployedFrom && blocklet.meta.logo) {
+    logoUrl = (0, _urlJoin.default)(blocklet.deployedFrom, (0, _util.formatRegistryLogoPath)(blocklet.meta.bundleDid, blocklet.meta.logo), search);
+  } else {
+    const prefix = window.env.apiPrefix || '/';
+    const components = ancestors.concat(blocklet);
+    const list = inService ? components.slice(1) : components;
+    logoUrl = (0, _urlJoin.default)(prefix, "/blocklet/logo".concat(list.map(x => "/".concat(x.meta.did)).join('')), search);
   }
   const setFallBackUrl = inService ? () => {} : ev => {
     ev.target.src = "".concat(node.prefix, "/blocklet.png");

package/lib/blocklet/component/environment.js

@@ -54,7 +54,7 @@ function ComponentEnvironment(_ref) {
       _toast.default.error(t('blocklet.config.environment.keyValueRequired'));
       return;
     }
-    if (data.key.startsWith('BLOCKLET_')) {
+    if (data.key.startsWith('BLOCKLET_') || data.key.startsWith('COMPONENT_')) {
       _toast.default.error(t('blocklet.config.environment.invalidKey'));
       return;
     }

package/lib/blocklet/configuration.js

@@ -28,7 +28,6 @@ var _util = require("@blocklet/meta/lib/util");
 var _toast = _interopRequireDefault(require("../toast"));
 var _schemaForm = _interopRequireDefault(require("../schema-form"));
 var _formTextInput = _interopRequireDefault(require("../form/form-text-input"));
-var _config = _interopRequireDefault(require("../who-can-access/config"));
 var _node = require("../contexts/node");
 var _util2 = require("../util");
 var _permission = require("../permission");
@@ -56,8 +55,7 @@ function BlockletEnvironment(_ref) {
     rest = _objectWithoutProperties(_ref, _excluded);
   const node = (0, _node.useNodeContext)();
   const {
-    t,
-    locale
+    t
   } = (0, _react.useContext)(_context.LocaleContext);
   const [cpuCores, setCpuCores] = (0, _react.useState)('');
   const [loading, setLoading] = (0, _react.useState)('');
@@ -145,30 +143,6 @@ function BlockletEnvironment(_ref) {
     defaultValue[item.key] = value;
     return _objectSpread({}, props);
   });
-  const onWhoCanAccessChange = async e => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    try {
-      const {
-        value
-      } = e.target;
-      const {
-        blocklet: data
-      } = await node.api.updateWhoCanAccess({
-        input: {
-          did: blocklet.meta.did,
-          whoCanAccess: value
-        }
-      });
-      onUpdate(data);
-    } catch (err) {
-      _toast.default.error(err.message);
-    } finally {
-      setLoading(false);
-    }
-  };
   const onPublicToStoreChange = async e => {
     if (loading) {
       return;
@@ -193,12 +167,6 @@ function BlockletEnvironment(_ref) {
       setLoading(false);
     }
   };
-  const iconStyle = {
-    marginRight: 4,
-    fontSize: 18,
-    verticalAlign: 'text-bottom',
-    color: theme.palette.text.secondary
-  };
   const onSubmitConfig = async value => {
     if (value.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE) {
       const errMessage = (0, _util2.isValidClusterSize)(value);
@@ -208,8 +176,7 @@ function BlockletEnvironment(_ref) {
       }
     }
     const params = [_objectSpread(_objectSpread({}, (0, _omit.default)(editingItem, ['childDid', 'componentType', 'componentProps'])), {}, {
-      value,
-      custom: true
+      value
     })];
     try {
       setLoading(true);
@@ -244,8 +211,7 @@ function BlockletEnvironment(_ref) {
           did: blocklet.meta.did,
           configs: [{
             key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_DELETABLE,
-            value: checked ? 'no' : 'yes',
-            custom: true
+            value: checked ? 'no' : 'yes'
           }]
         }
       });
@@ -333,54 +299,7 @@ function BlockletEnvironment(_ref) {
       }
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       className: "config-form",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        className: "config-item",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          className: "config-label",
-          children: [t('blocklet.config.access.title'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            className: "config-desc",
-            children: t('blocklet.config.access.description')
-          })]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
-          disabled: disabled,
-          select: true,
-          size: "small",
-          value: whoCanAccess,
-          onChange: onWhoCanAccessChange,
-          SelectProps: {
-            renderValue: selected => {
-              const d = _config.default.find(x => x.value === selected);
-              return d ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(d.icon, {
-                  style: iconStyle
-                }), d.title[locale]]
-              }) : null;
-            }
-          },
-          children: _config.default.map(d => {
-            return /*#__PURE__*/(0, _jsxRuntime.jsxs)(StyledMenuItem, {
-              value: d.value,
-              sx: {
-                display: 'block'
-              },
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-                display: "flex",
-                alignItems: "center",
-                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(d.icon, {
-                  style: iconStyle
-                }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  children: d.title[locale]
-                })]
-              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  className: "tip",
-                  children: d.description[locale]
-                })
-              })]
-            });
-          })
-        })]
-      }), whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: [whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-item",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           className: "config-label",
@@ -588,7 +507,6 @@ function BlockletEnvironment(_ref) {
         key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK,
         description: t('blocklet.config.sk'),
         value: blocklet.environments.find(x => x.key === 'BLOCKLET_APP_SK').value,
-        custom: true,
         secure: true
       }],
       defaultValue: {
@@ -631,5 +549,5 @@ BlockletEnvironment.defaultProps = {
   onUpdate: () => {},
   hasPermission: false
 };
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .config-form {\n    flex-grow: 1;\n    overflow-y: auto;\n    ", " {\n      width: 100%;\n      flex-shrink: 0;\n      padding: 0 24px;\n      transform: translate(0, 0);\n      max-height: 60vh;\n    }\n  }\n\n  .config-item {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 16px 0;\n  }\n\n  .config-label {\n    font-weight: bold;\n  }\n\n  .config-desc {\n    font-weight: normal;\n    font-size: 12px;\n    color: #666;\n  }\n\n  .form-item {\n    margin-top: 0;\n  }\n"])), props => props.theme.breakpoints.down('md'));
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding-top: 24px;\n  .config-form {\n    flex-grow: 1;\n    overflow-y: auto;\n    ", " {\n      width: 100%;\n      flex-shrink: 0;\n      padding: 0 24px;\n      transform: translate(0, 0);\n      max-height: 60vh;\n    }\n  }\n\n  .config-item {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 16px 0;\n  }\n\n  .config-label {\n    font-weight: bold;\n  }\n\n  .config-desc {\n    font-weight: normal;\n    font-size: 12px;\n    color: #666;\n  }\n\n  .form-item {\n    margin-top: 0;\n  }\n"])), props => props.theme.breakpoints.down('md'));
 const StyledMenuItem = (0, _styled.default)(_MenuItem.default)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .tip {\n    font-size: 12px;\n    color: ", ";\n  }\n"])), props => props.theme.palette.text.secondary);

package/lib/blocklet/overview.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BlockletOverview;
-var _react = require("react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -18,6 +17,7 @@ var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _blocklet = require("../contexts/blocklet");
+var _node = require("../contexts/node");
 var _util2 = require("../util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
 var _blockletSource = _interopRequireDefault(require("./blocklet-source"));
@@ -44,7 +44,7 @@ function DomainLink(_ref) {
   } = _ref;
   const {
     t
-  } = (0, _react.useContext)(_context.LocaleContext);
+  } = (0, _context.useLocaleContext)();
   const {
     href,
     accessibility
@@ -113,7 +113,11 @@ function BlockletOverview(_ref2) {
     rest = _objectWithoutProperties(_ref2, _excluded);
   const {
     t
-  } = (0, _react.useContext)(_context.LocaleContext);
+  } = (0, _context.useLocaleContext)();
+  const {
+    info: nodeInfo,
+    inService
+  } = (0, _node.useNodeContext)();
   const {
     loadingRuntimeInfo
   } = (0, _blocklet.useBlockletContext)();
@@ -183,21 +187,26 @@ function BlockletOverview(_ref2) {
       did: blocklet.settings.owner.did
     }) : '--'
   }].filter(Boolean);
+  if (inService) {
+    infoRows.push({
+      name: t('common.serverDid'),
+      value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+        did: nodeInfo.did
+      })
+    }, {
+      name: t('common.serverVersion'),
+      value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
+        children: nodeInfo.version
+      })
+    });
+  }
   const engineRows = getEngineRows(blocklet.engine, t);
   const renderRows = rows => rows.map(row => {
-    if (row.name === t('common.did') || row.name === t('blocklet.appId')) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
-        valueComponent: "div",
-        nameWidth: 120,
-        name: row.name,
-        nameFormatter: () => row.name,
-        children: row.value
-      }, row.name);
-    }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
       valueComponent: "div",
       nameWidth: 120,
       name: row.name,
+      nameFormatter: () => row.name,
       children: row.value
     }, row.name);
   });

package/lib/blocklet/preferences/index.js

@@ -12,11 +12,16 @@ var _urlJoin = _interopRequireDefault(require("url-join"));
 var _constant = require("@abtnode/constant");
 var _material = require("@mui/material");
 var _TuneRounded = _interopRequireDefault(require("@mui/icons-material/TuneRounded"));
+var _Key = _interopRequireDefault(require("@mui/icons-material/Key"));
+var _SettingsOutlined = _interopRequireDefault(require("@mui/icons-material/SettingsOutlined"));
+var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
+var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _util = require("@blocklet/meta/lib/util");
 var _avatar = _interopRequireDefault(require("../avatar"));
 var _configuration = _interopRequireDefault(require("../configuration"));
+var _index = _interopRequireDefault(require("../access/index"));
 var _node = require("../../contexts/node");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
@@ -36,7 +41,7 @@ const addComponentTabs = function addComponentTabs(tabs, blocklet) {
   const key = [...ancestors.map(x => x.meta.did), blocklet.meta.did].join('/');
   tabs.push({
     label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      pl: (depth - 1) * 2,
+      pl: Math.max(1, depth - 1) * 2,
       display: "flex",
       alignItems: "center",
       justifyContent: "flex-start",
@@ -76,6 +81,7 @@ function BlockletPreferences(_ref) {
     inService
   } = (0, _node.useNodeContext)();
   const [current, setCurrent] = (0, _react.useState)('general');
+  const [expandPref, setExpandPref] = (0, _react.useState)(true);
   const tabs = [{
     label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       display: "flex",
@@ -95,14 +101,73 @@ function BlockletPreferences(_ref) {
       })]
     }, "general"),
     value: 'general'
+  }, {
+    label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+      display: "flex",
+      alignItems: "center",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Key.default, {
+        sx: {
+          fontSize: 24
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+        ml: "16px",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          style: {
+            color: '#222'
+          },
+          children: t('common.access')
+        })
+      })]
+    }, "access"),
+    value: 'access'
+  }, {
+    label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+      display: "flex",
+      alignItems: "center",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+        ml: -2,
+        style: {
+          transform: 'translateY(2px)'
+        },
+        children: expandPref ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {
+          fontSize: "inherit"
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChevronRight.default, {
+          fontSize: "inherit"
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingsOutlined.default, {
+        sx: {
+          fontSize: 24
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+        ml: "16px",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          style: {
+            color: '#222'
+          },
+          children: t('common.preferences')
+        })
+      })]
+    }, "preference"),
+    value: 'preference'
   }];
-  addComponentTabs(tabs, blocklet);
+  if (expandPref) {
+    addComponentTabs(tabs, blocklet);
+  }
+  const onTabChange = x => {
+    if (x === 'preference') {
+      setExpandPref(!expandPref);
+    } else {
+      setCurrent(x);
+    }
+  };
   let content = null;
   if (current === 'general') {
     content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_configuration.default, {
       blocklet: blocklet,
       onUpdate: onUpdate
     });
+  } else if (current === 'access') {
+    content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {});
   } else {
     // eslint-disable-next-line no-nested-ternary
     const pathPrefix = inService ? _constant.WELLKNOWN_SERVICE_PATH_PREFIX : process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
@@ -125,16 +190,16 @@ function BlockletPreferences(_ref) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Grid, {
       container: true,
       spacing: 4,
-      columns: 16,
+      columns: 24,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
         item: true,
-        sm: 5,
-        md: 3,
+        sm: 7,
+        md: 5,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tabs.default, {
           tabs: tabs,
           current: current,
           orientation: "vertical",
-          onChange: setCurrent,
+          onChange: onTabChange,
           sx: {
             borderRight: 1,
             height: '100%',
@@ -143,8 +208,8 @@ function BlockletPreferences(_ref) {
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
         item: true,
-        sm: 11,
-        md: 13,
+        sm: 17,
+        md: 19,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
           style: {
             minHeight: '66vh',

package/lib/blocklet/runtime-info.js

@@ -70,6 +70,7 @@ function BlockletRuntimeInfo(_ref) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
         nameWidth: 120,
         name: name,
+        nameFormatter: x => x,
         children: value
       }, name);
     })

package/lib/layout/feedback.js

@@ -14,16 +14,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function Feedback(_ref) {
   let {
-    id,
-    version,
-    bundleName
+    infos
   } = _ref;
   const {
     t
   } = (0, _context.useLocaleContext)();
+  const infoStr = infos.map(x => "* ".concat(x.label, ": ").concat(x.value)).join('\n');
   const feedbackUrl = new URL('https://github.com/blocklet/blocklet-site/issues/new');
   feedbackUrl.searchParams.set('title', '[Feedback]');
-  feedbackUrl.searchParams.set('body', "\n\n[Enter feedback here]\n\n\n---\n#### Document Details\n* App Id: ".concat(id, "\n* App Version: ").concat(version, "\n* App Bundle Name: ").concat(bundleName, "\n* Page: ").concat(window.location.href, "\n"));
+  feedbackUrl.searchParams.set('body', "<!-- [Enter feedback here] -->\n\n\n\n<!--\nDocument Details\n".concat(infoStr, "\n* Page: ").concat(window.location.href, "\n-->\n"));
   return (0, _jsxRuntime.jsx)(_material.Box, {
     sx: {
       mx: {
@@ -46,12 +45,11 @@ function Feedback(_ref) {
   });
 }
 Feedback.propTypes = {
-  id: _propTypes.default.string,
-  version: _propTypes.default.string,
-  bundleName: _propTypes.default.string
+  infos: _propTypes.default.arrayOf(_propTypes.default.shape({
+    label: _propTypes.default.string,
+    value: _propTypes.default.string
+  }))
 };
 Feedback.defaultProps = {
-  id: '',
-  version: '',
-  bundleName: ''
+  infos: []
 };

package/lib/locales/en.js

@@ -60,6 +60,7 @@ module.exports = {
   },
   common: {
     about: 'About',
+    access: 'Access',
     general: 'General',
     preferences: 'Preferences',
     auditLogs: 'Audit Trail',
@@ -228,6 +229,8 @@ module.exports = {
     scheduleSuccess: 'successfully scheduled',
     search: 'Search',
     security: 'Security',
+    serverDid: 'Server DID',
+    serverVersion: 'Server Version',
     setting: 'Settings',
     start: 'Start',
     status: 'Status',
@@ -366,7 +369,8 @@ module.exports = {
           }
         },
         publicToStore: 'Public On Store',
-        publicInstanceTip: 'The access address of this blocklet will be displayed in the Store (along with your DID for accepting donations)'
+        publicInstanceTip: 'The access address of this blocklet will be displayed in the Store (along with your DID for accepting donations)',
+        updatedTip: 'Access Control Modified'
       },
       disabledText: 'Please edit environment variables in ".env" file or "blocklet.yml" file',
       changedTip: 'Configuration updated, please restart Blocklet',
@@ -376,7 +380,7 @@ module.exports = {
         key: 'Configuration key',
         value: 'Configuration value',
         keyValueRequired: 'Configuration key and value must be specified',
-        invalidKey: 'Configuration key must not start with BLOCKLET_',
+        invalidKey: 'Configuration key must not start with BLOCKLET_ or COMPONENT_',
         deleteForbidden: 'This configuration is required and should not be deleted',
         tip: 'Configurations prefixed with BWA_ should not contain sensitive information because they will be sent to the browser'
       }
@@ -1033,6 +1037,7 @@ module.exports = {
     dialog: {
       title: 'Authorization Required',
       freeDescription: 'You need to present Blocklet Server Ownership NFT or Blocklet Server Passport to launch application',
+      freeServerlessDescription: 'Please provide serverless NFT',
       nonFreeDescription: 'You need to present application purchase NFT and Blocklet Server NFT to launch application',
       confirm: 'Confirm on your DID Wallet',
       success: 'Authorization Successfully',

package/lib/locales/zh.js

@@ -64,6 +64,7 @@ module.exports = {
   },
   common: {
     about: '关于',
+    access: '访问',
     general: '通用',
     preferences: '偏好',
     auditLogs: '审计记录',
@@ -234,6 +235,8 @@ module.exports = {
     scheduleSuccess: '成功加入任务队列',
     search: '搜索',
     security: '安全',
+    serverDid: '服务器 DID',
+    serverVersion: '服务器版本',
     setting: '设置',
     start: '启动',
     status: '状态',
@@ -372,7 +375,8 @@ module.exports = {
           }
         },
         publicToStore: '在 Store 公开',
-        publicInstanceTip: '此应用的访问地址将展示在 Store 中（同时也会展示你的 DID，用于接受捐赠）'
+        publicInstanceTip: '此应用的访问地址将展示在 Store 中（同时也会展示你的 DID，用于接受捐赠）',
+        updatedTip: '访问控制已修改'
       },
       disabledText: '请在 ".env" 文件或 "blocklet.yml" 文件中编辑环境变量',
       changedTip: '配置已更新，请重启 Blocklet',
@@ -382,7 +386,7 @@ module.exports = {
         key: '配置键',
         value: '配置值',
         keyValueRequired: '键和值不能为空',
-        invalidKey: '键不能以 BLOCKLET_ 开头',
+        invalidKey: '键不能以 BLOCKLET_ 或 COMPONENT_ 开头',
         deleteForbidden: '该配置项是必填项，不能删除',
         tip: '包含 BWA_ 前缀的配置项不应该包含敏感信息，因为他们会被发送到前端页面'
       }
@@ -1039,6 +1043,7 @@ module.exports = {
     dialog: {
       title: '需要您的授权',
       freeDescription: '你需要提供节点所有权 NFT 或节点通行证凭据来启动应用',
+      freeServerlessDescription: '请提供无服务 NFT',
       nonFreeDescription: '你需要提供应用购买凭证和节点通行证来启动应用',
       confirm: '在您的 DID 钱包上确认',
       success: '授权成功',

package/lib/team/passports/color.js

@@ -81,7 +81,7 @@ function PassportColor(_ref) {
         disabled: loading,
         variant: "contained",
         autoFocus: true,
-        "data-cy": "bind-permission-btn-confirm",
+        "data-cy": "color-btn-confirm",
         children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
           size: [16, 10]
         }), t('common.save')]

package/lib/team/passports/detail.js

@@ -117,6 +117,39 @@ function PassportDetail(_ref) {
   }, [teamDid, roleName]); // eslint-disable-line
 
   const readPermissionsOnly = isNodeTeam || !hasPermission;
+  let bindPermission = null;
+  if (isNodeTeam) {
+    bindPermission = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "bind",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "title",
+        children: t('common.permission')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "list",
+        children: binds
+        // if readonly, show obtained permissions only
+        .filter(x => readPermissionsOnly ? x.bind : true).map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "item",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
+            control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+              disabled: readPermissionsOnly,
+              checked: x.bind,
+              onChange: () => {
+                setBinds(state => state.map(y => {
+                  if (y.name === x.name) {
+                    y.bind = !y.bind;
+                  }
+                  return y;
+                }));
+              },
+              name: x.name
+            }),
+            label: x.description
+          })
+        }))
+      })]
+    });
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
     title: t('common.passport'),
     onClose: onCancel,
@@ -149,11 +182,12 @@ function PassportDetail(_ref) {
         "data-cy": "delete-passport-".concat(role.name),
         size: "large",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DeleteIcon.default, {
+          "data-cy": "close-passport-dialog",
           fill: "#bfbfbf"
         })
       })]
     }),
-    actions: !readPermissionsOnly && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    actions: isNodeTeam && !readPermissionsOnly && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
         onClick: onCancel,
         color: "inherit",
@@ -182,38 +216,12 @@ function PassportDetail(_ref) {
             children: role.title
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: "description",
+            style: {
+              marginTop: isNodeTeam ? 16 : 48
+            },
             children: role.description
           })]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "bind",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "title",
-            children: t('common.permission')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "list",
-            children: binds
-            // if readonly, show obtained permissions only
-            .filter(x => readPermissionsOnly ? x.bind : true).map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "item",
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
-                control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
-                  disabled: readPermissionsOnly,
-                  checked: x.bind,
-                  onChange: () => {
-                    setBinds(state => state.map(y => {
-                      if (y.name === x.name) {
-                        y.bind = !y.bind;
-                      }
-                      return y;
-                    }));
-                  },
-                  name: x.name
-                }),
-                label: x.description
-              })
-            }))
-          })]
-        })]
+        }), bindPermission]
       })]
     }), updateForm && /*#__PURE__*/(0, _jsxRuntime.jsx)(_mutateRole.default, {
       teamDid: teamDid,

package/lib/who-can-access/config.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _Lock = _interopRequireDefault(require("@mui/icons-material/Lock"));
 var _ContactMail = _interopRequireDefault(require("@mui/icons-material/ContactMail"));
-var _Group = _interopRequireDefault(require("@mui/icons-material/Group"));
+var _Public = _interopRequireDefault(require("@mui/icons-material/Public"));
 var _constant = require("@abtnode/constant");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = [{
-  value: _constant.WHO_CAN_ACCESS.OWNER,
-  icon: _Lock.default,
+  value: _constant.WHO_CAN_ACCESS.ALL,
+  icon: _Public.default,
   title: {
-    zh: '只有我自己可访问',
-    en: 'Only me can access'
+    zh: '所有人可访问',
+    en: 'Accessible to all'
   },
   description: {
-    zh: '必须提供所有者通行证才能访问应用',
-    en: 'You must provide owner passport to access this application'
+    zh: '向所有人开放，无需通行证即可访问应用',
+    en: 'Open to the world anyone can access without passport'
   }
 }, {
   value: _constant.WHO_CAN_ACCESS.INVITED,
@@ -32,15 +32,15 @@ var _default = [{
     en: 'You can invite members later in the admin page'
   }
 }, {
-  value: _constant.WHO_CAN_ACCESS.ALL,
-  icon: _Group.default,
+  value: _constant.WHO_CAN_ACCESS.OWNER,
+  icon: _Lock.default,
   title: {
-    zh: '所有人可访问',
-    en: 'Accessible to all'
+    zh: '只有应用所有者可以访问',
+    en: 'Only Owner of the blocklet can access'
   },
   description: {
-    zh: '向所有人开放，无需通行证即可访问应用',
-    en: 'Open to the world anyone can access without passport'
+    zh: '必须提供所有者通行证才能访问应用',
+    en: 'You must provide owner passport to access this application'
   }
 }];
 exports.default = _default;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.37",
+  "version": "1.8.38",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.37",
-    "@abtnode/constant": "1.8.37",
-    "@abtnode/util": "1.8.37",
+    "@abtnode/auth": "1.8.38",
+    "@abtnode/constant": "1.8.38",
+    "@abtnode/util": "1.8.38",
     "@arcblock/did-connect": "^2.4.52",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.52",
     "@arcblock/terminal": "^2.4.52",
     "@arcblock/ux": "^2.4.52",
-    "@blocklet/constant": "1.8.37",
-    "@blocklet/launcher-layout": "^1.9.10",
-    "@blocklet/list": "^0.10.34",
-    "@blocklet/meta": "1.8.37",
+    "@blocklet/constant": "1.8.38",
+    "@blocklet/launcher-layout": "^1.9.12",
+    "@blocklet/list": "^0.10.36",
+    "@blocklet/meta": "1.8.38",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@material-table/core": "^0.2.48",
@@ -76,5 +76,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "f26f451c6e2b1168b36f78269eafdf3f671236bf"
+  "gitHead": "cbb88f107eb6b403c8cd47a765920575860c7bc7"
 }