@abtnode/ux 1.8.65-beta-f7af64a4 → 1.8.65-beta-db7f2529

package/lib/blocklet/storage.js

@@ -29,7 +29,20 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function Storage() {
-  var _blocklet$environment;
+  var _localStorage$getItem, _blocklet$environment, _blocklet$environment2, _blocklet$environment3;
+  const options = [
+  // TODO: 测试用，上线后才需删除
+  {
+    value: (_localStorage$getItem = localStorage.getItem('test-spaces')) !== null && _localStorage$getItem !== void 0 && _localStorage$getItem.startsWith('http') ? localStorage.getItem('test-spaces') : 'https://bbqazi2fhuczchrlggs4njj2bucbvnwjjm2xlq6yk6i.did.abtnet.io',
+    label: 'test spaces'
+  }, {
+    value: 'https://storage.staging.abtnet.io/app',
+    label: 'staging spaces'
+  }, {
+    value: 'https://service.didspaces.com/app',
+    label: 'prod spaces'
+  }];
+
   /** @type {{ api: import('@abtnode/client').ABTNodeClient }} */
   const {
     api
@@ -44,7 +57,7 @@ function Storage() {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
   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 [didSpacesUrl, setDidSpacesUrl] = (0, _react.useState)('https://storage.staging.abtnet.io/app');
+  const [didSpacesUrl, setDidSpacesUrl] = (0, _react.useState)((_blocklet$environment2 = (_blocklet$environment3 = blocklet.environments.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL)) === null || _blocklet$environment3 === void 0 ? void 0 : _blocklet$environment3.value) !== null && _blocklet$environment2 !== void 0 ? _blocklet$environment2 : options[0].value);
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
   const {
     appDid
@@ -78,6 +91,15 @@ function Storage() {
       _toast.default.error(error.message);
     });
   }
+  const onAuthorizeConnectSuccess = async (response, decrypt) => {
+    setEndpoint(decrypt(response.endpoint));
+    await saveStorageEndpoint(blocklet.meta.did, decrypt(response.endpoint));
+    setTimeout(() => {
+      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+    }, 3000);
+  };
   const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({
     open: false,
     action: 'one-click-authorization',
@@ -85,19 +107,6 @@ function Storage() {
     checkFn: _axios.default.create({
       baseURL: (0, _urlJoin.default)(didSpacesUrl, 'space')
     }).get,
-    /**
-     *
-     * @param {{endpoint: string}} response
-     */
-    onSuccess: async (response, decrypt) => {
-      setEndpoint(decrypt(response.endpoint));
-      await saveStorageEndpoint(blocklet.meta.did, decrypt(response.endpoint));
-      setTimeout(() => {
-        setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-          open: false
-        }));
-      }, 3000);
-    },
     onClose: () => {
       setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
         open: false
@@ -130,9 +139,9 @@ function Storage() {
     } = event.target;
     if ((0, _lodash.isEmpty)(value)) {
       setErrorMessage(t('storage.didSpaces.addressCannotEmpty', locale));
-    } else {
-      setErrorMessage(null);
+      return;
     }
+    setErrorMessage(null);
     setDidSpacesUrl(value);
   };
   const onBackup = async () => {
@@ -173,6 +182,7 @@ function Storage() {
   }, [appName, locale, t]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(StorageUrlTextField, {
+      select: true,
       sx: {
         marginTop: '20px'
       },
@@ -199,7 +209,11 @@ function Storage() {
           },
           children: endpoint ? t('storage.didSpaces.reAuthorization') : t('storage.didSpaces.goToAuthorization')
         })
-      }
+      },
+      children: options.map(option => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: option.value,
+        children: option.label
+      }, option.value))
     }), endpoint && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       color: "text.secondary",
       sx: {
@@ -241,7 +255,7 @@ function Storage() {
       action: authorizeConnect.action,
       baseUrl: authorizeConnect.baseUrl,
       checkFn: authorizeConnect.checkFn,
-      onSuccess: authorizeConnect.onSuccess,
+      onSuccess: onAuthorizeConnectSuccess,
       onClose: authorizeConnect.onClose,
       checkTimeout: authorizeConnect.checkTimeout,
       extraParams: authorizeConnect.extraParams,

package/lib/locales/en.js

@@ -280,13 +280,6 @@ module.exports = {
     installFromMarket: 'Install New Blocklets',
     installFromUrl: 'Install From Url',
     installFromCreate: 'Create Blocklet',
-    restoreFromSpaces: 'Restore from Spaces',
-    restoreFromSpacesForm: {
-      endpoint: 'Spaces endpoint',
-      blockletSecretKey: "blocklet's secret key",
-      restore: 'Restore',
-      successfully: 'Restored successfully'
-    },
     installedAt: 'Installed At',
     internal: 'Internal',
     startedAt: 'Started At',

package/lib/locales/zh.js

@@ -286,13 +286,6 @@ module.exports = {
     installFromMarket: '从应用商店安装',
     installFromUrl: '通过 URL 安装',
     installFromCreate: '创建基石程序',
-    restoreFromSpaces: '从 Spaces 还原',
-    restoreFromSpacesForm: {
-      endpoint: 'Spaces 端点',
-      blockletSecretKey: 'blocklet 的私钥',
-      restore: '还原',
-      successfully: '还原成功'
-    },
     installedAt: '安装时间',
     internal: '内部',
     startedAt: '启动时间',

package/lib/util/mode.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAlphaMode = void 0;
+/* eslint-disable import/prefer-default-export */
+
+// 当前模式是 内测模式 吗？ @see: https://developer.aliyun.com/article/572525
+const isAlphaMode = localStorage.getItem('enableAlphaMode') === 'true';
+exports.isAlphaMode = isAlphaMode;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65-beta-f7af64a4",
+  "version": "1.8.65-beta-db7f2529",
   "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-beta-f7af64a4",
-    "@abtnode/constant": "1.8.65-beta-f7af64a4",
-    "@abtnode/util": "1.8.65-beta-f7af64a4",
-    "@arcblock/did-connect": "^2.4.66",
+    "@abtnode/auth": "1.8.65-beta-db7f2529",
+    "@abtnode/constant": "1.8.65-beta-db7f2529",
+    "@abtnode/util": "1.8.65-beta-db7f2529",
+    "@arcblock/did-connect": "^2.4.71",
     "@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.65-beta-f7af64a4",
-    "@blocklet/launcher-layout": "^1.9.50",
-    "@blocklet/list": "^0.10.47",
-    "@blocklet/meta": "1.8.65-beta-f7af64a4",
-    "@blocklet/ui-react": "^2.4.66",
+    "@arcblock/icons": "^2.4.71",
+    "@arcblock/terminal": "^2.4.71",
+    "@arcblock/ux": "^2.4.71",
+    "@blocklet/constant": "1.8.65-beta-db7f2529",
+    "@blocklet/launcher-layout": "^1.9.58",
+    "@blocklet/list": "^0.10.50",
+    "@blocklet/meta": "1.8.65-beta-db7f2529",
+    "@blocklet/ui-react": "^2.4.71",
     "@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": "97607d6e12bf8508ac29ab6546110c4ae3b31a82"
+  "gitHead": "b9cd53d1db3535a691aebed2ff6f9053376d46dc"
 }