@abtnode/ux 1.16.19-beta-710018ca → 1.16.19-beta-ba354e01

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

@@ -66,7 +66,7 @@ function CreateProject(_ref) {
   const [blockletDid, setBlockletDid] = (0, _react.useState)();
   const [openConnect, setOpenConnect] = (0, _react.useState)(false);
   const {
-    componentDid
+    componentDid = ''
   } = (0, _reactRouterDom.useParams)();
   const handleCreateBlockletDidError = err => {
     _Toast.default.error(err.message);

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

@@ -19,6 +19,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
 var _InputAdornment = _interopRequireDefault(require("@mui/material/InputAdornment"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
@@ -136,6 +137,7 @@ function CreateRelease(_ref2) {
   const [params, setParams] = (0, _useSetState.default)(null);
   const [paramsErrTip, setParamsErrTip] = (0, _react.useState)({});
   const [loading, setLoading] = (0, _react.useState)(false);
+  const [createLoading, setCreateLoading] = (0, _react.useState)(false);
   const [release, setRelease] = (0, _react.useState)(null);
   const {
     api
@@ -193,7 +195,7 @@ function CreateRelease(_ref2) {
       _Toast.default.error((0, _util.formatError)(err));
     });
   };
-  const getData = () => {
+  const getData = (0, _react.useCallback)(() => {
     if (mode === 'edit') {
       if (!releaseId) {
         _Toast.default.error('Empty release id');
@@ -204,11 +206,11 @@ function CreateRelease(_ref2) {
     if (mode === 'create') {
       getProject();
     }
-  };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [mode, releaseId]);
   (0, _react.useEffect)(() => {
     getData();
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
+  }, [getData]);
   const onRelease = status => {
     const errors = validateParams(params, status, t);
     if (errors) {
@@ -231,6 +233,8 @@ function CreateRelease(_ref2) {
     _params.blockletDescription = (_params.blockletDescription || '').trim();
     _params.blockletIntroduction = (_params.blockletIntroduction || '').trim();
     _params.note = (_params.note || '').trim();
+    setCreateLoading(status);
+    setLoading(true);
     api.createRelease({
       input: _objectSpread(_objectSpread({}, _params), {}, {
         did: blocklet.meta.did,
@@ -238,21 +242,26 @@ function CreateRelease(_ref2) {
         releaseId,
         status
       })
-    }).then(() => {
+    }).then(res => {
+      setCreateLoading(false);
+      setLoading(false);
       if (status === 'draft') {
-        _Toast.default.success('Save draft success');
-        if (mode === 'create') {
-          navigate("../".concat(projectId), {
-            replace: true
-          });
-        }
+        _Toast.default.success(t('blocklet.publish.saveDraftSuccess'));
       } else {
-        _Toast.default.success('Create Release success');
-        navigate("../".concat(projectId), {
+        _Toast.default.success(t('blocklet.publish.createReleaseSuccess'));
+      }
+      if (mode === 'create') {
+        var _res$release;
+        const id = res === null || res === void 0 ? void 0 : (_res$release = res.release) === null || _res$release === void 0 ? void 0 : _res$release.id;
+        navigate("../".concat(projectId, "/").concat(id), {
           replace: true
         });
+      } else {
+        getRelease();
       }
     }).catch(err => {
+      setCreateLoading(false);
+      setLoading(false);
       _Toast.default.error((0, _util.formatError)(err));
     });
   };
@@ -305,19 +314,30 @@ function CreateRelease(_ref2) {
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         children: [!isPublished && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
             variant: "outlined",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(_constant.PROJECT.RELEASE_STATUS.draft),
             style: {
               marginRight: 12
             },
-            children: t('blocklet.publish.saveDraft')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+            children: [createLoading === _constant.PROJECT.RELEASE_STATUS.draft && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              }
+            }), t('blocklet.publish.saveDraft')]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
             variant: "contained",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(_constant.PROJECT.RELEASE_STATUS.published),
-            children: t('common.release')
+            children: [createLoading === _constant.PROJECT.RELEASE_STATUS.published && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              },
+              color: "inherit"
+            }), t('common.release')]
           })]
         }), isPublished && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           variant: "contained",

package/lib/blocklet/publish/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = BlockletPublish;
 var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactRouterDom = require("react-router-dom");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -19,7 +20,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function BlockletPublish() {
+function BlockletPublish(_ref) {
+  let {
+    padding
+  } = _ref;
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
@@ -43,7 +47,12 @@ function BlockletPublish() {
   if (!blocklet) {
     return null;
   }
+  const style = {};
+  if (padding) {
+    style.padding = padding;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Main, {
+    style: style,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Routes, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
         path: "/",
@@ -61,10 +70,15 @@ function BlockletPublish() {
     })
   });
 }
-BlockletPublish.propTypes = {};
-const Main = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  a {\n    color: ", ";\n  }\n"])), _ref => {
+BlockletPublish.propTypes = {
+  padding: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
+};
+BlockletPublish.defaultProps = {
+  padding: ''
+};
+const Main = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  a {\n    color: ", ";\n  }\n"])), _ref2 => {
   let {
     theme
-  } = _ref;
+  } = _ref2;
   return theme.palette.primary.main;
 });

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

@@ -21,6 +21,7 @@ var _node = require("../../contexts/node");
 var _emptySpinner = _interopRequireDefault(require("../../empty-spinner"));
 var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
+var _bundleAvatar = _interopRequireDefault(require("../bundle-avatar"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 /* eslint-disable react/no-unstable-nested-components */
@@ -75,6 +76,7 @@ function ProjectList() {
       setLoading(false);
       getProjects();
       _Toast.default.success(t('common.removeSuccess'));
+      setDeleteConfirm(null);
     }).catch(err => {
       setLoading(false);
       _Toast.default.error(err.message);
@@ -154,6 +156,35 @@ function ProjectList() {
         }) : '';
       }
     }
+  }, componentDid ? null : {
+    label: t('common.scope'),
+    name: 'componentDid',
+    options: {
+      customBodyRender: value => {
+        const component = (blocklet.children || []).find(x => x.meta.did === value);
+        if (!component) {
+          return '';
+        }
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "flex-start",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_bundleAvatar.default, {
+            size: 14,
+            blocklet: component,
+            ancestors: [blocklet]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            ml: 0.5,
+            sx: {
+              ml: 0.5,
+              color: 'text.primary',
+              fontSize: 14
+            },
+            children: component.meta.title
+          })]
+        }, value);
+      }
+    }
   }, {
     label: t('common.updatedAt'),
     name: 'updatedAt',
@@ -186,7 +217,7 @@ function ProjectList() {
         });
       }
     }
-  }];
+  }].filter(Boolean);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Main, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       sx: {

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

@@ -107,6 +107,7 @@ function ReleaseList() {
       setLoading(false);
       getReleases();
       _Toast.default.success(t('common.removeSuccess'));
+      setDeleteConfirm(null);
     }).catch(err => {
       setLoading(false);
       _Toast.default.error(err.message);

package/lib/blocklet/publish/resource.js

@@ -7,7 +7,6 @@ exports.default = Resource;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _difference = _interopRequireDefault(require("lodash/difference"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
@@ -32,12 +31,6 @@ const fillParent = (nodes, parentId) => {
   });
   return nodes;
 };
-const checkDiff = (a, b) => {
-  if (a.length !== b.length) {
-    return true;
-  }
-  return !!(0, _difference.default)(a, b || []).length;
-};
 function Resource(_ref) {
   let {
     app,
@@ -54,14 +47,12 @@ function Resource(_ref) {
   } = (0, _node.useNodeContext)();
   const [resources, setResources] = (0, _react.useState)([]);
   const [selectedResourceIds, setSelectedResourceIds] = (0, _react.useState)([]);
-  const [savedResourceIds, setSavedResourceIds] = (0, _react.useState)([]);
   const [loading, setLoading] = (0, _react.useState)(false);
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
     resourceExportApi = '/'
   } = (component === null || component === void 0 ? void 0 : component.meta.capabilities) || {};
-  const hasDiff = (0, _react.useMemo)(() => checkDiff(savedResourceIds, selectedResourceIds), [savedResourceIds, selectedResourceIds]);
   const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
@@ -78,7 +69,6 @@ function Resource(_ref) {
           resources: data
         }
       });
-      setSavedResourceIds(data);
     } catch (err) {
       _Toast.default.error(err.message);
     }
@@ -119,7 +109,6 @@ function Resource(_ref) {
     }).then(res => {
       const list = (res === null || res === void 0 ? void 0 : res.resources) || [];
       setSelectedResourceIds(list);
-      setSavedResourceIds(list);
     }).catch(err => {
       _Toast.default.error(err.message);
     });
@@ -148,7 +137,7 @@ function Resource(_ref) {
         className: "footer",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           variant: "contained",
-          disabled: loading || !hasDiff,
+          disabled: loading,
           onClick: () => onSave(),
           children: t('common.save')
         })

package/lib/blocklet/publish/tree.js

@@ -17,6 +17,7 @@ var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore
 var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
 var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
 var _react = require("@iconify/react");
+var _images = _interopRequireDefault(require("../../images"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject; // BFS algorithm to find node by his ID
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -126,45 +127,51 @@ function Tree(_ref2) {
     var _node$children;
     return ((_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.length) > 0;
   });
-  const renderTree = node => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem.default, {
-    nodeId: node.id,
-    label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
-      onClick: stopExpand,
-      control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
-        size: "small",
-        checked: selectedNodes.indexOf(node.id) !== -1,
-        tabIndex: -1,
-        disableRipple: true,
-        onClick: event => handleNodeSelect(event, node.id),
-        disabled: disabled
-      }),
-      label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        className: "content",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          display: "flex",
-          alignItems: "center",
-          children: [node.icon && /*#__PURE__*/(0, _jsxRuntime.jsx)(ResourceIcon, {
-            icon: node.icon
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            className: "name",
-            children: node.name
-          }), node.url && /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-            href: node.url,
-            target: "_blank",
-            rel: "noreferrer",
-            className: "link",
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenInNew.default, {
-              className: "link-icon"
-            })
+  const renderTree = node => {
+    var _node$images;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem.default, {
+      nodeId: node.id,
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
+        onClick: stopExpand,
+        control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+          size: "small",
+          checked: selectedNodes.indexOf(node.id) !== -1,
+          tabIndex: -1,
+          disableRipple: true,
+          onClick: event => handleNodeSelect(event, node.id),
+          disabled: disabled
+        }),
+        label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          className: "content",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            display: "flex",
+            alignItems: "center",
+            children: [node.icon && /*#__PURE__*/(0, _jsxRuntime.jsx)(ResourceIcon, {
+              icon: node.icon
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              className: "name",
+              children: node.name
+            }), node.url && /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+              href: node.url,
+              target: "_blank",
+              rel: "noreferrer",
+              className: "link",
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenInNew.default, {
+                className: "link-icon"
+              })
+            })]
+          }), !!node.description && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            className: "description",
+            children: node.description
+          }), !!((_node$images = node.images) !== null && _node$images !== void 0 && _node$images.length) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_images.default, {
+            className: "images",
+            data: node.images
           })]
-        }), !!node.description && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-          className: "description",
-          children: node.description
-        })]
-      })
-    }),
-    children: Array.isArray(node.children) ? node.children.map(renderTree) : null
-  }, node.id);
+        })
+      }),
+      children: Array.isArray(node.children) ? node.children.map(renderTree) : null
+    }, node.id);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledTreeView, {
     className: (0, _classnames.default)(!hadChildren && 'no-children'),
     multiSelect: true,

package/lib/blocklet/resource-type.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = ResourceType;
+var _react = require("react");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _uniq = _interopRequireDefault(require("lodash/uniq"));
+var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
+var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["blocklet"];
+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 ResourceType(_ref) {
+  let {
+      blocklet
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  const types = (0, _react.useMemo)(() => {
+    var _blocklet$meta;
+    return (0, _uniq.default)(((blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.resources) || []).map(x => (0, _upperFirst.default)(x.split('.').slice(-1)[0])).filter(Boolean));
+  }, [blocklet]);
+  const style = {
+    color: '#FFF',
+    backgroundColor: '#5B9BD5',
+    marginRight: '4px'
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, _objectSpread(_objectSpread({
+    display: "flex",
+    mr: "-4px"
+  }, rest), {}, {
+    children: types.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
+      type: "custom",
+      style: style,
+      children: x
+    }, x))
+  }));
+}
+ResourceType.propTypes = {
+  blocklet: _propTypes.default.object.isRequired
+};
+ResourceType.defaultProps = {};

package/lib/blocklet/storage/connect-to.js

@@ -148,18 +148,14 @@ function ConnectTo(_ref) {
    * @returns {Promise<void>}
    */
   const addSpaceGatewayNow = async _ref2 => {
-    var _endpoint$replace, _endpoint$replace$tri, _spaceGateway$name;
+    var _spaceGateway$name;
     let {
       endpoint,
       name,
       did
     } = _ref2;
-    let normalizeUrl = endpoint === null || endpoint === void 0 ? void 0 : (_endpoint$replace = endpoint.replace(/\/api\/.+/, '')) === null || _endpoint$replace === void 0 ? void 0 : (_endpoint$replace$tri = _endpoint$replace.trim()) === null || _endpoint$replace$tri === void 0 ? void 0 : _endpoint$replace$tri.replace(/\/$/, '');
-    if (!normalizeUrl.startsWith('http')) {
-      // eslint-disable-next-line no-param-reassign
-      normalizeUrl = "https://".concat(normalizeUrl);
-    }
-    if (!(await (0, _spaces.isValidSpaceGatewayUrl)(normalizeUrl))) {
+    const spaceGatewayUrl = await (0, _spaces.getSpaceGatewayUrl)(endpoint);
+    if (!(await (0, _spaces.isValidSpaceGatewayUrl)(spaceGatewayUrl))) {
       _Toast.default.error(t('storage.spaces.gateway.add.invalidUrl'));
       return;
     }
@@ -173,7 +169,7 @@ function ConnectTo(_ref) {
     const spaceGateway = {
       name,
       did,
-      url: normalizeUrl,
+      url: spaceGatewayUrl,
       endpoint
     };
     await addSpaceGateway(spaceGateway, endpoint);
@@ -198,18 +194,18 @@ function ConnectTo(_ref) {
   const handleUseSpaceGatewayConnect = async () => {
     try {
       setLoading(true);
-      const tempUrl = url.startsWith('http') ? url : "https://".concat(url);
-      const fullUrl = (0, _spaces.extraDIDSpacesCoreUrl)(tempUrl);
-      const spaceDid = new URL(tempUrl).searchParams.get('spaceDid');
-      if (!(await (0, _spaces.isValidSpaceGatewayUrl)(fullUrl))) {
+      const spaceGatewayUrl = await (0, _spaces.getSpaceGatewayUrl)(url);
+      const didSpacesCoreUrl = (0, _spaces.extraDIDSpacesCoreUrl)(spaceGatewayUrl);
+      const spaceDid = new URL(spaceGatewayUrl).searchParams.get('spaceDid');
+      if (!(await (0, _spaces.isValidSpaceGatewayUrl)(didSpacesCoreUrl))) {
         throw new Error(t('storage.spaces.gateway.add.invalidUrl'));
       }
       setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
         open: true,
-        prefix: (0, _urlJoin.default)(fullUrl, 'space/api/did'),
-        baseUrl: new URL(fullUrl).origin,
+        prefix: (0, _urlJoin.default)(didSpacesCoreUrl, 'space/api/did'),
+        baseUrl: new URL(didSpacesCoreUrl).origin,
         checkFn: _api.axios.create({
-          baseURL: (0, _urlJoin.default)(fullUrl, 'space')
+          baseURL: (0, _urlJoin.default)(didSpacesCoreUrl, 'space')
         }).get,
         extraParams: {
           appDid: blockletInfo.appDid,