@abtnode/ux 1.16.20-beta-28c66e0b → 1.16.20-beta-9c254d14

package/es/blocklet/add-cert.js

@@ -5,9 +5,9 @@ import useAsyncRetry from 'react-use/lib/useAsyncRetry';
 import Tooltip from '@mui/material/Tooltip';
 import CircularProgress from '@mui/material/CircularProgress';
 import Alert from '@arcblock/ux/lib/Alert';
+import Toast from '@arcblock/ux/lib/Toast';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { BlockletEvents } from '@blocklet/constant';
-import Toast from '@arcblock/ux/lib/Toast';
 import Confirm from '../confirm';
 import { useNodeContext } from '../contexts/node';
 import { useBlockletContext } from '../contexts/blocklet';
@@ -21,21 +21,26 @@ function Add(props) {
     t
   } = useLocaleContext();
   const [loading, setLoading] = useState(false);
+  const {
+    inService
+  } = useNodeContext();
   const [confirmSetting, setConfirmSetting] = useState(null);
   const {
+    siteId,
     domain,
     onAdd,
     children,
     did
   } = props;
+  const [issuing, setIssuing] = useState(false);
   const {
     api,
     ws: {
       useSubscription
     }
   } = useNodeContext();
-  const [issuing, setIssuing] = useState(false);
   const {
+    mode,
     actions: {
       refreshDomainStatus
     }
@@ -54,18 +59,24 @@ function Add(props) {
   const handleIssueComplete = (cert, type) => {
     if (cert.domain === domain) {
       setIssuing(false);
-      if (type === 'success') {
-        Toast.success(`The ${cert.domain} certificate is issued successfully`);
-      } else if (type === 'error') {
-        Toast.error(`Failed to issue certificate for ${cert.domain}`);
+      setLoading(false);
+
+      // Setup 模式下有全局通知，所以这里不需要通知
+      if (inService && mode !== 'setup') {
+        if (type === 'success') {
+          Toast.success(`The ${cert.domain} certificate is issued successfully`);
+        } else if (type === 'error') {
+          Toast.error(`Failed to issue certificate for ${cert.domain}`);
+        }
       }
     }
   };
   useEffect(() => {
-    if (!certState.loading && isCertInProgress(certState.value?.status)) {
-      setIssuing(true);
+    if (certState.loading) {
+      return;
     }
-  }, [certState]);
+    setIssuing(isCertInProgress(certState.value?.status));
+  }, [certState.loading, certState.value?.status]);
   useSubscription(BlockletEvents.certError, cert => handleIssueComplete(cert, 'error'));
   useSubscription(BlockletEvents.certIssued, cert => {
     certState.retry();
@@ -89,8 +100,10 @@ function Add(props) {
     try {
       await api.issueLetsEncryptCert({
         input: {
+          siteId,
           domain,
-          did
+          did,
+          inBlockletSetup: mode === 'setup'
         }
       });
       onAdd();
@@ -142,6 +155,7 @@ function Add(props) {
 Add.propTypes = {
   domain: PropTypes.string.isRequired,
   did: PropTypes.string.isRequired,
+  siteId: PropTypes.string.isRequired,
   onAdd: PropTypes.func,
   children: PropTypes.any
 };

package/es/blocklet/component/domain-list.js

@@ -177,6 +177,7 @@ function DomainList({
                 domain: domain,
                 filters: ['domain']
               }, `${domain.value}-domain`), /*#__PURE__*/_jsx(InnerAddDomain, {
+                siteId: blocklet.site?.id,
                 domain: domain,
                 blocklet: blocklet,
                 hasMutatePermission: hasMutatePermission
@@ -217,6 +218,7 @@ function DomainList({
                 children: domain.value
               })
             }), /*#__PURE__*/_jsx(InnerAddDomain, {
+              siteId: blocklet.site?.id,
               domain: domain,
               blocklet: blocklet,
               hasMutatePermission: hasMutatePermission
@@ -374,6 +376,7 @@ InnerAction.propTypes = {
   blocklet: PropTypes.object.isRequired
 };
 function InnerAddDomain({
+  siteId,
   domain,
   blocklet,
   hasMutatePermission
@@ -486,6 +489,7 @@ function InnerAddDomain({
       domain: domain,
       filters: ['http']
     }, `${domain.value}-http`), hasMutatePermission && /*#__PURE__*/_jsx(AddCert, {
+      siteId: siteId,
       domain: domain.value,
       domainStatus: domain.domainStatus,
       did: blocklet.meta.did,
@@ -503,6 +507,7 @@ function InnerAddDomain({
   });
 }
 InnerAddDomain.propTypes = {
+  siteId: PropTypes.string.isRequired,
   domain: DomainType.isRequired,
   blocklet: PropTypes.object.isRequired,
   hasMutatePermission: PropTypes.bool.isRequired

package/es/blocklet/publish/create-project.js

@@ -1,5 +1,6 @@
 import { useState } from 'react';
 import { Link, useNavigate, useParams } from 'react-router-dom';
+import useLocalStorage from 'react-use/lib/useLocalStorage';
 import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
@@ -52,6 +53,7 @@ export default function CreateProject({
   } = useNodeContext();
   const [blockletDid, setBlockletDid] = useState();
   const [openConnect, setOpenConnect] = useState(false);
+  const [manualCreateBlockletDid] = useLocalStorage('manual-create-blocklet-did', false);
   const {
     componentDid = ''
   } = useParams();
@@ -122,10 +124,11 @@ export default function CreateProject({
         readonly: true,
         autoComplete: "off",
         variant: "outlined",
-        onClick: () => !blockletDid && setOpenConnect(true),
+        onChange: e => manualCreateBlockletDid && setBlockletDid(e.target.value),
+        onClick: () => !manualCreateBlockletDid && !blockletDid && setOpenConnect(true),
         InputProps: {
           'data-cy': 'export-blocklet-did',
-          endAdornment: /*#__PURE__*/_jsx(InputAdornment, {
+          endAdornment: !manualCreateBlockletDid && /*#__PURE__*/_jsx(InputAdornment, {
             position: "end",
             children: /*#__PURE__*/_jsx(Button, {
               onClick: () => setOpenConnect(true),

package/es/blocklet/publish/create-release.js

@@ -249,7 +249,13 @@ export default function CreateRelease({
     }).catch(err => {
       setCreateLoading(false);
       setLoading(false);
-      Toast.error(formatError(err));
+      const msg = formatError(err);
+      Toast.error(msg);
+      if (/resource.*empty/.test(msg)) {
+        setParamsErrTip({
+          blockletResource: msg
+        });
+      }
     });
   };
   if (!params && loading) {
@@ -265,12 +271,20 @@ export default function CreateRelease({
   const item = resourceComponents.find(x => x.meta.did === tab);
   const resourceContent = item ? /*#__PURE__*/_jsx(Box, {
     children: /*#__PURE__*/_jsx(Resource, {
+      error: paramsErrTip.blockletResource,
       app: blocklet,
       component: item,
       projectId: projectId,
       release: {
         ...release,
         id: releaseId
+      },
+      onSave: selected => {
+        if (selected.length) {
+          setParamsErrTip({
+            blockletResource: ''
+          });
+        }
       }
     })
   }) : /*#__PURE__*/_jsx(Box, {

package/es/blocklet/publish/resource.js

@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import joinUrl from 'url-join';
+import classnames from 'classnames';
 import Box from '@mui/material/Box';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
@@ -27,7 +28,9 @@ export default function Resource({
   app,
   component,
   projectId,
-  release
+  release,
+  error,
+  onSave
 }) {
   const {
     t,
@@ -64,7 +67,7 @@ export default function Resource({
       Toast.error(err.message);
     }
   };
-  const onSave = async () => {
+  const _onSave = async () => {
     const params = selectedResourceIds;
     try {
       setLoading(true);
@@ -77,6 +80,7 @@ export default function Resource({
       Toast.success(t('common.saveSuccess'));
       setLoading(false);
       saveSelected(selectedResourceIds);
+      onSave(selectedResourceIds);
     } catch (err) {
       setLoading(false);
       Toast.error(err.message);
@@ -114,7 +118,8 @@ export default function Resource({
       })
     });
   }
-  return /*#__PURE__*/_jsx(Container, {
+  return [/*#__PURE__*/_jsx(Container, {
+    className: classnames(error && 'error'),
     children: /*#__PURE__*/_jsxs(Box, {
       children: [/*#__PURE__*/_jsx(Tree, {
         data: resources,
@@ -128,29 +133,41 @@ export default function Resource({
         children: /*#__PURE__*/_jsx(Button, {
           variant: "contained",
           disabled: loading,
-          onClick: () => onSave(),
+          onClick: () => _onSave(),
           children: t('common.save')
         })
       })]
     })
-  });
+  }), !!error && /*#__PURE__*/_jsx(Box, {
+    color: "error.main",
+    mt: 1,
+    fontSize: 14,
+    children: error
+  })];
 }
 Resource.propTypes = {
   component: PropTypes.object.isRequired,
   app: PropTypes.object.isRequired,
   projectId: PropTypes.string.isRequired,
+  error: PropTypes.string,
   release: PropTypes.shape({
     id: PropTypes.string.isRequired,
     status: PropTypes.string
-  })
+  }),
+  onSave: PropTypes.func
 };
 Resource.defaultProps = {
+  error: '',
   release: {
     id: ''
-  }
+  },
+  onSave: () => {}
 };
 const Container = styled(Box)`
   border: 1px solid #ccc;
+  &.error {
+    border-color: ${props => props.theme.palette.error.main};
+  }
   border-radius: 4px;
   padding: 16px;
   padding-bottom: 0px;
@@ -164,5 +181,6 @@ const Container = styled(Box)`
     position: sticky;
     bottom: 0;
     background: #fff;
+    z-index: 10;
   }
 `;

package/es/blocklet/router/add-domain.js

@@ -30,6 +30,7 @@ export default function AddDomain({
   onSuccess,
   disabled,
   autoFocus,
+  inBlockletSetup,
   ...props
 }) {
   const {
@@ -56,14 +57,16 @@ export default function AddDomain({
     chainHost
   }) => {
     try {
+      const tmpDomain = parseDomainFromURL(domain);
       await api.addDomainAlias({
         input: {
           id: siteId,
           type: 'nft-domain',
-          domainAlias: parseDomainFromURL(domain),
+          domainAlias: tmpDomain,
           nftDid,
           chainHost,
-          teamDid
+          teamDid,
+          inBlockletSetup
         }
       });
       await sleep(2000);
@@ -72,8 +75,10 @@ export default function AddDomain({
         showNFTDomainAuth: false
       });
       onSuccess({
-        domain,
-        type: state.type
+        domain: tmpDomain,
+        type: state.type,
+        nftDid,
+        chainHost
       });
     } finally {
       setState({
@@ -215,7 +220,7 @@ export default function AddDomain({
         gap: '1em'
       },
       children: inputDomainTypes.map((type, index) => /*#__PURE__*/_jsxs(Box, {
-        children: [/*#__PURE__*/_jsx(Box, {
+        children: [inputDomainTypes.length > 1 && /*#__PURE__*/_jsx(Box, {
           children: `${t(`optionsOrder.${index + 1}`)}: ${domainTypes[type]?.name}`
         }), /*#__PURE__*/_jsx(Box, {
           sx: {
@@ -237,7 +242,8 @@ AddDomain.propTypes = {
   appId: PropTypes.string,
   appPk: PropTypes.string,
   disabled: PropTypes.bool,
-  autoFocus: PropTypes.bool
+  autoFocus: PropTypes.bool,
+  inBlockletSetup: PropTypes.bool
 };
 AddDomain.defaultProps = {
   defaultCustomDomain: '',
@@ -246,5 +252,6 @@ AddDomain.defaultProps = {
   appId: '',
   appPk: '',
   disabled: false,
-  autoFocus: true
+  autoFocus: true,
+  inBlockletSetup: false
 };

package/lib/blocklet/add-cert.js

@@ -10,9 +10,9 @@ var _useAsyncRetry = _interopRequireDefault(require("react-use/lib/useAsyncRetry
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
-var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../confirm"));
 var _node = require("../contexts/node");
 var _blocklet = require("../contexts/blocklet");
@@ -30,26 +30,31 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 const isCertInProgress = status => ['waiting', 'creating', 'renewaling'].includes(status);
 function Add(props) {
-  var _certState$value2;
+  var _certState$value2, _certState$value3;
   const {
     t
   } = (0, _context.useLocaleContext)();
   const [loading, setLoading] = (0, _react.useState)(false);
+  const {
+    inService
+  } = (0, _node.useNodeContext)();
   const [confirmSetting, setConfirmSetting] = (0, _react.useState)(null);
   const {
+    siteId,
     domain,
     onAdd,
     children,
     did
   } = props;
+  const [issuing, setIssuing] = (0, _react.useState)(false);
   const {
     api,
     ws: {
       useSubscription
     }
   } = (0, _node.useNodeContext)();
-  const [issuing, setIssuing] = (0, _react.useState)(false);
   const {
+    mode,
     actions: {
       refreshDomainStatus
     }
@@ -68,19 +73,25 @@ function Add(props) {
   const handleIssueComplete = (cert, type) => {
     if (cert.domain === domain) {
       setIssuing(false);
-      if (type === 'success') {
-        _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));
+      setLoading(false);
+
+      // Setup 模式下有全局通知，所以这里不需要通知
+      if (inService && mode !== 'setup') {
+        if (type === 'success') {
+          _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));
+        }
       }
     }
   };
   (0, _react.useEffect)(() => {
     var _certState$value;
-    if (!certState.loading && isCertInProgress((_certState$value = certState.value) === null || _certState$value === void 0 ? void 0 : _certState$value.status)) {
-      setIssuing(true);
+    if (certState.loading) {
+      return;
     }
-  }, [certState]);
+    setIssuing(isCertInProgress((_certState$value = certState.value) === null || _certState$value === void 0 ? void 0 : _certState$value.status));
+  }, [certState.loading, (_certState$value2 = certState.value) === null || _certState$value2 === void 0 ? void 0 : _certState$value2.status]);
   useSubscription(_constant.BlockletEvents.certError, cert => handleIssueComplete(cert, 'error'));
   useSubscription(_constant.BlockletEvents.certIssued, cert => {
     certState.retry();
@@ -91,7 +102,7 @@ function Add(props) {
     return ''; // 如果正在加载证书的状态，则不渲染任何元素
   }
 
-  if (((_certState$value2 = certState.value) === null || _certState$value2 === void 0 ? void 0 : _certState$value2.status) === 'normal') {
+  if (((_certState$value3 = certState.value) === null || _certState$value3 === void 0 ? void 0 : _certState$value3.status) === 'normal') {
     return ''; // 如果证书已经生成，则不渲染任何元素
   }
 
@@ -104,8 +115,10 @@ function Add(props) {
     try {
       await api.issueLetsEncryptCert({
         input: {
+          siteId,
           domain,
-          did
+          did,
+          inBlockletSetup: mode === 'setup'
         }
       });
       onAdd();
@@ -157,6 +170,7 @@ function Add(props) {
 Add.propTypes = {
   domain: _propTypes.default.string.isRequired,
   did: _propTypes.default.string.isRequired,
+  siteId: _propTypes.default.string.isRequired,
   onAdd: _propTypes.default.func,
   children: _propTypes.default.any
 };

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

@@ -173,34 +173,78 @@ function DomainList(_ref) {
         flexDirection: 'column',
         gap: 1
       },
-      children: (showAllDomains ? domains : displayDomains).map(domain => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-        children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          display: "flex",
-          flexDirection: "column",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      children: (showAllDomains ? domains : displayDomains).map(domain => {
+        var _blocklet$site3, _blocklet$site4;
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
             display: "flex",
-            alignItems: "center",
-            justifyContent: "flex-start",
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DomainLink, {
-              domain: domain,
-              target: "_blank",
-              children: domain.value
-            })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            flexDirection: "column",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "flex-start",
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DomainLink, {
+                domain: domain,
+                target: "_blank",
+                children: domain.value
+              })
+            }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "space-between",
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+                sx: {
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'flex-start',
+                  gap: 1
+                },
+                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_domainStatus.default, {
+                  domain: domain,
+                  filters: ['domain']
+                }, "".concat(domain.value, "-domain")), /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAddDomain, {
+                  siteId: (_blocklet$site3 = blocklet.site) === null || _blocklet$site3 === void 0 ? void 0 : _blocklet$site3.id,
+                  domain: domain,
+                  blocklet: blocklet,
+                  hasMutatePermission: hasMutatePermission
+                })]
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                sx: {
+                  button: {
+                    padding: 0
+                  }
+                },
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAction, {
+                  hasMutatePermission: hasMutatePermission,
+                  site: site,
+                  domain: domain,
+                  blocklet: blocklet
+                })
+              })]
+            })]
+          }, domain.value), !isMobile && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
             display: "flex",
             alignItems: "center",
             justifyContent: "space-between",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-              sx: {
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'flex-start',
-                gap: 1
-              },
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "flex-start",
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_domainStatus.default, {
                 domain: domain,
                 filters: ['domain']
-              }, "".concat(domain.value, "-domain")), /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAddDomain, {
+              }, "".concat(domain.value, "-domain")), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+                sx: {
+                  ml: 2,
+                  mr: 0.5
+                },
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DomainLink, {
+                  domain: domain,
+                  target: "_blank",
+                  children: domain.value
+                })
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAddDomain, {
+                siteId: (_blocklet$site4 = blocklet.site) === null || _blocklet$site4 === void 0 ? void 0 : _blocklet$site4.id,
                 domain: domain,
                 blocklet: blocklet,
                 hasMutatePermission: hasMutatePermission
@@ -218,48 +262,9 @@ function DomainList(_ref) {
                 blocklet: blocklet
               })
             })]
-          })]
-        }, domain.value), !isMobile && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "space-between",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "flex-start",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_domainStatus.default, {
-              domain: domain,
-              filters: ['domain']
-            }, "".concat(domain.value, "-domain")), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-              sx: {
-                ml: 2,
-                mr: 0.5
-              },
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DomainLink, {
-                domain: domain,
-                target: "_blank",
-                children: domain.value
-              })
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAddDomain, {
-              domain: domain,
-              blocklet: blocklet,
-              hasMutatePermission: hasMutatePermission
-            })]
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            sx: {
-              button: {
-                padding: 0
-              }
-            },
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerAction, {
-              hasMutatePermission: hasMutatePermission,
-              site: site,
-              domain: domain,
-              blocklet: blocklet
-            })
-          })]
-        }, domain.value)]
-      }))
+          }, domain.value)]
+        });
+      })
     }), hiddenDomains.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         marginLeft: '20px',
@@ -387,6 +392,7 @@ InnerAction.propTypes = {
 };
 function InnerAddDomain(_ref5) {
   let {
+    siteId,
     domain,
     blocklet,
     hasMutatePermission
@@ -499,6 +505,7 @@ function InnerAddDomain(_ref5) {
       domain: domain,
       filters: ['http']
     }, "".concat(domain.value, "-http")), hasMutatePermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_addCert.default, {
+      siteId: siteId,
       domain: domain.value,
       domainStatus: domain.domainStatus,
       did: blocklet.meta.did,
@@ -519,6 +526,7 @@ function InnerAddDomain(_ref5) {
   });
 }
 InnerAddDomain.propTypes = {
+  siteId: _propTypes.default.string.isRequired,
   domain: _types.DomainType.isRequired,
   blocklet: _propTypes.default.object.isRequired,
   hasMutatePermission: _propTypes.default.bool.isRequired

package/lib/blocklet/publish/create-project.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = CreateProject;
 var _react = require("react");
 var _reactRouterDom = require("react-router-dom");
+var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
@@ -65,6 +66,7 @@ function CreateProject(_ref) {
   } = (0, _node.useNodeContext)();
   const [blockletDid, setBlockletDid] = (0, _react.useState)();
   const [openConnect, setOpenConnect] = (0, _react.useState)(false);
+  const [manualCreateBlockletDid] = (0, _useLocalStorage.default)('manual-create-blocklet-did', false);
   const {
     componentDid = ''
   } = (0, _reactRouterDom.useParams)();
@@ -135,10 +137,11 @@ function CreateProject(_ref) {
         readonly: true,
         autoComplete: "off",
         variant: "outlined",
-        onClick: () => !blockletDid && setOpenConnect(true),
+        onChange: e => manualCreateBlockletDid && setBlockletDid(e.target.value),
+        onClick: () => !manualCreateBlockletDid && !blockletDid && setOpenConnect(true),
         InputProps: {
           'data-cy': 'export-blocklet-did',
-          endAdornment: /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputAdornment.default, {
+          endAdornment: !manualCreateBlockletDid && /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputAdornment.default, {
             position: "end",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
               onClick: () => setOpenConnect(true),

package/lib/blocklet/publish/create-release.js

@@ -262,7 +262,13 @@ function CreateRelease(_ref2) {
     }).catch(err => {
       setCreateLoading(false);
       setLoading(false);
-      _Toast.default.error((0, _util.formatError)(err));
+      const msg = (0, _util.formatError)(err);
+      _Toast.default.error(msg);
+      if (/resource.*empty/.test(msg)) {
+        setParamsErrTip({
+          blockletResource: msg
+        });
+      }
     });
   };
   if (!params && loading) {
@@ -278,12 +284,20 @@ function CreateRelease(_ref2) {
   const item = resourceComponents.find(x => x.meta.did === tab);
   const resourceContent = item ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_resource.default, {
+      error: paramsErrTip.blockletResource,
       app: blocklet,
       component: item,
       projectId: projectId,
       release: _objectSpread(_objectSpread({}, release), {}, {
         id: releaseId
-      })
+      }),
+      onSave: selected => {
+        if (selected.length) {
+          setParamsErrTip({
+            blockletResource: ''
+          });
+        }
+      }
     })
   }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
     display: "flex",

package/lib/blocklet/publish/resource.js

@@ -8,6 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -36,7 +37,9 @@ function Resource(_ref) {
     app,
     component,
     projectId,
-    release
+    release,
+    error,
+    onSave
   } = _ref;
   const {
     t,
@@ -73,7 +76,7 @@ function Resource(_ref) {
       _Toast.default.error(err.message);
     }
   };
-  const onSave = async () => {
+  const _onSave = async () => {
     const params = selectedResourceIds;
     try {
       setLoading(true);
@@ -86,6 +89,7 @@ function Resource(_ref) {
       _Toast.default.success(t('common.saveSuccess'));
       setLoading(false);
       saveSelected(selectedResourceIds);
+      onSave(selectedResourceIds);
     } catch (err) {
       setLoading(false);
       _Toast.default.error(err.message);
@@ -124,7 +128,8 @@ function Resource(_ref) {
       })
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Container, {
+  return [/*#__PURE__*/(0, _jsxRuntime.jsx)(Container, {
+    className: (0, _classnames.default)(error && 'error'),
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tree.default, {
         data: resources,
@@ -138,25 +143,34 @@ function Resource(_ref) {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           variant: "contained",
           disabled: loading,
-          onClick: () => onSave(),
+          onClick: () => _onSave(),
           children: t('common.save')
         })
       })]
     })
-  });
+  }), !!error && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    color: "error.main",
+    mt: 1,
+    fontSize: 14,
+    children: error
+  })];
 }
 Resource.propTypes = {
   component: _propTypes.default.object.isRequired,
   app: _propTypes.default.object.isRequired,
   projectId: _propTypes.default.string.isRequired,
+  error: _propTypes.default.string,
   release: _propTypes.default.shape({
     id: _propTypes.default.string.isRequired,
     status: _propTypes.default.string
-  })
+  }),
+  onSave: _propTypes.default.func
 };
 Resource.defaultProps = {
+  error: '',
   release: {
     id: ''
-  }
+  },
+  onSave: () => {}
 };
-const Container = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  border: 1px solid #ccc;\n  border-radius: 4px;\n  padding: 16px;\n  padding-bottom: 0px;\n  max-height: 600px;\n  overflow-y: auto;\n  .footer {\n    border-top: 1px solid #ddd;\n    display: flex;\n    padding: 12px 0;\n    margin-top: 12px;\n    position: sticky;\n    bottom: 0;\n    background: #fff;\n  }\n"])));
+const Container = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  border: 1px solid #ccc;\n  &.error {\n    border-color: ", ";\n  }\n  border-radius: 4px;\n  padding: 16px;\n  padding-bottom: 0px;\n  max-height: 600px;\n  overflow-y: auto;\n  .footer {\n    border-top: 1px solid #ddd;\n    display: flex;\n    padding: 12px 0;\n    margin-top: 12px;\n    position: sticky;\n    bottom: 0;\n    background: #fff;\n    z-index: 10;\n  }\n"])), props => props.theme.palette.error.main);

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

@@ -23,7 +23,7 @@ var _api = require("../../util/api");
 var _dnsTip = _interopRequireDefault(require("./dns-tip"));
 var _util3 = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["siteId", "teamDid", "cnameDomain", "defaultCustomDomain", "onInputDomain", "appId", "appPk", "onSuccess", "disabled", "autoFocus"];
+const _excluded = ["siteId", "teamDid", "cnameDomain", "defaultCustomDomain", "onInputDomain", "appId", "appPk", "onSuccess", "disabled", "autoFocus", "inBlockletSetup"];
 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; }
@@ -43,7 +43,8 @@ function AddDomain(_ref) {
       appPk,
       onSuccess,
       disabled,
-      autoFocus
+      autoFocus,
+      inBlockletSetup
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const {
@@ -71,14 +72,16 @@ function AddDomain(_ref) {
       chainHost
     } = _ref2;
     try {
+      const tmpDomain = (0, _util3.parseDomainFromURL)(domain);
       await api.addDomainAlias({
         input: {
           id: siteId,
           type: 'nft-domain',
-          domainAlias: (0, _util3.parseDomainFromURL)(domain),
+          domainAlias: tmpDomain,
           nftDid,
           chainHost,
-          teamDid
+          teamDid,
+          inBlockletSetup
         }
       });
       await (0, _util2.sleep)(2000);
@@ -87,8 +90,10 @@ function AddDomain(_ref) {
         showNFTDomainAuth: false
       });
       onSuccess({
-        domain,
-        type: state.type
+        domain: tmpDomain,
+        type: state.type,
+        nftDid,
+        chainHost
       });
     } finally {
       setState({
@@ -232,7 +237,7 @@ function AddDomain(_ref) {
       children: inputDomainTypes.map((type, index) => {
         var _domainTypes$type, _domainTypes$type2;
         return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          children: [inputDomainTypes.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
             children: "".concat(t("optionsOrder.".concat(index + 1)), ": ").concat((_domainTypes$type = domainTypes[type]) === null || _domainTypes$type === void 0 ? void 0 : _domainTypes$type.name)
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
             sx: {
@@ -255,7 +260,8 @@ AddDomain.propTypes = {
   appId: _propTypes.default.string,
   appPk: _propTypes.default.string,
   disabled: _propTypes.default.bool,
-  autoFocus: _propTypes.default.bool
+  autoFocus: _propTypes.default.bool,
+  inBlockletSetup: _propTypes.default.bool
 };
 AddDomain.defaultProps = {
   defaultCustomDomain: '',
@@ -264,5 +270,6 @@ AddDomain.defaultProps = {
   appId: '',
   appPk: '',
   disabled: false,
-  autoFocus: true
+  autoFocus: true,
+  inBlockletSetup: false
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.20-beta-28c66e0b",
+  "version": "1.16.20-beta-9c254d14",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,9 +27,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.20-beta-28c66e0b",
-    "@abtnode/constant": "1.16.20-beta-28c66e0b",
-    "@abtnode/util": "1.16.20-beta-28c66e0b",
+    "@abtnode/auth": "1.16.20-beta-9c254d14",
+    "@abtnode/constant": "1.16.20-beta-9c254d14",
+    "@abtnode/util": "1.16.20-beta-9c254d14",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.103",
     "@arcblock/did-connect": "^2.8.20",
@@ -39,12 +39,12 @@
     "@arcblock/react-hooks": "^2.8.20",
     "@arcblock/terminal": "^2.8.20",
     "@arcblock/ux": "^2.8.20",
-    "@blocklet/constant": "1.16.20-beta-28c66e0b",
+    "@blocklet/constant": "1.16.20-beta-9c254d14",
     "@blocklet/launcher-layout": "2.2.46",
-    "@blocklet/list": "^0.12.55",
-    "@blocklet/meta": "1.16.20-beta-28c66e0b",
+    "@blocklet/list": "^0.12.56",
+    "@blocklet/meta": "1.16.20-beta-9c254d14",
     "@blocklet/ui-react": "^2.8.20",
-    "@blocklet/uploader": "^0.0.51",
+    "@blocklet/uploader": "^0.0.52",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "c4c767c15f6f3c0972a466e262f00860878a90a3",
+  "gitHead": "2f74601e9a8f2e07e872a629b6abc8d4bc1fd371",
   "exports": {
     ".": {
       "import": "./es/index.js",