@abtnode/ux 1.16.13-beta-423a40b1 → 1.16.13-beta-d17a7de4

package/lib/blocklet/configuration.js

@@ -330,7 +330,7 @@ function BlockletEnvironment(_ref) {
         disabled: loading || disabled,
         loading: loading,
         options: languages,
-        initialValue: customLanguages ? customLanguages.value.split(',') : ['en'],
+        initialValue: customLanguages ? customLanguages.value.split(',') : ['en', 'zh'],
         onSubmit: value => onSubmitConfig('BLOCKLET_APP_LANGUAGES', value)
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {

package/lib/blocklet/oauth/common-settings.js

@@ -24,16 +24,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 const defaultForm = {
-  cacheTtl: 10 * 60,
   ttl: 86400 * 7
 };
 function fixTtl(data) {
   let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ttl = reverse ? data.ttl * 86400 : data.ttl / 86400;
-  const cacheTtl = reverse ? data.cacheTtl * 60 : data.cacheTtl / 60;
   return _objectSpread(_objectSpread({}, data), {}, {
-    ttl,
-    cacheTtl
+    ttl
   });
 }
 function CommonSettings() {
@@ -52,7 +49,7 @@ function CommonSettings() {
     formState,
     reset
   } = (0, _reactHookForm.useForm)({
-    defaultValues: (0, _pick.default)(fixTtl(sessionSettings), ['cacheTtl', 'ttl'])
+    defaultValues: (0, _pick.default)(fixTtl(sessionSettings), ['ttl'])
   });
   const {
     t
@@ -68,7 +65,7 @@ function CommonSettings() {
           config: fixTtl(data, true)
         }
       });
-      const defaultValues = Object.assign({}, defaultForm, (blockletChanged === null || blockletChanged === void 0 ? void 0 : (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.session) || {});
+      const defaultValues = Object.assign({}, defaultForm, (0, _pick.default)((blockletChanged === null || blockletChanged === void 0 ? void 0 : (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.session) || {}, ['ttl']));
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(fixTtl(defaultValues));
       _Toast.default.success(t('common.configSuccess'));

package/lib/locales/en.js

@@ -678,7 +678,7 @@ module.exports = {
         switchLabel: 'Welcome Page'
       },
       upgrade: {
-        title: 'Upgrade Blocklet Server to v{version}',
+        title: 'Upgrade Blocklet Server {version}',
         description: 'During the upgrade, your Blocklet Server will enter maintenance mode for a few minutes while the update is completed.',
         dialog: 'Click on "confirm" to install the update. Blocklet Server will enter maintenance mode until the update is completed and return to production mode automatically.',
         confirm: 'Upgrade',
@@ -1458,6 +1458,8 @@ module.exports = {
       success: 'Subscription will expire after {validity}',
       warning: 'Subscription will expire after {validity}',
       error: 'Subscription Expired'
-    }
+    },
+    loading: 'Load subscription...',
+    loadFailed: 'Failed to load subscription info, please retry!'
   }
 };

package/lib/locales/zh.js

@@ -678,7 +678,7 @@ module.exports = {
       webWalletUrl: 'DID Wallet 地址',
       webWalletUrlPlaceholder: '你可以使用自己运行的 "DID Wallet", 也可以使用官方提供的版本',
       upgrade: {
-        title: '升级节点到 v{version}',
+        title: '升级节点 {version}',
         description: '在升级期间，节点将会进入维护模式几分钟。',
         dialog: '点击 “确认” 安装更新。节点将进入维护模式，直到更新完成并自动返回生产模式。',
         confirm: '升级',
@@ -1236,7 +1236,7 @@ module.exports = {
       extracting: '提取应用包的数据...',
       downloadingComponent: '下载 {name}',
       extractingComponent: '提取 {name}',
-      installing: '安装应用置组件...',
+      installing: '安装应用组件...',
       installed: '已安装',
       starting: '正在启动应用...',
       done: '等待应用就绪...'
@@ -1461,6 +1461,8 @@ module.exports = {
       success: '订阅将在{validity}后到期',
       warning: '订阅将在{validity}后到期',
       error: '订阅已过期'
-    }
+    },
+    loadFailed: '加载订阅信息失败，请重试!',
+    loading: '加载订阅信息...'
   }
 };

package/lib/{expiration.js → subscription.js}

@@ -7,7 +7,9 @@ exports.default = void 0;
 var _prettyMsI18n = _interopRequireDefault(require("pretty-ms-i18n"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Popover = _interopRequireDefault(require("@mui/material/Popover"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = require("react");
@@ -26,7 +28,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || 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; }
 const ALERT_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
-function Expiration(_ref) {
+function Subscription(_ref) {
   var _assetState$value, _assetState$value$dat, _assetState$value$dat2;
   let {
       chainHost,
@@ -49,11 +51,31 @@ function Expiration(_ref) {
     rest = _objectWithoutProperties(props, _excluded2);
   const assetState = (0, _useAsyncRetry.default)(() => (0, _util.getAsset)(chainHost, nftId));
   if (assetState.loading) {
-    return '';
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, _objectSpread(_objectSpread({
+      sx: _objectSpread({
+        display: 'flex',
+        alignItems: 'center',
+        color: 'grey',
+        gap: 1
+      }, sx)
+    }, rest), {}, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+        size: 16
+      }), t('expiration.loading')]
+    }));
   }
   if (assetState.error) {
     console.error(assetState.error);
-    return '';
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, _objectSpread(_objectSpread({
+      label: t('expiration.loadFailed'),
+      color: "error",
+      variant: "success",
+      sx: _objectSpread({
+        cursor: 'pointer'
+      }, sx)
+    }, rest), {}, {
+      onClick: () => assetState.retry()
+    }));
   }
   const expirationDate = (0, _util.getAssetExpiration)(assetState.value);
   const launcherUrl = (_assetState$value = assetState.value) === null || _assetState$value === void 0 ? void 0 : (_assetState$value$dat = _assetState$value.data) === null || _assetState$value$dat === void 0 ? void 0 : (_assetState$value$dat2 = _assetState$value$dat.value) === null || _assetState$value$dat2 === void 0 ? void 0 : _assetState$value$dat2.launcherUrl;
@@ -99,7 +121,11 @@ function Expiration(_ref) {
       onClose: handlePopoverClose,
       anchorOrigin: {
         vertical: 'bottom',
-        horizontal: 'left'
+        horizontal: 'right'
+      },
+      transformOrigin: {
+        vertical: 'top',
+        horizontal: 'right'
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
         ref: iframeRef,
@@ -118,15 +144,15 @@ function Expiration(_ref) {
     })]
   });
 }
-Expiration.propTypes = {
+Subscription.propTypes = {
   chainHost: _propTypes.default.string.isRequired,
   nftId: _propTypes.default.string.isRequired,
   sx: _propTypes.default.object,
   retention: _propTypes.default.number
 };
-Expiration.defaultProps = {
+Subscription.defaultProps = {
   sx: {},
   retention: 0
 };
-var _default = Expiration;
+var _default = Subscription;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.13-beta-423a40b1",
+  "version": "1.16.13-beta-d17a7de4",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13-beta-423a40b1",
-    "@abtnode/constant": "1.16.13-beta-423a40b1",
-    "@abtnode/util": "1.16.13-beta-423a40b1",
+    "@abtnode/auth": "1.16.13-beta-d17a7de4",
+    "@abtnode/constant": "1.16.13-beta-d17a7de4",
+    "@abtnode/util": "1.16.13-beta-d17a7de4",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.84",
-    "@arcblock/did-connect": "^2.5.52",
-    "@arcblock/did-motif": "^1.1.11",
-    "@arcblock/icons": "^2.5.52",
-    "@arcblock/react-hooks": "^2.5.52",
-    "@arcblock/terminal": "^2.5.52",
-    "@arcblock/ux": "^2.5.52",
-    "@blocklet/constant": "1.16.13-beta-423a40b1",
-    "@blocklet/launcher-layout": "2.1.21",
-    "@blocklet/list": "^0.12.3",
-    "@blocklet/meta": "1.16.13-beta-423a40b1",
-    "@blocklet/ui-react": "^2.5.52",
+    "@arcblock/did-connect": "^2.5.53",
+    "@arcblock/did-motif": "^1.1.12",
+    "@arcblock/icons": "^2.5.53",
+    "@arcblock/react-hooks": "^2.5.53",
+    "@arcblock/terminal": "^2.5.53",
+    "@arcblock/ux": "^2.5.53",
+    "@blocklet/constant": "1.16.13-beta-d17a7de4",
+    "@blocklet/launcher-layout": "2.1.26",
+    "@blocklet/list": "^0.12.4",
+    "@blocklet/meta": "1.16.13-beta-d17a7de4",
+    "@blocklet/ui-react": "^2.5.53",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -94,5 +94,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "1aee04f45042bd4784ca72f9f8b93918980be4d4"
+  "gitHead": "f14750f3b9feeafe80ee88499b2b4a061c2c28c4"
 }