@abtnode/ux 1.16.11-next-069c3537 → 1.16.11-next-3d2b39f7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/actions.js +5 -4
- package/lib/blocklet/access/config-access.js +3 -3
- package/lib/blocklet/actions.js +6 -6
- package/lib/blocklet/add-cert.js +3 -3
- package/lib/blocklet/component/add.js +2 -2
- package/lib/blocklet/component/delete.js +32 -7
- package/lib/blocklet/component/environment.js +11 -11
- package/lib/blocklet/component/index.js +161 -26
- package/lib/blocklet/component/navigation/navigation-dialog.js +4 -9
- package/lib/blocklet/component/setting.js +2 -2
- package/lib/blocklet/component/space-connector.js +4 -4
- package/lib/blocklet/component/space-selector.js +2 -2
- package/lib/blocklet/component/start.js +108 -0
- package/lib/blocklet/component/store-blocklet-list.js +2 -2
- package/lib/blocklet/config-navigation.js +10 -19
- package/lib/blocklet/configuration.js +7 -7
- package/lib/blocklet/migration.js +4 -4
- package/lib/blocklet/notification/email.js +4 -3
- package/lib/blocklet/oauth/auth0.js +4 -3
- package/lib/blocklet/overview.js +1 -7
- package/lib/blocklet/preferences/app-sk.js +3 -3
- package/lib/blocklet/purchase/component-purchase.js +2 -2
- package/lib/blocklet/router/action/add-domain-alias.js +2 -2
- package/lib/blocklet/router/action/add-rule.js +2 -2
- package/lib/blocklet/router/action/delete-domain-alias.js +2 -2
- package/lib/blocklet/router/action/delete-rule.js +2 -2
- package/lib/blocklet/router/action/update-rule.js +2 -2
- package/lib/blocklet/router/rule-actions.js +3 -0
- package/lib/blocklet/router/rule-list.js +1 -1
- package/lib/blocklet/storage/connect.js +2 -2
- package/lib/blocklet/storage/delete.js +2 -2
- package/lib/blocklet/storage/index.js +4 -4
- package/lib/blocklet/storage/switch-did-spaces.js +3 -3
- package/lib/blocklet/version.js +1 -8
- package/lib/contexts/audit-log.js +2 -2
- package/lib/exchange-passport.js +3 -3
- package/lib/hooks/blocklet.js +4 -4
- package/lib/hooks/use-navigation.js +1 -1
- package/lib/locales/en.js +24 -24
- package/lib/locales/zh.js +44 -44
- package/lib/logs/download.js +2 -2
- package/lib/store/delete.js +2 -2
- package/lib/team/members/index.js +4 -3
- package/lib/team/members/member.js +2 -8
- package/lib/team/members/passport-issuances.js +2 -8
- package/lib/team/members/passports.js +2 -8
- package/lib/team/members/toggle-user-approval.js +2 -2
- package/lib/team/passports/color.js +2 -2
- package/lib/team/passports/detail.js +4 -4
- package/lib/team/passports/index.js +3 -3
- package/lib/team/passports/trusted-factories.js +3 -3
- package/lib/team/passports/trusted-factory.js +3 -3
- package/lib/team/passports/trusted-issuer.js +3 -3
- package/lib/team/passports/trusted-issuers.js +4 -4
- package/lib/util/index.js +8 -13
- package/package.json +14 -15
- package/lib/toast.js +0 -86
|
@@ -24,10 +24,10 @@ var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
|
|
|
24
24
|
var _isString = _interopRequireDefault(require("lodash/isString"));
|
|
25
25
|
var _isObject = _interopRequireDefault(require("lodash/isObject"));
|
|
26
26
|
var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
|
|
27
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
27
28
|
var _react = require("react");
|
|
28
29
|
var _reactHookForm = require("react-hook-form");
|
|
29
30
|
var _react2 = require("@iconify/react");
|
|
30
|
-
var _notistack = require("notistack");
|
|
31
31
|
var _parseNavigationFromBlocklet = require("@blocklet/meta/lib/parse-navigation-from-blocklet");
|
|
32
32
|
var _urlJoin = _interopRequireDefault(require("url-join"));
|
|
33
33
|
var _index = require("ufo/dist/index.mjs");
|
|
@@ -99,9 +99,6 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
|
|
|
99
99
|
setFalse,
|
|
100
100
|
setTrue
|
|
101
101
|
}] = (0, _ahooks.useBoolean)(false);
|
|
102
|
-
const {
|
|
103
|
-
enqueueSnackbar
|
|
104
|
-
} = (0, _notistack.useSnackbar)();
|
|
105
102
|
const state = (0, _ahooks.useReactive)({
|
|
106
103
|
isRoot: true,
|
|
107
104
|
type: defaultType,
|
|
@@ -185,7 +182,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
|
|
|
185
182
|
const {
|
|
186
183
|
navigation = []
|
|
187
184
|
} = componentBlocklet || {};
|
|
188
|
-
const
|
|
185
|
+
const flattenedNavigation = (0, _parseNavigationFromBlocklet.flattenNavigation)(navigation, {
|
|
189
186
|
transform(item, parent) {
|
|
190
187
|
if (parent !== null && parent !== void 0 && parent.section) {
|
|
191
188
|
item.section = item.section || parent.section;
|
|
@@ -193,7 +190,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
|
|
|
193
190
|
return item;
|
|
194
191
|
}
|
|
195
192
|
});
|
|
196
|
-
return
|
|
193
|
+
return flattenedNavigation.filter(item => item.link)
|
|
197
194
|
// 在指定 section 下只展示能够展示的 navigation
|
|
198
195
|
.filter(item => (0, _parseNavigationFromBlocklet.isMatchSection)(item.section, section)).map(item => {
|
|
199
196
|
return {
|
|
@@ -395,9 +392,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
|
|
|
395
392
|
if (checkRes === true) {
|
|
396
393
|
saveFn.current(patchFormValues(params));
|
|
397
394
|
} else {
|
|
398
|
-
|
|
399
|
-
variant: 'error'
|
|
400
|
-
});
|
|
395
|
+
_Toast.default.error(checkRes);
|
|
401
396
|
}
|
|
402
397
|
}, [checkFormState, enqueueSnackbar, patchFormValues]);
|
|
403
398
|
const handleRemoveLocale = (0, _react.useCallback)(currentLocale => {
|
|
@@ -10,7 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
10
10
|
var _Box = _interopRequireDefault(require("@mui/material/Box"));
|
|
11
11
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
12
12
|
var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
|
|
13
|
-
var
|
|
13
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
14
14
|
var _formTextInput = _interopRequireDefault(require("../../form/form-text-input"));
|
|
15
15
|
var _node = require("../../contexts/node");
|
|
16
16
|
var _permission = require("../../permission");
|
|
@@ -69,7 +69,7 @@ function ComponentSetting(_ref) {
|
|
|
69
69
|
} catch (err) {
|
|
70
70
|
setLoading(false);
|
|
71
71
|
err.message = (0, _util.formatError)(err);
|
|
72
|
-
|
|
72
|
+
_Toast.default.error(err.message);
|
|
73
73
|
throw err;
|
|
74
74
|
}
|
|
75
75
|
};
|
|
@@ -13,10 +13,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
13
13
|
var _urlJoin = _interopRequireDefault(require("url-join"));
|
|
14
14
|
var _lodash = require("lodash");
|
|
15
15
|
var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
|
|
16
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
16
17
|
var _util = require("@blocklet/meta/lib/util");
|
|
17
18
|
var _blocklet = require("../../../lib/contexts/blocklet");
|
|
18
19
|
var _node = require("../../contexts/node");
|
|
19
|
-
var _toast = _interopRequireDefault(require("../../../lib/toast"));
|
|
20
20
|
var _spaceSelector = _interopRequireDefault(require("./space-selector"));
|
|
21
21
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
22
22
|
const _excluded = ["onConnect"];
|
|
@@ -106,10 +106,10 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
|
|
|
106
106
|
}]
|
|
107
107
|
}
|
|
108
108
|
}).then(() => {
|
|
109
|
-
|
|
109
|
+
_Toast.default.success(t('storage.spaces.connected', locale));
|
|
110
110
|
}).catch(error => {
|
|
111
111
|
console.error(error);
|
|
112
|
-
|
|
112
|
+
_Toast.default.error(error.message);
|
|
113
113
|
});
|
|
114
114
|
}
|
|
115
115
|
const onAuthorizeConnectSuccess = async (response, decrypt) => {
|
|
@@ -129,7 +129,7 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
|
|
|
129
129
|
// eslint-disable-next-line no-shadow
|
|
130
130
|
const handleOnClickAuthorize = async gatewayUrl => {
|
|
131
131
|
if ((0, _lodash.isEmpty)(gatewayUrl)) {
|
|
132
|
-
|
|
132
|
+
_Toast.default.error(t('storage.spaces.addressCannotEmpty', locale));
|
|
133
133
|
return;
|
|
134
134
|
}
|
|
135
135
|
setGatewayUrl(gatewayUrl);
|
|
@@ -14,8 +14,8 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
|
|
|
14
14
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
15
15
|
var _material = require("@mui/material");
|
|
16
16
|
var _Autocomplete = _interopRequireWildcard(require("@mui/material/Autocomplete"));
|
|
17
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
17
18
|
var _session = require("../../../lib/contexts/session");
|
|
18
|
-
var _toast = _interopRequireDefault(require("../../toast"));
|
|
19
19
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
20
20
|
var _templateObject;
|
|
21
21
|
const _excluded = ["onSelect", "endpoint", "gatewayUrl", "loading", "size", "helperText"];
|
|
@@ -68,7 +68,7 @@ function SpaceSelector(_ref) {
|
|
|
68
68
|
}]);
|
|
69
69
|
}).catch(err => {
|
|
70
70
|
console.error(err);
|
|
71
|
-
|
|
71
|
+
_Toast.default.error('Can not add this gateway, please check the url and try again');
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
}, [gatewayUrl]); // eslint-disable-line
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = StartComponent;
|
|
7
|
+
var _react = require("react");
|
|
8
|
+
var _styled = _interopRequireDefault(require("@emotion/styled"));
|
|
9
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
11
|
+
var _PlayArrow = _interopRequireDefault(require("@mui/icons-material/PlayArrow"));
|
|
12
|
+
var _Stop = _interopRequireDefault(require("@mui/icons-material/Stop"));
|
|
13
|
+
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
14
|
+
var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
|
|
15
|
+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
|
|
16
|
+
var _confirm = _interopRequireDefault(require("../../confirm"));
|
|
17
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
18
|
+
var _templateObject;
|
|
19
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
20
|
+
function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
21
|
+
function StartComponent(_ref) {
|
|
22
|
+
let {
|
|
23
|
+
component,
|
|
24
|
+
onStart,
|
|
25
|
+
onStop,
|
|
26
|
+
disabled,
|
|
27
|
+
tip
|
|
28
|
+
} = _ref;
|
|
29
|
+
const {
|
|
30
|
+
t
|
|
31
|
+
} = (0, _react.useContext)(_context.LocaleContext);
|
|
32
|
+
const [loading, setLoading] = (0, _react.useState)(false);
|
|
33
|
+
const [confirmSetting, setConfirmSetting] = (0, _react.useState)();
|
|
34
|
+
const startComponent = async () => {
|
|
35
|
+
setLoading(true);
|
|
36
|
+
try {
|
|
37
|
+
await onStart(component);
|
|
38
|
+
} catch (error) {
|
|
39
|
+
_Toast.default.error(error.message);
|
|
40
|
+
}
|
|
41
|
+
setLoading(false);
|
|
42
|
+
};
|
|
43
|
+
const stopComponent = async () => {
|
|
44
|
+
setLoading(true);
|
|
45
|
+
try {
|
|
46
|
+
await onStop(component);
|
|
47
|
+
} catch (error) {
|
|
48
|
+
_Toast.default.error(error.message);
|
|
49
|
+
}
|
|
50
|
+
setLoading(false);
|
|
51
|
+
};
|
|
52
|
+
const componentDisabled = disabled || loading;
|
|
53
|
+
const isStop = component.status === 'running';
|
|
54
|
+
const Icon = isStop ? _Stop.default : _PlayArrow.default;
|
|
55
|
+
const btn = /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledButton, {
|
|
56
|
+
disabled: componentDisabled,
|
|
57
|
+
onClick: () => {
|
|
58
|
+
if (isStop) {
|
|
59
|
+
var _component$meta;
|
|
60
|
+
setConfirmSetting({
|
|
61
|
+
title: "".concat(t('common.stop'), " ").concat(component === null || component === void 0 ? void 0 : (_component$meta = component.meta) === null || _component$meta === void 0 ? void 0 : _component$meta.title),
|
|
62
|
+
description: t('blocklet.action.stopComponentDescription'),
|
|
63
|
+
confirm: t('blocklet.action.confirmStop'),
|
|
64
|
+
cancel: t('common.cancel'),
|
|
65
|
+
onConfirm: () => {
|
|
66
|
+
setConfirmSetting(null);
|
|
67
|
+
return stopComponent();
|
|
68
|
+
},
|
|
69
|
+
onCancel: () => setConfirmSetting(null)
|
|
70
|
+
});
|
|
71
|
+
} else {
|
|
72
|
+
startComponent();
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
"data-cy": "".concat(isStop ? 'stop' : 'start', "-component-btn"),
|
|
76
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Icon, {
|
|
77
|
+
disabled: componentDisabled
|
|
78
|
+
})
|
|
79
|
+
});
|
|
80
|
+
return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
|
|
81
|
+
title: tip || t("common.".concat(isStop ? 'stop' : 'start')),
|
|
82
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
83
|
+
children: btn
|
|
84
|
+
})
|
|
85
|
+
}), confirmSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
|
|
86
|
+
title: confirmSetting.title,
|
|
87
|
+
description: confirmSetting.description,
|
|
88
|
+
confirm: confirmSetting.confirm,
|
|
89
|
+
cancel: confirmSetting.cancel,
|
|
90
|
+
params: confirmSetting.params,
|
|
91
|
+
onConfirm: confirmSetting.onConfirm,
|
|
92
|
+
onCancel: confirmSetting.onCancel
|
|
93
|
+
})];
|
|
94
|
+
}
|
|
95
|
+
StartComponent.propTypes = {
|
|
96
|
+
component: _propTypes.default.object.isRequired,
|
|
97
|
+
onStart: _propTypes.default.func,
|
|
98
|
+
onStop: _propTypes.default.func,
|
|
99
|
+
disabled: _propTypes.default.bool,
|
|
100
|
+
tip: _propTypes.default.string
|
|
101
|
+
};
|
|
102
|
+
StartComponent.defaultProps = {
|
|
103
|
+
onStart: async () => {},
|
|
104
|
+
onStop: async () => {},
|
|
105
|
+
disabled: false,
|
|
106
|
+
tip: ''
|
|
107
|
+
};
|
|
108
|
+
const StyledButton = (0, _styled.default)(_IconButton.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n &.Mui-disabled {\n opacity: 0.5;\n }\n"])));
|
|
@@ -17,7 +17,7 @@ var _Blocklet = _interopRequireWildcard(require("@arcblock/ux/lib/Blocklet"));
|
|
|
17
17
|
var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
|
|
18
18
|
var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
|
|
19
19
|
var _util = require("@blocklet/meta/lib/util");
|
|
20
|
-
var
|
|
20
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
21
21
|
var _util2 = require("../../util");
|
|
22
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
23
23
|
var _templateObject;
|
|
@@ -81,7 +81,7 @@ function BlockletItem(_ref2) {
|
|
|
81
81
|
blocklets
|
|
82
82
|
});
|
|
83
83
|
} catch (err) {
|
|
84
|
-
|
|
84
|
+
_Toast.default.error(err.message);
|
|
85
85
|
} finally {
|
|
86
86
|
setLoading(false);
|
|
87
87
|
}
|
|
@@ -16,8 +16,8 @@ var _Select = _interopRequireDefault(require("@mui/material/Select"));
|
|
|
16
16
|
var _Toolbar = _interopRequireDefault(require("@mui/material/Toolbar"));
|
|
17
17
|
var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
|
|
18
18
|
var _LoadingButton = _interopRequireDefault(require("@mui/lab/LoadingButton"));
|
|
19
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
19
20
|
var _react2 = require("@iconify/react");
|
|
20
|
-
var _notistack = require("notistack");
|
|
21
21
|
var _ahooks = require("ahooks");
|
|
22
22
|
var _Dialog = require("@arcblock/ux/lib/Dialog");
|
|
23
23
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
@@ -36,7 +36,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
36
36
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
37
37
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
38
38
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
39
|
-
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); }
|
|
39
|
+
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); } // FIXME: @zhanghan 这里还有几处文案没有 i18n
|
|
40
40
|
const mockSession = {
|
|
41
41
|
login: () => {},
|
|
42
42
|
logout: () => {},
|
|
@@ -64,9 +64,6 @@ function ConfigNavigation() {
|
|
|
64
64
|
const {
|
|
65
65
|
roles
|
|
66
66
|
} = (0, _team.useTeamContext)();
|
|
67
|
-
const {
|
|
68
|
-
enqueueSnackbar
|
|
69
|
-
} = (0, _notistack.useSnackbar)();
|
|
70
67
|
const pageState = (0, _ahooks.useReactive)({
|
|
71
68
|
saveLoading: false,
|
|
72
69
|
resetLoading: false,
|
|
@@ -118,11 +115,9 @@ function ConfigNavigation() {
|
|
|
118
115
|
try {
|
|
119
116
|
pageState.saveLoading = true;
|
|
120
117
|
await saveNavigationList(navigationState.rawNavigation);
|
|
121
|
-
|
|
122
|
-
variant: 'success'
|
|
123
|
-
});
|
|
118
|
+
_Toast.default.success(t('common.succeeded'));
|
|
124
119
|
} catch (e) {
|
|
125
|
-
|
|
120
|
+
_Toast.default.error( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
|
126
121
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
|
|
127
122
|
variant: "subtitle2",
|
|
128
123
|
children: t('navigation.actionFailed')
|
|
@@ -130,22 +125,20 @@ function ConfigNavigation() {
|
|
|
130
125
|
variant: "body1",
|
|
131
126
|
children: (0, _util.formatError)(e) || e.error
|
|
132
127
|
})]
|
|
133
|
-
})
|
|
134
|
-
variant: 'error'
|
|
135
|
-
});
|
|
128
|
+
}));
|
|
136
129
|
} finally {
|
|
137
130
|
pageState.saveLoading = false;
|
|
138
131
|
}
|
|
139
|
-
}, [
|
|
132
|
+
}, [navigationState.rawNavigation, pageState, saveNavigationList, t]);
|
|
140
133
|
const handleResetNavigation = (0, _react.useCallback)(async () => {
|
|
141
134
|
try {
|
|
142
135
|
pageState.resetLoading = true;
|
|
143
136
|
await resetNavigation();
|
|
144
|
-
|
|
137
|
+
_Toast.default.success('重置成功', {
|
|
145
138
|
variant: 'success'
|
|
146
139
|
});
|
|
147
140
|
} catch (e) {
|
|
148
|
-
|
|
141
|
+
_Toast.default.error( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
|
149
142
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
|
|
150
143
|
variant: "subtitle2",
|
|
151
144
|
children: t('navigation.actionFailed')
|
|
@@ -153,13 +146,11 @@ function ConfigNavigation() {
|
|
|
153
146
|
variant: "body1",
|
|
154
147
|
children: (0, _util.formatError)(e) || e.error
|
|
155
148
|
})]
|
|
156
|
-
})
|
|
157
|
-
variant: 'error'
|
|
158
|
-
});
|
|
149
|
+
}));
|
|
159
150
|
} finally {
|
|
160
151
|
pageState.resetLoading = false;
|
|
161
152
|
}
|
|
162
|
-
}, [
|
|
153
|
+
}, [pageState, resetNavigation, t]);
|
|
163
154
|
const sessionCtxValue = (0, _react.useMemo)(() => {
|
|
164
155
|
return {
|
|
165
156
|
session: _objectSpread(_objectSpread({}, mockSession), {}, {
|
|
@@ -24,7 +24,7 @@ var _Loop = _interopRequireDefault(require("@mui/icons-material/Loop"));
|
|
|
24
24
|
var _constant = require("@abtnode/constant");
|
|
25
25
|
var _constant2 = require("@blocklet/constant");
|
|
26
26
|
var _util = require("@blocklet/meta/lib/util");
|
|
27
|
-
var
|
|
27
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
28
28
|
var _formTextInput = _interopRequireDefault(require("../form/form-text-input"));
|
|
29
29
|
var _node = require("../contexts/node");
|
|
30
30
|
var _util2 = require("../util");
|
|
@@ -157,7 +157,7 @@ function BlockletEnvironment(_ref) {
|
|
|
157
157
|
});
|
|
158
158
|
onUpdate(data);
|
|
159
159
|
} catch (err) {
|
|
160
|
-
|
|
160
|
+
_Toast.default.error(err.message);
|
|
161
161
|
} finally {
|
|
162
162
|
setLoading(false);
|
|
163
163
|
}
|
|
@@ -169,7 +169,7 @@ function BlockletEnvironment(_ref) {
|
|
|
169
169
|
cpuCores
|
|
170
170
|
});
|
|
171
171
|
if (errMessage) {
|
|
172
|
-
|
|
172
|
+
_Toast.default.error(errMessage);
|
|
173
173
|
return;
|
|
174
174
|
}
|
|
175
175
|
}
|
|
@@ -189,7 +189,7 @@ function BlockletEnvironment(_ref) {
|
|
|
189
189
|
});
|
|
190
190
|
onUpdate(data);
|
|
191
191
|
} catch (err) {
|
|
192
|
-
|
|
192
|
+
_Toast.default.error(err.message);
|
|
193
193
|
} finally {
|
|
194
194
|
setLoading(false);
|
|
195
195
|
}
|
|
@@ -216,7 +216,7 @@ function BlockletEnvironment(_ref) {
|
|
|
216
216
|
});
|
|
217
217
|
onUpdate(data);
|
|
218
218
|
} catch (err) {
|
|
219
|
-
|
|
219
|
+
_Toast.default.error(err.message);
|
|
220
220
|
} finally {
|
|
221
221
|
setLoading(false);
|
|
222
222
|
}
|
|
@@ -239,7 +239,7 @@ function BlockletEnvironment(_ref) {
|
|
|
239
239
|
});
|
|
240
240
|
setLoading(false);
|
|
241
241
|
} catch (err) {
|
|
242
|
-
|
|
242
|
+
_Toast.default.error(err.message);
|
|
243
243
|
setLoading(false);
|
|
244
244
|
return false;
|
|
245
245
|
}
|
|
@@ -264,7 +264,7 @@ function BlockletEnvironment(_ref) {
|
|
|
264
264
|
});
|
|
265
265
|
onUpdate(data);
|
|
266
266
|
} catch (err) {
|
|
267
|
-
|
|
267
|
+
_Toast.default.error(err.message);
|
|
268
268
|
} finally {
|
|
269
269
|
setLoading(false);
|
|
270
270
|
}
|
|
@@ -12,10 +12,10 @@ var _constant = require("@abtnode/constant");
|
|
|
12
12
|
var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
|
|
13
13
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
14
14
|
var _util = require("@blocklet/meta/lib/util");
|
|
15
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
15
16
|
var _node = require("../contexts/node");
|
|
16
17
|
var _blocklet = require("../contexts/blocklet");
|
|
17
18
|
var _session = require("../contexts/session");
|
|
18
|
-
var _toast = _interopRequireDefault(require("../toast"));
|
|
19
19
|
var _util2 = require("../util");
|
|
20
20
|
var _util3 = require("./util");
|
|
21
21
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -78,19 +78,19 @@ function BlockletMigration() {
|
|
|
78
78
|
const onMigrate = async () => {
|
|
79
79
|
try {
|
|
80
80
|
if (blocklet.status === 'running') {
|
|
81
|
-
|
|
81
|
+
_Toast.default.error(t('blocklet.migrate.tip.running'));
|
|
82
82
|
return;
|
|
83
83
|
}
|
|
84
84
|
const duplicate = findDuplicate(blocklet);
|
|
85
85
|
if (duplicate) {
|
|
86
|
-
|
|
86
|
+
_Toast.default.error(t('blocklet.migrate.tip.duplicate', {
|
|
87
87
|
name: duplicate
|
|
88
88
|
}));
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
91
|
setOpenConnect(true);
|
|
92
92
|
} catch (error) {
|
|
93
|
-
|
|
93
|
+
_Toast.default.error((0, _util2.formatError)(error));
|
|
94
94
|
}
|
|
95
95
|
};
|
|
96
96
|
const onSuccess = () => {
|
|
@@ -14,7 +14,7 @@ var _isURL = _interopRequireDefault(require("validator/lib/isURL"));
|
|
|
14
14
|
var _isPort = _interopRequireDefault(require("validator/lib/isPort"));
|
|
15
15
|
var _node = require("../../contexts/node");
|
|
16
16
|
var _blocklet = require("../../contexts/blocklet");
|
|
17
|
-
var
|
|
17
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
18
18
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
19
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
20
20
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -22,6 +22,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
22
22
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
23
23
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
24
24
|
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); }
|
|
25
|
+
;
|
|
25
26
|
const defaultFormValues = {
|
|
26
27
|
enabled: false,
|
|
27
28
|
from: '',
|
|
@@ -69,9 +70,9 @@ function NotificationEmail() {
|
|
|
69
70
|
const defaultValues = Object.assign(_objectSpread({}, defaultFormValues), (blockletChanged === null || blockletChanged === void 0 ? void 0 : (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 ? void 0 : (_blockletChanged$sett2 = _blockletChanged$sett.notification) === null || _blockletChanged$sett2 === void 0 ? void 0 : _blockletChanged$sett2.email) || {});
|
|
70
71
|
// 将当前表单的默认值重置为新的数据,这样能够修正页面的 isDirty 数据
|
|
71
72
|
reset(defaultValues);
|
|
72
|
-
|
|
73
|
+
_Toast.default.success(t('oauth.saveSuccess'));
|
|
73
74
|
} catch (err) {
|
|
74
|
-
|
|
75
|
+
_Toast.default.error(err.message || t('oauth.saveFailed'));
|
|
75
76
|
}
|
|
76
77
|
});
|
|
77
78
|
const validateFrom = (0, _ahooks.useMemoizedFn)(value => {
|
|
@@ -11,7 +11,7 @@ var _reactHookForm = require("react-hook-form");
|
|
|
11
11
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
12
12
|
var _node = require("../../contexts/node");
|
|
13
13
|
var _blocklet = require("../../contexts/blocklet");
|
|
14
|
-
var
|
|
14
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
15
15
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
17
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -19,6 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
19
19
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
20
20
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
21
21
|
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); }
|
|
22
|
+
;
|
|
22
23
|
function OAuthAuth0() {
|
|
23
24
|
var _blocklet$meta, _blocklet$settings, _blocklet$settings$oa;
|
|
24
25
|
const {
|
|
@@ -67,9 +68,9 @@ function OAuthAuth0() {
|
|
|
67
68
|
}, (blockletChanged === null || blockletChanged === void 0 ? void 0 : (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 ? void 0 : (_blockletChanged$sett2 = _blockletChanged$sett.oauth) === null || _blockletChanged$sett2 === void 0 ? void 0 : _blockletChanged$sett2.auth0) || {});
|
|
68
69
|
// 将当前表单的默认值重置为新的数据,这样能够修正页面的 isDirty 数据
|
|
69
70
|
reset(defaultValues);
|
|
70
|
-
|
|
71
|
+
_Toast.default.success(t('oauth.saveSuccess'));
|
|
71
72
|
} catch (err) {
|
|
72
|
-
|
|
73
|
+
_Toast.default.error(err.message || t('oauth.saveFailed'));
|
|
73
74
|
}
|
|
74
75
|
});
|
|
75
76
|
const validateDomain = (0, _ahooks.useMemoizedFn)(val => {
|
package/lib/blocklet/overview.js
CHANGED
|
@@ -155,13 +155,7 @@ function BlockletOverview() {
|
|
|
155
155
|
} : null, {
|
|
156
156
|
name: t('blocklet.installedAt'),
|
|
157
157
|
value: (0, _util2.formatToDatetime)(blocklet.installedAt)
|
|
158
|
-
},
|
|
159
|
-
name: t('blocklet.startedAt'),
|
|
160
|
-
value: (0, _util2.formatToDatetime)(blocklet.startedAt)
|
|
161
|
-
} : null, blocklet.status !== 'running' ? {
|
|
162
|
-
name: t('blocklet.stoppedAt'),
|
|
163
|
-
value: (0, _util2.formatToDatetime)(blocklet.stoppedAt)
|
|
164
|
-
} : null, {
|
|
158
|
+
}, {
|
|
165
159
|
name: t('blocklet.overview.accessControl'),
|
|
166
160
|
value: t("team.whoCanAccess.".concat((0, _util.getWhoCanAccess)(blocklet), ".title"))
|
|
167
161
|
}, {
|
|
@@ -13,12 +13,12 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
|
|
|
13
13
|
var _constant = require("@abtnode/constant");
|
|
14
14
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
15
15
|
var _util = require("@blocklet/meta/lib/util");
|
|
16
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
16
17
|
var _formTextInput = _interopRequireDefault(require("../../form/form-text-input"));
|
|
17
18
|
var _confirm = _interopRequireDefault(require("../../confirm"));
|
|
18
19
|
var _session = require("../../contexts/session");
|
|
19
20
|
var _blocklet = require("../../contexts/blocklet");
|
|
20
21
|
var _util2 = require("../../util");
|
|
21
|
-
var _toast = _interopRequireDefault(require("../../toast"));
|
|
22
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
23
23
|
var _templateObject;
|
|
24
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -66,11 +66,11 @@ function AppSk(_ref) {
|
|
|
66
66
|
title: 'Migrate with DID Wallet',
|
|
67
67
|
handler: () => {
|
|
68
68
|
if ((0, _util2.isRunning)(blocklet.status)) {
|
|
69
|
-
|
|
69
|
+
_Toast.default.error(t('blocklet.error.isRunning'));
|
|
70
70
|
return;
|
|
71
71
|
}
|
|
72
72
|
if ((0, _util.isInProgress)(blocklet.status)) {
|
|
73
|
-
|
|
73
|
+
_Toast.default.error(t('blocklet.error.isInProgress'));
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
setState({
|
|
@@ -12,7 +12,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
|
|
|
12
12
|
var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
|
|
13
13
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
14
14
|
var _pWaitFor = _interopRequireDefault(require("p-wait-for"));
|
|
15
|
-
var
|
|
15
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
16
16
|
var _node = require("../../contexts/node");
|
|
17
17
|
var _util2 = require("../../util");
|
|
18
18
|
var _api = require("../../util/api");
|
|
@@ -57,7 +57,7 @@ function ComponentPurchase(_ref) {
|
|
|
57
57
|
});
|
|
58
58
|
};
|
|
59
59
|
const failure = async errorMessage => {
|
|
60
|
-
|
|
60
|
+
_Toast.default.error(errorMessage);
|
|
61
61
|
onCancel(errorMessage);
|
|
62
62
|
};
|
|
63
63
|
async function handleConnectSessionStatus(url) {
|
|
@@ -12,7 +12,7 @@ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
|
|
|
12
12
|
var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
|
|
13
13
|
var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
|
|
14
14
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
15
|
-
var
|
|
15
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
16
16
|
var _confirm = _interopRequireDefault(require("../../../confirm"));
|
|
17
17
|
var _util = require("../../../util");
|
|
18
18
|
var _node = require("../../../contexts/node");
|
|
@@ -58,7 +58,7 @@ function AddDomainAlias(_ref) {
|
|
|
58
58
|
});
|
|
59
59
|
await (0, _util.sleep)(2000);
|
|
60
60
|
} catch (err) {
|
|
61
|
-
|
|
61
|
+
_Toast.default.error(err.message);
|
|
62
62
|
} finally {
|
|
63
63
|
setConfirmSetting(null);
|
|
64
64
|
setLoading(false);
|
|
@@ -14,10 +14,10 @@ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
|
|
|
14
14
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
15
15
|
var _constant = require("@abtnode/constant");
|
|
16
16
|
var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
|
|
17
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
17
18
|
var _node = require("../../../contexts/node");
|
|
18
19
|
var _blocklet = require("../../../contexts/blocklet");
|
|
19
20
|
var _confirm = _interopRequireDefault(require("../../../confirm"));
|
|
20
|
-
var _toast = _interopRequireDefault(require("../../../toast"));
|
|
21
21
|
var _util = require("../util");
|
|
22
22
|
var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule"));
|
|
23
23
|
var _util2 = require("../../../util");
|
|
@@ -76,7 +76,7 @@ function AddRule(_ref) {
|
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
78
|
} catch (error) {
|
|
79
|
-
|
|
79
|
+
_Toast.default.error(error.message);
|
|
80
80
|
} finally {
|
|
81
81
|
setLoading(false);
|
|
82
82
|
setConfirmSetting(null);
|
|
@@ -10,8 +10,8 @@ var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
|
|
|
10
10
|
var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
|
|
11
11
|
var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
|
|
12
12
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
13
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
13
14
|
var _confirm = _interopRequireDefault(require("../../../confirm"));
|
|
14
|
-
var _toast = _interopRequireDefault(require("../../../toast"));
|
|
15
15
|
var _node = require("../../../contexts/node");
|
|
16
16
|
var _util = require("../../../util");
|
|
17
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -47,7 +47,7 @@ function DeleteDomainAlias(props) {
|
|
|
47
47
|
});
|
|
48
48
|
await (0, _util.sleep)(2000);
|
|
49
49
|
} catch (err) {
|
|
50
|
-
|
|
50
|
+
_Toast.default.error(err.message);
|
|
51
51
|
} finally {
|
|
52
52
|
setConfirmSetting(null);
|
|
53
53
|
setLoading(false);
|
|
@@ -10,10 +10,10 @@ var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
|
|
|
10
10
|
var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
|
|
11
11
|
var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
|
|
12
12
|
var _context = require("@arcblock/ux/lib/Locale/context");
|
|
13
|
+
var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
13
14
|
var _node = require("../../../contexts/node");
|
|
14
15
|
var _blocklet = require("../../../contexts/blocklet");
|
|
15
16
|
var _deleteConfirm = _interopRequireDefault(require("../../../delete-confirm"));
|
|
16
|
-
var _toast = _interopRequireDefault(require("../../../toast"));
|
|
17
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
19
19
|
function DeleteRule(_ref) {
|
|
@@ -51,7 +51,7 @@ function DeleteRule(_ref) {
|
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
} catch (error) {
|
|
54
|
-
|
|
54
|
+
_Toast.default.error(error.message);
|
|
55
55
|
} finally {
|
|
56
56
|
setConfirmSetting(null);
|
|
57
57
|
setLoading(false);
|