@abtnode/ux 1.16.13 → 1.16.14-beta-0c29907f

package/lib/blocklet/actions.js

@@ -294,12 +294,12 @@ function BlockletActions(_ref) {
     }, true),
     disabled: inProgress
   } : null;
-  const cancelDownloadAction = !inService ? {
+  const cancelDownloadAction = {
     action: 'remove',
     icon: _icons.default.Remove,
     name: t('common.cancel'),
     handler: createHandler('cancelDownload', node.api.cancelDownloadBlocklet, true)
-  } : null;
+  };
   const missingRequiredConfigs = (0, _util.getAppMissingConfigs)(blocklet);
   const actions = [{
     action: 'start',

package/lib/blocklet/audit-logs.js

@@ -19,6 +19,7 @@ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _Select = _interopRequireDefault(require("@mui/material/Select"));
 var _InputLabel = _interopRequireDefault(require("@mui/material/InputLabel"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
+var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _auditLog = require("../contexts/audit-log");
 var _node = require("../contexts/node");
 var _relativeTime = _interopRequireDefault(require("../relative-time"));
@@ -51,6 +52,10 @@ function AuditLog(_ref2) {
     inService,
     info
   } = (0, _node.useNodeContext)();
+  const {
+    showScope,
+    scopeFormatter = x => x
+  } = (0, _auditLog.useAuditLogContext)();
   if (!log.actor.did) {
     return null;
   }
@@ -80,17 +85,27 @@ function AuditLog(_ref2) {
           target: "_blank",
           children: [log.actor.fullName, log.actor.role ? "(".concat(log.actor.role, ")") : '']
         }), ' ', "- ", log.action]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
         className: "log-content",
         maxWidth: "lg",
         color: "textPrimary",
         component: "div",
         "data-color-mode": "light",
         gutterBottom: true,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactMarkdownPreview.default, {
+        display: "flex",
+        alignItems: "center",
+        children: [showScope && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+          to: log.link,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
+            style: {
+              marginRight: 8
+            },
+            children: scopeFormatter(log.scope)
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactMarkdownPreview.default, {
           source: log.content,
           linkTarget: "_blank"
-        })
+        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "log-meta",
         variant: "body2",
@@ -186,11 +201,15 @@ function AuditLogs() {
 function WrappedAuditLogs(_ref3) {
   let {
     scope,
-    categories
+    categories,
+    showScope,
+    scopeFormatter
   } = _ref3;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_auditLog.AuditLogProvider, {
     scope: scope,
     categories: categories,
+    showScope: showScope,
+    scopeFormatter: scopeFormatter,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AuditLogs, {})
   });
 }

package/lib/blocklet/component/space-connector.js

@@ -106,7 +106,7 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
         }]
       }
     }).then(() => {
-      _Toast.default.success(t('storage.spaces.connected', locale));
+      _Toast.default.success(t('storage.spaces.connect.succeeded', locale));
     }).catch(error => {
       console.error(error);
       _Toast.default.error(error.message);

package/lib/blocklet/config-navigation.js

@@ -22,6 +22,7 @@ var _ahooks = require("ahooks");
 var _Dialog = require("@arcblock/ux/lib/Dialog");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Session = require("@arcblock/did-connect/lib/Session");
+var _noop = _interopRequireDefault(require("lodash/noop"));
 var _sortableTree = _interopRequireDefault(require("./component/sortable-tree"));
 var _navigationDialog = _interopRequireDefault(require("./component/navigation/navigation-dialog"));
 var _navigationActions = _interopRequireDefault(require("./component/navigation/navigation-actions"));
@@ -38,12 +39,25 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // FIXME: @zhanghan 这里还有几处文案没有 i18n
 const mockSession = {
-  login: () => {},
-  logout: () => {},
-  switch: () => {},
-  switchDid: () => {},
-  switchProfile: () => {},
-  switchPassport: () => {}
+  login: _noop.default,
+  logout: _noop.default,
+  switch: _noop.default,
+  switchDid: _noop.default,
+  switchProfile: _noop.default,
+  switchPassport: _noop.default,
+  useDid: () => {
+    return {
+      walletDid: 'abcdefghijklmnopqrstuvwxyz'
+    };
+  },
+  useOAuth: () => {
+    return {
+      logoutOAuth: _noop.default,
+      bindOAuth: _noop.default,
+      configs: {},
+      switchOAuthPassport: _noop.default
+    };
+  }
 };
 const navigationTypeMap = {
   header: 'Header',

package/lib/blocklet/oauth/federated-detail-dialog.js

@@ -0,0 +1,183 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
+var _pull = _interopRequireDefault(require("lodash/pull"));
+var _noop = _interopRequireDefault(require("lodash/noop"));
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+var _react = require("react");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _ahooks = require("ahooks");
+var _Theme = require("@arcblock/ux/lib/Theme");
+var _material = require("@mui/material");
+var _didConnect = require("@arcblock/did-connect");
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _Stars = _interopRequireDefault(require("@mui/icons-material/Stars"));
+var _blocklet = require("../../contexts/blocklet");
+var _node = require("../../contexts/node");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const FederatedDetailDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  var _theme$transitions, _theme$transitions$du;
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const state = (0, _ahooks.useReactive)({
+    mode: 'view',
+    show: false,
+    data: {},
+    callback: _noop.default
+  });
+  const theme = (0, _Theme.useTheme)();
+  const leavingScreen = (theme === null || theme === void 0 ? void 0 : (_theme$transitions = theme.transitions) === null || _theme$transitions === void 0 ? void 0 : (_theme$transitions$du = _theme$transitions.duration) === null || _theme$transitions$du === void 0 ? void 0 : _theme$transitions$du.leavingScreen) || 300;
+  const reset = (0, _ahooks.useMemoizedFn)(() => {
+    state.mode = 'view';
+    state.data = {};
+    state.callback = _noop.default;
+  }, []);
+  const close = (0, _ahooks.useMemoizedFn)(() => {
+    state.show = false;
+    setTimeout(() => {
+      reset();
+    }, leavingScreen);
+  }, []);
+  const open = (0, _ahooks.useMemoizedFn)(data => {
+    state.mode = 'view';
+    state.show = true;
+    state.data = data;
+  }, []);
+  const approve = (0, _ahooks.useMemoizedFn)(function (data) {
+    let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _noop.default;
+    state.mode = 'approve';
+    state.show = true;
+    state.data = data;
+    state.callback = callback;
+  }, []);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    open,
+    close,
+    approve
+  }), [open, close, approve]);
+  const infoList = (0, _ahooks.useCreation)(() => {
+    state.data.migratedFrom = [state.data.appId, state.data.appPid];
+    // const keys = Object.keys(omit(state.data, ['isMaster', 'did', 'pk']));
+    const keys = ['appName', 'appLogo', 'appId', 'appPid', 'migratedFrom', 'appDescription', 'appUrl', 'version', 'appliedAt', 'status', 'serverId', 'serverVersion'];
+    if (state.data.isMaster !== false) {
+      (0, _pull.default)(keys, 'appliedAt', 'status');
+    }
+    return keys.map(key => {
+      const name = t("federated.info.".concat(key));
+      let value = state.data[key];
+      if (key === 'appName') {
+        if (state.data.isMaster) {
+          value = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.SvgIcon, {
+              component: _Stars.default
+            }), value]
+          });
+        }
+      }
+      if (['appId', 'appPid', 'serverId'].includes(key)) {
+        value = /*#__PURE__*/(0, _jsxRuntime.jsx)(_didConnect.Address, {
+          children: value
+        });
+      }
+      if (['appUrl'].includes(key)) {
+        value = /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          component: "a",
+          href: value,
+          target: "_blank",
+          children: value
+        });
+      }
+      if (['appLogo'].includes(key)) {
+        value = /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+          src: "".concat(state.data.appUrl, "/").concat(value),
+          width: "60",
+          height: "60",
+          alt: state.data.appName
+        });
+      }
+      if (key === 'status') {
+        value = value && t("federated.status.".concat(value));
+      }
+      if (key === 'migratedFrom') {
+        const migratedFrom = state.data.migratedFrom || [];
+        const filterDids = migratedFrom.filter(item => ![state.data.appId, state.data.appPid].includes(item));
+        value = filterDids.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_didConnect.Address, {
+          children: item
+        }));
+      }
+      if ((0, _isEmpty.default)(value)) {
+        value = '-';
+      }
+      return {
+        name,
+        value
+      };
+    });
+  }, [state.data]);
+  const isApprove = state.mode === 'approve';
+  const onReject = (0, _ahooks.useMemoizedFn)(async () => {
+    await api.auditFederatedLogin({
+      input: {
+        appId: state.data.appId,
+        did: blocklet.meta.did,
+        status: 'rejected'
+      }
+    });
+    state === null || state === void 0 ? void 0 : state.callback(false);
+  });
+  const onApprove = (0, _ahooks.useMemoizedFn)(async () => {
+    await api.auditFederatedLogin({
+      input: {
+        appId: state.data.appId,
+        did: blocklet.meta.did,
+        status: 'approved'
+      }
+    });
+    close();
+    state === null || state === void 0 ? void 0 : state.callback(true);
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
+    open: state.show,
+    title: isApprove ? t('federated.approveToJoinLogin') : t('federated.siteDetail'),
+    onClose: close,
+    actions: isApprove ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+        color: "error",
+        variant: "contained",
+        onClick: onReject,
+        children: t('common.reject')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+        variant: "contained",
+        onClick: onApprove,
+        children: t('common.approve')
+      })]
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+      variant: "outlined",
+      onClick: close,
+      children: t('common.close')
+    }),
+    children: infoList.map(row => /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
+      style: {
+        alignItems: 'flex-start'
+      },
+      valueComponent: "div",
+      nameWidth: 180,
+      name: row.name,
+      children: row.value
+    }, row.name))
+  });
+});
+var _default = FederatedDetailDialog;
+exports.default = _default;

package/lib/blocklet/oauth/federated-invite-dialog.js

@@ -0,0 +1,93 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _react = require("react");
+var _ahooks = require("ahooks");
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _CodeBlock = _interopRequireDefault(require("@arcblock/ux/lib/CodeBlock"));
+var _copyToClipboard = _interopRequireDefault(require("copy-to-clipboard"));
+var _Theme = require("@arcblock/ux/lib/Theme");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable react/no-unstable-nested-components */
+
+const FederatedInviteDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  var _theme$transitions, _theme$transitions$du;
+  const theme = (0, _Theme.useTheme)();
+  const leavingScreen = (theme === null || theme === void 0 ? void 0 : (_theme$transitions = theme.transitions) === null || _theme$transitions === void 0 ? void 0 : (_theme$transitions$du = _theme$transitions.duration) === null || _theme$transitions$du === void 0 ? void 0 : _theme$transitions$du.leavingScreen) || 300;
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
+  const state = (0, _ahooks.useReactive)({
+    show: false,
+    data: {
+      link: ''
+    }
+  });
+  const reset = (0, _ahooks.useMemoizedFn)(() => {
+    state.data.link = '';
+  }, []);
+  const close = (0, _ahooks.useMemoizedFn)(() => {
+    state.show = false;
+    setTimeout(() => {
+      reset();
+    }, leavingScreen);
+  }, []);
+  const open = (0, _ahooks.useMemoizedFn)(_ref => {
+    let {
+      link
+    } = _ref;
+    state.show = true;
+    state.data.link = link;
+  }, []);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    open,
+    close
+  }), [open, close]);
+  const copyAndClose = (0, _ahooks.useMemoizedFn)(() => {
+    (0, _copyToClipboard.default)(state.data.link);
+    close();
+  }, [close]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
+    open: state.show,
+    title: t('federated.joinFederatedLogin'),
+    onClose: close,
+    PaperProps: {
+      style: {
+        minHeight: 'unset'
+      }
+    },
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      color: "primary",
+      autoFocus: true,
+      variant: "contained",
+      onClick: copyAndClose,
+      children: t('common.copyAndClose')
+    }),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mb: 1,
+      children: t('federated.inviteJoinFederatedLoginDescription')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      sx: {
+        '& .copy-button': {
+          display: 'none !important'
+        }
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CodeBlock.default, {
+        language: "shell",
+        style: {
+          marginBottom: 0
+        },
+        children: state.data.link
+      })
+    })]
+  });
+});
+var _default = FederatedInviteDialog;
+exports.default = _default;

package/lib/blocklet/oauth/federated-join-dialog.js

@@ -0,0 +1,120 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _react = require("react");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _ahooks = require("ahooks");
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _material = require("@mui/material");
+var _Theme = require("@arcblock/ux/lib/Theme");
+var _noop = _interopRequireDefault(require("lodash/noop"));
+var _isUrl = _interopRequireDefault(require("is-url"));
+var _blocklet = require("../../contexts/blocklet");
+var _node = require("../../contexts/node");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const FederatedJoinDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  var _blocklet$meta, _theme$transitions, _theme$transitions$du;
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const did = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
+  const theme = (0, _Theme.useTheme)();
+  const leavingScreen = (theme === null || theme === void 0 ? void 0 : (_theme$transitions = theme.transitions) === null || _theme$transitions === void 0 ? void 0 : (_theme$transitions$du = _theme$transitions.duration) === null || _theme$transitions$du === void 0 ? void 0 : _theme$transitions$du.leavingScreen) || 300;
+  const state = (0, _ahooks.useReactive)({
+    show: false,
+    appUrl: '',
+    appUrlError: '',
+    callback: _noop.default
+  });
+  const reset = (0, _ahooks.useMemoizedFn)(() => {
+    state.appUrl = '';
+    state.appUrlError = '';
+    state.callback = _noop.default;
+  }, []);
+  const close = (0, _ahooks.useMemoizedFn)(() => {
+    state.show = false;
+    setTimeout(() => {
+      reset();
+    }, leavingScreen);
+  }, []);
+  const open = (0, _ahooks.useMemoizedFn)(function () {
+    let callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _noop.default;
+    state.show = true;
+    state.callback = callback;
+  }, []);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    open,
+    close
+  }), [open, close]);
+  const validateAppUrl = (0, _ahooks.useMemoizedFn)(value => {
+    if (!value) {
+      throw new Error(t('federated.federatedJoinAppUrlRequired'));
+    }
+    if (!(0, _isUrl.default)(value)) {
+      throw new Error(t('federated.federatedJoinAppUrlInvalid'));
+    }
+  });
+  const confirm = (0, _ahooks.useMemoizedFn)(async () => {
+    try {
+      validateAppUrl(state.appUrl);
+      const data = await api.joinFederatedLogin({
+        input: {
+          did,
+          appUrl: state.appUrl
+        }
+      });
+      state.show = false;
+      close();
+      state === null || state === void 0 ? void 0 : state.callback(data);
+    } catch (err) {
+      state.appUrlError = err.message;
+    }
+  }, [close, did]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
+    open: state.show,
+    title: t('federated.joinFederatedLogin'),
+    onClose: close,
+    PaperProps: {
+      style: {
+        minHeight: 'unset'
+      }
+    },
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      color: "primary",
+      autoFocus: true,
+      variant: "contained",
+      onClick: confirm,
+      children: t('common.confirm')
+    }),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      mb: 1,
+      children: t('federated.joinFederatedLoginDescription')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+      fullWidth: true,
+      variant: "outlined",
+      margin: "dense",
+      placeholder: t('federated.federatedJoinAppUrl'),
+      label: t('federated.federatedJoinAppUrl'),
+      value: state.appUrl,
+      error: !!state.appUrlError,
+      helperText: state.appUrlError || 'eg: https://www.arcblock.io',
+      onChange: e => {
+        state.appUrl = e.target.value;
+      }
+    })]
+  });
+});
+var _default = FederatedJoinDialog;
+exports.default = _default;