@abtnode/ux 1.16.17-beta-09df289d → 1.16.17-beta-4f13d99d

package/lib/blocklet/storage/item.js

@@ -205,7 +205,8 @@ function SpaceItem(_ref) {
         scopes,
         appUrl,
         referrer,
-        nodeDid
+        nodeDid,
+        spaceDid: spaceGateway.did
       }
     }));
   };

package/lib/locales/en.js

@@ -634,6 +634,7 @@ module.exports = {
       saveDraft: 'Save Draft',
       releaseNote: 'Release Note',
       errorTip: {
+        noDid: 'Blocklet DID is required',
         noTitle: 'Blocklet Title is required',
         noVersion: 'Blocklet Version is required',
         noDescription: 'Blocklet Description is required',
@@ -1315,7 +1316,8 @@ module.exports = {
       launchFailed: 'Failed to launch the app, please try again',
       installedButStopped: 'The app is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
       installedButError: 'The app is successfully installed, but failed to start',
-      restoreFailed: 'Failed to restore app, please try again'
+      restoreFailed: 'Failed to restore app, please try again',
+      resourceBlocklet: 'Resource Blocklet cannot be installed as an application, you can mount this blocklet into existing applications.'
     },
     steps: {
       introduction: 'Introduction',

package/lib/locales/zh.js

@@ -641,6 +641,7 @@ module.exports = {
       saveDraft: '保存草稿',
       releaseNote: '发布说明',
       errorTip: {
+        noDid: '请填写 Blocklet DID',
         noTitle: '请填写 Blocklet 名称',
         noVersion: '请填写 Blocklet 版本号',
         noDescription: '请填写 Blocklet 描述',
@@ -1320,7 +1321,8 @@ module.exports = {
       launchFailed: '启动应用失败，请重试',
       installedButStopped: '应用安装成功，但是无法启动，解决启动问题之后后可手动启动',
       installedButError: '应用已经安装，但是运行出错了',
-      restoreFailed: '还原应用失败,请重试'
+      restoreFailed: '还原应用失败,请重试',
+      resourceBlocklet: '资源 Blocklet 无法作为应用被安装，你可以将该 Blocklet 挂载到现有的应用中。'
     },
     steps: {
       introduction: '简介',

package/lib/team/members/toggle-user-approval.js

@@ -8,6 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _passport = require("@abtnode/util/lib/passport");
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -88,7 +89,9 @@ function ToggleUserApproval(_ref) {
     color: user.approved ? 'error' : 'primary'
   };
   let can;
-  if (!inService) {
+  if ((0, _passport.hasActiveOwnerPassport)(user)) {
+    can = false;
+  } else if (!inService) {
     can = nodeInfo.nodeOwner && !isNodeOwner(nodeInfo, user.did) && !isSelf(session.user, user.did);
   } else {
     can = !isSelf(session.user, user.did);

package/lib/util/spaces.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.extraDIDSpacesCoreUrl = extraDIDSpacesCoreUrl;
 exports.getBackupFilesUrlFromEndpoint = getBackupFilesUrlFromEndpoint;
 exports.getDIDSpaceDidFromEndpoint = getDIDSpaceDidFromEndpoint;
 exports.getDIDSpaceEndpoint = void 0;
@@ -16,10 +17,10 @@ exports.isValidSpaceGatewayUrl = isValidSpaceGatewayUrl;
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _constant = require("@blocklet/constant");
 var _lodash = require("lodash");
+var _ufo = require("ufo");
 var _api = require("./api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable import/prefer-default-export */
-const joinUrl = require('url-join');
 
 /**
  * @FIXME 希望之后放在 sdk 中 @jianchao
@@ -32,7 +33,7 @@ function getBackupFilesUrlFromEndpoint(endpoint) {
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
   const appDid = strArray.at(-2);
-  return joinUrl(prefix, 'space', spaceDid, 'apps', appDid, 'explorer', "?key=/apps/".concat(appDid, "/.did-objects/").concat(appDid, "/"));
+  return (0, _ufo.joinURL)(prefix, 'space', spaceDid, 'apps', appDid, "explorer?key=/apps/".concat(appDid, "/.did-objects/").concat(appDid, "/"));
 }
 
 /**
@@ -45,7 +46,7 @@ function getDIDSpaceUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, 'space', spaceDid);
+  return (0, _ufo.joinURL)(prefix, 'space', spaceDid);
 }
 
 /**
@@ -104,6 +105,19 @@ function getSpaceGatewayFromEndpoint(endpoint) {
   return endpoint === null || endpoint === void 0 ? void 0 : endpoint.replace(/\/api\/space\/.+/, '');
 }
 
+/**
+ * @description
+ * @export
+ * @param {string} url
+ * @return {string}
+ */
+function extraDIDSpacesCoreUrl(url) {
+  const Url = new URL(url);
+  // @note: 去除查询参数的那部分字符串
+  const didSpacesCoreUrl = (0, _ufo.joinURL)(Url.origin, Url.pathname);
+  return didSpacesCoreUrl;
+}
+
 /**
  * @description
  * @export
@@ -115,7 +129,8 @@ async function isValidSpaceGatewayUrl(spaceGatewayUrl) {
     if (!(0, _isUrl.default)(spaceGatewayUrl)) {
       return false;
     }
-    const didConnectTokenUrl = joinUrl(spaceGatewayUrl, 'space/api/did/one-click-authorization/token');
+    const didSpacesCoreUrl = extraDIDSpacesCoreUrl(spaceGatewayUrl);
+    const didConnectTokenUrl = (0, _ufo.joinURL)(didSpacesCoreUrl, 'space/api/did/one-click-authorization/token');
     const {
       status,
       data
@@ -163,7 +178,7 @@ function getSpaceNftDisplayUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, "/api/space/nft/display?spaceDid=".concat(spaceDid));
+  return (0, _ufo.joinURL)(prefix, "/api/space/nft/display?spaceDid=".concat(spaceDid));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.17-beta-09df289d",
+  "version": "1.16.17-beta-4f13d99d",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,24 +27,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.17-beta-09df289d",
-    "@abtnode/constant": "1.16.17-beta-09df289d",
-    "@abtnode/util": "1.16.17-beta-09df289d",
+    "@abtnode/auth": "1.16.17-beta-4f13d99d",
+    "@abtnode/constant": "1.16.17-beta-4f13d99d",
+    "@abtnode/util": "1.16.17-beta-4f13d99d",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.91",
-    "@arcblock/did-connect": "^2.7.25",
+    "@arcblock/did": "^1.18.92",
+    "@arcblock/did-connect": "^2.7.27",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.25",
-    "@arcblock/nft-display": "2.7.25",
-    "@arcblock/react-hooks": "^2.7.25",
-    "@arcblock/terminal": "^2.7.25",
-    "@arcblock/ux": "^2.7.25",
-    "@blocklet/constant": "1.16.17-beta-09df289d",
-    "@blocklet/launcher-layout": "2.2.19",
+    "@arcblock/icons": "^2.7.27",
+    "@arcblock/nft-display": "2.7.27",
+    "@arcblock/react-hooks": "^2.7.27",
+    "@arcblock/terminal": "^2.7.27",
+    "@arcblock/ux": "^2.7.27",
+    "@blocklet/constant": "1.16.17-beta-4f13d99d",
+    "@blocklet/launcher-layout": "2.2.21",
     "@blocklet/list": "^0.12.45",
-    "@blocklet/meta": "1.16.17-beta-09df289d",
-    "@blocklet/ui-react": "^2.7.25",
-    "@blocklet/uploader": "^0.0.24",
+    "@blocklet/meta": "1.16.17-beta-4f13d99d",
+    "@blocklet/ui-react": "^2.7.27",
+    "@blocklet/uploader": "^0.0.26",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -54,7 +54,7 @@
     "@mui/material": "^5.14.10",
     "@mui/styles": "^5.14.10",
     "@mui/x-date-pickers": "^6.14.0",
-    "@ocap/client": "1.18.91",
+    "@ocap/client": "1.18.92",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "e86da424c87029c447e4900fc5b6d91a287ebbae",
+  "gitHead": "005478c4b14448f2ae896ae363972afbde1d7e7b",
   "exports": {
     ".": {
       "import": "./es/index.js",