@abtnode/ux 1.8.68-beta-500af7e5 → 1.8.69-beta-e0666d0d

package/lib/blocklet/preferences/app-sk.js

@@ -98,6 +98,7 @@ function AppSk(_ref) {
     popup: true,
     open: state.isConnectOpen,
     forceConnected: false,
+    saveConnect: false,
     action: "rotate-key-pair",
     checkFn: api.get,
     checkTimeout: 5 * 60 * 1000,

package/lib/blocklet/storage.js

@@ -15,6 +15,8 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _lodash = require("lodash");
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _material = require("@mui/material");
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _util = require("@blocklet/meta/lib/util");
 var _blocklet = require("../../lib/contexts/blocklet");
 var _node = require("../contexts/node");
 var _toast = _interopRequireDefault(require("../../lib/toast"));
@@ -34,12 +36,12 @@ const Container = (0, _styled.default)('div')(_templateObject || (_templateObjec
 
 /**
  * @description 实时显示备份的进度
- * @param {{appDid: string}} {appDid}
+ * @param {{appPid: string}} {appPid}
  * @return {{message: string, progress: number, completed: boolean}}
  */
 function useBackupProgress(_ref) {
   let {
-    appDid
+    appPid
   } = _ref;
   const [progress, setProgress] = (0, _react.useState)({
     message: '',
@@ -50,14 +52,14 @@ function useBackupProgress(_ref) {
   const webSocketClient = node.ws.getWsClient();
   (0, _react.useEffect)(() => {
     webSocketClient.on(_constant.BlockletEvents.backupProgress, data => {
-      if (appDid === (data === null || data === void 0 ? void 0 : data.did)) {
+      if (appPid === (data === null || data === void 0 ? void 0 : data.appPid)) {
         setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
       }
     });
     return () => {
       webSocketClient.off(_constant.BlockletEvents.backupProgress);
     };
-  }, [appDid, webSocketClient]);
+  }, [appPid, webSocketClient]);
   return progress;
 }
 
@@ -100,16 +102,11 @@ function Storage() {
   const [gatewayUrl, setGatewayUrl] = (0, _react.useState)('');
   const [endpoint, setEndpoint] = (0, _react.useState)(((_blocklet$environment = blocklet.environments.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT)) === null || _blocklet$environment === void 0 ? void 0 : _blocklet$environment.value) || '');
   const progress = useBackupProgress({
-    appDid: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appDid
+    appPid: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appPid
   });
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
-  const {
-    appDid
-  } = blocklet;
-  const {
-    title: appName,
-    description: appDescription
-  } = blocklet.meta;
+  const appName = (0, _util.getAppName)(blocklet);
+  const appDescription = (0, _util.getAppDescription)(blocklet);
   const {
     appUrl,
     isReady
@@ -162,7 +159,7 @@ function Storage() {
         baseURL: (0, _urlJoin.default)(gatewayUrl, 'space')
       }).get,
       extraParams: {
-        appDid,
+        appDid: blocklet.appPid,
         appName,
         appDescription,
         scopes: 'list:object read:object write:object',
@@ -186,7 +183,7 @@ function Storage() {
       setIsLoading(true);
       await api.backupToSpaces({
         input: {
-          did: blocklet.appDid
+          appPid: blocklet.appPid
         }
       });
       _toast.default.success(t('storage.spaces.backupSuccessfully'));
@@ -246,7 +243,7 @@ function Storage() {
           fontWeight: "fontWeightBold",
           children: t('storage.spaces.connected')
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
         onClick: onBackup,
         loading: isLoading,
         variant: "contained",
@@ -256,6 +253,9 @@ function Storage() {
         children: t('storage.spaces.backup')
       })]
     }), isLoading && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      sx: {
+        overflow: 'hidden'
+      },
       display: "flex",
       flexDirection: "column",
       justifyContent: "center",
@@ -291,6 +291,8 @@ function Storage() {
         })]
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+      forceConnected: false,
+      saveConnect: false,
       prefix: authorizeConnect.prefix,
       open: authorizeConnect.open,
       popup: true,

package/lib/team/members/index.js

@@ -27,6 +27,7 @@ var _constant = require("@abtnode/constant");
 var _toast = _interopRequireDefault(require("../../toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
+var _blocklet = require("../../contexts/blocklet");
 var _permission = _interopRequireDefault(require("../../permission"));
 var _util = require("../../util");
 var _inviteMember = _interopRequireDefault(require("./invite-member"));
@@ -52,14 +53,14 @@ const getCount = (counts, name) => {
   const item = counts.find(x => x.key === name);
   return (item === null || item === void 0 ? void 0 : item.value) || 0;
 };
-const isFromExternal = (user, teamIssuerDid) => {
+const isFromExternal = (user, appIdList) => {
   const list = user.passports || [];
   if (!list.length) {
     return false;
   }
   return !list.some(z => {
     var _z$issuer;
-    return ((_z$issuer = z.issuer) === null || _z$issuer === void 0 ? void 0 : _z$issuer.id) === teamIssuerDid;
+    return appIdList.includes((_z$issuer = z.issuer) === null || _z$issuer === void 0 ? void 0 : _z$issuer.id);
   });
 };
 function SimpleInfo(_ref) {
@@ -113,9 +114,11 @@ function MemberList(_ref2) {
   let {
     type
   } = _ref2;
+  const {
+    appIdList
+  } = (0, _blocklet.useBlockletContext)();
   const {
     teamDid,
-    teamIssuerDid,
     invitations,
     roles,
     refresh,
@@ -184,7 +187,7 @@ function MemberList(_ref2) {
     }).then(res => {
       setLoading(false);
       (res.users || []).forEach(x => {
-        x.isFromExternal = isFromExternal(x, teamIssuerDid);
+        x.isFromExternal = isFromExternal(x, 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.68-beta-500af7e5",
+  "version": "1.8.69-beta-e0666d0d",
   "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.68-beta-500af7e5",
-    "@abtnode/constant": "1.8.68-beta-500af7e5",
-    "@abtnode/util": "1.8.68-beta-500af7e5",
+    "@abtnode/auth": "1.8.69-beta-e0666d0d",
+    "@abtnode/constant": "1.8.69-beta-e0666d0d",
+    "@abtnode/util": "1.8.69-beta-e0666d0d",
     "@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.68-beta-500af7e5",
+    "@blocklet/constant": "1.8.69-beta-e0666d0d",
     "@blocklet/launcher-layout": "^1.9.61",
     "@blocklet/list": "^0.11.4",
-    "@blocklet/meta": "1.8.68-beta-500af7e5",
+    "@blocklet/meta": "1.8.69-beta-e0666d0d",
     "@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": "9070621373f317a10ff0d289323bf725e30d3521"
+  "gitHead": "acf0373591eaa3aff76483edc4e648afc543f1f7"
 }