@abtnode/ux 1.8.64 → 1.8.65-beta-5405baf2

package/lib/blocklet/app-avatar.js

@@ -7,6 +7,7 @@ exports.default = BlockletAppAvatar;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Avatar2 = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
+var _constant = require("@blocklet/constant");
 var _useAppLogo = _interopRequireDefault(require("../hooks/use-app-logo"));
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["blocklet", "style", "size"];
@@ -41,10 +42,14 @@ function BlockletAppAvatar(_ref) {
     }
   });
   if (!blocklet.meta.logo) {
-    imgEle = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar2.default, {
-      did: blocklet.meta.did || '',
-      responsive: true
-    });
+    var _find;
+    const exist = (_find = (blocklet.configs || []).find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE)) === null || _find === void 0 ? void 0 : _find.value;
+    if (!exist) {
+      imgEle = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar2.default, {
+        did: blocklet.meta.did || '',
+        responsive: true
+      });
+    }
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, _objectSpread(_objectSpread({
     variant: variant || 'square',

package/lib/blocklet/configuration.js

@@ -80,9 +80,7 @@ function BlockletEnvironment(_ref) {
   const {
     site
   } = blocklet;
-  const {
-    domainAliases
-  } = site;
+  const domains = (0, _util2.sortDomains)(site === null || site === void 0 ? void 0 : site.domainAliases);
   const clusterMode = (0, _get.default)(blocklet.meta, 'capabilities.clusterMode', false);
   useSubscription(_constant.EVENTS.NODE_RUNTIME_INFO, res => {
     if (clusterMode) {
@@ -398,7 +396,7 @@ function BlockletEnvironment(_ref) {
             }
           })
         })]
-      }), domainAliases.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      }), domains.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
@@ -460,7 +458,7 @@ function BlockletEnvironment(_ref) {
             })
           })
         })]
-      }, domain.value)), !domainAliases.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      }, domain.value)), !domains.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         mt: 4,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
           children: t('common.empty')

package/lib/blocklet/overview.js

@@ -99,7 +99,7 @@ const getEngineRows = (engine, t) => {
   }];
 };
 function BlockletOverview() {
-  var _blocklet$settings;
+  var _blocklet$settings, _blocklet$site;
   const {
     t,
     locale
@@ -207,12 +207,7 @@ function BlockletOverview() {
       children: row.value
     }, row.name);
   });
-  const {
-    site
-  } = blocklet;
-  const {
-    domainAliases = []
-  } = site || {};
+  const domains = (0, _util2.sortDomains)((_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : _blocklet$site.domainAliases);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
     component: "div",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
@@ -231,7 +226,7 @@ function BlockletOverview() {
         severity: "warning",
         children: t('blocklet.router.noRunning')
       })
-    }), domainAliases.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    }), domains.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       display: "flex",
       alignItems: "center",
       justifyContent: "space-between",
@@ -260,7 +255,7 @@ function BlockletOverview() {
           }
         })]
       })
-    }, domain.value)), !domainAliases.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+    }, domain.value)), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
       size: 16
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
       children: t('common.empty')

package/lib/invitation/invitation-receive.js

@@ -71,6 +71,8 @@ function InvitationReceive(_ref) {
       className: "connect",
       action: "invite",
       checkFn: checkFn,
+      forceConnected: false,
+      autoConnect: false,
       checkTimeout: 10 * 60 * 1000,
       onSuccess: onSuccess,
       onClose: onClose,

package/lib/issue-passport.js

@@ -105,6 +105,8 @@ function IssuePassport(_ref) {
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
       className: "connect",
       action: "issue-passport",
+      forceConnected: false,
+      autoConnect: false,
       checkFn: api.get,
       checkTimeout: 10 * 60 * 1000,
       socketUrl: api.socketUrl,

package/lib/locales/en.js

@@ -1036,9 +1036,10 @@ module.exports = {
     appInfoDesc: 'Confirm the application information',
     author: 'Application Author: {author}',
     setup: 'Setup Blocklet',
+    redirect: 'Redirect',
     alreadyRunning: 'Application {name} is already running on this Blocklet Server',
     alreadyInstalled: 'Application {name} is already installed on this Blocklet Server',
-    alreadyExists: 'This application already exists, please visit',
+    alreadyExists: 'This application already exists, redirecting...',
     selectAbtNode: 'Select Blocklet Server',
     purchased: 'Already Purchased',
     purchase: 'Purchase',

package/lib/locales/zh.js

@@ -1042,9 +1042,10 @@ module.exports = {
     appInfoDesc: '确认应用信息',
     author: '应用作者：{author}',
     setup: '设置应用',
+    redirect: '跳转',
     alreadyRunning: '应用 {name} 已经运行在当前节点',
     alreadyInstalled: '应用 {name} 已经安装到当前节点，无需重复安装',
-    alreadyExists: '该应用已经存在，可直接访问',
+    alreadyExists: '该应用已经存在，跳转中...',
     launchSuccess: '{appName} 已经启动成功！',
     selectAbtNode: '选择节点',
     nextStep: '下一步',

package/lib/lost-passport.js

@@ -143,6 +143,8 @@ function LostPassport(_ref2) {
           hideCloseButton: true,
           className: "connect",
           action: "lost-passport-list",
+          forceConnected: false,
+          autoConnect: false,
           checkFn: api.get,
           checkTimeout: 10 * 60 * 1000,
           socketUrl: api.socketUrl,

package/lib/util/index.js

@@ -40,7 +40,7 @@ exports.parseQuery = void 0;
 exports.patchJsxToLocale = patchJsxToLocale;
 exports.shouldCheckDomainStatus = void 0;
 exports.sleep = sleep;
-exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = void 0;
+exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = exports.sortDomains = void 0;
 var _constant = require("@abtnode/constant");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("moment/locale/zh-cn");
@@ -692,4 +692,25 @@ const getStoreList = _ref5 => {
     storeList
   };
 };
-exports.getStoreList = getStoreList;
+exports.getStoreList = getStoreList;
+const isDidDomainOrIpEchoDomain = domain => {
+  if (!domain) {
+    return false;
+  }
+  return domain.endsWith(_constant.DEFAULT_DID_DOMAIN) || domain.endsWith(_constant.DEFAULT_IP_DOMAIN_SUFFIX);
+};
+const sortDomains = domains => {
+  return (domains || []).sort((x, y) => {
+    if (isDidDomainOrIpEchoDomain(x.value) && isDidDomainOrIpEchoDomain(y.value)) {
+      return 0;
+    }
+    if (isDidDomainOrIpEchoDomain(x.value)) {
+      return 1;
+    }
+    if (isDidDomainOrIpEchoDomain(y.value)) {
+      return -1;
+    }
+    return 1;
+  });
+};
+exports.sortDomains = sortDomains;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.64",
+  "version": "1.8.65-beta-5405baf2",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.64",
-    "@abtnode/constant": "1.8.64",
-    "@abtnode/util": "1.8.64",
+    "@abtnode/auth": "1.8.65-beta-5405baf2",
+    "@abtnode/constant": "1.8.65-beta-5405baf2",
+    "@abtnode/util": "1.8.65-beta-5405baf2",
     "@arcblock/did-connect": "^2.4.66",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.66",
     "@arcblock/terminal": "^2.4.66",
     "@arcblock/ux": "^2.4.66",
-    "@blocklet/constant": "1.8.64",
+    "@blocklet/constant": "1.8.65-beta-5405baf2",
     "@blocklet/launcher-layout": "^1.9.50",
     "@blocklet/list": "^0.10.47",
-    "@blocklet/meta": "1.8.64",
+    "@blocklet/meta": "1.8.65-beta-5405baf2",
     "@blocklet/ui-react": "^2.4.66",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "2abf7d3078ae9251ddeb394b4f0d82de4d9ababe"
+  "gitHead": "e5dc838baded7031096118462a604fd70d78ff1c"
 }