@abtnode/ux 1.8.65 → 1.8.66-beta-7f4224af

package/lib/blocklet/component/add.js

@@ -25,6 +25,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
 var _launcherLayout = _interopRequireDefault(require("@blocklet/launcher-layout"));
 var _step = require("@blocklet/launcher-layout/lib/context/step");
+var _constant2 = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
@@ -177,6 +178,7 @@ function AddComponent(_ref2) {
   const {
     setActiveStepByIndex
   } = stepRef.current || {};
+  const isServerlessMode = nodeInfo.mode === _constant2.NODE_MODES.SERVERLESS;
   const updateParams = obj => setParams(x => _objectSpread(_objectSpread({}, x), obj));
   (0, _react.useEffect)(() => {
     if (params.pathPrefix) {
@@ -607,7 +609,7 @@ function AddComponent(_ref2) {
           confirm: t('blocklet.component.choose')
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_selectStore.default, {
-        extra: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+        extra: !isServerlessMode ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
           variant: "text",
           color: "primary",
           "data-cy": "add-component-from-url",
@@ -625,7 +627,7 @@ function AddComponent(_ref2) {
               marginRight: 4
             }
           }), " ", t('blocklet.component.addComponentTip.fromUrl'), ' ']
-        }),
+        }) : null,
         loading: loading,
         onChange: () => {
           setParams({});

package/lib/blocklet/component/select-store.js

@@ -10,6 +10,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
+var _constant = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _ArrowDropDown = _interopRequireDefault(require("@mui/icons-material/ArrowDropDown"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
@@ -54,6 +55,7 @@ function SelectStore(_ref) {
     nodeInfo
   });
   const currentRegistry = storeUrl && storeList.find(x => storeUrl === x.url) || storeList[0];
+  const isServerlessMode = nodeInfo.mode === _constant.NODE_MODES.SERVERLESS;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(SelectStoreTitle, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
@@ -124,7 +126,7 @@ function SelectStore(_ref) {
             }
           })
         }, x.url);
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
+      }), !isServerlessMode && /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
         disabled: loading,
         storeList: storeList,
         teamDid: teamDid,

package/lib/blocklet/install-from-url.js

@@ -121,10 +121,10 @@ function InstallFromUrl(_ref) {
       onSuccess(_objectSpread({
         meta
       }, params));
-    } else {
-      await onInstall();
+      _onCancel();
+      return;
     }
-    _onCancel();
+    await onInstall();
   };
   const onInstall = async () => {
     setLoading(true);
@@ -137,6 +137,7 @@ function InstallFromUrl(_ref) {
       onSuccess(_objectSpread({
         meta
       }, params));
+      _onCancel();
     } catch (err) {
       const errMsg = "Blocklet Install failed: ".concat((0, _util2.formatError)(err));
       setError(errMsg);

package/lib/issue-passport.js

@@ -109,7 +109,6 @@ function IssuePassport(_ref) {
       autoConnect: false,
       checkFn: api.get,
       checkTimeout: 10 * 60 * 1000,
-      socketUrl: api.socketUrl,
       webWalletUrl: webWalletUrl,
       onSuccess: onReceivePassport,
       locale: locale,

package/lib/lost-passport.js

@@ -147,7 +147,6 @@ function LostPassport(_ref2) {
           autoConnect: false,
           checkFn: api.get,
           checkTimeout: 10 * 60 * 1000,
-          socketUrl: api.socketUrl,
           webWalletUrl: webWalletUrl,
           onSuccess: onGetUser,
           locale: locale,
@@ -238,7 +237,6 @@ function LostPassport(_ref2) {
         action: "lost-passport-issue",
         checkFn: api.get,
         checkTimeout: 10 * 60 * 1000,
-        socketUrl: api.socketUrl,
         webWalletUrl: webWalletUrl,
         onSuccess: onReceivePassport,
         locale: locale,

package/lib/util/index.js

@@ -375,6 +375,12 @@ const stringSortHandlerAsc = function stringSortHandlerAsc() {
   }
   return 0;
 };
+
+/**
+ *
+ * @param {ABTNode} nodeInfo
+ * @returns {string} like http://localhost:3000, http://localhost:3000/admin
+ */
 exports.stringSortHandlerAsc = stringSortHandlerAsc;
 const getEndPoint = nodeInfo => {
   const {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65",
+  "version": "1.8.66-beta-7f4224af",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,19 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.65",
-    "@abtnode/constant": "1.8.65",
-    "@abtnode/util": "1.8.65",
-    "@arcblock/did-connect": "^2.4.71",
+    "@abtnode/auth": "1.8.66-beta-7f4224af",
+    "@abtnode/constant": "1.8.66-beta-7f4224af",
+    "@abtnode/util": "1.8.66-beta-7f4224af",
+    "@arcblock/did-connect": "^2.5.1",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.4.71",
-    "@arcblock/terminal": "^2.4.71",
-    "@arcblock/ux": "^2.4.71",
-    "@blocklet/constant": "1.8.65",
-    "@blocklet/launcher-layout": "^1.9.58",
-    "@blocklet/list": "^0.10.50",
-    "@blocklet/meta": "1.8.65",
-    "@blocklet/ui-react": "^2.4.71",
+    "@arcblock/icons": "^2.5.1",
+    "@arcblock/terminal": "^2.5.1",
+    "@arcblock/ux": "^2.5.1",
+    "@blocklet/constant": "1.8.66-beta-7f4224af",
+    "@blocklet/launcher-layout": "^1.9.59",
+    "@blocklet/list": "^0.11.1",
+    "@blocklet/meta": "1.8.66-beta-7f4224af",
+    "@blocklet/ui-react": "^2.5.1",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "69b608353fbbdb7c61f9ccb10965a1d0c55c45f2"
+  "gitHead": "72d418f63ecb76b1d5d62edbcc5f336cb62bf308"
 }