@abtnode/ux 1.16.0-beta-1f8bf936 → 1.16.0-beta-58020de5

package/lib/blocklet/component/navigation/locale-tabs.js

@@ -27,7 +27,8 @@ const defaultLocale = 'en';
 function LocaleTabs(_ref) {
   let {
     sx,
-    onChange,
+    onAdd,
+    onChange: _onChange,
     locales,
     onRemoveLocale
   } = _ref;
@@ -45,15 +46,18 @@ function LocaleTabs(_ref) {
   const openChooseLocale = (0, _react.useMemo)(() => {
     return !!addLocaleButtonEl;
   }, [addLocaleButtonEl]);
+  const showLocale = (0, _react.useMemo)(() => {
+    if (locales.includes(state.currentLocale)) {
+      return state.currentLocale;
+    }
+    return defaultLocale;
+  }, [locales, state.currentLocale]);
   const localeOptions = (0, _react.useMemo)(() => {
     return Object.keys((0, _lodash.omit)(_locales.default, [...state.localeList, defaultLocale])).map(locale => ({
       title: _locales.default[locale],
       value: locale
     }));
   }, [state.localeList]);
-  (0, _react.useEffect)(() => {
-    onChange(state.currentLocale);
-  }, [onChange, state.currentLocale]);
   (0, _react.useEffect)(() => {
     state.localeList = [...locales];
   }, [locales, state]);
@@ -97,6 +101,7 @@ function LocaleTabs(_ref) {
       close();
       state.localeList.push(value);
       state.currentLocale = value;
+      onAdd(value);
     }
   }
   function close() {
@@ -123,9 +128,10 @@ function LocaleTabs(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Tabs.default, {
       sx: sx,
-      value: state.currentLocale,
+      value: showLocale,
       onChange: (e, value) => {
         state.currentLocale = value;
+        _onChange(value);
       },
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tab.default, {
         label: "Default (".concat(_locales.default[defaultLocale], ")"),
@@ -210,12 +216,14 @@ function LocaleTabs(_ref) {
 }
 LocaleTabs.propTypes = {
   sx: _propTypes.default.any,
+  onAdd: _propTypes.default.func,
   onChange: _propTypes.default.func,
   onRemoveLocale: _propTypes.default.func,
   locales: _propTypes.default.array
 };
 LocaleTabs.defaultProps = {
   sx: null,
+  onAdd: () => {},
   onChange: () => {},
   onRemoveLocale: () => {},
   locales: []

package/lib/blocklet/component/navigation/navigation-dialog.js

@@ -214,6 +214,8 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
     return '--';
   }, [state.type, t]);
   const reset = (0, _react.useCallback)(() => {
+    state.isRoot = true;
+    state.locale = defaultLocale;
     state.type = defaultType;
     state.linkDisabled = false;
     saveFn.current = () => {};
@@ -402,6 +404,15 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
     state.formState.title = (0, _omit.default)(state.formState.title, currentLocale);
     state.formState.link = (0, _omit.default)(state.formState.link, currentLocale);
   }, [state.formState]);
+  const handleAddLocale = (0, _react.useCallback)(newLocale => {
+    var _state$formState$titl, _state$formState$link;
+    state.locale = newLocale;
+    state.formState.title[newLocale] = (_state$formState$titl = state.formState.title) === null || _state$formState$titl === void 0 ? void 0 : _state$formState$titl[defaultLocale];
+    state.formState.link[newLocale] = (_state$formState$link = state.formState.link) === null || _state$formState$link === void 0 ? void 0 : _state$formState$link[defaultLocale];
+    setTimeout(() => {
+      clearErrors();
+    });
+  }, [clearErrors, state]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
     open: show,
     title: name,
@@ -417,6 +428,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
       sx: {
         mb: 1
       },
+      onAdd: handleAddLocale,
       onChange: handleChangeLocale,
       onRemoveLocale: handleRemoveLocale,
       locales: state.localeList
@@ -464,6 +476,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             placeholder: t('navigation.form.iconPlaceholder'),
             label: t('navigation.form.icon'),
             error: !!(errors !== null && errors !== void 0 && (_errors$icon = errors.icon) !== null && _errors$icon !== void 0 && _errors$icon.message),
+            disabled: state.locale !== defaultLocale,
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$icon2 = errors.icon) === null || _errors$icon2 === void 0 ? void 0 : _errors$icon2.message) || /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
               display: "flex",
               children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
@@ -490,7 +503,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
                   },
                   disableFocusRipple: true,
                   disableRipple: true,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(IconSuffix, {
+                  children: watchIcon && /*#__PURE__*/(0, _jsxRuntime.jsx)(IconSuffix, {
                     icon: watchIcon
                   })
                 })
@@ -509,7 +522,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_simpleSelect.default, _objectSpread({
             fullWidth: true,
             margin: "dense",
-            disabled: state.type === 'edit',
+            disabled: state.type === 'edit' || state.locale !== defaultLocale,
             label: t('navigation.form.component'),
             placeholer: t('navigation.form.componentPlaceholder'),
             options: components.map(item => ({
@@ -519,7 +532,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             })),
             error: !!(errors !== null && errors !== void 0 && (_errors$component = errors.component) !== null && _errors$component !== void 0 && _errors$component.message),
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$component2 = errors.component) === null || _errors$component2 === void 0 ? void 0 : _errors$component2.message) || ' '
-          }, field));
+          }, (0, _omit.default)(field, 'ref')));
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
         name: "link",
@@ -528,7 +541,6 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
           validate: validLink
         },
         render: _ref6 => {
-          var _errors$link3, _errors$link4;
           let {
             field
           } = _ref6;
@@ -575,8 +587,6 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
                   children: option.title
                 })]
               })),
-              error: !!(errors !== null && errors !== void 0 && (_errors$link3 = errors.link) !== null && _errors$link3 !== void 0 && _errors$link3.message),
-              helperText: (errors === null || errors === void 0 ? void 0 : (_errors$link4 = errors.link) === null || _errors$link4 === void 0 ? void 0 : _errors$link4.message) || ' ',
               margin: "dense"
             }, field), {}, {
               onChange: () => {},
@@ -606,7 +616,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             })),
             error: !!(errors !== null && errors !== void 0 && (_errors$role = errors.role) !== null && _errors$role !== void 0 && _errors$role.message),
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$role2 = errors.role) === null || _errors$role2 === void 0 ? void 0 : _errors$role2.message) || ' '
-          }, field));
+          }, (0, _omit.default)(field, 'ref')));
         }
       })]
     })]

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

@@ -23,6 +23,7 @@ var _util = require("@blocklet/meta/lib/util");
 var _node = require("../contexts/node");
 var _session = require("../contexts/session");
 var _util2 = require("../util");
+var _util3 = require("./util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -319,6 +320,7 @@ function InstallFromUrl(_ref) {
       onSuccess: onEndInstall,
       extraParams: {
         title: meta.title,
+        wt: (0, _util3.getWalletType)(meta),
         blockletMetaUrl: decodeURIComponent(url.trim())
       },
       messages: {

package/lib/blocklet/util.js

@@ -8,7 +8,7 @@ exports.fixBlocklet = exports.ensureDomainAliases = void 0;
 exports.genExportedMeta = genExportedMeta;
 exports.getLaunchAgreementUrl = exports.getAppCapabilities = void 0;
 exports.getNameByTitle = getNameByTitle;
-exports.getServerUrl = void 0;
+exports.getWalletType = exports.getServerUrl = void 0;
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
@@ -230,4 +230,9 @@ const fixBlocklet = async function fixBlocklet(blocklet) {
   }
   blocklet.capabilities = getAppCapabilities(blocklet);
 };
-exports.fixBlocklet = fixBlocklet;
+exports.fixBlocklet = fixBlocklet;
+const getWalletType = meta => {
+  const type = (meta.environments || []).find(x => x.name === 'BLOCKLET_WALLET_TYPE');
+  return (type === null || type === void 0 ? void 0 : type.default) || 'default';
+};
+exports.getWalletType = getWalletType;

package/lib/locales/en.js

@@ -228,6 +228,7 @@ module.exports = {
     requiredErrorText: '{name} is required',
     resource: 'Resource',
     restart: 'Restart',
+    restore: 'Restore',
     retry: 'Retry',
     revoke: 'Revoke',
     role: 'Role',
@@ -306,6 +307,7 @@ module.exports = {
     reloadSuccess: 'Blocklet was reloaded successfully',
     statusTip: 'Blocklet is {status}',
     initialUptime: 'Less than 1m',
+    dashboard: 'Blocklet Dashboard',
     fromUrl: {
       title: 'Install Blocklet',
       label: 'Blocklet Meta URL',
@@ -321,8 +323,8 @@ module.exports = {
       confirmStop: 'Yes, Stop It',
       cancelDownloadDescription: 'Cancel download {name} ?',
       removeApplicationDescription: 'Removing the application will erase code and data generated by this application, which is not recoverable if you do not have any backups',
-      removeApplicationAfterBackup: 'Backup and delete the application. You can restore the application from this server if you need',
-      removeApplicationComplete: 'Delete the application directly',
+      removeApplicationAfterBackup: 'Backup and remove the application. You can restore the application from this server if you need',
+      removeApplicationComplete: 'Remove both code and data for this application',
       removeComponentDescription: 'Removing the component will erase code and data generated by this component, which is not recoverable if you do not have any backups',
       removeComponentKeepData: 'Keep data for this component, only remove code',
       removeComponentComplete: 'Remove both code and data for this component',
@@ -1151,6 +1153,7 @@ module.exports = {
     title: 'Lost Passport',
     description: 'The owner of {name} can scan the QR code to retrieve the passport, members please contact the owner to reissue the passport',
     dialog: {
+      title: 'Recover Passport',
       scan: 'Use your DID Wallet to recover the passport',
       confirm: 'Confirm on your DID Wallet',
       success: 'The passport has been successfully added in your wallet'

package/lib/locales/zh.js

@@ -234,6 +234,7 @@ module.exports = {
     requiredErrorText: '{name}是必填的',
     resource: '资源',
     restart: '重启',
+    restore: '还原',
     retry: '重试',
     revoke: '撤销',
     role: '角色',
@@ -312,13 +313,14 @@ module.exports = {
     reloadSuccess: 'Blocklet 重启成功',
     statusTip: 'Blocklet {status}',
     initialUptime: '少于1分钟',
+    dashboard: 'Blocklet 控制台',
     action: {
       stopDescription: '停止该基石程序将会使页面不可以访问，可能会导致使用它的用户出现错误',
       confirmStop: '是的，停止',
       cancelDownloadDescription: '取消下载 {name} ？',
       removeApplicationDescription: '如果没有备份数据，删除应用将会删除所有数据，包括应用运行时产生的所有数据',
-      removeApplicationAfterBackup: '备份和删除该应用。 需要时您可以从此服务器恢复该应用',
-      removeApplicationComplete: '直接删除该应用',
+      removeApplicationAfterBackup: '备份后删除应用。 需要时您可以从此服务器恢复该应用',
+      removeApplicationComplete: '直接删除应用程序和数据',
       removeComponentDescription: '如果没有备份数据，删除该组件将会删除所有数据，包括组件运行时产生的所有数据',
       removeComponentKeepData: '保留该组件的数据，只删除组件',
       removeComponentComplete: '删除组件和数据',
@@ -1156,6 +1158,7 @@ module.exports = {
     title: '找回通行证',
     description: '{name} 所有者可扫描二维码找回通行证，成员请联系所有者重新颁发通行证',
     dialog: {
+      title: '找回通行证',
       scan: '用您的 DID 钱包扫描下面的二维码',
       confirm: '在您的 DID 钱包上确认',
       success: '通行证已成功添加到您的 DID 钱包'

package/lib/lost-passport.js

@@ -170,6 +170,7 @@ function LostPassport(_ref2) {
           onSuccess: onGetUser,
           locale: locale,
           messages: {
+            title: t('lostPassport.dialog.title'),
             scan: t('lostPassport.dialog.scan'),
             confirm: t('lostPassport.dialog.confirm'),
             success: t('lostPassport.dialog.success')
@@ -260,6 +261,7 @@ function LostPassport(_ref2) {
         onSuccess: onReceivePassport,
         locale: locale,
         messages: {
+          title: "".concat(t('lostPassport.dialog.title')),
           scan: t('lostPassport.dialog.scan'),
           confirm: t('lostPassport.dialog.confirm'),
           success: t('lostPassport.dialog.success')

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-1f8bf936",
+  "version": "1.16.0-beta-58020de5",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,20 +21,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-1f8bf936",
-    "@abtnode/constant": "1.16.0-beta-1f8bf936",
-    "@abtnode/util": "1.16.0-beta-1f8bf936",
-    "@arcblock/did-connect": "^2.5.15",
+    "@abtnode/auth": "1.16.0-beta-58020de5",
+    "@abtnode/constant": "1.16.0-beta-58020de5",
+    "@abtnode/util": "1.16.0-beta-58020de5",
+    "@arcblock/did-connect": "^2.5.16",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.15",
-    "@arcblock/react-hooks": "^2.5.15",
-    "@arcblock/terminal": "^2.5.15",
-    "@arcblock/ux": "^2.5.15",
-    "@blocklet/constant": "1.16.0-beta-1f8bf936",
+    "@arcblock/icons": "^2.5.16",
+    "@arcblock/react-hooks": "^2.5.16",
+    "@arcblock/terminal": "^2.5.16",
+    "@arcblock/ux": "^2.5.16",
+    "@blocklet/constant": "1.16.0-beta-58020de5",
     "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.10",
-    "@blocklet/meta": "1.16.0-beta-1f8bf936",
-    "@blocklet/ui-react": "^2.5.15",
+    "@blocklet/meta": "1.16.0-beta-58020de5",
+    "@blocklet/ui-react": "^2.5.16",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -88,5 +88,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "d832948cdc83e67ea42a2aefba3649fa73723b65"
+  "gitHead": "9d3f47f9827acf13e9efea38cd605d3b36f9f523"
 }