@blocklet/launcher-workflow 1.7.19 → 1.7.20
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.
|
@@ -25,7 +25,7 @@ var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
|
|
|
25
25
|
|
|
26
26
|
var _AnimationWaiter = _interopRequireDefault(require("@arcblock/ux/lib/AnimationWaiter"));
|
|
27
27
|
|
|
28
|
-
var
|
|
28
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
29
29
|
|
|
30
30
|
var _pageHeader = _interopRequireDefault(require("@blocklet/launcher-layout/lib/page-header"));
|
|
31
31
|
|
|
@@ -100,7 +100,7 @@ function OperationPage(_ref) {
|
|
|
100
100
|
}
|
|
101
101
|
} = await api.get("/public/instances/".concat(nftId, "/status"));
|
|
102
102
|
|
|
103
|
-
if (instance.status >=
|
|
103
|
+
if (instance.status >= _constant.INSTANCE_STATUS.running) {
|
|
104
104
|
const url = (0, _util.getLaunchBlockletUrl)(instance.serverUrl, blockletMetaUrl, locale);
|
|
105
105
|
setLaunchState(pre => _objectSpread(_objectSpread({}, pre), {}, {
|
|
106
106
|
status: STATUS.success,
|
|
@@ -23,7 +23,7 @@ var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
|
|
|
23
23
|
|
|
24
24
|
var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
27
27
|
|
|
28
28
|
var _locale = require("../../contexts/locale");
|
|
29
29
|
|
|
@@ -154,7 +154,7 @@ function Checkout(_ref3) {
|
|
|
154
154
|
t
|
|
155
155
|
} = (0, _locale.useLocaleContext)();
|
|
156
156
|
const [showCloseButton, setShowCloseButton] = (0, _react.useState)(true);
|
|
157
|
-
const [waitingCompleted, setWaitingCompleted] = (0, _react.useState)(status ===
|
|
157
|
+
const [waitingCompleted, setWaitingCompleted] = (0, _react.useState)(status === _constant.ORDER_STATUS.paid);
|
|
158
158
|
const stripePromise = (0, _stripeJs.loadStripe)(window.env.stripePublicKey);
|
|
159
159
|
const options = {
|
|
160
160
|
clientSecret,
|
|
@@ -17,7 +17,7 @@ var _useInterval = _interopRequireDefault(require("react-use/lib/useInterval"));
|
|
|
17
17
|
|
|
18
18
|
var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
|
|
19
19
|
|
|
20
|
-
var
|
|
20
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
21
21
|
|
|
22
22
|
var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
|
|
23
23
|
|
|
@@ -42,7 +42,7 @@ function Paying(_ref) {
|
|
|
42
42
|
t
|
|
43
43
|
} = (0, _locale.useLocaleContext)();
|
|
44
44
|
const [needFetchOrderStatus, setNeedFetchOrderStatus] = (0, _react.useState)(true);
|
|
45
|
-
const [status, setStatus] = (0, _react.useState)(
|
|
45
|
+
const [status, setStatus] = (0, _react.useState)(_constant.ORDER_STATUS.unpaid);
|
|
46
46
|
const {
|
|
47
47
|
api
|
|
48
48
|
} = (0, _request.default)();
|
|
@@ -51,7 +51,7 @@ function Paying(_ref) {
|
|
|
51
51
|
data: order
|
|
52
52
|
} = await api.get("/orders/".concat(orderId, "?userDid=").concat(userDid));
|
|
53
53
|
|
|
54
|
-
if (order.status ===
|
|
54
|
+
if (order.status === _constant.ORDER_STATUS.nftSent) {
|
|
55
55
|
fetchOrder.cancel();
|
|
56
56
|
setNeedFetchOrderStatus(false);
|
|
57
57
|
setTimeout(() => onComplete({
|
|
@@ -59,14 +59,14 @@ function Paying(_ref) {
|
|
|
59
59
|
}), 2000);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
if (order.status >=
|
|
62
|
+
if (order.status >= _constant.ORDER_STATUS.paid) {
|
|
63
63
|
onPaid();
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
setStatus(order.status);
|
|
67
67
|
}, 3000);
|
|
68
68
|
(0, _useInterval.default)(fetchOrder, needFetchOrderStatus ? 3000 : null);
|
|
69
|
-
return /*#__PURE__*/_react.default.createElement(Content, null, status <=
|
|
69
|
+
return /*#__PURE__*/_react.default.createElement(Content, null, status <= _constant.ORDER_STATUS.paid && /*#__PURE__*/_react.default.createElement(_Spinner.default, null), status === _constant.ORDER_STATUS.nftSent && /*#__PURE__*/_react.default.createElement(_Check.default, {
|
|
70
70
|
className: "status--succeed_icon"
|
|
71
71
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
72
72
|
className: "status"
|
package/lib/locales/en.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
4
4
|
|
|
5
5
|
module.exports = {
|
|
6
6
|
common: {
|
|
@@ -26,10 +26,10 @@ module.exports = {
|
|
|
26
26
|
loadListFailed: 'Plan list load error',
|
|
27
27
|
paymentCredit: {
|
|
28
28
|
status: {
|
|
29
|
-
[
|
|
30
|
-
[
|
|
31
|
-
[
|
|
32
|
-
[
|
|
29
|
+
[_constant.ORDER_STATUS.unpaid]: 'Waiting for payment',
|
|
30
|
+
[_constant.ORDER_STATUS.paid]: 'Payment completed, waiting for order completion',
|
|
31
|
+
[_constant.ORDER_STATUS.nftSent]: 'Completed',
|
|
32
|
+
[_constant.ORDER_STATUS.expired]: 'Order has expired'
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
useCrypto: 'Crypto',
|
package/lib/locales/zh.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
4
4
|
|
|
5
5
|
module.exports = {
|
|
6
6
|
common: {
|
|
@@ -26,10 +26,10 @@ module.exports = {
|
|
|
26
26
|
loadListFailed: '加载节点类型列表出错',
|
|
27
27
|
paymentCredit: {
|
|
28
28
|
status: {
|
|
29
|
-
[
|
|
30
|
-
[
|
|
31
|
-
[
|
|
32
|
-
[
|
|
29
|
+
[_constant.ORDER_STATUS.unpaid]: '支付中',
|
|
30
|
+
[_constant.ORDER_STATUS.paid]: '支付完成, 等待订单完成',
|
|
31
|
+
[_constant.ORDER_STATUS.nftSent]: '已完成',
|
|
32
|
+
[_constant.ORDER_STATUS.expired]: '订单已过期'
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
useCrypto: '数字货币支付',
|
package/lib/prepare.js
CHANGED
|
@@ -23,7 +23,7 @@ var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
|
|
|
23
23
|
|
|
24
24
|
var _FormHelperText = _interopRequireDefault(require("@mui/material/FormHelperText"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
27
27
|
|
|
28
28
|
var _server = _interopRequireDefault(require("@arcblock/license/lib/server"));
|
|
29
29
|
|
|
@@ -90,17 +90,17 @@ function PreparePage() {
|
|
|
90
90
|
validate();
|
|
91
91
|
};
|
|
92
92
|
|
|
93
|
-
const isRedeem = nftId ===
|
|
93
|
+
const isRedeem = nftId === _constant.REDEEM_NFT_ID;
|
|
94
94
|
const headerScope = isRedeem ? 'redeem' : 'prepare';
|
|
95
95
|
|
|
96
96
|
const validate = () => {
|
|
97
97
|
let isError = false;
|
|
98
98
|
|
|
99
|
-
if (name.length >
|
|
99
|
+
if (name.length > _constant.INSTANCE_MAX_NAME_LENGTH) {
|
|
100
100
|
isError = true;
|
|
101
101
|
setFormError(value => _objectSpread(_objectSpread({}, value), {}, {
|
|
102
102
|
name: t('launchPrepare.formError.nameExceed', {
|
|
103
|
-
length:
|
|
103
|
+
length: _constant.INSTANCE_MAX_NAME_LENGTH
|
|
104
104
|
})
|
|
105
105
|
}));
|
|
106
106
|
} else {
|
|
@@ -109,11 +109,11 @@ function PreparePage() {
|
|
|
109
109
|
}));
|
|
110
110
|
}
|
|
111
111
|
|
|
112
|
-
if (description.length >
|
|
112
|
+
if (description.length > _constant.INSTANCE_MAX_DESC_LENGTH) {
|
|
113
113
|
isError = true;
|
|
114
114
|
setFormError(value => _objectSpread(_objectSpread({}, value), {}, {
|
|
115
115
|
description: t('launchPrepare.formError.descriptionExceed', {
|
|
116
|
-
length:
|
|
116
|
+
length: _constant.INSTANCE_MAX_DESC_LENGTH
|
|
117
117
|
})
|
|
118
118
|
}));
|
|
119
119
|
} else {
|
package/lib/purchase.js
CHANGED
|
@@ -39,7 +39,7 @@ var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
|
|
|
39
39
|
|
|
40
40
|
var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
|
|
41
41
|
|
|
42
|
-
var
|
|
42
|
+
var _constant = require("@blocklet/launcher-util/lib/constant");
|
|
43
43
|
|
|
44
44
|
var _Alert = _interopRequireDefault(require("@mui/material/Alert"));
|
|
45
45
|
|
|
@@ -245,7 +245,7 @@ function PurchasePage() {
|
|
|
245
245
|
|
|
246
246
|
const handleRedeem = () => {
|
|
247
247
|
handlePaid({
|
|
248
|
-
nftId:
|
|
248
|
+
nftId: _constant.REDEEM_NFT_ID
|
|
249
249
|
});
|
|
250
250
|
};
|
|
251
251
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blocklet/launcher-workflow",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.20",
|
|
4
4
|
"description": "Purchase components for Launcher UI",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"@arcblock/icons": "^2.1.20",
|
|
42
42
|
"@arcblock/license": "^2.1.20",
|
|
43
43
|
"@arcblock/ux": "^2.1.20",
|
|
44
|
-
"@blocklet/launcher-
|
|
45
|
-
"@blocklet/launcher-
|
|
44
|
+
"@blocklet/launcher-layout": "1.7.20",
|
|
45
|
+
"@blocklet/launcher-util": "1.7.20",
|
|
46
46
|
"@emotion/react": "^11.9.0",
|
|
47
47
|
"@emotion/styled": "^11.8.1",
|
|
48
48
|
"@mui/icons-material": "^5.6.2",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"babel-plugin-inline-react-svg": "^2.0.1",
|
|
74
74
|
"babel-plugin-styled-components": "^1.10.7"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "8dfbf475e6b8a6b96614c3a9aa92cfcc6135308a"
|
|
77
77
|
}
|