@abtnode/ux 1.16.13-beta-55b3e93d → 1.16.13-beta-423a40b1

package/lib/blocklet/component/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BlockletComponent;
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
@@ -62,6 +62,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["blocklet", "onUpdate", "getComponentUrl"];
 var _templateObject, _templateObject2, _templateObject3;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -413,8 +415,7 @@ function ComponentItem(_ref) {
         component: blocklet,
         onStart: onStart,
         onStop: onStop,
-        disabled: !!deleteDisabledTip,
-        tip: deleteDisabledTip
+        disabled: root.status !== 'starting' && (0, _util.isInProgress)(root.status)
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_actions.default, {
         "data-cy": "component-actions",
         actions: [{

package/lib/blocklet/component/start.js

@@ -50,7 +50,7 @@ function StartComponent(_ref) {
     setLoading(false);
   };
   const componentDisabled = disabled || loading;
-  const isStop = component.status === 'running';
+  const isStop = ['starting', 'running'].includes(component.status);
   const Icon = isStop ? _Stop.default : _PlayArrow.default;
   const btn = /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledButton, {
     disabled: componentDisabled,
@@ -82,7 +82,7 @@ function StartComponent(_ref) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: btn
     })
-  }), confirmSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+  }, "btn"), confirmSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
     title: confirmSetting.title,
     description: confirmSetting.description,
     confirm: confirmSetting.confirm,
@@ -90,7 +90,7 @@ function StartComponent(_ref) {
     params: confirmSetting.params,
     onConfirm: confirmSetting.onConfirm,
     onCancel: confirmSetting.onCancel
-  })];
+  }, "connect")];
 }
 StartComponent.propTypes = {
   component: _propTypes.default.object.isRequired,

package/lib/blocklet/configuration.js

@@ -29,7 +29,8 @@ var _formTextInput = _interopRequireDefault(require("../form/form-text-input"));
 var _formSelectInput = _interopRequireDefault(require("../form/form-select-input"));
 var _node = require("../contexts/node");
 var _util2 = require("../util");
-var _permission = require("../permission");
+var _mode = require("../util/mode");
+var _permission = _interopRequireWildcard(require("../permission"));
 var _addDomainAlias = _interopRequireDefault(require("./router/action/add-domain-alias"));
 var _domainStatus = _interopRequireDefault(require("./router/domain-status"));
 var _domainActions = _interopRequireDefault(require("./router/domain-actions"));
@@ -293,9 +294,9 @@ function BlockletEnvironment(_ref) {
         initialValue: item.value,
         onSubmit: value => onSubmitConfig(item.key, value)
       })]
-    })), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-form",
-      children: [whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-item",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           className: "config-label",
@@ -309,21 +310,7 @@ function BlockletEnvironment(_ref) {
           defaultChecked: true,
           onChange: onPublicToStoreChange
         })]
-      }), !inService && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        className: "config-item",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          className: "config-label",
-          children: [t('blocklet.config.deletable.name'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            className: "config-desc",
-            children: deletable ? t('blocklet.config.deletable.disable') : t('blocklet.config.deletable.enable')
-          })]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Switch.default, {
-          disabled: disabled,
-          checked: !deletable,
-          defaultChecked: true,
-          onChange: onDeletableChange
-        })]
-      })]
+      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-form",
       component: _Divider.default,
@@ -508,7 +495,25 @@ function BlockletEnvironment(_ref) {
         border: '1px solid red',
         borderRadius: 2
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        className: "config-form",
+        mt: 2,
+        children: !inService && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          className: "config-item",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            className: "config-label",
+            children: [t('blocklet.config.deletable.name'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              className: "config-desc",
+              children: deletable ? t('blocklet.config.deletable.disable') : t('blocklet.config.deletable.enable')
+            })]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Switch.default, {
+            disabled: disabled,
+            checked: !deletable,
+            defaultChecked: true,
+            onChange: onDeletableChange
+          })]
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-form",
         mt: 2,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
@@ -522,36 +527,42 @@ function BlockletEnvironment(_ref) {
           initialValue: blocklet.environments.find(x => x.key === 'BLOCKLET_APP_SK').value,
           onChange: onAppSkChange
         })]
-      }), inService && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        className: "config-form",
-        mt: 2,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          className: "config-item",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            className: "config-label",
-            mb: 0,
-            children: t('team.transferApp.name')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-            style: {
-              flexShrink: 0
-            },
-            variant: "contained",
-            edge: "end",
-            color: "error",
-            size: "small",
-            "data-cy": "transfer-app",
-            onClick: () => setShowTransferOwner(true),
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Loop.default, {
+      }), inService &&
+      /*#__PURE__*/
+      // eslint-disable-next-line jsx-a11y/aria-role
+      (0, _jsxRuntime.jsx)(_permission.default, {
+        role: "owner",
+        children: isOwner => (isOwner || _mode.enableDebug) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          className: "config-form",
+          mt: 2,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            className: "config-item",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              className: "config-label",
+              mb: 0,
+              children: t('team.transferApp.name')
+            }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
               style: {
-                fontSize: '1.3em',
-                marginRight: 4
-              }
-            }), t('team.transferApp.name')]
+                flexShrink: 0
+              },
+              variant: "contained",
+              edge: "end",
+              color: "error",
+              size: "small",
+              "data-cy": "transfer-app",
+              onClick: () => setShowTransferOwner(true),
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Loop.default, {
+                style: {
+                  fontSize: '1.3em',
+                  marginRight: 4
+                }
+              }), t('team.transferApp.name')]
+            })]
+          }), showTransferOwner && /*#__PURE__*/(0, _jsxRuntime.jsx)(_transferOwner.default, {
+            onCancel: () => setShowTransferOwner(false),
+            onSuccess: () => setShowTransferOwner(false)
           })]
-        }), showTransferOwner && /*#__PURE__*/(0, _jsxRuntime.jsx)(_transferOwner.default, {
-          onCancel: () => setShowTransferOwner(false),
-          onSuccess: () => setShowTransferOwner(false)
-        })]
+        })
       })]
     })]
   }));

package/lib/blocklet/migration.js

@@ -129,7 +129,7 @@ function BlockletMigration() {
       alignItems: "center",
       children: t("blocklet.migrate.intro.".concat(x))
     }, x))]
-  }), blocklet && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+  }, "alert"), blocklet && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
     popup: true,
     open: openConnect,
     saveConnect: false,
@@ -153,6 +153,6 @@ function BlockletMigration() {
       }) : 'Redirecting...'
     },
     onClose: onClose
-  })];
+  }, "connect")];
 }
 BlockletMigration.propTypes = {};

package/lib/blocklet/oauth/auth0.js

@@ -12,6 +12,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _blocklet = require("../../contexts/blocklet");
+var _switchControl = _interopRequireDefault(require("../component/switch-control"));
 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; }
@@ -97,12 +98,16 @@ function OAuthAuth0() {
             field
           } = _ref;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
-            control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Switch, _objectSpread({
-              checked: field.value
+            control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchControl.default, _objectSpread({
+              checked: field.value,
+              style: {
+                marginRight: '6px'
+              }
             }, field)),
             label: t('oauth.auth0.enable'),
             sx: {
-              marginBottom: '8px'
+              marginBottom: 2,
+              ml: 1
             }
           });
         }

package/lib/blocklet/oauth/common-settings.js

@@ -0,0 +1,151 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = CommonSettings;
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _reactHookForm = require("react-hook-form");
+var _Button = _interopRequireDefault(require("@mui/material/Button"));
+var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
+var _Slider = _interopRequireDefault(require("@mui/material/Slider"));
+var _Stack = _interopRequireDefault(require("@mui/material/Stack"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _ahooks = require("ahooks");
+var _pick = _interopRequireDefault(require("lodash/pick"));
+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 }; }
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
+const defaultForm = {
+  cacheTtl: 10 * 60,
+  ttl: 86400 * 7
+};
+function fixTtl(data) {
+  let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  const ttl = reverse ? data.ttl * 86400 : data.ttl / 86400;
+  const cacheTtl = reverse ? data.cacheTtl * 60 : data.cacheTtl / 60;
+  return _objectSpread(_objectSpread({}, data), {}, {
+    ttl,
+    cacheTtl
+  });
+}
+function CommonSettings() {
+  var _blocklet$meta, _blocklet$settings;
+  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 sessionSettings = Object.assign({}, defaultForm, (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.session) || {});
+  const {
+    handleSubmit,
+    control,
+    formState,
+    reset
+  } = (0, _reactHookForm.useForm)({
+    defaultValues: (0, _pick.default)(fixTtl(sessionSettings), ['cacheTtl', 'ttl'])
+  });
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
+    try {
+      var _blockletChanged$sett;
+      const {
+        blocklet: blockletChanged
+      } = await api.updateAppSessionConfig({
+        input: {
+          did,
+          config: fixTtl(data, true)
+        }
+      });
+      const defaultValues = Object.assign({}, defaultForm, (blockletChanged === null || blockletChanged === void 0 ? void 0 : (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.session) || {});
+      // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
+      reset(fixTtl(defaultValues));
+      _Toast.default.success(t('common.configSuccess'));
+    } catch (err) {
+      _Toast.default.error(err.message);
+    }
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
+      onSubmit: handleSubmit(onSubmit),
+      disabled: true,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
+        name: "ttl",
+        control: control,
+        render: _ref => {
+          let {
+            field
+          } = _ref;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControl.default, {
+            fullWidth: true,
+            sx: {
+              mb: 2
+            },
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Stack.default, {
+              px: 3,
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                mx: -3,
+                my: 0.5,
+                children: t('blocklet.config.session.ttl', {
+                  day: field.value
+                })
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Slider.default, _objectSpread(_objectSpread({}, field), {}, {
+                defaultValue: 7,
+                step: 1,
+                marks: [{
+                  value: 1,
+                  label: t('blocklet.config.session.day', {
+                    day: 1
+                  })
+                }, {
+                  value: 7,
+                  label: t('blocklet.config.session.days', {
+                    day: 7
+                  })
+                }, {
+                  value: 14,
+                  label: t('blocklet.config.session.days', {
+                    day: 14
+                  })
+                }, {
+                  value: 21,
+                  label: t('blocklet.config.session.days', {
+                    day: 21
+                  })
+                }, {
+                  value: 30,
+                  label: t('blocklet.config.session.days', {
+                    day: 30
+                  })
+                }],
+                min: 1,
+                max: 30,
+                valueLabelDisplay: "auto",
+                style: {
+                  maxWidth: '360px'
+                }
+              }))]
+            })
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        type: "submit",
+        variant: "contained",
+        onSubmit: handleSubmit(onSubmit),
+        disabled: !formState.isDirty,
+        children: t('oauth.save')
+      })]
+    })
+  });
+}

package/lib/blocklet/oauth/index.js

@@ -11,10 +11,21 @@ var _material = require("@mui/material");
 var _ahooks = require("ahooks");
 var _react = require("react");
 var _auth = _interopRequireDefault(require("./auth0"));
+var _commonSettings = _interopRequireDefault(require("./common-settings"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function OAuth() {
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
   const tabs = [{
+    label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+      textAlign: "center",
+      width: "100%",
+      children: t('oauth.commonSettings')
+    }),
+    value: 'settings'
+  }, {
     label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
       textAlign: "center",
       width: "100%",
@@ -25,20 +36,20 @@ function OAuth() {
     label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
       textAlign: "center",
       width: "100%",
-      children: "More"
+      children: t('oauth.moreLogin')
     }),
     value: 'more'
   }];
   const [currentTab, setCurrentTab] = (0, _react.useState)(tabs[0].value);
-  const {
-    t
-  } = (0, _react.useContext)(_context.LocaleContext);
   const contents = (0, _ahooks.useCreation)(() => ({
     auth0: /*#__PURE__*/(0, _jsxRuntime.jsx)(_auth.default, {}),
     more: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
         children: t('oauth.comingSoon')
       })
+    }),
+    settings: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_commonSettings.default, {})
     })
   }), [t]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {

package/lib/blocklet/overview.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BlockletOverview;
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _Alert = _interopRequireDefault(require("@mui/material/Alert"));
@@ -26,10 +25,10 @@ var _blocklet = require("../contexts/blocklet");
 var _node = require("../contexts/node");
 var _didAddress = _interopRequireDefault(require("../did-address"));
 var _util2 = require("../util");
-var _expiration = _interopRequireDefault(require("./component/expiration"));
 var _domainStatus = _interopRequireDefault(require("./router/domain-status"));
 var _status = _interopRequireDefault(require("./status"));
 var _types = require("./types");
+var _util3 = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -92,10 +91,9 @@ DomainLink.propTypes = {
 };
 const LinkDiv = _styled.default.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &,\n  & > * {\n    color: #222;\n    font-size: 18px;\n  }\n\n  .status {\n    margin-left: 8px;\n  }\n"])));
 function BlockletOverview() {
-  var _blocklet$environment, _blocklet$settings, _blocklet$site;
+  var _blocklet$environment, _blocklet$controller, _blocklet$controller2, _blocklet$controller3, _blocklet$settings, _blocklet$site;
   const {
-    t,
-    locale
+    t
   } = (0, _context.useLocaleContext)();
   const {
     info: nodeInfo,
@@ -146,11 +144,12 @@ function BlockletOverview() {
       status: blocklet.status,
       source: blocklet.source
     })
-  }, !(0, _isEmpty.default)(blocklet.controller) ? {
-    name: t('common.expires'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_expiration.default, {
-      controller: blocklet.controller,
-      locale: locale
+  }, (0, _util3.isServerless)(blocklet) ? {
+    name: 'NFT',
+    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+      external: true,
+      href: (0, _util2.getExplorerLink)(blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$controller = blocklet.controller) === null || _blocklet$controller === void 0 ? void 0 : _blocklet$controller.chainHost, blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$controller2 = blocklet.controller) === null || _blocklet$controller2 === void 0 ? void 0 : _blocklet$controller2.nftId, 'asset'),
+      did: blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$controller3 = blocklet.controller) === null || _blocklet$controller3 === void 0 ? void 0 : _blocklet$controller3.nftId
     })
   } : null, {
     name: t('blocklet.installedAt'),

package/lib/blocklet/page-group.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = BlockletPageGroup;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _tag = _interopRequireDefault(require("../tag"));
+var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["group"];
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function BlockletPageGroup(_ref) {
+  let {
+      group
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  if (group) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tag.default, _objectSpread(_objectSpread({
+      type: "reverse"
+    }, rest), {}, {
+      children: group
+    }));
+  }
+  return null;
+}
+BlockletPageGroup.propTypes = {
+  group: _propTypes.default.string.isRequired
+};

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = AddRule;
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Link = _interopRequireDefault(require("@mui/icons-material/Link"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
@@ -23,6 +23,8 @@ var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule")
 var _util2 = require("../../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -68,6 +70,14 @@ function AddRule(_ref) {
         rule.to.url = params.url.trim();
         rule.to.redirectCode = params.redirectCode;
       }
+      if (params.type === _constant.ROUTING_RULE_TYPES.COMPONENT) {
+        rule.to.did = teamDid;
+        rule.to.componentId = params.componentId;
+        rule.to.pageGroup = params.pageGroup;
+      }
+      if (params.type === _constant.ROUTING_RULE_TYPES.GENERAL_REWRITE) {
+        rule.to.url = (0, _urlPathFriendly.default)(params.url);
+      }
       await api.addRoutingRule({
         input: {
           id: siteId,
@@ -107,7 +117,7 @@ function AddRule(_ref) {
           "data-cy": "path-prefix-input",
           fullWidth: true,
           autoFocus: true,
-          helperText: params.helperText || t('router.rule.add.pathPrefixTip'),
+          helperText: params.pathPrefixHint || t('router.rule.add.pathPrefixTip'),
           style: {
             marginBottom: 32
           },
@@ -128,6 +138,9 @@ function AddRule(_ref) {
             if (params.type === _constant.ROUTING_RULE_TYPES.REDIRECT && !params.url) {
               disable = true;
             }
+            if (params.type === _constant.ROUTING_RULE_TYPES.GENERAL_REWRITE && !params.url) {
+              disable = true;
+            }
             if (!e.target.value.trim()) {
               disable = true;
               setError(t('router.validation.pathPrefixRequired'));
@@ -135,12 +148,12 @@ function AddRule(_ref) {
             if (!disable) {
               setError('');
             }
-            const helperText = t('common.slugifyHint', {
+            const pathPrefixHint = t('common.slugifyHint', {
               value: (0, _util2.formatMountPoint)(e.target.value)
             });
             setParams(_objectSpread(_objectSpread({}, params), {}, {
               pathPrefix: e.target.value,
-              helperText,
+              pathPrefixHint,
               __disableConfirm: disable
             }));
           }
@@ -154,9 +167,11 @@ function AddRule(_ref) {
     confirm: t('router.rule.add.confirm'),
     cancel: t('common.cancel'),
     params: {
+      did: '',
       pathPrefix: '',
       type: _constant.ROUTING_RULE_TYPES.REDIRECT,
-      interfaceName: '',
+      componentId: '',
+      pageGroup: '',
       redirectCode: 302,
       __disableConfirm: true
     },