@abtnode/ux 1.8.69-beta-e0666d0d → 1.8.69-beta-b0bb2d67

package/lib/blocklet/storage.js

@@ -76,7 +76,12 @@ function useAppUrl(blocklet) {
       return +a.isProtected - +b.isProtected;
     }
     return +b.accessibility.accessible - +a.accessibility.accessible;
-  })) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.map(domainAlias => domainAlias.accessibility.url);
+  })) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.map(domainAlias => {
+    var _domainAlias$domainSt;
+    const protocol = domainAlias !== null && domainAlias !== void 0 && (_domainAlias$domainSt = domainAlias.domainStatus) !== null && _domainAlias$domainSt !== void 0 && _domainAlias$domainSt.isHttps ? 'https://' : 'http://';
+    const value = domainAlias === null || domainAlias === void 0 ? void 0 : domainAlias.value;
+    return "".concat(protocol).concat(value);
+  }).filter(Boolean);
   const appUrl = appUrls === null || appUrls === void 0 ? void 0 : appUrls[0];
 
   // 授权的时候提供 appUrl, 因为 appUrl 可能很久都拿不到值，所以加一个 loading 效果过渡一下
@@ -87,10 +92,12 @@ function useAppUrl(blocklet) {
 }
 function Storage() {
   var _blocklet$environment;
-  /** @type {{ api: import('@abtnode/client').ABTNodeClient }} */
+  /** @type {{ api: import('@abtnode/client').ABTNodeClient, info: import('@abtnode/client').NodeState  }} */
   const {
-    api
+    api,
+    info
   } = (0, _node.useNodeContext)();
+  const nodeDid = info.did;
   const {
     t,
     locale
@@ -164,7 +171,8 @@ function Storage() {
         appDescription,
         scopes: 'list:object read:object write:object',
         appUrl,
-        referrer: window.location.href
+        referrer: window.location.href,
+        nodeDid
       },
       onClose: () => {
         // eslint-disable-next-line no-shadow
@@ -214,10 +222,13 @@ function Storage() {
   (0, _react.useEffect)(() => {
     if (progress !== null && progress !== void 0 && progress.completed) {
       setIsLoading(false);
+      if (progress !== null && progress !== void 0 && progress.progress) {
+        progress.progress = 0;
+      }
     } else if (progress !== null && progress !== void 0 && progress.message) {
       setIsLoading(true);
     }
-  }, [progress === null || progress === void 0 ? void 0 : progress.completed, progress === null || progress === void 0 ? void 0 : progress.message, t]);
+  }, [progress]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
     style: {
       maxWidth: '720px'
@@ -276,7 +287,7 @@ function Storage() {
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.LinearProgress, {
             color: "primary",
-            variant: "determinate",
+            variant: "indeterminate",
             value: progress === null || progress === void 0 ? void 0 : progress.progress
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {

package/lib/team/members/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = MemberList;
 var _react = require("react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
@@ -115,11 +116,12 @@ function MemberList(_ref2) {
     type
   } = _ref2;
   const {
-    appIdList
+    appIdList = []
   } = (0, _blocklet.useBlockletContext)();
   const {
     teamDid,
     invitations,
+    teamIssuerDid,
     roles,
     refresh,
     enablePassportIssuance,
@@ -187,7 +189,7 @@ function MemberList(_ref2) {
     }).then(res => {
       setLoading(false);
       (res.users || []).forEach(x => {
-        x.isFromExternal = isFromExternal(x, appIdList);
+        x.isFromExternal = isFromExternal(x, (0, _isEmpty.default)(appIdList) ? [teamIssuerDid] : appIdList);
         x.avatar = (0, _util2.parseAvatar)(x.avatar, teamDid, inService);
 
         // for backwards compatibility

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-e0666d0d",
+  "version": "1.8.69-beta-b0bb2d67",
   "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.69-beta-e0666d0d",
-    "@abtnode/constant": "1.8.69-beta-e0666d0d",
-    "@abtnode/util": "1.8.69-beta-e0666d0d",
+    "@abtnode/auth": "1.8.69-beta-b0bb2d67",
+    "@abtnode/constant": "1.8.69-beta-b0bb2d67",
+    "@abtnode/util": "1.8.69-beta-b0bb2d67",
     "@arcblock/did-connect": "^2.5.5",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.5.5",
     "@arcblock/terminal": "^2.5.5",
     "@arcblock/ux": "^2.5.5",
-    "@blocklet/constant": "1.8.69-beta-e0666d0d",
+    "@blocklet/constant": "1.8.69-beta-b0bb2d67",
     "@blocklet/launcher-layout": "^1.9.61",
     "@blocklet/list": "^0.11.4",
-    "@blocklet/meta": "1.8.69-beta-e0666d0d",
+    "@blocklet/meta": "1.8.69-beta-b0bb2d67",
     "@blocklet/ui-react": "^2.5.5",
     "@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": "acf0373591eaa3aff76483edc4e648afc543f1f7"
+  "gitHead": "d6853c4b55a67526748017268257b869a5092cb1"
 }