@abtnode/ux 1.16.11-beta-069c3537 → 1.16.11-beta-f74663ac

package/lib/actions.js

@@ -56,7 +56,7 @@ function Actions(_ref) {
       "aria-haspopup": "true",
       "data-cy": "actions-menu-icon",
       onClick: onOpen,
-      size: "large",
+      size: "small",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_MoreHoriz.default, {})
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Menu.default, {
       id: "actions-menu",
@@ -82,13 +82,14 @@ function Actions(_ref) {
         return /*#__PURE__*/(0, _react.createElement)(_MenuItem.default, _objectSpread(_objectSpread({}, opts), {}, {
           disabled: disabled,
           dense: true,
-          onClick: e => {
+          onClick: async e => {
+            await _onClick(e);
             onClose();
-            _onClick(e);
           }
           // eslint-disable-next-line react/no-array-index-key
           ,
-          key: index
+          key: index,
+          "data-cy": "actions-menu-".concat(index)
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemIcon.default, {
           style: {
             minWidth: 24,

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

@@ -26,10 +26,10 @@ 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 _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _util2 = require("../../util");
-var _toast = _interopRequireDefault(require("../../toast"));
 var _config = _interopRequireDefault(require("../../who-can-access/config"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2;
@@ -160,12 +160,12 @@ function ConfigAccess(_ref) {
           whoCanAccess: value
         }
       });
-      _toast.default.success(t('blocklet.config.access.updatedTip'));
+      _Toast.default.success(t('blocklet.config.access.updatedTip'));
       onClose();
       setLoading(false);
     } catch (err) {
       setLoading(false);
-      _toast.default.error((0, _util2.formatError)(err));
+      _Toast.default.error((0, _util2.formatError)(err));
     }
   };
   const disabled = loading || whoCanAccess === CONFIG_ROLE && !roles.length;

package/lib/blocklet/actions.js

@@ -28,12 +28,13 @@ var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
 var _constant2 = require("@abtnode/constant");
-var _toast = _interopRequireDefault(require("../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util2 = require("../util");
 var _util3 = require("./util");
 var _node = require("../contexts/node");
 var _confirm = _interopRequireDefault(require("../confirm"));
 var _icons = _interopRequireDefault(require("./icons"));
+var _blocklet = require("../contexts/blocklet");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 const _excluded = ["blocklet", "onStart", "onComplete", "variant", "hasPermission", "useBlockletUrlEvaluation"];
@@ -49,6 +50,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || 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 BlockletActions(_ref) {
+  var _blocklet$controller, _blocklet$controller$, _blocklet$controller2, _blocklet$controller3;
   let {
       blocklet,
       onStart,
@@ -72,7 +74,14 @@ function BlockletActions(_ref) {
     loading: recommendedUrlLoading,
     recommendedUrl
   } = useBlockletUrlEvaluation(blocklet);
+  const {
+    nftState
+  } = (0, _blocklet.useBlockletContext)();
   const inProgress = (0, _util.isInProgress)(blocklet.status);
+  let disableStart = (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$controller = blocklet.controller) === null || _blocklet$controller === void 0 ? void 0 : (_blocklet$controller$ = _blocklet$controller.status) === null || _blocklet$controller$ === void 0 ? void 0 : _blocklet$controller$.value) === _constant.BLOCKLET_CONTROLLER_STATUS.suspended;
+  if (!(nftState !== null && nftState !== void 0 && nftState.expired) && (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$controller2 = blocklet.controller) === null || _blocklet$controller2 === void 0 ? void 0 : (_blocklet$controller3 = _blocklet$controller2.status) === null || _blocklet$controller3 === void 0 ? void 0 : _blocklet$controller3.reason) === _constant.SUSPENDED_REASON.expired) {
+    disableStart = false;
+  }
   const {
     inService
   } = node;
@@ -93,6 +102,10 @@ function BlockletActions(_ref) {
             await fn(params);
           } else if (action === 'start') {
             var _blocklet$settings;
+            if (!(0, _util.hasRunnableComponent)(blocklet)) {
+              _Toast.default.error(t('blocklet.noComponent'));
+              return;
+            }
             if (!inService && !skipSetup && !((_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.initialized)) {
               // 跳转到 setup 流程界面时携带 serverUrl 查询参数
               const serverUrl = (0, _util3.getServerUrl)(node.info);
@@ -105,10 +118,6 @@ function BlockletActions(_ref) {
               });
               return;
             }
-            if (!(0, _util.hasRunnableComponent)(blocklet)) {
-              _toast.default.error(t('blocklet.noComponent'));
-              return;
-            }
             const input = {
               did: blocklet.meta.did
             };
@@ -130,7 +139,7 @@ function BlockletActions(_ref) {
           }
 
           if (action === 'reload') {
-            _toast.default.success(t('blocklet.reloadSuccess'));
+            _Toast.default.success(t('blocklet.reloadSuccess'));
           }
           onComplete({
             action,
@@ -297,7 +306,7 @@ function BlockletActions(_ref) {
     icon: _icons.default.Start,
     name: t('common.start'),
     handler: createHandler('start', node.api.startBlocklet),
-    disabled: blocklet.status === 'running' || blocklet.status === 'corrupted' || missingRequiredConfigs.length > 0 || (0, _util2.isDownloading)(blocklet.status) || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT || recommendedUrlLoading || inProgress
+    disabled: disableStart || blocklet.status === 'running' || blocklet.status === 'corrupted' || missingRequiredConfigs.length > 0 || (0, _util2.isDownloading)(blocklet.status) || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT || recommendedUrlLoading || inProgress
   }, {
     action: 'stop',
     icon: _icons.default.Stop,
@@ -309,13 +318,13 @@ function BlockletActions(_ref) {
     icon: _icons.default.Restart,
     name: t('common.restart'),
     handler: createHandler('restart', node.api.restartBlocklet, true),
-    disabled: blocklet.status !== 'running' || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT
+    disabled: disableStart || blocklet.status !== 'running' || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT
   }, {
     action: 'reload',
     icon: _icons.default.Reload,
     name: t('common.reload'),
     handler: createHandler('reload', node.api.reloadBlocklet),
-    disabled: blocklet.status !== 'running' || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT
+    disabled: disableStart || blocklet.status !== 'running' || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT
   }, (0, _util2.isDownloading)(blocklet.status) ? cancelDownloadAction : removeAction, {
     separator: true
   }, {

package/lib/blocklet/add-cert.js

@@ -12,7 +12,7 @@ var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularPr
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
-var _toast = _interopRequireDefault(require("../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../confirm"));
 var _node = require("../contexts/node");
 var _blocklet = require("../contexts/blocklet");
@@ -68,9 +68,9 @@ function Add(props) {
     if (cert.domain === domain) {
       setIssuing(false);
       if (type === 'success') {
-        _toast.default.success("The ".concat(cert.domain, " certificate is issued successfully"));
+        _Toast.default.success("The ".concat(cert.domain, " certificate is issued successfully"));
       } else if (type === 'error') {
-        _toast.default.error("Failed to issue certificate for ".concat(cert.domain));
+        _Toast.default.error("Failed to issue certificate for ".concat(cert.domain));
       }
     }
   };

package/lib/blocklet/component/add.js

@@ -33,9 +33,9 @@ var _AnimationWaiter = _interopRequireDefault(require("@arcblock/ux/lib/Animatio
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _util = require("@blocklet/meta/lib/util");
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _util2 = require("../../util");
-var _toast = _interopRequireDefault(require("../../toast"));
 var _schemaForm = _interopRequireDefault(require("../../schema-form"));
 var _required = _interopRequireDefault(require("../../form/required"));
 var _purchase = require("../purchase");
@@ -334,7 +334,7 @@ function AddComponent(_ref2) {
       }
     } catch (err) {
       const errMsg = (0, _util2.formatError)(err);
-      _toast.default.error(errMsg);
+      _Toast.default.error(errMsg);
       console.error('installComponent error: ', err);
       setInstallErrorResult(errMsg);
     } finally {
@@ -377,7 +377,7 @@ function AddComponent(_ref2) {
   const _onCancel = () => {
     setActiveStepByIndex(x => x - 1);
   };
-  const onGeneratePurchaseData = async () => {
+  const onGeneratePurchaseData = () => {
     const {
       pathPrefix: mountPoint,
       bundleDid,

package/lib/blocklet/component/delete.js

@@ -30,7 +30,10 @@ function DeleteComponent(_ref) {
     component,
     remove,
     disabled,
-    tip
+    tip,
+    showConfirm,
+    hideBtn,
+    onCancel: _onCancel
   } = _ref;
   const {
     t
@@ -44,9 +47,8 @@ function DeleteComponent(_ref) {
     setDeleteSetting(null);
   };
   const componentDisabled = disabled || loading;
-  const btn = /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledButton, {
-    disabled: componentDisabled,
-    onClick: () => setDeleteSetting({
+  const doShowConfirm = () => {
+    setDeleteSetting({
       title: "".concat(t('common.delete'), " ").concat(component.meta.title || component.meta.name),
       // eslint-disable-next-line react/no-unstable-nested-components
       description: (params, setParams) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
@@ -78,8 +80,25 @@ function DeleteComponent(_ref) {
         removeType: 'keepData'
       },
       onConfirm: deleteComponent,
-      onCancel: () => setDeleteSetting(null)
-    }),
+      onCancel: () => {
+        setDeleteSetting(null);
+        _onCancel();
+      }
+    });
+  };
+  (0, _react.useEffect)(() => {
+    if (showConfirm) {
+      doShowConfirm();
+    } else {
+      setLoading(false);
+      setDeleteSetting(null);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showConfirm]);
+  const btn = /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledButton, {
+    size: "small",
+    disabled: componentDisabled,
+    onClick: () => doShowConfirm,
     "data-cy": "delete-component-btn",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Delete.default, {
       disabled: componentDisabled
@@ -92,7 +111,7 @@ function DeleteComponent(_ref) {
     })
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [btnWithToolTip, deleteSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+    children: [!hideBtn && btnWithToolTip, deleteSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       title: deleteSetting.title,
       description: deleteSetting.description,
       confirm: deleteSetting.confirm,
@@ -106,12 +125,18 @@ function DeleteComponent(_ref) {
 DeleteComponent.propTypes = {
   component: _propTypes.default.object.isRequired,
   remove: _propTypes.default.func,
+  onCancel: _propTypes.default.func,
   disabled: _propTypes.default.bool,
+  showConfirm: _propTypes.default.bool,
+  hideBtn: _propTypes.default.bool,
   tip: _propTypes.default.string
 };
 DeleteComponent.defaultProps = {
   remove: async () => {},
   disabled: false,
+  showConfirm: false,
+  hideBtn: false,
+  onCancel: () => {},
   tip: ''
 };
 const StyledButton = (0, _styled.default)(_IconButton.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.Mui-disabled {\n    opacity: 0.5;\n  }\n"])));

package/lib/blocklet/component/environment.js

@@ -13,8 +13,8 @@ var _Alert = _interopRequireDefault(require("@mui/material/Alert"));
 var _constant = require("@blocklet/constant");
 var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _clickToCopy = _interopRequireDefault(require("../../click-to-copy"));
-var _toast = _interopRequireDefault(require("../../toast"));
 var _node = require("../../contexts/node");
 var _tableIcons = _interopRequireDefault(require("../../table-icons"));
 var _table = _interopRequireDefault(require("../../table"));
@@ -61,7 +61,7 @@ function ComponentEnvironment(_ref) {
     t
   } = (0, _react.useContext)(_context.LocaleContext);
   const dids = [...ancestors.map(x => x.meta.did), blocklet.meta.did];
-  const onConfigChanged = () => _toast.default.success(t('blocklet.config.changedTip'));
+  const onConfigChanged = () => _Toast.default.success(t('blocklet.config.changedTip'));
   const isConfigEditable = x => x.custom;
   if ((0, _util2.isInstalling)(blocklet.status)) {
     return null;
@@ -71,11 +71,11 @@ function ComponentEnvironment(_ref) {
   }
   const onAddConfig = async data => {
     if (!data.key.trim() || !data.value.trim()) {
-      _toast.default.error(t('blocklet.config.environment.keyValueRequired'));
+      _Toast.default.error(t('blocklet.config.environment.keyValueRequired'));
       return;
     }
     if (data.key.startsWith('BLOCKLET_') || data.key.startsWith('COMPONENT_')) {
-      _toast.default.error(t('blocklet.config.environment.invalidKey'));
+      _Toast.default.error(t('blocklet.config.environment.invalidKey'));
       return;
     }
     data.custom = true;
@@ -92,24 +92,24 @@ function ComponentEnvironment(_ref) {
   const onEditConfig = async (newData, oldData) => {
     // only required field can't be empty
     if (newData.required && (!newData.key.trim() || !newData.value.trim())) {
-      _toast.default.error(t('blocklet.config.environment.keyValueRequired'));
+      _Toast.default.error(t('blocklet.config.environment.keyValueRequired'));
       return;
     }
     if (newData.key.startsWith('BLOCKLET_') && !_constant.BLOCKLET_CONFIGURABLE_KEY[newData.key]) {
-      _toast.default.error(t('blocklet.config.environment.invalidKey'));
+      _Toast.default.error(t('blocklet.config.environment.invalidKey'));
       return;
     }
     if (newData.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE) {
       const errMessage = (0, _util2.isValidClusterSize)(newData);
       if (errMessage) {
-        _toast.default.error(errMessage);
+        _Toast.default.error(errMessage);
         return;
       }
     }
     const configs = [newData];
     if (newData.key !== oldData.key) {
       if (!newData.custom) {
-        _toast.default.error('Only key of custom env can be changed');
+        _Toast.default.error('Only key of custom env can be changed');
         return;
       }
       configs.push({
@@ -128,16 +128,16 @@ function ComponentEnvironment(_ref) {
         onConfigChanged(result.blocklet);
       }
     } catch (err) {
-      _toast.default.error((0, _util2.formatError)(err));
+      _Toast.default.error((0, _util2.formatError)(err));
     }
   };
   const onDeleteConfig = async data => {
     if (data.required) {
-      _toast.default.error(t('blocklet.config.environment.deleteForbidden'));
+      _Toast.default.error(t('blocklet.config.environment.deleteForbidden'));
       return;
     }
     if (!data.custom) {
-      _toast.default.error('Only key of custom env can be changed');
+      _Toast.default.error('Only key of custom env can be changed');
       return;
     }
     const result = await node.api.configBlocklet({

package/lib/blocklet/component/expiration.js

@@ -5,20 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _get = _interopRequireDefault(require("lodash/get"));
-var _last = _interopRequireDefault(require("lodash/last"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
-var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _RelativeTime = _interopRequireDefault(require("@arcblock/ux/lib/RelativeTime"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@mui/material/Button"));
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
+var _blocklet = require("../../contexts/blocklet");
 var _util = require("../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function Expiration(_ref) {
-  var _state$value, _state$value$data, _state$value$data$val;
   let {
     controller
   } = _ref;
@@ -26,18 +22,15 @@ function Expiration(_ref) {
     t,
     locale
   } = (0, _context.useLocaleContext)();
-  const state = (0, _useAsync.default)(async () => (0, _util.getAsset)(controller.chainHost, controller.nftId));
-  if (state.loading) {
-    return '';
-  }
-  if (state.error) {
-    console.error('load nft expiration failed, nfId:', controller === null || controller === void 0 ? void 0 : controller.nftId, 'chainHost:', controller === null || controller === void 0 ? void 0 : controller.chainHost, state.error);
+  const {
+    nftState
+  } = (0, _blocklet.useBlockletContext)();
+  if (!nftState) {
     return '-';
   }
-  const expirationDate = (0, _last.default)((0, _get.default)(state.value, 'data.value.expirationDate', []));
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RelativeTime.default, {
-      value: expirationDate,
+      value: nftState === null || nftState === void 0 ? void 0 : nftState.expirationDate,
       locale: locale
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
       style: {
@@ -45,7 +38,11 @@ function Expiration(_ref) {
       },
       variant: "contained",
       component: _Link.default,
-      href: (0, _urlJoin.default)((_state$value = state.value) === null || _state$value === void 0 ? void 0 : (_state$value$data = _state$value.data) === null || _state$value$data === void 0 ? void 0 : (_state$value$data$val = _state$value$data.value) === null || _state$value$data$val === void 0 ? void 0 : _state$value$data$val.launcherUrl, "/instances/".concat(controller.nftId, "/renewal?locale=").concat(locale, "&return-url=").concat(encodeURIComponent(window.location.href))),
+      href: (0, _util.getRenewBlockletURL)({
+        nftState,
+        nftId: controller.nftId,
+        locale
+      }),
       children: t('common.renew')
     })]
   });