@abtnode/ux 1.16.13-beta-0086a35d → 1.16.13-beta-714bec78

package/lib/blocklet/component/add.js

@@ -35,6 +35,7 @@ var _util = require("@blocklet/meta/lib/util");
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
+var _blocklet = require("../../contexts/blocklet");
 var _util2 = require("../../util");
 var _schemaForm = _interopRequireDefault(require("../../schema-form"));
 var _required = _interopRequireDefault(require("../../form/required"));
@@ -156,6 +157,11 @@ function AddComponent(_ref2) {
     inService,
     info: nodeInfo
   } = (0, _node.useNodeContext)();
+  const {
+    actions: {
+      refreshBlocklet: refreshApp
+    }
+  } = (0, _blocklet.useBlockletContext)();
   const [purchaseData, setPurchaseData] = (0, _react.useState)(null);
   const [isWaitingPurchase, setIsWaitingPurchase] = (0, _react.useState)(false);
   const initParams = {
@@ -218,24 +224,36 @@ function AddComponent(_ref2) {
     return '';
   };
   const setInstallErrorResult = errorMessage => {
-    updateParams({
-      installResultProps: {
-        variant: 'error',
-        title: getComponentName(),
-        subTitle: errorMessage,
-        footer: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-          className: "bottom-button",
-          "data-cy": "retry-install-component",
-          onClick: () => {
-            updateParams({
-              installResultProps: {}
-            });
-            onInstall(component.current.installInput);
-          },
-          children: t('common.retry')
-        })
-      }
-    });
+    const update = _loading => {
+      updateParams({
+        installResultProps: {
+          variant: 'error',
+          title: getComponentName(),
+          subTitle: errorMessage,
+          footer: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+            className: "bottom-button",
+            disabled: _loading,
+            "data-cy": "retry-install-component",
+            onClick: async () => {
+              // set button disabled and show spinner
+              update(true);
+              await onInstall(component.current.installInput);
+            },
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+              display: "flex",
+              alignItems: "center",
+              children: [_loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+                size: 16,
+                style: {
+                  marginRight: 8
+                }
+              }), t('common.retry')]
+            })
+          })
+        }
+      });
+    };
+    update();
   };
   const createBlockletEventHandler = handler => {
     return b => {
@@ -332,6 +350,15 @@ function AddComponent(_ref2) {
           });
         }
       }
+      updateParams({
+        installResultProps: {}
+      });
+
+      // let app state refresh fast before receive subscribe event
+      refreshApp({
+        showError: false,
+        attachRuntimeInfo: false
+      });
     } catch (err) {
       const errMsg = (0, _util2.formatError)(err);
       _Toast.default.error(errMsg);
@@ -357,7 +384,7 @@ function AddComponent(_ref2) {
       errMsg
     };
   };
-  const onNext = payload => {
+  const onNext = async payload => {
     const {
       errMsg
     } = validateInput(_objectSpread(_objectSpread({}, params), {}, {
@@ -367,10 +394,7 @@ function AddComponent(_ref2) {
 
     // the step can complete, install component
     if (activeStep === steps.length - 2) {
-      updateParams({
-        installResultProps: {}
-      });
-      onInstall(payload);
+      await onInstall(payload);
     }
     setActiveStepByIndex(x => x + 1);
   };
@@ -1033,16 +1057,17 @@ function AddComponent(_ref2) {
             e.stopPropagation();
             step.onCancel();
           },
+          disabled: activeStep === steps.length - 2 && loading,
           color: "inherit",
           children: step.cancel || t('common.cancel')
-        }), step.confirm && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
+        }), step.confirm && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           onClick: e => {
             e.stopPropagation();
             step.onConfirm();
           },
           color: "primary",
           "data-cy": "submit-confirm-next",
-          disabled: typeof step.disabled === 'boolean' ? step.disabled : isDisabled(),
+          disabled: loading || (typeof step.disabled === 'boolean' ? step.disabled : isDisabled()),
           variant: "contained",
           autoFocus: true,
           title: step.confirm,
@@ -1054,9 +1079,13 @@ function AddComponent(_ref2) {
             maxWidth: '200px',
             display: 'inline-block'
           },
-          children: [(typeof step.loading === 'boolean' ? step.loading : loading) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-            size: 16
-          }), step.confirm]
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            display: "flex",
+            alignItems: "center",
+            children: [(typeof step.loading === 'boolean' ? step.loading : loading) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 16
+            }), step.confirm]
+          })
         })]
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_step.StepProvider, {

package/lib/blocklet/component/index.js

@@ -328,7 +328,7 @@ function ComponentItem(_ref) {
               marginLeft: 4
             },
             mode: blocklet.mode || ''
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_status.default, {
+          }), status !== 'unknown' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_status.default, {
             style: {
               marginLeft: 4
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.13-beta-0086a35d",
+  "version": "1.16.13-beta-714bec78",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,9 +23,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13-beta-0086a35d",
-    "@abtnode/constant": "1.16.13-beta-0086a35d",
-    "@abtnode/util": "1.16.13-beta-0086a35d",
+    "@abtnode/auth": "1.16.13-beta-714bec78",
+    "@abtnode/constant": "1.16.13-beta-714bec78",
+    "@abtnode/util": "1.16.13-beta-714bec78",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.84",
     "@arcblock/did-connect": "^2.5.54",
@@ -34,10 +34,10 @@
     "@arcblock/react-hooks": "^2.5.54",
     "@arcblock/terminal": "^2.5.54",
     "@arcblock/ux": "^2.5.54",
-    "@blocklet/constant": "1.16.13-beta-0086a35d",
+    "@blocklet/constant": "1.16.13-beta-714bec78",
     "@blocklet/launcher-layout": "2.1.26",
     "@blocklet/list": "^0.12.4",
-    "@blocklet/meta": "1.16.13-beta-0086a35d",
+    "@blocklet/meta": "1.16.13-beta-714bec78",
     "@blocklet/ui-react": "^2.5.54",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -95,5 +95,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "cbf5c99e7cadf9fef4d77673cb45b44ef26436cf"
+  "gitHead": "6f447ce64c37e20b871c4b2cbb81085bd509b84f"
 }