@abtnode/ux 1.16.15-beta-933eb977 → 1.16.15-beta-18951729

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

@@ -6,11 +6,10 @@ import Typography from '@mui/material/Typography';
 import TextField from '@mui/material/TextField';
 import MenuItem from '@mui/material/MenuItem';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import Toast from '@arcblock/ux/lib/Toast';
 import Confirm from '../../../confirm';
 import { formatError, sleep } from '../../../util';
 import { useNodeContext } from '../../../contexts/node';
-import { validateDomain } from '../util';
+import { parseDomainFromURL, validateDomain } from '../util';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -41,15 +40,13 @@ export default function AddDomainAlias({
       await api.addDomainAlias({
         input: {
           id,
-          domainAlias: params.domain.trim(),
+          domainAlias: parseDomainFromURL(params.domain),
           teamDid
         }
       });
       await sleep(2000);
-    } catch (err) {
-      Toast.error(err.message);
-    } finally {
       setConfirmSetting(null);
+    } finally {
       setLoading(false);
     }
   };
@@ -69,6 +66,7 @@ export default function AddDomainAlias({
       component: "div",
       children: /*#__PURE__*/_jsx(TextField, {
         label: t('router.domainAlias.add.domainDescription'),
+        helperText: t('router.domainAlias.add.helperText'),
         autoComplete: "off",
         variant: "outlined",
         name: "domain",

package/es/blocklet/router/util.js

@@ -128,4 +128,20 @@ export const isSpecialDomain = name => {
     specialDomains.push(window.location.hostname);
   }
   return specialDomains.includes(name);
+};
+export const parseDomainFromURL = tmpDomain => {
+  if (!tmpDomain || typeof tmpDomain !== 'string') {
+    return tmpDomain;
+  }
+  let domain = tmpDomain.trim();
+  try {
+    domain = domain.toLowerCase();
+    if (domain.startsWith('http://') || domain.startsWith('https://')) {
+      return new URL(domain).hostname;
+    }
+    return domain;
+  } catch (error) {
+    console.error('format domain failed', error);
+    return domain;
+  }
 };

package/es/locales/en.js

@@ -820,13 +820,14 @@ module.exports = {
       rewriteUrlRequired: 'Rewrite URL is required'
     },
     domain: {
+      addSite: 'Add Site',
       validate: {
         emptyTip: 'Site domain cannot be empty',
         suffixTip: 'Site domain cannot include {suffix}'
       },
       add: {
-        title: 'Add Site',
-        description: 'Please provide a valid site name address',
+        title: 'Add Domain Name',
+        description: 'Please provide a valid domain name',
         confirm: 'Add',
         cancel: 'Cancel',
         blocklet: 'Select Blocklet',
@@ -861,7 +862,8 @@ module.exports = {
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
-        forceTip: 'Force add if domain name already exists'
+        forceTip: 'Force add if domain name already exists',
+        helperText: 'If an HTTP or HTTPS URL is entered, it will be automatically converted into a domain name.'
       },
       delete: {
         title: 'Delete',

package/es/locales/zh.js

@@ -823,13 +823,14 @@ module.exports = {
       rewriteUrlRequired: '重写到 URL 是必填的'
     },
     domain: {
+      addSite: '添加站点',
       validate: {
         emptyTip: '站点域名不能为空',
         suffixTip: '站点域名不能包含 {suffix}'
       },
       add: {
-        title: '添加站点',
-        description: '请填写你所拥有的合法的站点地址',
+        title: '添加域名',
+        description: '请填写你所拥有的合法的域名',
         confirm: '添加',
         cancel: '取消',
         blocklet: '选择基石程序',
@@ -864,7 +865,8 @@ module.exports = {
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
-        forceTip: '当域名已存在时强制添加'
+        forceTip: '当域名已存在时强制添加',
+        helperText: '如果输入 HTTP 或者 HTTPS URL, 则会被自动转换为域名。'
       },
       delete: {
         title: '删除',

package/es/util/index.js

@@ -606,7 +606,8 @@ export const getSubscriptionURL = async ({
       timeout: 5000
     });
     const mountPoint = appMeta.componentMountPoints?.find(item => item.did === 'z8iZy4P83i6AgnNdNUexsh2kBcsDHoqcwPavn');
-    baseUrl = joinUrl(launcherUrl, mountPoint?.mountPoint, '/nfts');
+    const launcherUrlObj = new URL(launcherUrl);
+    baseUrl = joinUrl(launcherUrlObj.origin, mountPoint?.mountPoint, '/nfts');
   } catch (error) {
     console.error(error);
   }

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

@@ -12,7 +12,6 @@ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../../../confirm"));
 var _util = require("../../../util");
 var _node = require("../../../contexts/node");
@@ -52,15 +51,13 @@ function AddDomainAlias(_ref) {
       await api.addDomainAlias({
         input: {
           id,
-          domainAlias: params.domain.trim(),
+          domainAlias: (0, _util2.parseDomainFromURL)(params.domain),
           teamDid
         }
       });
       await (0, _util.sleep)(2000);
-    } catch (err) {
-      _Toast.default.error(err.message);
-    } finally {
       setConfirmSetting(null);
+    } finally {
       setLoading(false);
     }
   };
@@ -80,6 +77,7 @@ function AddDomainAlias(_ref) {
       component: "div",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
         label: t('router.domainAlias.add.domainDescription'),
+        helperText: t('router.domainAlias.add.helperText'),
         autoComplete: "off",
         variant: "outlined",
         name: "domain",

package/lib/blocklet/router/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateSite = exports.validateRule = exports.validatePathPrefix = exports.validateDomain = exports.isSpecialDomain = exports.getInitialBlockletDid = void 0;
+exports.validateSite = exports.validateRule = exports.validatePathPrefix = exports.validateDomain = exports.parseDomainFromURL = exports.isSpecialDomain = exports.getInitialBlockletDid = void 0;
 var _constant = require("@abtnode/constant");
 var _isPathPrefixEqual = _interopRequireDefault(require("@abtnode/util/lib/is-path-prefix-equal"));
 var _constant2 = require("@blocklet/constant");
@@ -143,4 +143,21 @@ const isSpecialDomain = name => {
   }
   return specialDomains.includes(name);
 };
-exports.isSpecialDomain = isSpecialDomain;
+exports.isSpecialDomain = isSpecialDomain;
+const parseDomainFromURL = tmpDomain => {
+  if (!tmpDomain || typeof tmpDomain !== 'string') {
+    return tmpDomain;
+  }
+  let domain = tmpDomain.trim();
+  try {
+    domain = domain.toLowerCase();
+    if (domain.startsWith('http://') || domain.startsWith('https://')) {
+      return new URL(domain).hostname;
+    }
+    return domain;
+  } catch (error) {
+    console.error('format domain failed', error);
+    return domain;
+  }
+};
+exports.parseDomainFromURL = parseDomainFromURL;

package/lib/locales/en.js

@@ -822,13 +822,14 @@ module.exports = {
       rewriteUrlRequired: 'Rewrite URL is required'
     },
     domain: {
+      addSite: 'Add Site',
       validate: {
         emptyTip: 'Site domain cannot be empty',
         suffixTip: 'Site domain cannot include {suffix}'
       },
       add: {
-        title: 'Add Site',
-        description: 'Please provide a valid site name address',
+        title: 'Add Domain Name',
+        description: 'Please provide a valid domain name',
         confirm: 'Add',
         cancel: 'Cancel',
         blocklet: 'Select Blocklet',
@@ -863,7 +864,8 @@ module.exports = {
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
-        forceTip: 'Force add if domain name already exists'
+        forceTip: 'Force add if domain name already exists',
+        helperText: 'If an HTTP or HTTPS URL is entered, it will be automatically converted into a domain name.'
       },
       delete: {
         title: 'Delete',

package/lib/locales/zh.js

@@ -825,13 +825,14 @@ module.exports = {
       rewriteUrlRequired: '重写到 URL 是必填的'
     },
     domain: {
+      addSite: '添加站点',
       validate: {
         emptyTip: '站点域名不能为空',
         suffixTip: '站点域名不能包含 {suffix}'
       },
       add: {
-        title: '添加站点',
-        description: '请填写你所拥有的合法的站点地址',
+        title: '添加域名',
+        description: '请填写你所拥有的合法的域名',
         confirm: '添加',
         cancel: '取消',
         blocklet: '选择基石程序',
@@ -866,7 +867,8 @@ module.exports = {
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
-        forceTip: '当域名已存在时强制添加'
+        forceTip: '当域名已存在时强制添加',
+        helperText: '如果输入 HTTP 或者 HTTPS URL, 则会被自动转换为域名。'
       },
       delete: {
         title: '删除',

package/lib/util/index.js

@@ -713,7 +713,8 @@ const getSubscriptionURL = async _ref8 => {
       timeout: 5000
     });
     const mountPoint = (_appMeta$componentMou = appMeta.componentMountPoints) === null || _appMeta$componentMou === void 0 ? void 0 : _appMeta$componentMou.find(item => item.did === 'z8iZy4P83i6AgnNdNUexsh2kBcsDHoqcwPavn');
-    baseUrl = (0, _urlJoin.default)(launcherUrl, mountPoint === null || mountPoint === void 0 ? void 0 : mountPoint.mountPoint, '/nfts');
+    const launcherUrlObj = new URL(launcherUrl);
+    baseUrl = (0, _urlJoin.default)(launcherUrlObj.origin, mountPoint === null || mountPoint === void 0 ? void 0 : mountPoint.mountPoint, '/nfts');
   } catch (error) {
     console.error(error);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.15-beta-933eb977",
+  "version": "1.16.15-beta-18951729",
   "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.15-beta-933eb977",
-    "@abtnode/constant": "1.16.15-beta-933eb977",
-    "@abtnode/util": "1.16.15-beta-933eb977",
+    "@abtnode/auth": "1.16.15-beta-18951729",
+    "@abtnode/constant": "1.16.15-beta-18951729",
+    "@abtnode/util": "1.16.15-beta-18951729",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.89",
     "@arcblock/did-connect": "^2.7.6",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.7.6",
     "@arcblock/terminal": "^2.7.6",
     "@arcblock/ux": "^2.7.6",
-    "@blocklet/constant": "1.16.15-beta-933eb977",
+    "@blocklet/constant": "1.16.15-beta-18951729",
     "@blocklet/launcher-layout": "2.1.93",
     "@blocklet/list": "^0.12.27",
-    "@blocklet/meta": "1.16.15-beta-933eb977",
+    "@blocklet/meta": "1.16.15-beta-18951729",
     "@blocklet/ui-react": "^2.7.6",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "d98826a347c05fb1c3dc50a44d8d492290c406ad",
+  "gitHead": "6ba076bcc138a3b9948771deae0f723a5104f70f",
   "exports": {
     ".": {
       "import": "./es/index.js",