@abtnode/ux 1.8.39 → 1.8.41

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

@@ -41,7 +41,7 @@ const Configs = [..._config.default, {
   icon: _Group.default,
   title: {
     zh: '指定通行证可访问',
-    en: 'Accessible to passports'
+    en: 'Accessible to selected passports'
   },
   description: {
     zh: '只有指定的通行证可以访问',
@@ -189,6 +189,7 @@ function ConfigAccess(_ref) {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
         onClick: onClose,
         color: "inherit",
+        "data-cy": "config-access-cancel",
         children: t('common.cancel')
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
         onClick: onConfirm,
@@ -196,6 +197,7 @@ function ConfigAccess(_ref) {
         disabled: disabled,
         variant: "contained",
         autoFocus: true,
+        "data-cy": "config-access-confirm",
         children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
           size: [16, 10]
         }), t('common.confirm')]
@@ -210,6 +212,7 @@ function ConfigAccess(_ref) {
         fullWidth: true,
         value: whoCanAccess,
         onChange: onWhoCanAccessChange,
+        "data-cy": "config-access-select",
         SelectProps: {
           renderValue: selected => {
             const d = Configs.find(x => x.value === selected);
@@ -226,6 +229,7 @@ function ConfigAccess(_ref) {
             sx: {
               display: 'block'
             },
+            "data-cy": "config-access-opt-".concat(d.value),
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
               display: "flex",
               alignItems: "center",

package/lib/blocklet/access/index.js

@@ -154,6 +154,7 @@ function ComponentItem(_ref) {
             title: t('common.edit'),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
               onClick: open,
+              "data-cy": "btn-edit-".concat(blocklet.meta.did),
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_EditIcon.default, {
                 style: iconStyle
               })

package/lib/blocklet/avatar.js

@@ -5,12 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = BlockletAvatar;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Avatar2 = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-var _constant = require("@abtnode/constant");
+var _useAvatar = _interopRequireDefault(require("../hooks/use-avatar"));
 var _node = require("../contexts/node");
-var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["blocklet", "style", "size", "ancestors"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -20,7 +18,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function BlockletAvatar(_ref) {
-  var _blocklet$meta;
   let {
       blocklet,
       style,
@@ -30,21 +27,15 @@ function BlockletAvatar(_ref) {
     rest = _objectWithoutProperties(_ref, _excluded);
   const node = (0, _node.useNodeContext)();
   const {
+    logoUrl,
     inService
-  } = node;
-  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');
+  } = (0, _useAvatar.default)({
+    blocklet,
+    ancestors
+  });
   const {
     variant
   } = rest;
-  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/add.js

@@ -456,8 +456,7 @@ function AddComponent(_ref2) {
         rest = _objectWithoutProperties(item, _excluded);
       const formatItem = {
         // if the blocklet has validation, provide the validation (fix not inStore)
-        validation: (0, _isNil.default)(validation) ? '' : validation,
-        custom: false
+        validation: (0, _isNil.default)(validation) ? '' : validation
       };
       return _objectSpread(_objectSpread({}, rest), {}, {
         key

package/lib/blocklet/component/navigation/locale-tabs.js

@@ -0,0 +1,218 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _ahooks = require("ahooks");
+var _lodash = require("lodash");
+var _react = require("react");
+var _react2 = require("@iconify/react");
+var _material = require("@mui/material");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _simpleSelect = _interopRequireDefault(require("./simple-select"));
+var _locales = _interopRequireDefault(require("../../../util/locales"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable react/jsx-no-bind */
+
+const defaultLocale = 'en';
+function LocaleTabs(_ref) {
+  let {
+    sx,
+    onChange,
+    locales,
+    onRemoveLocale
+  } = _ref;
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const inputRef = (0, _react.useRef)();
+  const [addLocaleButtonEl, setAddLocaleButtonEl] = (0, _react.useState)(null);
+  const state = (0, _ahooks.useReactive)({
+    currentLocale: defaultLocale,
+    localeList: [],
+    inputLocale: '',
+    localeError: ''
+  });
+  const openChooseLocale = (0, _react.useMemo)(() => {
+    return !!addLocaleButtonEl;
+  }, [addLocaleButtonEl]);
+  const localeOptions = (0, _react.useMemo)(() => {
+    return Object.keys((0, _lodash.omit)(_locales.default, [...state.localeList, defaultLocale])).map(locale => ({
+      title: _locales.default[locale],
+      value: locale
+    }));
+  }, [state.localeList]);
+  (0, _react.useEffect)(() => {
+    onChange(state.currentLocale);
+  }, [onChange, state.currentLocale]);
+  (0, _react.useEffect)(() => {
+    state.localeList = [...locales];
+  }, [locales, state]);
+  (0, _ahooks.useKeyPress)('enter', () => {
+    // HACK: 必须加一个延时，否则无法正确关闭 chooseLocale 弹窗
+    setTimeout(() => {
+      handleAddLocale();
+    });
+  }, {
+    target: inputRef
+  });
+  function checkLocale(locale) {
+    if (!locale) {
+      return t('common.requiredErrorText', {
+        name: 'Locale'
+      });
+    }
+    if (locale === 'en' || state.localeList.includes(locale)) {
+      return t('navigation.form.localeExists', {
+        value: locale
+      });
+    }
+    return true;
+  }
+  function checkValidLocale() {
+    let locale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    const value = locale === null || locale === void 0 ? void 0 : locale.trim();
+    const checkResult = checkLocale(value);
+    if (checkResult !== true) {
+      state.localeError = checkResult;
+    } else {
+      state.localeError = '';
+    }
+    return checkResult;
+  }
+  function handleAddLocale() {
+    var _state$inputLocale;
+    const value = (_state$inputLocale = state.inputLocale) === null || _state$inputLocale === void 0 ? void 0 : _state$inputLocale.trim();
+    const checkResult = checkValidLocale(value);
+    if (checkResult === true) {
+      close();
+      state.localeList.push(value);
+      state.currentLocale = value;
+    }
+  }
+  function close() {
+    setAddLocaleButtonEl(null);
+    state.inputLocale = '';
+    state.localeError = '';
+  }
+  function handleRemoveLocale(e, locale) {
+    e.preventDefault();
+    e.stopPropagation();
+    state.localeList = (0, _lodash.without)(state.localeList, locale);
+    onRemoveLocale(locale);
+    if (locale === state.currentLocale) {
+      state.currentLocale = defaultLocale;
+    }
+  }
+  function handleChangeLocale(e) {
+    const {
+      value
+    } = e.target;
+    checkValidLocale(value);
+    state.inputLocale = value;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Tabs, {
+      sx: sx,
+      value: state.currentLocale,
+      onChange: (e, value) => {
+        state.currentLocale = value;
+      },
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tab, {
+        label: "Default (".concat(_locales.default[defaultLocale], ")"),
+        value: "en"
+      }), state.localeList.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tab, {
+        sx: {
+          position: 'relative'
+        },
+        label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [_locales.default[item], /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+            size: "small",
+            color: "inherit",
+            sx: {
+              position: 'absolute',
+              top: 0,
+              right: 0
+            },
+            onClick: e => {
+              handleRemoveLocale(e, item);
+            },
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Icon, {
+              icon: "mdi:close",
+              height: 14
+            })
+          })]
+        }),
+        value: item
+      }, item)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+        color: "primary",
+        disableFocusRipple: true,
+        sx: {
+          width: '48px'
+        },
+        onClick: e => {
+          setAddLocaleButtonEl(e.currentTarget);
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Icon, {
+          icon: "mdi:plus"
+        })
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Popover, {
+      open: openChooseLocale,
+      anchorEl: addLocaleButtonEl,
+      onClose: close,
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'left'
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+        sx: {
+          p: 2,
+          width: '270px'
+        },
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          variant: "subtitle2",
+          children: t('navigation.form.localePlaceholder')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          mt: 1,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_simpleSelect.default, {
+            required: true,
+            fullWidth: true,
+            label: "Locale",
+            value: state.inputLocale,
+            options: localeOptions,
+            onChange: handleChangeLocale,
+            error: !!state.localeError,
+            helperText: state.localeError || ' '
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          display: "flex",
+          justifyContent: "flex-end",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+            size: "small",
+            variant: "contained",
+            onClick: handleAddLocale,
+            children: t('common.confirm')
+          })
+        })]
+      })
+    })]
+  });
+}
+LocaleTabs.propTypes = {
+  sx: _propTypes.default.any,
+  onChange: _propTypes.default.func,
+  onRemoveLocale: _propTypes.default.func,
+  locales: _propTypes.default.array
+};
+LocaleTabs.defaultProps = {
+  sx: null,
+  onChange: () => {},
+  onRemoveLocale: () => {},
+  locales: []
+};
+var _default = LocaleTabs;
+exports.default = _default;

package/lib/blocklet/component/navigation/navigation-actions.js

@@ -0,0 +1,103 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("@iconify/react");
+var _material = require("@mui/material");
+var _react2 = require("react");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function NavigationActions(_ref) {
+  let {
+    className,
+    add,
+    edit,
+    toggle,
+    del,
+    data,
+    section
+  } = _ref;
+  const isDisabled = ['yaml', 'tmpl'].includes(data.from);
+  const isUninstalled = /*#__PURE__*/(0, _react2.isValidElement)(data.subtitle);
+  function handleClick(e) {
+    e.preventDefault();
+    e.stopPropagation();
+  }
+  const handleClickAdd = (0, _react2.useCallback)(e => {
+    handleClick(e);
+    add(data);
+  }, [add, data]);
+  const handleClickEdit = (0, _react2.useCallback)(e => {
+    handleClick(e);
+    edit(data);
+  }, [edit, data]);
+  const handleClickToggle = (0, _react2.useCallback)(e => {
+    handleClick(e);
+    toggle(data);
+  }, [toggle, data]);
+  const handleClickDelete = (0, _react2.useCallback)(e => {
+    handleClick(e);
+    del(data);
+  }, [del, data]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: className,
+    children: [!data.parent && ['header', 'footer', 'dashboard'].includes(section) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+      size: "small",
+      color: "success",
+      onClick: handleClickAdd,
+      disabled: isUninstalled,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+        icon: "mdi:plus-box-outline"
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+      size: "small",
+      color: "primary",
+      onClick: handleClickEdit,
+      disabled: isUninstalled,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+        icon: "mdi:pencil"
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+      size: "small",
+      color: "warning",
+      onClick: handleClickToggle,
+      disabled: isUninstalled,
+      children: data.visible === false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+        icon: "mdi:eye-off-outline"
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+        icon: "mdi:eye-outline"
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+      disabled: isDisabled,
+      size: "small",
+      color: "error",
+      onClick: handleClickDelete,
+      title: isDisabled ? 'Not allowed delete built-in navigation' : 'Delete navigation',
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+        icon: "mdi:delete"
+      })
+    })]
+  });
+}
+NavigationActions.propTypes = {
+  data: _propTypes.default.object.isRequired,
+  className: _propTypes.default.string,
+  add: _propTypes.default.func,
+  edit: _propTypes.default.func,
+  toggle: _propTypes.default.func,
+  del: _propTypes.default.func,
+  section: _propTypes.default.string
+};
+NavigationActions.defaultProps = {
+  className: '',
+  add: () => {},
+  edit: () => {},
+  toggle: () => {},
+  del: () => {},
+  section: ''
+};
+var _default = NavigationActions;
+exports.default = _default;