@abtnode/ux 1.16.8-beta-186fd5aa → 1.16.8-beta-56e84f3c

package/lib/blocklet/notification/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
+var _context = require("@arcblock/ux/lib/Locale/context");
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _material = require("@mui/material");
 var _ahooks = require("ahooks");
@@ -28,12 +30,17 @@ const tabs = [{
 }];
 function BlockletNotification() {
   const [currentTab, setCurrentTab] = (0, _react.useState)(tabs[0].value);
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
   const contents = (0, _ahooks.useCreation)(() => ({
     email: /*#__PURE__*/(0, _jsxRuntime.jsx)(_email.default, {}),
     more: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-      children: "TBD"
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
+        children: t('notification.comingSoon')
+      })
     })
-  }), []);
+  }), [t]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tabs.default, {
       tabs: tabs,

package/lib/blocklet/oauth/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
+var _context = require("@arcblock/ux/lib/Locale/context");
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _material = require("@mui/material");
 var _ahooks = require("ahooks");
@@ -28,12 +30,17 @@ function OAuth() {
     value: 'more'
   }];
   const [currentTab, setCurrentTab] = (0, _react.useState)(tabs[0].value);
+  const {
+    t
+  } = (0, _react.useContext)(_context.LocaleContext);
   const contents = (0, _ahooks.useCreation)(() => ({
     auth0: /*#__PURE__*/(0, _jsxRuntime.jsx)(_auth.default, {}),
     more: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-      children: "TBD"
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
+        children: t('oauth.comingSoon')
+      })
     })
-  }), []);
+  }), [t]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tabs.default, {
       tabs: tabs,

package/lib/blocklet/preferences/index.js

@@ -18,6 +18,7 @@ var _NotificationsNone = _interopRequireDefault(require("@mui/icons-material/Not
 var _SettingsOutlined = _interopRequireDefault(require("@mui/icons-material/SettingsOutlined"));
 var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
 var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
+var _reactRouterDom = require("react-router-dom");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _util = require("@blocklet/meta/lib/util");
@@ -89,8 +90,9 @@ function BlockletPreferences(_ref) {
     info,
     inService
   } = (0, _node.useNodeContext)();
-  const [current, setCurrent] = (0, _react.useState)('general');
   const [expandPref, setExpandPref] = (0, _react.useState)(true);
+  const [searchParams, setSearchParams] = (0, _reactRouterDom.useSearchParams)();
+  const current = searchParams.get('tab') || 'general';
   const tabs = [{
     label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       display: "flex",
@@ -209,7 +211,14 @@ function BlockletPreferences(_ref) {
     if (x === 'preference') {
       setExpandPref(!expandPref);
     } else {
-      setCurrent(x);
+      setSearchParams(prev => {
+        if (x === 'general') {
+          prev.delete('tab');
+        } else {
+          prev.set('tab', x);
+        }
+        return prev;
+      });
     }
   };
   let content = null;
@@ -227,13 +236,13 @@ function BlockletPreferences(_ref) {
   } else {
     // eslint-disable-next-line no-nested-ternary
     const pathPrefix = inService ? _constant.WELLKNOWN_SERVICE_PATH_PREFIX : process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
-    const searchParams = new URLSearchParams();
+    const urlSearchParams = new URLSearchParams();
     if (!inService) {
-      searchParams.set('authKey', '__sst');
+      urlSearchParams.set('authKey', '__sst');
     }
-    searchParams.set('schemaKey', (0, _urlJoin.default)(window.location.origin, pathPrefix, "/api/preferences?id=".concat(encodeURIComponent(current))));
+    urlSearchParams.set('schemaKey', (0, _urlJoin.default)(window.location.origin, pathPrefix, "/api/preferences?id=".concat(encodeURIComponent(current))));
     content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIframe.default, {
-      url: "".concat((0, _urlJoin.default)(window.location.origin, pathPrefix, '/hosted/form-collector/'), "?").concat(searchParams.toString()),
+      url: "".concat((0, _urlJoin.default)(window.location.origin, pathPrefix, '/hosted/form-collector/'), "?").concat(urlSearchParams.toString()),
       width: "100%",
       height: "100%",
       frameBorder: 0,

package/lib/blocklet/util.js

@@ -242,7 +242,7 @@ const getWalletType = function getWalletType(raw) {
     if (item && item.value) {
       return item.value;
     }
-    item = (raw.environments || []).find(x => x.key === 'BLOCKLET_APP_CHAIN_TYPE');
+    item = (raw.environments || []).find(x => ['CHAIN_TYPE', 'BLOCKLET_APP_CHAIN_TYPE'].includes(x.key));
     if (item && item.value) {
       return item.value;
     }
@@ -250,7 +250,7 @@ const getWalletType = function getWalletType(raw) {
   }
 
   // from meta: installing
-  item = (raw.environments || []).find(x => x.name === 'BLOCKLET_APP_CHAIN_TYPE');
+  item = (raw.environments || []).find(x => ['CHAIN_TYPE', 'BLOCKLET_APP_CHAIN_TYPE'].includes(x.name));
   if (item && item.default) {
     return item.default;
   }

package/lib/locales/en.js

@@ -767,7 +767,8 @@ module.exports = {
       portInvalid: 'SMTP server port is invalid, port should be between 1 and 65535',
       userRequired: 'SMTP server username is required',
       passwordRequired: 'SMTP server user password is required'
-    }
+    },
+    comingSoon: 'More notification channel are under construction'
   },
   router: {
     routerSetting: 'Domains & URLs',
@@ -1214,6 +1215,8 @@ module.exports = {
     waiting: {
       verifying: 'Verifying blocklet meta',
       downloading: 'Downloading blocklet bundle',
+      downloadingComponent: 'Downloading: {name}',
+      extractingComponent: 'Extracting: {name}',
       extracting: 'Extracting blocklet bundle',
       installing: 'Installing blocklet and setup components',
       done: 'Installation Complete'
@@ -1402,6 +1405,7 @@ module.exports = {
       domainDescription: "Auth0's domain is required",
       clientId: 'ClientID',
       clientIdDescribe: "Auth0's clientId is required"
-    }
+    },
+    comingSoon: 'More login methods are under construction'
   }
 };

package/lib/locales/zh.js

@@ -770,7 +770,8 @@ module.exports = {
       portInvalid: '请输入 SMTP 服务端口，端口号应该在 0-65535 之间',
       userRequired: '请输入 SMTP 服务用户名',
       passwordRequired: '请输入 SMTP 服务用户密码'
-    }
+    },
+    comingSoon: '更多通知方式正在建设中'
   },
   router: {
     routerSetting: '域名和网址',
@@ -1220,6 +1221,8 @@ module.exports = {
       verifying: '验证应用元数据',
       downloading: '下载应用包',
       extracting: '提取应用包的数据',
+      downloadingComponent: '下载中: {name}',
+      extractingComponent: '提取中: {name}',
       installing: '安装应用和设置组件',
       done: '安装完成'
     },
@@ -1405,6 +1408,7 @@ module.exports = {
       domainDescription: '请输入 Auth0 的 Domain',
       clientId: 'ClientID',
       clientIdDescribe: '请输入 Auth0 的 ClientID'
-    }
+    },
+    comingSoon: '更多登录方式正在建设中'
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.8-beta-186fd5aa",
+  "version": "1.16.8-beta-56e84f3c",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-beta-186fd5aa",
-    "@abtnode/constant": "1.16.8-beta-186fd5aa",
-    "@abtnode/util": "1.16.8-beta-186fd5aa",
+    "@abtnode/auth": "1.16.8-beta-56e84f3c",
+    "@abtnode/constant": "1.16.8-beta-56e84f3c",
+    "@abtnode/util": "1.16.8-beta-56e84f3c",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.78",
-    "@arcblock/did-connect": "^2.5.39",
+    "@arcblock/did": "^1.18.80",
+    "@arcblock/did-connect": "^2.5.40",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.39",
-    "@arcblock/react-hooks": "^2.5.39",
-    "@arcblock/terminal": "^2.5.39",
-    "@arcblock/ux": "^2.5.39",
-    "@blocklet/constant": "1.16.8-beta-186fd5aa",
+    "@arcblock/icons": "^2.5.40",
+    "@arcblock/react-hooks": "^2.5.40",
+    "@arcblock/terminal": "^2.5.40",
+    "@arcblock/ux": "^2.5.40",
+    "@blocklet/constant": "1.16.8-beta-56e84f3c",
     "@blocklet/launcher-layout": "2.0.39",
-    "@blocklet/list": "^0.11.24",
-    "@blocklet/meta": "1.16.8-beta-186fd5aa",
-    "@blocklet/ui-react": "^2.5.39",
+    "@blocklet/list": "^0.11.26",
+    "@blocklet/meta": "1.16.8-beta-56e84f3c",
+    "@blocklet/ui-react": "^2.5.40",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -47,7 +47,7 @@
     "@mui/lab": "^5.0.0-alpha.102",
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
-    "@ocap/client": "1.18.78",
+    "@ocap/client": "1.18.80",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -94,5 +94,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "3150c3a5c3e041fe7f5a3902418d9d62adee3173"
+  "gitHead": "2abfe83fcd951169a59719addb3dc3c1bbf8789f"
 }