@abtnode/ux 1.16.17-beta-3232a7af → 1.16.17-beta-703fb879

package/es/blocklet/oauth/federated-site-list.js

@@ -1,13 +1,12 @@
 /* eslint-disable react/no-unstable-nested-components */
 import SvgIcon from '@mui/material/SvgIcon';
-import FormControlLabel from '@mui/material/FormControlLabel';
 import StarsIcon from '@mui/icons-material/Stars';
 import PropTypes from 'prop-types';
 import Box from '@mui/material/Box';
 import Datatable from '@arcblock/ux/lib/Datatable';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Address from '@arcblock/did-connect/lib/Address';
-import { useContext, useRef, useState } from 'react';
+import { useContext, useRef } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -17,7 +16,6 @@ import { useNodeContext } from '../../contexts/node';
 import useConfirm from '../../hooks/confirm';
 import FederatedDetailDialog from './federated-detail-dialog';
 import FederatedInviteDialog from './federated-invite-dialog';
-import SwitchControl from '../component/switch-control';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -44,9 +42,7 @@ function FederatedSiteList({
     api
   } = useNodeContext();
   const federatedSites = blocklet.settings.federated?.sites || [];
-  const federatedConfig = blocklet.settings.federated?.config || {
-    autoLogin: false
-  };
+  const federatedConfig = blocklet.settings.federated?.config || {};
   const isMaster = federatedConfig.isMaster !== false;
   const viewDetail = useMemoizedFn(row => {
     federatedDetailDialogRef.current?.open(row);
@@ -236,23 +232,6 @@ function FederatedSiteList({
       Toast.error(t('federated.failedToGetFederatedLoginLink'));
     }
   }, [blocklet.site?.domainAliases?.[0]?.href]);
-  const [checked, setChecked] = useState(federatedConfig.autoLogin || false);
-  const changeAutoLogin = useMemoizedFn(() => {
-    confirmApi.open({
-      title: checked ? t('federated.disableFederatedAutoLogin') : t('federated.enableFederatedAutoLogin'),
-      content: checked ? t('federated.disableFederatedAutoLoginDescription') : t('federated.enableFederatedAutoLoginDescription'),
-      async onConfirm(close) {
-        await api.configFederated({
-          input: {
-            did: blocklet.appPid,
-            autoLogin: !checked
-          }
-        });
-        setChecked(prevValue => !prevValue);
-        close();
-      }
-    });
-  }, [setChecked, checked]);
   const quitFederatedLogin = useMemoizedFn(() => {
     confirmApi.open({
       title: t('federated.quitFederatedLogin'),
@@ -323,25 +302,7 @@ function FederatedSiteList({
       customButtons: customButtons,
       title: /*#__PURE__*/_jsx(Box, {
         className: "table-toolbar-left",
-        children: mode === 'master' ? t('oauth.federated') : /*#__PURE__*/_jsx(FormControlLabel, {
-          sx: {
-            ml: 0,
-            '& span.MuiSwitch-switchBase': {
-              display: 'flex'
-            },
-            '& span.MuiSwitch-track': {
-              display: 'block'
-            }
-          },
-          control: /*#__PURE__*/_jsx(SwitchControl, {
-            checked: checked,
-            style: {
-              marginRight: '6px'
-            },
-            onChange: changeAutoLogin
-          }),
-          label: t('federated.enableFederatedAutoLogin')
-        })
+        children: t('oauth.federated')
       }),
       options: tableOptions
     }), confirmHolder, /*#__PURE__*/_jsx(FederatedInviteDialog, {

package/es/blocklet/router/add-domain.js

@@ -4,7 +4,7 @@ import DiamondIcon from '@mui/icons-material/Diamond';
 import EditIcon from '@mui/icons-material/Edit';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import Box from '@mui/material/Box';
-import Button from '@mui/material/Button';
+import Button from '@arcblock/ux/lib/Button';
 import Link from '@mui/material/Link';
 import TextField from '@mui/material/TextField';
 import useTheme from '@mui/material/styles/useTheme';

package/es/invitation/invitation-receive.js

@@ -1,26 +1,28 @@
-import { useCallback, useState } from 'react';
+import { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import DidConnect from '@arcblock/did-connect/lib/Connect';
 import DidButton from '@arcblock/did-connect/lib/Button';
-import { getWebWalletUrl } from '@arcblock/did-connect/lib/utils';
+import { getFederatedEnabled, getMaster } from '@arcblock/ux/lib/Util/federated';
+import { AUTH_SERVICE_PREFIX, API_DID_PREFIX } from '@arcblock/did-connect/lib/constant';
+import joinURL from 'url-join';
 import { formatDateTime } from '../util';
 import usePassportId from '../hooks/use-passport-id';
+import { useSessionContext } from '../contexts/session';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 function InvitationReceive({
   invitation,
-  checkFn,
   onLogin,
   onReceive
 }) {
-  const [open, setOpen] = useState(false);
   const {
     t,
     locale
   } = useLocaleContext();
+  const {
+    connectApi
+  } = useSessionContext();
   const {
     getPassportId
   } = usePassportId();
@@ -36,60 +38,60 @@ function InvitationReceive({
     componentId
   };
   const onClose = useCallback(() => {
-    setOpen(false);
-  }, []);
+    connectApi.close();
+  }, [connectApi]);
   const onSuccess = useCallback((...args) => {
-    setOpen(false);
+    connectApi.close();
     onLogin(...args);
-  }, [onLogin]);
+  }, [onLogin, connectApi]);
   const onClickReceive = useCallback(() => {
     if (typeof onReceive === 'function') {
       onReceive();
       return;
     }
-    setOpen(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsxs(Root, {
-      children: [/*#__PURE__*/_jsx(DidButton, {
-        size: "large",
-        variant: "contained",
-        className: "invite-receive__button",
-        "data-cy": "invite-receive-passport",
-        color: "primary",
-        onClick: onClickReceive,
-        children: t('invite.receive')
-      }), /*#__PURE__*/_jsxs("div", {
-        className: "invite-receive__until",
-        children: [t('invite.validUntil'), formatDateTime(invitation.expireDate, locale)]
-      })]
-    }), /*#__PURE__*/_jsx(DidConnect, {
-      popup: true,
-      open: open,
-      className: "connect",
-      action: "invite",
-      checkFn: checkFn,
+    const masterSite = getMaster();
+    const federatedEnabled = getFederatedEnabled();
+    const baseUrl = federatedEnabled ? masterSite.appUrl : window.location.origin;
+    connectApi.openPopup({
+      action: 'invite',
+      className: 'connect',
       forceConnected: false,
       autoConnect: false,
-      checkTimeout: 10 * 60 * 1000,
-      onSuccess: onSuccess,
-      onClose: onClose,
-      locale: locale,
-      webWalletUrl: getWebWalletUrl(),
+      locale,
+      extraParams,
+      baseUrl: window.location.origin,
+      prefix: joinURL(window.location.origin, AUTH_SERVICE_PREFIX, API_DID_PREFIX),
       messages: {
         title: t('receive.dialog.title'),
         scan: t('receive.dialog.scan'),
         confirm: t('receive.dialog.confirm'),
         success: t('receive.dialog.success')
       },
-      extraParams: extraParams
+      onSuccess,
+      onClose
+    }, {
+      baseUrl,
+      locale
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [connectApi.openPopup]);
+  return /*#__PURE__*/_jsxs(Root, {
+    children: [/*#__PURE__*/_jsx(DidButton, {
+      size: "large",
+      variant: "contained",
+      className: "invite-receive__button",
+      "data-cy": "invite-receive-passport",
+      color: "primary",
+      onClick: onClickReceive,
+      children: t('invite.receive')
+    }), /*#__PURE__*/_jsxs("div", {
+      className: "invite-receive__until",
+      children: [t('invite.validUntil'), formatDateTime(invitation.expireDate, locale)]
     })]
   });
 }
 InvitationReceive.propTypes = {
   invitation: PropTypes.object.isRequired,
-  checkFn: PropTypes.func.isRequired,
   onLogin: PropTypes.func,
   onReceive: PropTypes.func
 };

package/es/locales/en.js

@@ -63,6 +63,10 @@ module.exports = {
       success: 'Passport has been successfully exchanged'
     }
   },
+  payablePassport: {
+    title: 'Purchase passport with payment',
+    tooltip: 'If you do not have a passport, you can purchase a passport with this link.'
+  },
   sidebar: {
     dashboard: 'Dashboard',
     blocklets: 'Blocklets',

package/es/locales/zh.js

@@ -66,6 +66,10 @@ module.exports = {
       success: '通行证换取成功'
     }
   },
+  payablePassport: {
+    title: 'Purchase passport with payment',
+    tooltip: 'If you do not have a passport, you can purchase a passport with this link.'
+  },
   sidebar: {
     dashboard: '仪表盘',
     blocklets: '基石程序',

package/lib/blocklet/oauth/federated-site-list.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _SvgIcon = _interopRequireDefault(require("@mui/material/SvgIcon"));
-var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormControlLabel"));
 var _Stars = _interopRequireDefault(require("@mui/icons-material/Stars"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -22,7 +21,6 @@ var _node = require("../../contexts/node");
 var _confirm = _interopRequireDefault(require("../../hooks/confirm"));
 var _federatedDetailDialog = _interopRequireDefault(require("./federated-detail-dialog"));
 var _federatedInviteDialog = _interopRequireDefault(require("./federated-invite-dialog"));
-var _switchControl = _interopRequireDefault(require("../component/switch-control"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable react/no-unstable-nested-components */
@@ -52,9 +50,7 @@ function FederatedSiteList(_ref) {
     api
   } = (0, _node.useNodeContext)();
   const federatedSites = ((_blocklet$settings$fe = blocklet.settings.federated) === null || _blocklet$settings$fe === void 0 ? void 0 : _blocklet$settings$fe.sites) || [];
-  const federatedConfig = ((_blocklet$settings$fe2 = blocklet.settings.federated) === null || _blocklet$settings$fe2 === void 0 ? void 0 : _blocklet$settings$fe2.config) || {
-    autoLogin: false
-  };
+  const federatedConfig = ((_blocklet$settings$fe2 = blocklet.settings.federated) === null || _blocklet$settings$fe2 === void 0 ? void 0 : _blocklet$settings$fe2.config) || {};
   const isMaster = federatedConfig.isMaster !== false;
   const viewDetail = (0, _ahooks.useMemoizedFn)(row => {
     var _federatedDetailDialo;
@@ -248,23 +244,6 @@ function FederatedSiteList(_ref) {
       _Toast.default.error(t('federated.failedToGetFederatedLoginLink'));
     }
   }, [(_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : (_blocklet$site$domain = _blocklet$site.domainAliases) === null || _blocklet$site$domain === void 0 ? void 0 : (_blocklet$site$domain2 = _blocklet$site$domain[0]) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.href]);
-  const [checked, setChecked] = (0, _react.useState)(federatedConfig.autoLogin || false);
-  const changeAutoLogin = (0, _ahooks.useMemoizedFn)(() => {
-    confirmApi.open({
-      title: checked ? t('federated.disableFederatedAutoLogin') : t('federated.enableFederatedAutoLogin'),
-      content: checked ? t('federated.disableFederatedAutoLoginDescription') : t('federated.enableFederatedAutoLoginDescription'),
-      async onConfirm(close) {
-        await api.configFederated({
-          input: {
-            did: blocklet.appPid,
-            autoLogin: !checked
-          }
-        });
-        setChecked(prevValue => !prevValue);
-        close();
-      }
-    });
-  }, [setChecked, checked]);
   const quitFederatedLogin = (0, _ahooks.useMemoizedFn)(() => {
     confirmApi.open({
       title: t('federated.quitFederatedLogin'),
@@ -335,25 +314,7 @@ function FederatedSiteList(_ref) {
       customButtons: customButtons,
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         className: "table-toolbar-left",
-        children: mode === 'master' ? t('oauth.federated') : /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
-          sx: {
-            ml: 0,
-            '& span.MuiSwitch-switchBase': {
-              display: 'flex'
-            },
-            '& span.MuiSwitch-track': {
-              display: 'block'
-            }
-          },
-          control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchControl.default, {
-            checked: checked,
-            style: {
-              marginRight: '6px'
-            },
-            onChange: changeAutoLogin
-          }),
-          label: t('federated.enableFederatedAutoLogin')
-        })
+        children: t('oauth.federated')
       }),
       options: tableOptions
     }), confirmHolder, /*#__PURE__*/(0, _jsxRuntime.jsx)(_federatedInviteDialog.default, {

package/lib/blocklet/router/add-domain.js

@@ -10,7 +10,7 @@ var _Diamond = _interopRequireDefault(require("@mui/icons-material/Diamond"));
 var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
 var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _Button = _interopRequireDefault(require("@mui/material/Button"));
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));

package/lib/invitation/invitation-receive.js

@@ -8,11 +8,13 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _Button = _interopRequireDefault(require("@arcblock/did-connect/lib/Button"));
-var _utils = require("@arcblock/did-connect/lib/utils");
+var _federated = require("@arcblock/ux/lib/Util/federated");
+var _constant = require("@arcblock/did-connect/lib/constant");
+var _urlJoin = _interopRequireDefault(require("url-join"));
 var _util = require("../util");
 var _usePassportId = _interopRequireDefault(require("../hooks/use-passport-id"));
+var _session = require("../contexts/session");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -20,15 +22,16 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function InvitationReceive(_ref) {
   let {
     invitation,
-    checkFn,
     onLogin,
     onReceive
   } = _ref;
-  const [open, setOpen] = (0, _react.useState)(false);
   const {
     t,
     locale
   } = (0, _context.useLocaleContext)();
+  const {
+    connectApi
+  } = (0, _session.useSessionContext)();
   const {
     getPassportId
   } = (0, _usePassportId.default)();
@@ -45,60 +48,60 @@ function InvitationReceive(_ref) {
     componentId
   };
   const onClose = (0, _react.useCallback)(() => {
-    setOpen(false);
-  }, []);
+    connectApi.close();
+  }, [connectApi]);
   const onSuccess = (0, _react.useCallback)(function () {
-    setOpen(false);
+    connectApi.close();
     onLogin(...arguments);
-  }, [onLogin]);
+  }, [onLogin, connectApi]);
   const onClickReceive = (0, _react.useCallback)(() => {
     if (typeof onReceive === 'function') {
       onReceive();
       return;
     }
-    setOpen(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Root, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-        size: "large",
-        variant: "contained",
-        className: "invite-receive__button",
-        "data-cy": "invite-receive-passport",
-        color: "primary",
-        onClick: onClickReceive,
-        children: t('invite.receive')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "invite-receive__until",
-        children: [t('invite.validUntil'), (0, _util.formatDateTime)(invitation.expireDate, locale)]
-      })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
-      popup: true,
-      open: open,
-      className: "connect",
-      action: "invite",
-      checkFn: checkFn,
+    const masterSite = (0, _federated.getMaster)();
+    const federatedEnabled = (0, _federated.getFederatedEnabled)();
+    const baseUrl = federatedEnabled ? masterSite.appUrl : window.location.origin;
+    connectApi.openPopup({
+      action: 'invite',
+      className: 'connect',
       forceConnected: false,
       autoConnect: false,
-      checkTimeout: 10 * 60 * 1000,
-      onSuccess: onSuccess,
-      onClose: onClose,
-      locale: locale,
-      webWalletUrl: (0, _utils.getWebWalletUrl)(),
+      locale,
+      extraParams,
+      baseUrl: window.location.origin,
+      prefix: (0, _urlJoin.default)(window.location.origin, _constant.AUTH_SERVICE_PREFIX, _constant.API_DID_PREFIX),
       messages: {
         title: t('receive.dialog.title'),
         scan: t('receive.dialog.scan'),
         confirm: t('receive.dialog.confirm'),
         success: t('receive.dialog.success')
       },
-      extraParams: extraParams
+      onSuccess,
+      onClose
+    }, {
+      baseUrl,
+      locale
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [connectApi.openPopup]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Root, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      size: "large",
+      variant: "contained",
+      className: "invite-receive__button",
+      "data-cy": "invite-receive-passport",
+      color: "primary",
+      onClick: onClickReceive,
+      children: t('invite.receive')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "invite-receive__until",
+      children: [t('invite.validUntil'), (0, _util.formatDateTime)(invitation.expireDate, locale)]
     })]
   });
 }
 InvitationReceive.propTypes = {
   invitation: _propTypes.default.object.isRequired,
-  checkFn: _propTypes.default.func.isRequired,
   onLogin: _propTypes.default.func,
   onReceive: _propTypes.default.func
 };

package/lib/locales/en.js

@@ -65,6 +65,10 @@ module.exports = {
       success: 'Passport has been successfully exchanged'
     }
   },
+  payablePassport: {
+    title: 'Purchase passport with payment',
+    tooltip: 'If you do not have a passport, you can purchase a passport with this link.'
+  },
   sidebar: {
     dashboard: 'Dashboard',
     blocklets: 'Blocklets',

package/lib/locales/zh.js

@@ -68,6 +68,10 @@ module.exports = {
       success: '通行证换取成功'
     }
   },
+  payablePassport: {
+    title: 'Purchase passport with payment',
+    tooltip: 'If you do not have a passport, you can purchase a passport with this link.'
+  },
   sidebar: {
     dashboard: '仪表盘',
     blocklets: '基石程序',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.17-beta-3232a7af",
+  "version": "1.16.17-beta-703fb879",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,23 +27,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.17-beta-3232a7af",
-    "@abtnode/constant": "1.16.17-beta-3232a7af",
-    "@abtnode/util": "1.16.17-beta-3232a7af",
+    "@abtnode/auth": "1.16.17-beta-703fb879",
+    "@abtnode/constant": "1.16.17-beta-703fb879",
+    "@abtnode/util": "1.16.17-beta-703fb879",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.92",
-    "@arcblock/did-connect": "^2.7.29",
+    "@arcblock/did-connect": "^2.8.2",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.29",
-    "@arcblock/nft-display": "2.7.29",
-    "@arcblock/react-hooks": "^2.7.29",
-    "@arcblock/terminal": "^2.7.29",
-    "@arcblock/ux": "^2.7.29",
-    "@blocklet/constant": "1.16.17-beta-3232a7af",
+    "@arcblock/icons": "^2.8.2",
+    "@arcblock/nft-display": "2.8.2",
+    "@arcblock/react-hooks": "^2.8.2",
+    "@arcblock/terminal": "^2.8.2",
+    "@arcblock/ux": "^2.8.2",
+    "@blocklet/constant": "1.16.17-beta-703fb879",
     "@blocklet/launcher-layout": "2.2.22",
     "@blocklet/list": "^0.12.45",
-    "@blocklet/meta": "1.16.17-beta-3232a7af",
-    "@blocklet/ui-react": "^2.7.29",
+    "@blocklet/meta": "1.16.17-beta-703fb879",
+    "@blocklet/ui-react": "^2.8.2",
     "@blocklet/uploader": "^0.0.32",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "af4067dd2e418c51a0ed96b1ee242ca812904056",
+  "gitHead": "97d63c671d823076e58b994107e10866367edd5d",
   "exports": {
     ".": {
       "import": "./es/index.js",