@abtnode/ux 1.16.26-beta-5251ab18 → 1.16.26-beta-351de484

package/lib/blocklet/authentication/oauth/google.js

@@ -0,0 +1,166 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _material = require("@mui/material");
+var _pick = _interopRequireDefault(require("lodash/pick"));
+var _ahooks = require("ahooks");
+var _reactHookForm = require("react-hook-form");
+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(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function OAuthGoogle() {
+  var _blocklet$meta, _blocklet$settings;
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
+  const authData = Object.assign({
+    enabled: false,
+    clientId: '',
+    clientSecret: ''
+  }, (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.google) || {});
+  const {
+    handleSubmit,
+    control,
+    formState,
+    watch,
+    reset
+  } = (0, _reactHookForm.useForm)({
+    defaultValues: (0, _pick.default)(authData, ['clientSecret', 'clientId', 'enabled'])
+  });
+  const enabled = watch('enabled');
+  const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
+    try {
+      var _blockletChanged$sett;
+      const {
+        blocklet: blockletChanged
+      } = await api.configOAuth({
+        input: {
+          did,
+          oauth: JSON.stringify({
+            google: data
+          })
+        }
+      });
+      const defaultValues = Object.assign({
+        enabled: false,
+        clientId: '',
+        clientSecret: ''
+      }, (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.google) || {});
+      // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
+      reset(defaultValues);
+      _Toast.default.success(t('oauth.saveSuccess'));
+    } catch (err) {
+      _Toast.default.error(err.message || t('oauth.saveFailed'));
+    }
+  });
+  const validateClientId = (0, _ahooks.useMemoizedFn)(val => {
+    if (!(val !== null && val !== void 0 && val.trim())) {
+      return t('oauth.google.clientIdDescribe');
+    }
+    return true;
+  });
+  const validateClientSecret = (0, _ahooks.useMemoizedFn)(val => {
+    if (!(val !== null && val !== void 0 && val.trim())) {
+      return t('oauth.google.clientSecretDescribe');
+    }
+    return true;
+  });
+  const noop = (0, _ahooks.useMemoizedFn)(() => true);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
+      onSubmit: handleSubmit(onSubmit),
+      disabled: true,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
+        name: "enabled",
+        control: control,
+        render: _ref => {
+          let {
+            field
+          } = _ref;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
+            control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchControl.default, _objectSpread({
+              checked: field.value,
+              style: {
+                marginRight: '6px'
+              }
+            }, field)),
+            label: t('oauth.google.enable'),
+            sx: {
+              marginBottom: 2,
+              ml: 1
+            }
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
+        name: "clientId",
+        control: control,
+        rules: {
+          validate: enabled ? validateClientId : noop
+        },
+        render: _ref2 => {
+          var _formState$errors$fie;
+          let {
+            field
+          } = _ref2;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
+              error: !!formState.errors[field.name],
+              label: t('oauth.google.clientId'),
+              helperText: ((_formState$errors$fie = formState.errors[field.name]) === null || _formState$errors$fie === void 0 ? void 0 : _formState$errors$fie.message) || '　',
+              disabled: !enabled
+            }))
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
+        name: "clientSecret",
+        control: control,
+        rules: {
+          validate: enabled ? validateClientSecret : noop
+        },
+        render: _ref3 => {
+          var _formState$errors$fie2;
+          let {
+            field
+          } = _ref3;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
+              type: "password",
+              label: t('oauth.google.clientSecret'),
+              error: !!formState.errors[field.name],
+              helperText: ((_formState$errors$fie2 = formState.errors[field.name]) === null || _formState$errors$fie2 === void 0 ? void 0 : _formState$errors$fie2.message) || '　',
+              disabled: !enabled
+            }))
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+        type: "submit",
+        variant: "contained",
+        onSubmit: handleSubmit(onSubmit),
+        disabled: !formState.isDirty,
+        children: t('oauth.save')
+      })]
+    })
+  });
+}
+var _default = exports.default = OAuthGoogle;

package/lib/blocklet/authentication/oauth/index.js

@@ -0,0 +1,136 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = OAuthLogin;
+var _material = require("@mui/material");
+var _ahooks = require("ahooks");
+var _reactDnd = require("react-dnd");
+var _reactDndHtml5Backend = require("react-dnd-html5-backend");
+var _react = require("@iconify/react");
+var _apple = _interopRequireDefault(require("@iconify-icons/logos/apple"));
+var _githubIcon = _interopRequireDefault(require("@iconify-icons/logos/github-icon"));
+var _googleIcon = _interopRequireDefault(require("@iconify-icons/logos/google-icon"));
+var _auth0Icon = _interopRequireDefault(require("@iconify-icons/logos/auth0-icon"));
+var _auth = _interopRequireDefault(require("./auth0"));
+var _github = _interopRequireDefault(require("./github"));
+var _google = _interopRequireDefault(require("./google"));
+var _apple2 = _interopRequireDefault(require("./apple"));
+var _dragItem = _interopRequireDefault(require("./drag-item"));
+var _node = require("../../../contexts/node");
+var _blocklet = require("../../../contexts/blocklet");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const avaliableAuthentication = [{
+  name: 'github',
+  title: 'GitHub',
+  icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+    icon: _githubIcon.default
+  }),
+  component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_github.default, {})
+}, {
+  name: 'google',
+  title: 'Google',
+  icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+    icon: _googleIcon.default
+  }),
+  component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_google.default, {})
+}, {
+  name: 'apple',
+  title: 'Apple',
+  icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+    icon: _apple.default
+  }),
+  component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_apple2.default, {})
+}, {
+  name: 'auth0',
+  title: 'Auth0',
+  icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+    icon: _auth0Icon.default
+  }),
+  component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_auth.default, {})
+}];
+const DEFAULT_OAUTH_LIST = ['github', 'google', 'apple', 'auth0'];
+function OAuthLogin() {
+  var _blocklet$meta, _blocklet$settings;
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
+  const oauthConfig = (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.oauth) || {};
+  const oauthSort = Object.keys(oauthConfig).sort((a, b) => {
+    var _oauthConfig$a, _oauthConfig$b, _oauthConfig$a2;
+    if (((_oauthConfig$a = oauthConfig[a]) === null || _oauthConfig$a === void 0 ? void 0 : _oauthConfig$a.order) !== undefined && ((_oauthConfig$b = oauthConfig[b]) === null || _oauthConfig$b === void 0 ? void 0 : _oauthConfig$b.order) !== undefined) {
+      return oauthConfig[a].order - oauthConfig[b].order;
+    }
+    if (((_oauthConfig$a2 = oauthConfig[a]) === null || _oauthConfig$a2 === void 0 ? void 0 : _oauthConfig$a2.order) !== undefined) {
+      return -1;
+    }
+    return 1;
+  });
+  for (const OAUTH_ITEM of DEFAULT_OAUTH_LIST) {
+    if (!oauthSort.includes(OAUTH_ITEM)) {
+      oauthSort.push(OAUTH_ITEM);
+    }
+  }
+  const sortMaps = (0, _ahooks.useReactive)(oauthSort.reduce((total, value, index) => Object.assign(total, {
+    [value]: index
+  }), {}));
+  const sortedAuthentication = (0, _ahooks.useCreation)(() => {
+    const list = [...avaliableAuthentication];
+    list.sort((a, b) => sortMaps[a.name] - sortMaps[b.name]);
+    return list;
+  }, [sortMaps.auth0, sortMaps.github, sortMaps.google]);
+  const dndProps = {};
+  if (typeof window !== 'undefined') {
+    dndProps.context = window;
+  }
+  const saveOrder = (0, _ahooks.useMemoizedFn)(async rawOrderData => {
+    const orderData = {};
+    Object.keys(rawOrderData).forEach(oauthName => {
+      orderData[oauthName] = {
+        order: rawOrderData[oauthName]
+      };
+    });
+    await api.configOAuth({
+      input: {
+        did,
+        oauth: JSON.stringify(orderData)
+      }
+    });
+  });
+  const handleMoveItem = (0, _ahooks.useMemoizedFn)((dragIndex, hoverIndex) => {
+    const dragItem = sortedAuthentication[dragIndex];
+    const hoverItem = sortedAuthentication[hoverIndex];
+    sortMaps[dragItem.name] = hoverIndex;
+    sortMaps[hoverItem.name] = dragIndex;
+  });
+  const handleSaveOrder = (0, _ahooks.useMemoizedFn)(async () => {
+    await saveOrder(sortMaps);
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactDnd.DndProvider, _objectSpread(_objectSpread({
+      backend: _reactDndHtml5Backend.HTML5Backend
+    }, dndProps), {}, {
+      children: sortedAuthentication.map((x, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_dragItem.default, {
+        index: index,
+        id: x.name,
+        title: x.title,
+        icon: x.icon,
+        onMove: handleMoveItem,
+        onEnd: handleSaveOrder,
+        defaultExpand: x.enabled,
+        children: x.component
+      }, x.name))
+    }))
+  });
+}

package/lib/blocklet/preferences/index.js

@@ -28,7 +28,7 @@ var _configuration = _interopRequireDefault(require("../configuration"));
 var _notification = _interopRequireDefault(require("../notification"));
 var _index = _interopRequireDefault(require("../access/index"));
 var _node = require("../../contexts/node");
-var _oauth = _interopRequireDefault(require("../oauth"));
+var _authentication = _interopRequireDefault(require("../authentication"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 const _excluded = ["blocklet", "onUpdate"]; // eslint-disable-line
@@ -150,7 +150,7 @@ function BlockletPreferences(_ref2) {
     label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       display: "flex",
       alignItems: "center",
-      "data-cy": "configuration-tab-oauth",
+      "data-cy": "configuration-tab-authentication",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Login.default, {
         sx: {
           fontSize: 24
@@ -164,8 +164,8 @@ function BlockletPreferences(_ref2) {
           children: t('common.login')
         })
       })]
-    }, "oauth"),
-    value: 'oauth'
+    }, "authentication"),
+    value: 'authentication'
   }, {
     label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       display: "flex",
@@ -246,8 +246,8 @@ function BlockletPreferences(_ref2) {
     });
   } else if (current === 'access') {
     content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {});
-  } else if (current === 'oauth') {
-    content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_oauth.default, {});
+  } else if (current === 'authentication') {
+    content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_authentication.default, {});
   } else if (current === 'notification') {
     content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_notification.default, {});
   } else {

package/lib/blocklet/publish/connect-store-list.js

@@ -12,10 +12,11 @@ var _item = _interopRequireDefault(require("../../store/item"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ConnectStoreList(_ref) {
-  var _blocklet$settings, _blocklet$settings4, _blocklet$meta;
+  var _blocklet$settings, _blocklet$meta;
   let {
     blocklet,
     releaseId,
+    connectedStores,
     projectId,
     releaseType,
     publishedStoreIds,
@@ -24,15 +25,14 @@ function ConnectStoreList(_ref) {
   } = _ref;
   const storeList = (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.storeList) || [];
   const connectedMap = (0, _react.useMemo)(() => {
-    var _blocklet$settings2, _blocklet$settings3;
-    if (!(blocklet !== null && blocklet !== void 0 && (_blocklet$settings2 = blocklet.settings) !== null && _blocklet$settings2 !== void 0 && _blocklet$settings2.connectedStores)) {
+    if (!(connectedStores !== null && connectedStores !== void 0 && connectedStores.length)) {
       return {};
     }
-    return blocklet === null || blocklet === void 0 || (_blocklet$settings3 = blocklet.settings) === null || _blocklet$settings3 === void 0 || (_blocklet$settings3 = _blocklet$settings3.connectedStores) === null || _blocklet$settings3 === void 0 ? void 0 : _blocklet$settings3.reduce((acc, x) => {
-      acc[x.storeUrl] = x;
+    return connectedStores === null || connectedStores === void 0 ? void 0 : connectedStores.reduce((acc, x) => {
+      acc[x.storeId] = x;
       return acc;
     }, {});
-  }, [blocklet === null || blocklet === void 0 || (_blocklet$settings4 = blocklet.settings) === null || _blocklet$settings4 === void 0 ? void 0 : _blocklet$settings4.connectedStores]);
+  }, [connectedStores]);
   const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
   const handleAddStore = () => {};
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.List, {
@@ -47,7 +47,7 @@ function ConnectStoreList(_ref) {
           teamDid: did,
           store: x,
           published: (publishedStoreIds === null || publishedStoreIds === void 0 ? void 0 : publishedStoreIds.indexOf(x.id)) > -1,
-          connected: !!connectedMap[x.url],
+          connectedStore: connectedMap[x.id],
           onPublish: onPublish,
           onDelete: onDelete
         })
@@ -66,7 +66,8 @@ ConnectStoreList.propTypes = {
   releaseType: _propTypes.default.string.isRequired,
   onPublish: _propTypes.default.func,
   onDelete: _propTypes.default.func,
-  publishedStoreIds: _propTypes.default.arrayOf(_propTypes.default.string)
+  publishedStoreIds: _propTypes.default.arrayOf(_propTypes.default.string),
+  connectedStores: _propTypes.default.arrayOf(_propTypes.default.object).isRequired
 };
 ConnectStoreList.defaultProps = {
   publishedStoreIds: [],

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

@@ -126,9 +126,10 @@ const addComponentTabs = _ref => {
   });
 };
 const pickParams = (release, app) => {
-  const params = (0, _pick.default)(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'blockletComponents', 'publishedStoreIds', 'note']);
+  const params = (0, _pick.default)(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'blockletComponents', 'publishedStoreIds', 'connectedStores', 'note']);
   params.blockletScreenshots || (params.blockletScreenshots = []);
   params.publishedStoreIds || (params.publishedStoreIds = []);
+  params.connectedStores || (params.connectedStores = []);
   if (!params.blockletComponents) {
     params.blockletComponents = (app.children || []).map(x => ({
       did: x.meta.did,
@@ -167,7 +168,10 @@ function CreateRelease(_ref2) {
   const [createLoading, setCreateLoading] = (0, _react.useState)(false);
   const [release, setRelease] = (0, _react.useState)(null);
   const {
-    api
+    api,
+    ws: {
+      useSubscription
+    }
   } = (0, _node.useNodeContext)();
   const uploaderLogoRef = (0, _react.useRef)(null);
   const uploaderScreenshotRef = (0, _react.useRef)(null);
@@ -240,7 +244,7 @@ function CreateRelease(_ref2) {
       }
     }).then(res => {
       setLoading(false);
-      setParams(pickParams(res === null || res === void 0 ? void 0 : res.release, blocklet));
+      // setParams(pickParams(res?.release, blocklet));
       setRelease(res === null || res === void 0 ? void 0 : res.release);
     }).catch(err => {
       setLoading(false);
@@ -255,9 +259,7 @@ function CreateRelease(_ref2) {
       }
       getRelease();
     }
-    if (mode === 'create') {
-      getProject();
-    }
+    getProject();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mode, releaseId]);
   const onRelease = status => {
@@ -389,6 +391,12 @@ function CreateRelease(_ref2) {
   (0, _react.useEffect)(() => {
     getData();
   }, [getData]);
+  useSubscription(_constant2.EVENTS.NOTIFICATION_BLOCKLET_CREATE, notification => {
+    var _notification$meta;
+    if ((notification === null || notification === void 0 || (_notification$meta = notification.meta) === null || _notification$meta === void 0 ? void 0 : _notification$meta.eventType) === _constant2.STUDIO_CONNECTED_STORE) {
+      getData();
+    }
+  }, [getData]);
   if (!params && loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_emptySpinner.default, {});
   }
@@ -972,6 +980,8 @@ function CreateRelease(_ref2) {
         projectId: projectId,
         releaseId: releaseId,
         onPublish: getRelease,
+        onDelete: getData,
+        connectedStores: params.connectedStores,
         publishedStoreIds: release === null || release === void 0 ? void 0 : release.publishedStoreIds
       })
     })]

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

@@ -15,6 +15,7 @@ var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
 var _FileOpen = _interopRequireDefault(require("@mui/icons-material/FileOpen"));
 var _AddBox = _interopRequireDefault(require("@mui/icons-material/AddBox"));
 var _HelpOutlineOutlined = _interopRequireDefault(require("@mui/icons-material/HelpOutlineOutlined"));
+var _Error = _interopRequireDefault(require("@mui/icons-material/Error"));
 var _constant = require("@abtnode/constant");
 var _Datatable = _interopRequireDefault(require("@arcblock/ux/lib/Datatable"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -368,10 +369,36 @@ function ProjectList() {
       }
     }), deleteConfirm && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       title: "".concat(t('common.delete'), " ").concat(deleteConfirm.blockletTitle),
-      description: t('blocklet.publish.deleteBlockletTip'),
+      description: t('blocklet.publish.deleteProject.description'),
       confirm: t('common.confirm'),
       onConfirm: confirmDeleteProject,
-      onCancel: () => setDeleteConfirm(null)
+      onCancel: () => setDeleteConfirm(null),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        sx: {
+          marginTop: 2
+        },
+        children: [t('blocklet.publish.deleteProject.tip1'), t('blocklet.publish.deleteProject.tip2'), t('blocklet.publish.deleteProject.tip3')].map(x => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          sx: {
+            display: 'flex',
+            marginTop: 1,
+            flexDirection: 'row',
+            alignItems: 'flex-start'
+          },
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Error.default, {
+            color: "warning",
+            sx: {
+              marginRight: 1,
+              fontSize: 20,
+              marginTop: '2px'
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+            component: "span",
+            variant: "inherit",
+            color: "text.secondary",
+            children: x
+          })]
+        }))
+      })
     }), didConnect]
   });
 }

package/lib/blocklet/storage/action.js

@@ -16,7 +16,7 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _spaces = require("../../util/spaces");
 var _delete = _interopRequireDefault(require("./delete"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["spaceGateway", "connected", "onDelete", "onConnect", "enableSwitchToSpace"];
+const _excluded = ["spaceGateway", "connected", "onDelete", "onConnect", "enableSwitchToSpace", "backupInProgress"];
 /**
  * @description
  * @param {{
@@ -24,7 +24,8 @@ const _excluded = ["spaceGateway", "connected", "onDelete", "onConnect", "enable
  *  onDelete: (spaceGateway: import('./connected').SpaceGateway) => Promise<void>,
  *  onConnect: (spaceGateway: import('./connected').SpaceGateway) => Promise<void>,
  *  enableSwitchToSpace: true | false,
- *  connected: false | true
+ *  connected: false | true,
+ *  backupInProgress: false | true,
  * } & import('@mui/material').IconButtonProps} { spaceGateway, onDelete, onConnect, enableSwitchToSpace, connected, ...rest }
  * @return {React.Component}
  */
@@ -44,7 +45,8 @@ function SpaceItemAction(_ref) {
       connected,
       onDelete,
       onConnect,
-      enableSwitchToSpace
+      enableSwitchToSpace,
+      backupInProgress
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
@@ -134,7 +136,7 @@ function SpaceItemAction(_ref) {
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ListItemText, {
           children: t('storage.spaces.connect.switchToSpace')
         })]
-      }), !connected && /*#__PURE__*/(0, _jsxRuntime.jsx)(_delete.default, {
+      }), !backupInProgress && /*#__PURE__*/(0, _jsxRuntime.jsx)(_delete.default, {
         spaceGateway: spaceGateway,
         onDelete: onDelete
       })]
@@ -152,11 +154,13 @@ SpaceItemAction.propTypes = {
   connected: _propTypes.default.bool.isRequired,
   enableSwitchToSpace: _propTypes.default.bool,
   onDelete: _propTypes.default.func,
-  onConnect: _propTypes.default.func
+  onConnect: _propTypes.default.func,
+  backupInProgress: _propTypes.default.bool
 };
 SpaceItemAction.defaultProps = {
   onDelete: () => {},
   onConnect: () => {},
-  enableSwitchToSpace: true
+  enableSwitchToSpace: true,
+  backupInProgress: false
 };
 var _default = exports.default = SpaceItemAction;

package/lib/blocklet/storage/item.js

@@ -455,7 +455,8 @@ function SpaceItem(_ref) {
           connected: connected,
           onDelete: onDelete,
           onConnect: onConnect,
-          enableSwitchToSpace: (backupProgress === null || backupProgress === void 0 ? void 0 : backupProgress.completed) || (0, _lodash.isEmpty)(backupProgress === null || backupProgress === void 0 ? void 0 : backupProgress.message)
+          enableSwitchToSpace: (backupProgress === null || backupProgress === void 0 ? void 0 : backupProgress.completed) || (0, _lodash.isEmpty)(backupProgress === null || backupProgress === void 0 ? void 0 : backupProgress.message),
+          backupInProgress: shouldDisplayBackupProgress
         })]
       })]
     })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {

package/lib/confirm.js

@@ -22,7 +22,7 @@ var _util = require("./util");
 var _mobileWidth = _interopRequireDefault(require("./hooks/mobile-width"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["title", "description", "showCancel", "cancel", "confirm", "color", "params", "onCancel", "onConfirm", "loading", "displayError"];
+const _excluded = ["title", "description", "showCancel", "cancel", "confirm", "color", "params", "onCancel", "onConfirm", "loading", "displayError", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -44,7 +44,8 @@ function ConfirmDialog(_ref) {
       onCancel,
       onConfirm,
       loading: inputLoading,
-      displayError
+      displayError,
+      children
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const [params, setParams] = (0, _react.useState)(initialParams);
@@ -107,7 +108,7 @@ function ConfirmDialog(_ref) {
           marginTop: 8
         },
         children: error
-      })]
+      }), children]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_DialogActions.default, {
       className: "delete-actions",
       style: {
@@ -156,9 +157,11 @@ ConfirmDialog.propTypes = {
   onCancel: _propTypes.default.func,
   onConfirm: _propTypes.default.func.isRequired,
   loading: _propTypes.default.bool,
-  displayError: _propTypes.default.bool
+  displayError: _propTypes.default.bool,
+  children: _propTypes.default.any
 };
 ConfirmDialog.defaultProps = {
+  children: undefined,
   onCancel: () => {},
   showCancel: true,
   cancel: '',

package/lib/contexts/blocklet-storage.js

@@ -153,10 +153,6 @@ function BlockletStorageProvider(_ref) {
     if (!spaceGateway) {
       return;
     }
-    if (spaceGateway.endpoint === backupEndpoint) {
-      _Toast.default.warning(t('storage.spaces.gateway.delete.failedForConnected'));
-      return;
-    }
     await api.deleteBlockletSpaceGateway({
       input: {
         did: blocklet.meta.did,

package/lib/layout/feedback.js

@@ -19,10 +19,13 @@ function Feedback(_ref) {
   const {
     t
   } = (0, _context.useLocaleContext)();
+  const feedbackUrl = new URL('https://community.arcblock.io/discussions/add');
+  infos.forEach(x => {
+    feedbackUrl.searchParams.set(x.label, x.value);
+  });
   const infoStr = infos.map(x => "* ".concat(x.label, ": ").concat(x.value)).join('\n');
-  const feedbackUrl = new URL('https://github.com/blocklet/blocklet-site/issues/new');
-  feedbackUrl.searchParams.set('title', '[Feedback]');
-  feedbackUrl.searchParams.set('body', "<!-- [Enter feedback here] -->\n\n\n\n<!--\nDocument Details\n".concat(infoStr, "\n* Page: ").concat(window.location.href, "\n-->\n"));
+  feedbackUrl.searchParams.set('report', 'server');
+  feedbackUrl.searchParams.set('context', "[Enter feedback here]\n\n\n\n<!--\n[Server Info]\n".concat(infoStr, "\n* Page: ").concat(window.location.href, "\n-->\n"));
   return (0, _jsxRuntime.jsx)(_material.Box, {
     sx: {
       mx: {