@abtnode/ux 1.16.15-beta-58d50c9a → 1.16.15-beta-e143b1cf

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

@@ -1,14 +1,16 @@
-import { useState } from 'react';
 import PropTypes from 'prop-types';
+import { useState } from 'react';
+import { isDidDomain, isSlpDomain } from '@abtnode/util/lib/url-evaluation';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import AddIcon from '@mui/icons-material/CallMerge';
 import Spinner from '@mui/material/CircularProgress';
-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 TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
 import Confirm from '../../../confirm';
-import { formatError, sleep } from '../../../util';
 import { useNodeContext } from '../../../contexts/node';
+import { formatError, sleep } from '../../../util';
+import DNSTip from '../dns-tip';
 import { parseDomainFromURL, validateDomain } from '../util';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -17,7 +19,8 @@ export default function AddDomainAlias({
   id,
   children,
   title,
-  teamDid
+  teamDid,
+  systemDomains
 }) {
   const {
     t
@@ -27,6 +30,10 @@ export default function AddDomainAlias({
   } = useNodeContext();
   const [loading, setLoading] = useState(false);
   const [confirmSetting, setConfirmSetting] = useState(null);
+  let cnameDomain = systemDomains.find(item => isSlpDomain(item));
+  if (!cnameDomain) {
+    cnameDomain = systemDomains.find(item => isDidDomain(item));
+  }
   const onCancel = () => {
     setLoading(false);
     setConfirmSetting(null);
@@ -62,9 +69,9 @@ export default function AddDomainAlias({
   const setting = {
     title: title || t('router.domainAlias.add.title'),
     // eslint-disable-next-line react/no-unstable-nested-components
-    description: (params, setParams, setError) => /*#__PURE__*/_jsx(Typography, {
+    description: (params, setParams, setError) => /*#__PURE__*/_jsxs(Typography, {
       component: "div",
-      children: /*#__PURE__*/_jsx(TextField, {
+      children: [/*#__PURE__*/_jsx(TextField, {
         label: t('router.domainAlias.add.domainDescription'),
         helperText: t('router.domainAlias.add.helperText'),
         autoComplete: "off",
@@ -107,7 +114,10 @@ export default function AddDomainAlias({
             }
           }
         }
-      })
+      }), /*#__PURE__*/_jsx(DNSTip, {
+        domain: params.domain,
+        resolvedTarget: cnameDomain
+      })]
     }),
     confirm: t('common.confirm'),
     cancel: t('common.cancel'),
@@ -148,7 +158,8 @@ export default function AddDomainAlias({
       onConfirm: confirmSetting.onConfirm,
       onCancel: confirmSetting.onCancel,
       color: "primary",
-      loading: loading
+      loading: loading,
+      maxWidth: "lg"
     })]
   });
 }
@@ -156,7 +167,8 @@ AddDomainAlias.propTypes = {
   id: PropTypes.string.isRequired,
   children: PropTypes.any,
   title: PropTypes.string,
-  teamDid: PropTypes.string
+  teamDid: PropTypes.string,
+  systemDomains: PropTypes.arrayOf(PropTypes.string).isRequired
 };
 AddDomainAlias.defaultProps = {
   children: null,

package/es/blocklet/router/dns-tip.js

@@ -0,0 +1,101 @@
+import { CopyButton } from '@arcblock/ux/lib/ClickToCopy';
+import InfoRow from '@arcblock/ux/lib/InfoRow';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { Typography } from '@mui/material';
+import Box from '@mui/material/Box';
+import useTheme from '@mui/material/styles/useTheme';
+import useMediaQuery from '@mui/material/useMediaQuery';
+import PropTypes from 'prop-types';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function DNSTip({
+  domain,
+  resolvedTarget,
+  ...rest
+}) {
+  const {
+    t,
+    locale
+  } = useLocaleContext();
+  return /*#__PURE__*/_jsxs(Box, {
+    sx: {
+      backgroundColor: 'rgb(236, 251, 253)',
+      borderColor: 'rgb(236, 251, 253)',
+      borderRadius: '8px',
+      padding: '12px'
+    },
+    ...rest,
+    children: [/*#__PURE__*/_jsxs(Box, {
+      display: "flex",
+      children: [t('router.domain.setup.tipStart'), domain && /*#__PURE__*/_jsx(Box, {
+        mx: 0.5,
+        color: "primary.main",
+        fontWeight: "fontWeightBold",
+        children: domain
+      }), t('router.domain.setup.tipEnd'), ":"]
+    }), /*#__PURE__*/_jsxs(Box, {
+      sx: {
+        '&>div': {
+          mb: 0
+        }
+      },
+      children: [/*#__PURE__*/_jsx(Tip, {
+        label: t('router.domain.setup.recordType'),
+        value: "CNAME",
+        locale: locale
+      }), /*#__PURE__*/_jsx(Tip, {
+        label: t('router.domain.setup.recordValue'),
+        value: resolvedTarget,
+        locale: locale
+      })]
+    })]
+  });
+}
+DNSTip.propTypes = {
+  domain: PropTypes.string,
+  resolvedTarget: PropTypes.string.isRequired
+};
+DNSTip.defaultProps = {
+  domain: ''
+};
+function Tip({
+  locale,
+  label,
+  value
+}) {
+  const isMobile = useMediaQuery(theme => theme.breakpoints.down('md'));
+  const theme = useTheme();
+  return /*#__PURE__*/_jsx(InfoRow, {
+    name: label,
+    nameWidth: 120,
+    children: /*#__PURE__*/_jsxs(Box, {
+      sx: {
+        display: 'flex',
+        alignItems: 'center',
+        lineHeight: 1
+      },
+      children: [/*#__PURE__*/_jsx(Typography, {
+        component: "span",
+        color: "primary.main",
+        wordWrap: "break-word",
+        overflow: "auto",
+        sx: isMobile ? {
+          maxWidth: '95%'
+        } : {},
+        children: value
+      }), /*#__PURE__*/_jsx(CopyButton, {
+        content: value,
+        locale: locale,
+        style: {
+          marginLeft: '4px',
+          color: theme.palette.text.secondary
+        }
+      })]
+    })
+  });
+}
+Tip.propTypes = {
+  locale: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  value: PropTypes.string.isRequired
+};

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

@@ -20,6 +20,7 @@ export default function DomainActions({
   const isCurrentDomain = domain.value === window.location.hostname;
   return /*#__PURE__*/_jsx(Actions, {
     "data-cy": "domain-actions",
+    size: "large",
     actions: [
     // eslint-disable-next-line react/no-unstable-nested-components
     ({

package/es/clear-cache.js

@@ -0,0 +1,78 @@
+import React, { useState } from 'react';
+import Toast from '@arcblock/ux/lib/Toast';
+import Button from '@arcblock/ux/lib/Button';
+import Spinner from '@mui/material/CircularProgress';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { formatError } from '../lib/util';
+import { useNodeContext } from './contexts/node';
+import Confirm from './confirm';
+
+// eslint-disable-next-line react/prop-types
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function ClearCache({
+  teamDid,
+  size = 'small',
+  ...rest
+}) {
+  const {
+    t
+  } = useLocaleContext();
+  const {
+    api
+  } = useNodeContext();
+  const [loading, setLoading] = useState(false);
+  const [confirmSetting, setConfirmSetting] = useState(null);
+  const onCancel = () => {
+    setLoading(false);
+    setConfirmSetting(null);
+  };
+  const onConfirm = async () => {
+    try {
+      setLoading(true);
+      const result = await api.clearCache({
+        input: {
+          teamDid
+        }
+      });
+      Toast.success(t('blocklet.config.clearCache.success', {
+        count: result.removed?.length || 0
+      }));
+    } catch (err) {
+      Toast.error(formatError(err));
+    } finally {
+      setLoading(false);
+      setConfirmSetting(null);
+    }
+  };
+  const setting = {
+    title: t('blocklet.config.clearCache.title'),
+    description: t('blocklet.config.clearCache.description'),
+    confirm: t('common.confirm'),
+    cancel: t('common.cancel'),
+    onConfirm,
+    onCancel
+  };
+  return /*#__PURE__*/_jsxs("div", {
+    ...rest,
+    children: [/*#__PURE__*/_jsxs(Button, {
+      onClick: () => setConfirmSetting(setting),
+      color: "error",
+      variant: "outlined",
+      size: size,
+      children: [loading ? /*#__PURE__*/_jsx(Spinner, {
+        size: 16,
+        style: {
+          marginRight: 5
+        }
+      }) : null, t('blocklet.config.clearCache.action')]
+    }), confirmSetting && /*#__PURE__*/_jsx(Confirm, {
+      title: confirmSetting.title,
+      description: confirmSetting.description,
+      confirm: confirmSetting.confirm,
+      cancel: confirmSetting.cancel,
+      onConfirm: confirmSetting.onConfirm,
+      onCancel: confirmSetting.onCancel
+    })]
+  });
+}

package/es/confirm.js

@@ -26,7 +26,8 @@ export default function ConfirmDialog({
   params: initialParams,
   onCancel,
   onConfirm,
-  loading: inputLoading
+  loading: inputLoading,
+  ...rest
 }) {
   const [params, setParams] = useState(initialParams);
   const [open, setOpen] = useState(true);
@@ -68,6 +69,7 @@ export default function ConfirmDialog({
     style: {
       minWidth
     },
+    ...rest,
     children: [/*#__PURE__*/_jsx(DialogTitle, {
       children: t
     }), /*#__PURE__*/_jsxs(DialogContent, {

package/es/locales/en.js

@@ -230,7 +230,7 @@ module.exports = {
     protocol: 'Protocol',
     published: 'published',
     purchase: 'Purchase',
-    readMore: 'Read More',
+    readMore: 'More',
     redirect: 'Redirect',
     redirectCode: 'Redirect Code',
     redirectPermanently: 'Permanent Redirect',
@@ -449,6 +449,14 @@ module.exports = {
         ttl: 'Login session validity period (user will be asked to login again if they have no activity on this site for {day} days)',
         day: '{day} day',
         days: '{day} days'
+      },
+      clearCache: {
+        name: 'Cache Management',
+        purpose: 'Manage files cached in router and blocklet services',
+        title: 'Confirm Cache Clear?',
+        action: 'Clear Cache',
+        success: 'Successfully cleared {count} cache entries',
+        description: 'Are you sure you want to clear cached files in router and blocklet service? this operation may cause slight performance downgrade in the short term'
       }
     },
     overview: {
@@ -849,6 +857,12 @@ module.exports = {
         label: 'Site Domain',
         description: 'Please provide a valid site domain'
       },
+      setup: {
+        tipStart: 'Please ensure that the domain name',
+        tipEnd: 'has been correctly resolved',
+        recordType: 'Record Type',
+        recordValue: 'Record Value'
+      },
       verify: {
         ok: 'This site is resolved',
         notResolved: 'This site neither resolved nor accessible, please check your DNS configuration'

package/es/locales/zh.js

@@ -235,7 +235,7 @@ module.exports = {
     protocol: '协议',
     published: '发布于',
     purchase: '购买',
-    readMore: '查看更多',
+    readMore: '更多',
     redirect: '重定向',
     redirectCode: '重定向状态码',
     redirectPermanently: '永久重定向',
@@ -454,6 +454,14 @@ module.exports = {
         ttl: '登录会话有效期（如果用户 {day} 天内在此站点没有任何活动，将被要求重新登录）',
         day: '{day} 天',
         days: '{day} 天'
+      },
+      clearCache: {
+        name: '缓存管理',
+        purpose: '管理缓存在网关和服务中的文件',
+        title: '确认清除缓存？',
+        action: '清除缓存',
+        success: '成功清除了 {count} 个缓存条目',
+        description: '您确定要清除缓存在网关和服务中的文件吗？此操作可能会在短期内导致轻微的性能降低。'
       }
     },
     overview: {
@@ -852,6 +860,12 @@ module.exports = {
         label: '站点域名',
         description: '请填写你所拥有的合法的站点域名'
       },
+      setup: {
+        tipStart: '请确保',
+        tipEnd: '域名已经被正确解析',
+        recordType: '记录类型',
+        recordValue: '记录值'
+      },
       verify: {
         ok: '该站点解析正常',
         notResolved: '改站点解析异常，请检查你域名服务商的 DNS 配置'

package/es/subscription.js

@@ -1,10 +1,11 @@
-import prettyMs from 'pretty-ms-i18n';
+import dayjs from '@abtnode/util/lib/dayjs';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import Chip from '@mui/material/Chip';
+import AccessTimeIcon from '@mui/icons-material/AccessTime';
 import Box from '@mui/material/Box';
-import Popover from '@mui/material/Popover';
+import Chip from '@mui/material/Chip';
 import CircularProgress from '@mui/material/CircularProgress';
-import dayjs from '@abtnode/util/lib/dayjs';
+import Popover from '@mui/material/Popover';
+import prettyMs from 'pretty-ms-i18n';
 import PropTypes from 'prop-types';
 import { useRef } from 'react';
 import useAsyncRetry from 'react-use/lib/useAsyncRetry';
@@ -96,12 +97,23 @@ function Subscription({
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Chip, {
-      label: t(`expiration.tips.${status}`, {
-        validity: prettyMs(validityMs, {
-          locale: formatPrettyMsLocale(locale),
-          compact: true,
-          verbose: true
-        })
+      label: /*#__PURE__*/_jsxs(Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center'
+        },
+        children: [/*#__PURE__*/_jsx(AccessTimeIcon, {
+          sx: {
+            mr: '4px'
+          },
+          fontSize: "small"
+        }), t(`expiration.tips.${status}`, {
+          validity: prettyMs(validityMs, {
+            locale: formatPrettyMsLocale(locale),
+            compact: true,
+            verbose: true
+          })
+        })]
       }),
       color: status,
       variant: status !== 'success' ? 'contained' : 'outlined',

package/es/util/index.js

@@ -1,23 +1,23 @@
 /* eslint-disable max-len */
 /* eslint-disable implicit-arrow-linebreak */
 /* eslint-disable import/prefer-default-export */
-import { DEFAULT_IP_DOMAIN_SUFFIX, DEFAULT_DID_DOMAIN, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE, ROLES, WELLKNOWN_SERVICE_PATH_PREFIX, WELLKNOWN_PING_PREFIX, IP, SLOT_FOR_IP_DNS_SITE, WELLKNOWN_PATH_PREFIX, WEB_WALLET_URL, BLOCKLET_STORE_API_PREFIX } from '@abtnode/constant';
-import qs from 'querystring';
-import isUrl from 'is-url';
-import humanizeUrl from 'humanize-url';
+import { BLOCKLET_STORE_API_PREFIX, DEFAULT_DID_DOMAIN, DEFAULT_IP_DOMAIN_SUFFIX, DEFAULT_SLP_DOMAIN, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, IP, ROLES, SLOT_FOR_IP_DNS_SITE, WEB_WALLET_URL, WELLKNOWN_PATH_PREFIX, WELLKNOWN_PING_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import filesize from 'filesize';
-import joinUrl from 'url-join';
+import humanizeUrl from 'humanize-url';
+import isUrl from 'is-url';
 import get from 'lodash/get';
 import last from 'lodash/last';
 import trimEnd from 'lodash/trimEnd';
-import { BLOCKLET_MODES } from '@blocklet/constant';
-import { evaluateURLs, isDidDomain, isIpEcho, isSlpDomain } from '@abtnode/util/lib/url-evaluation';
-import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
+import qs from 'querystring';
+import joinUrl from 'url-join';
 import axios from '@abtnode/util/lib/axios';
+import dayjs from '@abtnode/util/lib/dayjs';
+import formatError from '@abtnode/util/lib/format-error';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
+import { evaluateURLs, isDidDomain, isIpEcho, isSlpDomain } from '@abtnode/util/lib/url-evaluation';
+import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
+import { BLOCKLET_MODES } from '@blocklet/constant';
 import urlPathFriendly from '@blocklet/meta/lib/url-path-friendly';
-import formatError from '@abtnode/util/lib/format-error';
-import dayjs from '@abtnode/util/lib/dayjs';
 export { formatError };
 export function sleep(t) {
   // eslint-disable-next-line no-promise-executor-return
@@ -568,7 +568,7 @@ const isDidDomainOrIpEchoDomain = domain => {
   if (!domain) {
     return false;
   }
-  return domain.endsWith(DEFAULT_DID_DOMAIN) || domain.endsWith(DEFAULT_IP_DOMAIN_SUFFIX);
+  return domain.endsWith(DEFAULT_DID_DOMAIN) || domain.endsWith(DEFAULT_IP_DOMAIN_SUFFIX) || domain.endsWith(DEFAULT_SLP_DOMAIN);
 };
 export const sortDomains = domains => {
   return (domains || []).sort((x, y) => {
@@ -613,4 +613,5 @@ export const getSubscriptionURL = async ({
   }
   return joinUrl(baseUrl, `/${nftId}/subscription?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
 };
-export const nanoid = (length = 16) => [...Array(length)].map(() => Math.random().toString(36)[2]).join('');
+export const nanoid = (length = 16) => [...Array(length)].map(() => Math.random().toString(36)[2]).join('');
+export const getSystemDomains = domains => domains.filter(x => x.isProtected);

package/lib/actions.js

@@ -15,7 +15,7 @@ var _ListItemIcon = _interopRequireDefault(require("@mui/material/ListItemIcon")
 var _ListItemText = _interopRequireDefault(require("@mui/material/ListItemText"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["actions"],
+const _excluded = ["actions", "size"],
   _excluded2 = ["icon", "text", "onClick", "disabled"];
 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) } })); }
@@ -28,7 +28,8 @@ 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; }
 function Actions(_ref) {
   let {
-      actions
+      actions,
+      size
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
@@ -56,7 +57,7 @@ function Actions(_ref) {
       "aria-haspopup": "true",
       "data-cy": "actions-menu-icon",
       onClick: onOpen,
-      size: "small",
+      size: size,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_MoreHoriz.default, {})
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Menu.default, {
       id: "actions-menu",
@@ -104,9 +105,11 @@ function Actions(_ref) {
   }));
 }
 Actions.propTypes = {
-  actions: _propTypes.default.array
+  actions: _propTypes.default.array,
+  size: _propTypes.default.oneOf(['small', 'medium', 'large'])
 };
 Actions.defaultProps = {
-  actions: []
+  actions: [],
+  size: 'small'
 };
 const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));