@abtnode/ux 1.8.33 → 1.8.35

package/lib/schema-form/index.js

@@ -91,6 +91,11 @@ function SchemaForm(_ref2) {
         [key]: '__encrypted__'
       }));
     }
+    if (['confirm', 'cancel'].includes(action)) {
+      onItemEditingStatusChange(null);
+    } else {
+      onItemEditingStatusChange(item);
+    }
   }
   function onItemEditingStatusChange(item) {
     if (item) {
@@ -147,7 +152,10 @@ function SchemaForm(_ref2) {
         description,
         editing,
         value: currentValue,
-        onChange: changeValue => onFormItemChange(x, changeValue, 'change'),
+        onChange: function onChange(changeValue) {
+          let action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'change';
+          return onFormItemChange(x, changeValue, action);
+        },
         componentProps
       };
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
@@ -170,7 +178,6 @@ function SchemaForm(_ref2) {
                 "data-cy": "schema-form-item-confirm",
                 onClick: () => {
                   onFormItemChange(x, currentValue, 'confirm');
-                  onItemEditingStatusChange(null);
                 },
                 disabled: disabled || loading,
                 size: "large",
@@ -181,7 +188,6 @@ function SchemaForm(_ref2) {
                 "data-cy": "schema-form-item-cancel",
                 onClick: () => {
                   onFormItemChange(x, editingItemInitialValue.current, 'cancel');
-                  onItemEditingStatusChange(null);
                 },
                 disabled: disabled || loading,
                 size: "large",
@@ -191,7 +197,6 @@ function SchemaForm(_ref2) {
               "data-cy": "schema-form-item-edit",
               onClick: () => {
                 onFormItemChange(x, formValues[key], 'edit');
-                onItemEditingStatusChange(x);
               },
               disabled: disabled || editingItem,
               size: "large",

package/lib/schema-form/text-input.js

@@ -33,7 +33,7 @@ function TextInput(_ref) {
   // enter keydown
   const handleKeydown = e => {
     if (e.key === 'Enter') {
-      onChange(inputValue.current);
+      onChange(inputValue.current, 'confirm');
     }
   };
   const onInputChange = changeValue => {

package/lib/team/members/index.js

@@ -55,7 +55,10 @@ const isFromExternal = (user, teamIssuerDid) => {
   if (!list.length) {
     return false;
   }
-  return !list.some(z => z.issuer.id === teamIssuerDid);
+  return !list.some(z => {
+    var _z$issuer;
+    return ((_z$issuer = z.issuer) === null || _z$issuer === void 0 ? void 0 : _z$issuer.id) === teamIssuerDid;
+  });
 };
 function SimpleInfo(_ref) {
   let {
@@ -181,6 +184,9 @@ function MemberList(_ref2) {
       (res.users || []).forEach(x => {
         x.isFromExternal = isFromExternal(x, teamIssuerDid);
         x.avatar = (0, _util2.parseAvatar)(x.avatar, teamDid, inService);
+
+        // for backwards compatibility
+        x.passports = (x.passports || []).filter(y => y.issuer);
       });
       setUsers(res.users || []);
       setRowCount(res.paging.total);
@@ -189,24 +195,30 @@ function MemberList(_ref2) {
       _toast.default.error(err.message);
     });
   };
-  (0, _react.useEffect)(() => {
-    getUsers();
-  }, ["".concat(search.hideBlocked, "-").concat(search.role, "-").concat(search.page, "-").concat(search.pageSize, "-").concat(search.searchText)]); //eslint-disable-line
-
-  // user counts
-  (0, _react.useEffect)(() => {
+  const getUserCounts = () => {
     api.getUsersCountPerRole().then(res => {
       setUserCounts(res.counts || []);
     }).catch(err => {
       _toast.default.error(err.message);
     });
-  }, []); //eslint-disable-line
-
-  useSubscription(_constant.EVENTS.USER_UPDATED, data => {
+  };
+  const handleUserChange = data => {
     if (data.teamDid === teamDid) {
       getUsers();
+      getUserCounts();
     }
-  }, [search]);
+  };
+  (0, _react.useEffect)(() => {
+    getUsers();
+  }, ["".concat(search.hideBlocked, "-").concat(search.role, "-").concat(search.page, "-").concat(search.pageSize, "-").concat(search.searchText)]); //eslint-disable-line
+
+  // user counts
+  (0, _react.useEffect)(() => {
+    getUserCounts();
+  }, []); //eslint-disable-line
+
+  useSubscription(_constant.EVENTS.USER_UPDATED, handleUserChange, [search]);
+  useSubscription(_constant.EVENTS.USER_ADDED, handleUserChange, [search]);
   const isInvitationEnabled = enablePassportIssuance;
   const columns = [{
     label: t('common.name'),

package/lib/team/members/member.js

@@ -78,6 +78,9 @@ function Member(_ref) {
       });
       if (res.getUser.user) {
         res.getUser.user.avatar = (0, _util2.parseAvatar)(res.getUser.user.avatar, teamDid, inService);
+
+        // for backwards compatibility
+        res.getUser.user.passports = (res.getUser.user.passports || []).filter(x => x.issuer);
       }
       setUser(res.getUser.user || {});
       setIssuances(res.getPassportIssuances.list || []);

package/lib/team/passports/color.js

@@ -0,0 +1,131 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = PassportColorWithPermission;
+var _react = require("react");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _reactColor = require("react-color");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/create-passport-svg"));
+var _util = require("@blocklet/meta/lib/util");
+var _passportColor = require("@abtnode/auth/lib/util/passport-color");
+var _constant = require("@blocklet/constant");
+var _toast = _interopRequireDefault(require("../../toast"));
+var _node = require("../../contexts/node");
+var _blocklet = require("../../contexts/blocklet");
+var _util2 = require("../../util");
+var _permission = require("../../permission");
+var _jsxRuntime = require("react/jsx-runtime");
+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; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function PassportColor(_ref) {
+  let {
+    onCancel,
+    onSuccess
+  } = _ref;
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const [loading, setLoading] = (0, _react.useState)(false);
+  const curColor = (blocklet.environments.find(x => x.key === 'BLOCKLET_PASSPORT_COLOR') || {}).value || 'auto';
+  const defaultColor = curColor === 'auto' ? (0, _passportColor.getPassportColorFromDid)(blocklet.appDid) : curColor;
+  const [color, setColor] = (0, _react.useState)(defaultColor);
+  const onSubmit = async () => {
+    const params = [{
+      key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR,
+      value: color,
+      custom: true
+    }];
+    try {
+      setLoading(true);
+      await api.configBlocklet({
+        input: {
+          did: blocklet.meta.did,
+          configs: params
+        }
+      });
+      onSuccess();
+    } catch (err) {
+      _toast.default.error(err.message);
+    } finally {
+      setLoading(false);
+    }
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
+    title: t('team.passport.color'),
+    onClose: onCancel,
+    open: true,
+    fullWidth: true,
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        onClick: onCancel,
+        color: "inherit",
+        children: t('common.cancel')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+        onClick: onSubmit,
+        color: "primary",
+        disabled: loading,
+        variant: "contained",
+        autoFocus: true,
+        "data-cy": "bind-permission-btn-confirm",
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
+        }), t('common.save')]
+      })]
+    }),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      className: "dialog-content",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactColor.ChromePicker, {
+        color: color,
+        onChange: c => setColor(c.hex)
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        style: {
+          width: 96,
+          marginLeft: 48
+        },
+        alt: "",
+        src: (0, _createPassportSvg.default)({
+          title: 'Owner',
+          issuer: (0, _util.getDisplayName)(blocklet),
+          issuerDid: blocklet.appDid,
+          ownerName: 'Your Name',
+          isDataUrl: true,
+          preferredColor: color
+        })
+      })]
+    })
+  });
+}
+const PassportColorInDaemon = (0, _permission.withPermission)(PassportColor, 'mutate_team');
+const PassportColorInService = (0, _permission.withPermission)(PassportColor, '', _util2.BlockletAdminRoles);
+function PassportColorWithPermission(props) {
+  const {
+    inService
+  } = (0, _node.useNodeContext)();
+  if (inService) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(PassportColorInService, _objectSpread({}, props));
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(PassportColorInDaemon, _objectSpread({}, props));
+}
+PassportColor.propTypes = {
+  onCancel: _propTypes.default.func.isRequired,
+  onSuccess: _propTypes.default.func.isRequired
+};
+PassportColor.defaultProps = {};

package/lib/team/passports/index.js

@@ -24,6 +24,7 @@ var _permission = _interopRequireDefault(require("../../permission"));
 var _searchInput = _interopRequireDefault(require("../search-input"));
 var _listHeader = _interopRequireDefault(require("../styles/list-header"));
 var _detail = _interopRequireDefault(require("./detail"));
+var _color = _interopRequireDefault(require("./color"));
 var _mutateRole = _interopRequireDefault(require("./mutate-role"));
 var _trustedIssuers = _interopRequireDefault(require("./trusted-issuers"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -50,6 +51,7 @@ function PassportList() {
   } = (0, _team.useTeamContext)();
   const [showCreate, setShowCreate] = (0, _react.useState)(false);
   const [updateForm, setUpdateForm] = (0, _react.useState)(false);
+  const [showColor, setShowColor] = (0, _react.useState)(false);
   const [showTrustedIssuers, setShowTrustedIssuers] = (0, _react.useState)(null);
   const [search, setSearch] = (0, _react.useState)('');
   const [loading, setLoading] = (0, _react.useState)(false);
@@ -94,27 +96,34 @@ function PassportList() {
             menuButtonProps: {
               'data-cy': 'trusted-issuers-more'
             },
-            menu: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SplitButton.default.Item, {
-              "data-cy": "config-show-issue-passport",
-              onClick: () => {
-                toggleShowIssue();
-              },
-              children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-                display: "flex",
-                alignItems: "center",
-                children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-                  size: [16, 10],
-                  style: {
-                    marginRight: 8
-                  }
-                }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-                  children: [enablePassportIssuance ? t('team.passport.disableIssuance') : t('team.passport.enableIssuance'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                    fontSize: 12,
-                    color: "#888",
-                    children: enablePassportIssuance ? t('team.passport.disableIssuanceTip') : t('team.passport.enableIssuanceTip')
+            menu: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_SplitButton.default.Item, {
+                "data-cy": "config-show-issue-passport",
+                onClick: () => {
+                  toggleShowIssue();
+                },
+                children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+                  display: "flex",
+                  alignItems: "center",
+                  children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+                    size: [16, 10],
+                    style: {
+                      marginRight: 8
+                    }
+                  }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+                    children: [enablePassportIssuance ? t('team.passport.disableIssuance') : t('team.passport.enableIssuance'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                      fontSize: 12,
+                      color: "#888",
+                      children: enablePassportIssuance ? t('team.passport.disableIssuanceTip') : t('team.passport.enableIssuanceTip')
+                    })]
                   })]
-                })]
-              })
+                })
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_SplitButton.default.Item, {
+                onClick: () => setShowColor(true),
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                  children: t('team.passport.configColor')
+                })
+              })]
             }),
             children: () => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
               variant: "outlined",
@@ -212,6 +221,9 @@ function PassportList() {
       item: updateForm
     }), showTrustedIssuers && /*#__PURE__*/(0, _jsxRuntime.jsx)(_trustedIssuers.default, {
       onCancel: () => setShowTrustedIssuers(false)
+    }), showColor && /*#__PURE__*/(0, _jsxRuntime.jsx)(_color.default, {
+      onCancel: () => setShowColor(null),
+      onSuccess: () => setShowColor(null)
     })]
   });
 }

package/lib/util/index.js

@@ -22,7 +22,11 @@ exports.getAsset = getAsset;
 exports.getAssetExpiration = getAssetExpiration;
 exports.getBlockletLogoUrl = void 0;
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
-exports.getEndPoint = exports.getBlockletUrlParams = exports.getBlockletServices = void 0;
+exports.getBlockletServices = void 0;
+exports.getBlockletUrl = getBlockletUrl;
+exports.getBlockletUrlParams = void 0;
+exports.getBlockletUrls = getBlockletUrls;
+exports.getEndPoint = void 0;
 exports.getExplorerLink = getExplorerLink;
 exports.getPathPrefix = exports.getIssuePassportLink = exports.getInviteLink = void 0;
 exports.getRelativeTime = getRelativeTime;
@@ -35,7 +39,7 @@ exports.parseQuery = void 0;
 exports.patchJsxToLocale = patchJsxToLocale;
 exports.shouldCheckDomainStatus = void 0;
 exports.sleep = sleep;
-exports.validateDomain = exports.stringSortHandlerAsc = void 0;
+exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = void 0;
 var _constant = require("@abtnode/constant");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("moment/locale/zh-cn");
@@ -113,6 +117,53 @@ function getAccessUrl(hostname) {
   });
   return "".concat(url, "?").concat(searchParams.toString());
 }
+function getBlockletUrl() {
+  let {
+    blocklet,
+    domain: inputDomain,
+    mountPoint: inputMountPoint,
+    params
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const {
+    site
+  } = blocklet;
+  if (!site) {
+    return null;
+  }
+  const domain = inputDomain || (site.domainAliases || [])[0];
+  if (!domain) {
+    return null;
+  }
+  let mountPoint = inputMountPoint;
+  if (!mountPoint) {
+    const rule = site.rules.filter(x => !x.from.pathPrefix.startsWith(_constant.WELLKNOWN_PATH_PREFIX))[0];
+    mountPoint = rule ? rule.from.pathPrefix : '/';
+  }
+  return getAccessUrl(domain.value, mountPoint, params);
+}
+function getBlockletUrls() {
+  let {
+    blocklet,
+    mountPoint: inputMountPoint,
+    params
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const {
+    site
+  } = blocklet;
+  if (!site) {
+    return [];
+  }
+  const domains = site.domainAliases || [];
+  if (!domains.length) {
+    return [];
+  }
+  let mountPoint = inputMountPoint;
+  if (!mountPoint) {
+    const rule = site.rules.filter(x => !x.from.pathPrefix.startsWith(_constant.WELLKNOWN_PATH_PREFIX))[0];
+    mountPoint = rule ? rule.name : '/';
+  }
+  return domains.map(domain => getAccessUrl(domain.value, mountPoint, params));
+}
 function getExplorerLink(chainHost, did, type) {
   if (!chainHost) return undefined;
   try {
@@ -279,6 +330,9 @@ const formatPerson = person => {
 exports.formatPerson = formatPerson;
 const getBlockletServices = blocklet => {
   const services = [];
+  if (!blocklet) {
+    return services;
+  }
   const interfaces = (blocklet.meta.interfaces || []).filter(x => x.type === _constant2.BLOCKLET_INTERFACE_TYPE_SERVICE);
   interfaces.forEach(x => {
     services.push({
@@ -468,8 +522,8 @@ const isCertificateMatch = function isCertificateMatch() {
   let matchedSites = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   try {
     return matchedSites.map(item => item.domain).some(domain => {
-      return blockletUrls.some(blockletUrl => {
-        const url = new window.URL(blockletUrl);
+      return blockletUrls.some(u => {
+        const url = new window.URL(u.startsWith('http') ? u : "http://".concat(u));
         return url.hostname === domain;
       });
     });
@@ -611,4 +665,15 @@ exports.isBlockletDev = isBlockletDev;
 const APP_PREFIX = ((_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.groupPathPrefix) || '/';
 exports.APP_PREFIX = APP_PREFIX;
 const BlockletAdminRoles = [_constant.ROLES.ADMIN, _constant.ROLES.OWNER];
-exports.BlockletAdminRoles = BlockletAdminRoles;
+exports.BlockletAdminRoles = BlockletAdminRoles;
+const toSlotDomain = domain => {
+  if (domain.endsWith(_constant.DEFAULT_IP_DOMAIN_SUFFIX)) {
+    const subDomain = domain.split('.').shift();
+    const matches = subDomain.match(_constant.IP);
+    if (matches) {
+      return domain.replace(matches[0].slice(1), _constant.SLOT_FOR_IP_DNS_SITE);
+    }
+  }
+  return domain;
+};
+exports.toSlotDomain = toSlotDomain;

package/package.json

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