@abtnode/ux 1.8.66 → 1.8.67-beta-794a8082

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

@@ -25,7 +25,7 @@ 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 _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util2 = require("../../util");
@@ -198,8 +198,8 @@ function ConfigAccess(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "config-access-confirm",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), t('common.confirm')]
       })]
     }),

package/lib/blocklet/actions.js

@@ -13,7 +13,7 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _Menu = _interopRequireDefault(require("@mui/material/Menu"));
 var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
 var _ButtonGroup = _interopRequireDefault(require("@mui/material/ButtonGroup"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _MoreVert = _interopRequireDefault(require("@mui/icons-material/MoreVert"));
 var _ListItemIcon = _interopRequireDefault(require("@mui/material/ListItemIcon"));
@@ -397,8 +397,8 @@ function BlockletActions(_ref) {
         "data-cy": "".concat(action.action, "-blocklet"),
         onClick: () => onAction(action),
         disabled: Boolean(action.disabled) || loading,
-        children: [currentAction === action.action && loading && inProgress ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [currentAction === action.action && loading && inProgress ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(action.icon, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: "blocklet-action-text",
           children: action.name

package/lib/blocklet/audit-logs.js

@@ -8,7 +8,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _reactRouterDom = require("react-router-dom");
 var _reactMarkdownPreview = _interopRequireDefault(require("@uiw/react-markdown-preview"));
 var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -49,6 +49,9 @@ function AuditLog(_ref2) {
     inService,
     info
   } = (0, _node.useNodeContext)();
+  if (!log.actor.did) {
+    return null;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
     className: "log-entry",
     "data-cy": "log-entry",
@@ -130,7 +133,7 @@ function AuditLogs() {
         textAlign: 'center',
         marginTop: '50px'
       },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
     });
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {

package/lib/blocklet/component/add.js

@@ -12,7 +12,7 @@ var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
 var _pageHeader = _interopRequireDefault(require("@blocklet/launcher-layout/lib/page-header"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -25,6 +25,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
 var _launcherLayout = _interopRequireDefault(require("@blocklet/launcher-layout"));
 var _step = require("@blocklet/launcher-layout/lib/context/step");
+var _constant2 = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
@@ -179,6 +180,7 @@ function AddComponent(_ref2) {
   const {
     setActiveStepByIndex
   } = stepRef.current || {};
+  const isServerlessMode = nodeInfo.mode === _constant2.NODE_MODES.SERVERLESS;
   const updateParams = obj => setParams(x => _objectSpread(_objectSpread({}, x), obj));
   (0, _react.useEffect)(() => {
     if (params.pathPrefix) {
@@ -609,7 +611,7 @@ function AddComponent(_ref2) {
           confirm: t('blocklet.component.choose')
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_selectStore.default, {
-        extra: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+        extra: !isServerlessMode ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
           variant: "text",
           color: "primary",
           "data-cy": "add-component-from-url",
@@ -627,7 +629,7 @@ function AddComponent(_ref2) {
               marginRight: 4
             }
           }), " ", t('blocklet.component.addComponentTip.fromUrl'), ' ']
-        }),
+        }) : null,
         loading: loading,
         onChange: () => {
           setParams({});
@@ -974,8 +976,8 @@ function AddComponent(_ref2) {
       onClick: onMenuItemClick,
       className: "component-action",
       "data-cy": "action-add-component",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.default, {
         style: {
           fontSize: 18,
@@ -1038,8 +1040,8 @@ function AddComponent(_ref2) {
             maxWidth: '200px',
             display: 'inline-block'
           },
-          children: [(typeof step.loading === 'boolean' ? step.loading : loading) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-            size: [16, 10]
+          children: [(typeof step.loading === 'boolean' ? step.loading : loading) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+            size: 16
           }), step.confirm]
         })]
       }),

package/lib/blocklet/component/index.js

@@ -27,7 +27,7 @@ var _ArrowForward = _interopRequireDefault(require("@mui/icons-material/ArrowFor
 var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
 var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -635,8 +635,8 @@ function BlockletComponent(_ref4) {
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
                 mr: 0.5,
                 display: "flex",
-                children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-                  size: [16, 10]
+                children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+                  size: 16
                 }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Update.default, {
                   style: {
                     fontSize: '1em'
@@ -792,8 +792,8 @@ function BlockletComponent(_ref4) {
             disabled: loading || updateConfirm.type === 'component' && !updateConfirm.hasChecks,
             variant: "contained",
             autoFocus: true,
-            children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-              size: [16, 10]
+            children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 16
             }), t('common.update')]
           })]
         })]

package/lib/blocklet/component/select-store.js

@@ -10,6 +10,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
+var _constant = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _ArrowDropDown = _interopRequireDefault(require("@mui/icons-material/ArrowDropDown"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
@@ -54,6 +55,7 @@ function SelectStore(_ref) {
     nodeInfo
   });
   const currentRegistry = storeUrl && storeList.find(x => storeUrl === x.url) || storeList[0];
+  const isServerlessMode = nodeInfo.mode === _constant.NODE_MODES.SERVERLESS;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(SelectStoreTitle, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
@@ -124,7 +126,7 @@ function SelectStore(_ref) {
             }
           })
         }, x.url);
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
+      }), !isServerlessMode && /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
         disabled: loading,
         storeList: storeList,
         teamDid: teamDid,

package/lib/blocklet/component/store-blocklet-list.js

@@ -14,7 +14,7 @@ var _reactErrorBoundary = require("react-error-boundary");
 var _list = _interopRequireDefault(require("@blocklet/list"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Blocklet = _interopRequireWildcard(require("@arcblock/ux/lib/Blocklet"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _util = require("@blocklet/meta/lib/util");
 var _toast = _interopRequireDefault(require("../../toast"));
@@ -120,8 +120,8 @@ function BlockletItem(_ref2) {
             color: "primary",
             "data-cy": "install-blocklet",
             children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-                size: [16, 10],
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+                size: 16,
                 style: {
                   marginRight: 3
                 }

package/lib/blocklet/install-from-url.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _semver = _interopRequireDefault(require("semver"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -16,12 +16,14 @@ var _Stepper = _interopRequireDefault(require("@mui/material/Stepper"));
 var _Step = _interopRequireDefault(require("@mui/material/Step"));
 var _StepLabel = _interopRequireDefault(require("@mui/material/StepLabel"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
+var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _util = require("@blocklet/meta/lib/util");
 var _node = require("../contexts/node");
+var _session = require("../contexts/session");
 var _util2 = require("../util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -43,6 +45,9 @@ function InstallFromUrl(_ref) {
   const {
     api
   } = (0, _node.useNodeContext)();
+  const {
+    api: $api
+  } = (0, _session.useSessionContext)();
   const [loading, setLoading] = (0, _react.useState)(false);
   const [error, setError] = (0, _react.useState)('');
   const {
@@ -55,6 +60,8 @@ function InstallFromUrl(_ref) {
   const [activeStep, setActiveStep] = (0, _react.useState)(defaultUrl ? 1 : 0);
   const [meta, setMeta] = (0, _react.useState)(initMeta);
   const [existingMeta, setExistingMeta] = (0, _react.useState)(null);
+  const [isConnectOpen, setConnectOpen] = (0, _react.useState)(false);
+  const [canUpgrade, setCanUpgrade] = (0, _react.useState)(false);
   const [params, setParams] = (0, _react.useState)({});
   const isComponentMode = mode === 'component';
   // if mode is component , we need to always show the step, that means the user can return to the previous step
@@ -95,12 +102,11 @@ function InstallFromUrl(_ref) {
             attachRuntimeInfo: false
           }
         });
-        if (existedBlocklet && _semver.default.gte(existedBlocklet.meta.version, newer.version)) {
+        if (existedBlocklet) {
           setExistingMeta(existedBlocklet.meta);
-          setMeta(newer);
-        } else {
-          setMeta(newer);
+          setCanUpgrade(_semver.default.lt(existedBlocklet.meta.version, newer.version));
         }
+        setMeta(newer);
       }
       setParams({
         inStore,
@@ -121,28 +127,43 @@ function InstallFromUrl(_ref) {
       onSuccess(_objectSpread({
         meta
       }, params));
-    } else {
-      await onInstall();
+      _onCancel();
+      return;
+    }
+    if (canUpgrade) {
+      try {
+        setLoading(true);
+        await api.installBlocklet({
+          input: {
+            url: decodeURIComponent(url.trim())
+          }
+        });
+        onSuccess(_objectSpread({
+          meta
+        }, params));
+        _onCancel();
+      } catch (err) {
+        const errMsg = "Blocklet Install failed: ".concat((0, _util2.formatError)(err));
+        setError(errMsg);
+      } finally {
+        setLoading(false);
+      }
+      return;
     }
+    setLoading(true);
+    setConnectOpen(true);
+  };
+  const onEndInstall = () => {
+    setLoading(false);
+    setConnectOpen(false);
+    onSuccess(_objectSpread({
+      meta
+    }, params));
     _onCancel();
   };
-  const onInstall = async () => {
-    setLoading(true);
-    try {
-      await api.installBlocklet({
-        input: {
-          url: decodeURIComponent(url.trim())
-        }
-      });
-      onSuccess(_objectSpread({
-        meta
-      }, params));
-    } catch (err) {
-      const errMsg = "Blocklet Install failed: ".concat((0, _util2.formatError)(err));
-      setError(errMsg);
-    } finally {
-      setLoading(false);
-    }
+  const onCancelInstall = () => {
+    setLoading(false);
+    setConnectOpen(false);
   };
   (0, _react.useEffect)(() => {
     if (defaultUrl) {
@@ -181,7 +202,7 @@ function InstallFromUrl(_ref) {
           justifyContent: 'center',
           flexDirection: 'column'
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
       });
     }
     if (meta.did) {
@@ -205,7 +226,7 @@ function InstallFromUrl(_ref) {
             name: row.name,
             children: row.value
           }, row.name);
-        }), existingMeta && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
+        }), existingMeta && !canUpgrade && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
           type: "error",
           variant: "icon",
           style: {
@@ -276,7 +297,7 @@ function InstallFromUrl(_ref) {
       }
     },
     onConfirm: () => {
-      if (existingMeta) {
+      if (existingMeta && !canUpgrade) {
         _onCancel();
       } else {
         _onConfirm();
@@ -284,67 +305,89 @@ function InstallFromUrl(_ref) {
     }
   }];
   const step = steps[activeStep];
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
-    title: (handleText === null || handleText === void 0 ? void 0 : handleText.title) || t('blocklet.fromUrl.title'),
-    fullWidth: true,
-    maxWidth: "md",
-    onClose: () => step.onCancel(),
-    showCloseButton: activeStep === 0,
-    disableEscapeKeyDown: true,
-    open: true,
-    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [step.cancel && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-        onClick: e => {
-          e.stopPropagation();
-          setError(null);
-          step.onCancel();
-        },
-        color: "inherit",
-        children: step.cancel || t('common.cancel')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-        onClick: e => {
-          e.stopPropagation();
-          step.onConfirm();
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
+      title: (handleText === null || handleText === void 0 ? void 0 : handleText.title) || t('blocklet.fromUrl.title'),
+      fullWidth: true,
+      maxWidth: "md",
+      onClose: () => step.onCancel(),
+      showCloseButton: activeStep === 0,
+      disableEscapeKeyDown: true,
+      open: true,
+      actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [step.cancel && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          onClick: e => {
+            e.stopPropagation();
+            setError(null);
+            step.onCancel();
+          },
+          color: "inherit",
+          children: step.cancel || t('common.cancel')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+          onClick: e => {
+            e.stopPropagation();
+            step.onConfirm();
+          },
+          color: "primary",
+          "data-cy": "install-blocklet-next-step",
+          disabled: loading || !url || error,
+          variant: "contained",
+          autoFocus: true,
+          style: {
+            marginLeft: 8
+          },
+          children: [loading && activeStep === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+            size: 16
+          }), step.confirm]
+        })]
+      }),
+      children: [alwayShowSteps && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Stepper.default, {
+        alternativeLabel: true,
+        activeStep: activeStep,
+        children: steps.map(_ref2 => {
+          let {
+            label
+          } = _ref2;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Step.default, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_StepLabel.default, {
+              children: label
+            })
+          }, label);
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_DialogContentText.default, {
+        component: "div",
+        style: {
+          marginTop: 24
         },
-        color: "primary",
-        "data-cy": "install-blocklet-next-step",
-        disabled: loading || !url || error,
-        variant: "contained",
-        autoFocus: true,
+        children: step.body
+      }), !!error && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
+        type: "error",
         style: {
-          marginLeft: 8
+          width: '100%',
+          marginTop: 8
         },
-        children: [loading && activeStep === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
-        }), step.confirm]
+        children: error
       })]
-    }),
-    children: [alwayShowSteps && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Stepper.default, {
-      alternativeLabel: true,
-      activeStep: activeStep,
-      children: steps.map(_ref2 => {
-        let {
-          label
-        } = _ref2;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Step.default, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_StepLabel.default, {
-            children: label
-          })
-        }, label);
-      })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_DialogContentText.default, {
-      component: "div",
-      style: {
-        marginTop: 24
+    }), meta && isConnectOpen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+      popup: true,
+      open: true,
+      forceConnected: false,
+      className: "launch-from-url-auth",
+      action: "launch-free-blocklet-by-session",
+      checkFn: $api.get,
+      checkTimeout: 5 * 60 * 1000,
+      onSuccess: onEndInstall,
+      extraParams: {
+        title: meta.title,
+        blockletMetaUrl: decodeURIComponent(url.trim())
       },
-      children: step.body
-    }), !!error && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
-      type: "error",
-      style: {
-        width: '100%',
-        marginTop: 8
+      messages: {
+        title: t('setup.keyPair.title'),
+        scan: t('setup.keyPair.scan'),
+        confirm: t('setup.keyPair.confirm'),
+        success: t('setup.keyPair.success')
       },
-      children: error
+      onClose: onCancelInstall
     })]
   });
 }

package/lib/blocklet/overview.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Alert = _interopRequireDefault(require("@mui/material/Alert"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
@@ -49,7 +49,7 @@ function DomainLink(_ref) {
         placement: "top-end",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: "status",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
             size: 12
           })
         })
@@ -255,7 +255,7 @@ function BlockletOverview() {
           }
         })]
       })
-    }, domain.value)), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+    }, domain.value)), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
       size: 16
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
       children: t('common.empty')

package/lib/blocklet/router/action/add-domain-alias.js

@@ -7,7 +7,7 @@ exports.default = AddDomainAlias;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _CallMerge = _interopRequireDefault(require("@mui/icons-material/CallMerge"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -140,8 +140,8 @@ function AddDomainAlias(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-add-domain-alias",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_CallMerge.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/add-rule.js

@@ -7,7 +7,7 @@ exports.default = AddRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Link = _interopRequireDefault(require("@mui/icons-material/Link"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -176,8 +176,8 @@ function AddRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-add-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/delete-domain-alias.js

@@ -7,7 +7,7 @@ exports.default = DeleteDomainAlias;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
@@ -78,8 +78,8 @@ function DeleteDomainAlias(props) {
       className: "rule-action",
       color: "error",
       "data-cy": "action-delete-domain-alias",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Delete.default, {
         style: {
           fontSize: 16

package/lib/blocklet/router/action/delete-rule.js

@@ -7,7 +7,7 @@ exports.default = DeleteRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _node = require("../../../contexts/node");
@@ -83,8 +83,8 @@ function DeleteRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-delete-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Delete.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/update-rule.js

@@ -7,7 +7,7 @@ exports.default = UpdateRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -172,8 +172,8 @@ function UpdateRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-update-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Edit.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/status.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BlockletStatus;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _dot = _interopRequireDefault(require("../dot"));
@@ -85,8 +85,8 @@ function BlockletStatus(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tag.default, _objectSpread(_objectSpread({
     type: map[status]
   }, rest), {}, {
-    children: [inProgress && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-      size: [12, 6],
+    children: [inProgress && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+      size: 12,
       color: "inherit",
       style: {
         marginRight: 5

package/lib/blocklet/version.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _semver = _interopRequireDefault(require("semver"));
 var _notistack = require("notistack");
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _ArrowUpward = _interopRequireDefault(require("@mui/icons-material/ArrowUpward"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
@@ -130,8 +130,8 @@ function Version(_ref) {
           },
           disabled: loading,
           onClick: () => setConfirmSetting(setting),
-          children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-            size: [16, 10]
+          children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+            size: 16
           }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowUpward.default, {
             style: {
               fontSize: 16,

package/lib/confirm.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogActions = _interopRequireDefault(require("@mui/material/DialogActions"));
 var _DialogContent = _interopRequireDefault(require("@mui/material/DialogContent"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
@@ -118,8 +118,8 @@ function ConfirmDialog(_ref) {
         variant: "contained",
         "data-cy": "submit-confirm-dialog",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), confirm]
       })]
     })]

package/lib/invitation/invitation.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _ahooks = require("ahooks");
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Result = _interopRequireDefault(require("@arcblock/ux/lib/Result"));
 var _invitationPassport = _interopRequireDefault(require("./invitation-passport"));
 var _invitationReceive = _interopRequireDefault(require("./invitation-receive"));
@@ -30,7 +30,7 @@ function Invitation(_ref) {
   } = _ref;
   const state = (0, _ahooks.useRequest)(getDataFn);
   if (state.loading) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {});
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {});
   }
   if (state.error) {
     var _state$error, _state$error$response;

package/lib/issue-passport.js

@@ -109,7 +109,6 @@ function IssuePassport(_ref) {
       autoConnect: false,
       checkFn: api.get,
       checkTimeout: 10 * 60 * 1000,
-      socketUrl: api.socketUrl,
       webWalletUrl: webWalletUrl,
       onSuccess: onReceivePassport,
       locale: locale,

package/lib/locales/en.js

@@ -8,6 +8,12 @@ module.exports = {
       confirm: 'Review this operation on your DID Wallet',
       success: 'Your account is connected to this server'
     },
+    keyPair: {
+      title: 'Derived KeyPair Required',
+      scan: 'Connect your DID Wallet to generate a key-pair for this app',
+      confirm: 'Review this operation on your DID Wallet',
+      success: 'Your key pair is securely stored'
+    },
     verify: {
       title: 'Ownership Credential Required',
       scan: 'Connect your DID Wallet to provide ownership credentials',
@@ -863,6 +869,9 @@ module.exports = {
         rate: 'Request Limit({rate} Request/Second)',
         ipHeaderLabel: 'Customize client IP header(Optional)',
         ipHeaderDesc: "If the Blocklet Server is running behind some proxies, you can set the header of the client's real IP here. Optional, leave empty to use default."
+      },
+      cacheEnabled: {
+        switchLabel: 'Enable Gateway Cache'
       }
     }
   },

package/lib/locales/zh.js

@@ -8,6 +8,12 @@ module.exports = {
       confirm: '请在 DID 钱包上确认',
       success: '你已经成功成为节点的所有者'
     },
+    keyPair: {
+      title: '生成钥匙对',
+      scan: '用你的 DID 钱包扫码为这个应用生成钥匙对',
+      confirm: '请在 DID 钱包上确认',
+      success: '你的钥匙对已经被安全存储'
+    },
     verify: {
       title: '需要节点所有权证书',
       scan: '用你的 DID 钱包扫描下面的二维码以提供所有权证书',
@@ -866,6 +872,9 @@ module.exports = {
         rate: '限流速率({rate} 请求/秒)',
         ipHeaderLabel: '自定义客户端 IP 头部(可选)',
         ipHeaderDesc: '如果 Blocklet Server 运行在一些代理后面，可以在这里设置客户端真实 IP 的头部；可选，如果不填将使用默认值。'
+      },
+      cacheEnabled: {
+        switchLabel: '启用网关缓存'
       }
     }
   },

package/lib/logs/download.js

@@ -12,7 +12,7 @@ var _Download = _interopRequireDefault(require("@mui/icons-material/Download"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
 var _Select = _interopRequireDefault(require("@mui/material/Select"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
@@ -75,8 +75,8 @@ function DownloadLog(_ref) {
       variant: "outlined",
       onClick: () => setShowDialog(true),
       disabled: isDownloading,
-      children: [isDownloading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [isDownloading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Download.default, {
         fontSize: "small",
         style: {
@@ -104,8 +104,8 @@ function DownloadLog(_ref) {
       variant: "outlined",
       onClick: () => onDownload(),
       disabled: isDownloading,
-      children: [isDownloading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-        size: [16, 10]
+      children: [isDownloading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         ml: 0.5,
         children: t('common.confirm')

package/lib/lost-passport.js

@@ -147,7 +147,6 @@ function LostPassport(_ref2) {
           autoConnect: false,
           checkFn: api.get,
           checkTimeout: 10 * 60 * 1000,
-          socketUrl: api.socketUrl,
           webWalletUrl: webWalletUrl,
           onSuccess: onGetUser,
           locale: locale,
@@ -238,7 +237,6 @@ function LostPassport(_ref2) {
         action: "lost-passport-issue",
         checkFn: api.get,
         checkTimeout: 10 * 60 * 1000,
-        socketUrl: api.socketUrl,
         webWalletUrl: webWalletUrl,
         onSuccess: onReceivePassport,
         locale: locale,

package/lib/store/add.js

@@ -7,7 +7,7 @@ exports.default = AddStore;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styles = require("@mui/styles");
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
@@ -115,8 +115,8 @@ function AddStore(_ref) {
           disabled: loading || !url || disable,
           variant: "contained",
           autoFocus: true,
-          children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-            size: [16, 10]
+          children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+            size: 16
           }), t('common.confirm')]
         })]
       }),

package/lib/team/members/invite-member.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -181,8 +181,8 @@ function InviteMember(_ref) {
         disabled: loading || !role,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), step.confirm]
       })]
     }),

package/lib/team/members/issue-passport.js

@@ -7,7 +7,7 @@ exports.default = IssuePassport;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -90,8 +90,8 @@ function IssuePassport(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "issue-passport-create-btn",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), t('team.passport.issuance.create.title')]
       })]
     }),

package/lib/team/members/member.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _notistack = require("notistack");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
@@ -244,7 +244,7 @@ function Member(_ref) {
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
       children: [!user && /*#__PURE__*/(0, _jsxRuntime.jsx)(Center, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
       }), user && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           display: "flex",

package/lib/team/members/transfer-node.js

@@ -10,7 +10,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -76,7 +76,7 @@ function TransferMember(_ref) {
           display: 'flex',
           justifyContent: 'center'
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
       })
     });
   }
@@ -233,8 +233,8 @@ function TransferMember(_ref) {
         disabled: loading,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), step.confirm]
       })]
     }),

package/lib/team/passports/color.js

@@ -8,7 +8,7 @@ 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 _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _reactColor = require("react-color");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -83,8 +83,8 @@ function PassportColor(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "color-btn-confirm",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), t('common.save')]
       })]
     }),

package/lib/team/passports/detail.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormControlLabel"));
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
@@ -201,14 +201,14 @@ function PassportDetail(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "bind-permission-btn-confirm",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), t('common.save')]
       })]
     }),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
       children: [!role && /*#__PURE__*/(0, _jsxRuntime.jsx)(Center, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
       }), role && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "dialog-content",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/team/passports/index.js

@@ -11,7 +11,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _SplitButton = _interopRequireDefault(require("@arcblock/ux/lib/SplitButton"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _LockIcon = _interopRequireDefault(require("@arcblock/icons/lib/LockIcon"));
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
@@ -105,8 +105,8 @@ function PassportList() {
                 children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
                   display: "flex",
                   alignItems: "center",
-                  children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-                    size: [16, 10],
+                  children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+                    size: 16,
                     style: {
                       marginRight: 8
                     }

package/lib/team/passports/mutate-role.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _md = _interopRequireDefault(require("md5"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -170,8 +170,8 @@ function MutateRole(_ref) {
         disabled: loading,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), mode === 'create' ? t('common.create') : t('common.update')]
       })]
     }),

package/lib/team/passports/trusted-issuer.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _ArrowBack = _interopRequireDefault(require("@mui/icons-material/ArrowBack"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
@@ -138,8 +138,8 @@ function TrustedIssuer(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "save-mapping",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
-          size: [16, 10]
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
         }), t('common.save')]
       })]
     }),

package/lib/util/index.js

@@ -377,6 +377,12 @@ const stringSortHandlerAsc = function stringSortHandlerAsc() {
   }
   return 0;
 };
+
+/**
+ *
+ * @param {ABTNode} nodeInfo
+ * @returns {string} like http://localhost:3000, http://localhost:3000/admin
+ */
 exports.stringSortHandlerAsc = stringSortHandlerAsc;
 const getEndPoint = nodeInfo => {
   const {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66",
+  "version": "1.8.67-beta-794a8082",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,19 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.66",
-    "@abtnode/constant": "1.8.66",
-    "@abtnode/util": "1.8.66",
-    "@arcblock/did-connect": "^2.4.71",
+    "@abtnode/auth": "1.8.67-beta-794a8082",
+    "@abtnode/constant": "1.8.67-beta-794a8082",
+    "@abtnode/util": "1.8.67-beta-794a8082",
+    "@arcblock/did-connect": "^2.5.4",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.4.71",
-    "@arcblock/terminal": "^2.4.71",
-    "@arcblock/ux": "^2.4.71",
-    "@blocklet/constant": "1.8.66",
-    "@blocklet/launcher-layout": "^1.9.58",
-    "@blocklet/list": "^0.10.50",
-    "@blocklet/meta": "1.8.66",
-    "@blocklet/ui-react": "^2.4.71",
+    "@arcblock/icons": "^2.5.4",
+    "@arcblock/terminal": "^2.5.4",
+    "@arcblock/ux": "^2.5.4",
+    "@blocklet/constant": "1.8.67-beta-794a8082",
+    "@blocklet/launcher-layout": "^1.9.60",
+    "@blocklet/list": "^0.11.4",
+    "@blocklet/meta": "1.8.67-beta-794a8082",
+    "@blocklet/ui-react": "^2.5.4",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "282247fd0ce6702e1d6920e90e2b3be0408cf879"
+  "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
 }