@abtnode/ux 1.16.23-beta-c9c4e08e → 1.16.23-beta-ed83c878

package/lib/blocklet/component/related-components-dialog.js

@@ -10,24 +10,25 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _material = require("@mui/material");
 var _react = require("@iconify/react");
 var _react2 = require("react");
-var _useComponentsByBlockletMetaUrl = _interopRequireDefault(require("../../hooks/use-components-by-blocklet-meta-url"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function parseLogoUrl(component) {
+  var _component$bundleSour, _component$meta, _component$meta2, _component$meta3;
+  return "".concat(((_component$bundleSour = component.bundleSource) === null || _component$bundleSour === void 0 ? void 0 : _component$bundleSour.store) || component.meta.homepage, "/assets/").concat((_component$meta = component.meta) === null || _component$meta === void 0 ? void 0 : _component$meta.did, "/").concat(((_component$meta2 = component.meta) === null || _component$meta2 === void 0 ? void 0 : _component$meta2.logo) || 'logo.png', "?v=").concat((_component$meta3 = component.meta) === null || _component$meta3 === void 0 ? void 0 : _component$meta3.version);
+}
 function RelatedComponentsDialog(_ref) {
   let {
     installRelated,
     meta,
     show,
-    onClose: _onClose
+    onClose: _onClose,
+    components,
+    loading
   } = _ref;
   const {
     t
   } = (0, _context.useLocaleContext)();
   const isMobile = (0, _material.useMediaQuery)(theme => theme.breakpoints.down('md'));
-  const {
-    components,
-    loading
-  } = (0, _useComponentsByBlockletMetaUrl.default)(meta);
   const requiredList = (0, _react2.useMemo)(() => {
     if (!meta || !meta.components) {
       return {};
@@ -126,7 +127,7 @@ function RelatedComponentsDialog(_ref) {
               minWidth: size,
               minHeight: size
             },
-            src: "".concat(component.meta.homepage, "/assets/").concat(meta.did, "/logo.png?v=").concat(meta.version),
+            src: parseLogoUrl(component),
             alt: component.meta.title
           }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
             sx: {
@@ -149,7 +150,8 @@ function RelatedComponentsDialog(_ref) {
                 }
               },
               onClick: () => {
-                window.open("".concat(component.meta.homepage, "/blocklets/").concat(component.meta.did), '_blank');
+                var _component$bundleSour2;
+                window.open("".concat(((_component$bundleSour2 = component.bundleSource) === null || _component$bundleSour2 === void 0 ? void 0 : _component$bundleSour2.store) || component.meta.homepage, "/blocklets/").concat(component.meta.did), '_blank');
               },
               children: [component.meta.title, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
                 sx: {
@@ -187,7 +189,9 @@ RelatedComponentsDialog.propTypes = {
   meta: _propTypes.default.object,
   show: _propTypes.default.bool,
   onClose: _propTypes.default.func.isRequired,
-  installRelated: _propTypes.default.func
+  installRelated: _propTypes.default.func,
+  components: _propTypes.default.array.isRequired,
+  loading: _propTypes.default.bool.isRequired
 };
 RelatedComponentsDialog.defaultProps = {
   meta: null,

package/lib/blocklet/publish/create-release.js

@@ -36,16 +36,17 @@ var _emptySpinner = _interopRequireDefault(require("../../empty-spinner"));
 var _clickToCopy = _interopRequireDefault(require("../../click-to-copy"));
 var _util = require("../../util");
 var _resource = _interopRequireDefault(require("./resource"));
+var _selectComponents = _interopRequireDefault(require("./select-components"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _window$env, _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const allowedFileTypes = ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
@@ -119,9 +120,20 @@ const addComponentTabs = _ref => {
     value: key
   });
 };
-const pickParams = release => {
-  const params = (0, _pick.default)(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'note']);
+const pickParams = (release, app) => {
+  const params = (0, _pick.default)(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'blockletComponents', 'note']);
   params.blockletScreenshots || (params.blockletScreenshots = []);
+  if (!params.blockletComponents) {
+    params.blockletComponents = (app.children || []).map(x => ({
+      did: x.meta.did,
+      included: true,
+      required: true
+    }));
+  } else {
+    params.blockletComponents = params.blockletComponents.map(x => _objectSpread(_objectSpread({}, x), {}, {
+      included: true
+    }));
+  }
   return params;
 };
 function CreateRelease(_ref2) {
@@ -190,7 +202,7 @@ function CreateRelease(_ref2) {
       } else if (_semver.default.valid(data.blockletVersion)) {
         data.blockletVersion = _semver.default.inc(data.blockletVersion, 'patch');
       }
-      setParams(pickParams(data));
+      setParams(pickParams(data, blocklet));
       setProjectType(data.type);
     }).catch(err => {
       setLoading(false);
@@ -206,7 +218,7 @@ function CreateRelease(_ref2) {
       }
     }).then(res => {
       setLoading(false);
-      setParams(pickParams(res === null || res === void 0 ? void 0 : res.release));
+      setParams(pickParams(res === null || res === void 0 ? void 0 : res.release, blocklet));
       setRelease(res === null || res === void 0 ? void 0 : res.release);
     }).catch(err => {
       setLoading(false);
@@ -254,6 +266,11 @@ function CreateRelease(_ref2) {
     _params.blockletDescription = (_params.blockletDescription || '').trim();
     _params.blockletIntroduction = (_params.blockletIntroduction || '').trim();
     _params.note = (_params.note || '').trim();
+    if (projectType === 'pack') {
+      _params.blockletComponents = (_params.blockletComponents || []).filter(x => x.included).map(x => (0, _pick.default)(x, ['did', 'required'])).map(JSON.stringify);
+    } else {
+      delete _params.blockletComponents;
+    }
     setCreateLoading(status);
     setLoading(true);
     api.createRelease({
@@ -778,6 +795,31 @@ function CreateRelease(_ref2) {
             children: resourceContent
           })]
         })]
+      }), projectType === 'pack' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+        display: "flex",
+        mt: 3,
+        className: "section full-width",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          className: "left",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+            variant: "h3",
+            children: t('common.components')
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          sx: {
+            flex: 1
+          },
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_selectComponents.default, {
+            disabled: loading || readOnly,
+            app: blocklet,
+            value: params.blockletComponents,
+            onChange: data => {
+              setParams({
+                blockletComponents: data
+              });
+            }
+          })
+        })]
       })]
     })]
   }));

package/lib/blocklet/publish/select-components.js

@@ -0,0 +1,175 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = SelectComponents;
+var _react = require("react");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _pick = _interopRequireDefault(require("lodash/pick"));
+var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Datatable = _interopRequireDefault(require("@arcblock/ux/lib/Datatable"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _bundleAvatar = _interopRequireDefault(require("../bundle-avatar"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _templateObject;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function SelectComponents(_ref) {
+  let {
+    value,
+    app,
+    onChange,
+    disabled
+  } = _ref;
+  const {
+    t,
+    locale
+  } = (0, _context.useLocaleContext)();
+  const components = app.children || [];
+  const list = (0, _react.useMemo)(() => app.children.map(component => {
+    const exist = value.find(item => item.did === component.meta.did);
+    return exist || {
+      did: component.meta.did
+    };
+  }), [app, value]);
+  const map = list.reduce((acc, curr) => {
+    acc[curr.did] = (0, _pick.default)(curr, ['required', 'included']);
+    return acc;
+  }, {});
+  const toggleIncluded = did => {
+    const newValue = list.map(item => {
+      if (item.did === did) {
+        const included = !item.included;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          included,
+          required: included
+        });
+      }
+      return item;
+    });
+    onChange(newValue);
+  };
+  const toggleRequired = did => {
+    const newValue = list.map(item => {
+      if (item.did === did) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          required: !item.required
+        });
+      }
+      return item;
+    });
+    onChange(newValue);
+  };
+  const columns = [{
+    label: t('common.name'),
+    name: 'meta.title',
+    width: 200,
+    options: {
+      // eslint-disable-next-line react/no-unstable-nested-components
+      customBodyRenderLite: rawIndex => {
+        var _map$component$meta$d;
+        const component = components[rawIndex];
+        const included = (_map$component$meta$d = map[component.meta.did]) === null || _map$component$meta$d === void 0 ? void 0 : _map$component$meta$d.included;
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          display: "flex",
+          alignItems: "center",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_bundleAvatar.default, {
+            size: 24,
+            blocklet: component,
+            ancestors: [app]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            ml: "4px",
+            className: (0, _classnames.default)('text', {
+              excluded: !included
+            }),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              children: component.meta.title
+            })
+          })]
+        });
+      }
+    }
+  }, {
+    label: t('blocklet.publish.componentIncluded'),
+    width: 100,
+    options: {
+      // eslint-disable-next-line react/no-unstable-nested-components
+      customBodyRenderLite: rawIndex => {
+        var _map$component$meta$d2;
+        const component = components[rawIndex];
+        const included = (_map$component$meta$d2 = map[component.meta.did]) === null || _map$component$meta$d2 === void 0 ? void 0 : _map$component$meta$d2.included;
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+          size: "small",
+          checked: included,
+          onClick: () => toggleIncluded(component.meta.did),
+          disabled: disabled
+        });
+      }
+    }
+  }, {
+    label: t('blocklet.publish.componentForceRequired'),
+    width: 100,
+    options: {
+      // eslint-disable-next-line react/no-unstable-nested-components
+      customBodyRenderLite: rawIndex => {
+        var _map$component$meta$d3, _map$component$meta$d4;
+        const component = components[rawIndex];
+        const included = (_map$component$meta$d3 = map[component.meta.did]) === null || _map$component$meta$d3 === void 0 ? void 0 : _map$component$meta$d3.included;
+        const required = (_map$component$meta$d4 = map[component.meta.did]) === null || _map$component$meta$d4 === void 0 ? void 0 : _map$component$meta$d4.required;
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+          disabled: disabled || !included,
+          size: "small",
+          checked: required && included,
+          onClick: () => toggleRequired(component.meta.did)
+        });
+      }
+    }
+  }];
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Root, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Datatable.default, {
+      className: "main-table",
+      verticalKeyWidth: 100,
+      locale: locale,
+      data: components,
+      columns: columns,
+      options: {
+        sort: false,
+        download: false,
+        filter: false,
+        print: false,
+        search: false,
+        rowsPerPage: 100
+      }
+    })
+  });
+}
+SelectComponents.propTypes = {
+  app: _propTypes.default.object.isRequired,
+  value: _propTypes.default.arrayOf(_propTypes.default.shape({
+    did: _propTypes.default.string.isRequired,
+    required: _propTypes.default.bool,
+    included: _propTypes.default.bool
+  })),
+  onChange: _propTypes.default.func,
+  disabled: _propTypes.default.bool
+};
+SelectComponents.defaultProps = {
+  value: [],
+  onChange: () => {},
+  disabled: false
+};
+const Root = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .main-table {\n    .text.excluded {\n      color: #999;\n    }\n    width: 400px;\n    ", " {\n      width: 100%;\n    }\n    > div:first-child {\n      display: none;\n    }\n    .MuiTableCell-head {\n      padding-top: 0;\n      padding-bottom: 0;\n    }\n    .MuiTableCell-body {\n      padding-top: 6px;\n      padding-bottom: 6px;\n    }\n    .datatable-footer {\n      display: none;\n    }\n  }\n"])), _ref2 => {
+  let {
+    theme
+  } = _ref2;
+  return theme.breakpoints.down('md');
+});

package/lib/hooks/blocklet.js

@@ -13,15 +13,15 @@ var _util = require("../util");
 var _util2 = require("../blocklet/util");
 var _urlEvaluation = require("./url-evaluation");
 var _parseProgress = _interopRequireDefault(require("../util/parse-progress"));
+var _storageTtl = require("../util/storage-ttl");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const parseStatusKey = id => "blocklet-status-".concat(id);
 const excludeDownloadingStatus = {
-  waiting: 1,
-  installing: 1,
   installed: 1,
   starting: 1,
   running: 1,
@@ -30,6 +30,28 @@ const excludeDownloadingStatus = {
   restarting: 1,
   deleting: 1
 };
+function rollbackSessionBlockletStatus(blocklet) {
+  if (blocklet) {
+    const children = blocklet.children || [];
+    let isExtracting = false;
+    children.forEach(item => {
+      if (item.status === 'downloading') {
+        var _item$meta;
+        const status = (0, _storageTtl.getStorageWithTTL)(parseStatusKey((_item$meta = item.meta) === null || _item$meta === void 0 ? void 0 : _item$meta.bundleDid));
+        item.status = status || item.status;
+        if (status === 'extracting') {
+          isExtracting = true;
+        }
+      } else if (excludeDownloadingStatus[blocklet.status]) {
+        var _item$meta2;
+        (0, _storageTtl.removeStorageTTL)(parseStatusKey((_item$meta2 = item.meta) === null || _item$meta2 === void 0 ? void 0 : _item$meta2.bundleDid));
+      }
+    });
+    if (isExtracting) {
+      blocklet.status = 'extracting';
+    }
+  }
+}
 
 // eslint-disable-next-line import/prefer-default-export
 function useBlocklet(_ref) {
@@ -79,6 +101,7 @@ function useBlocklet(_ref) {
       await (0, _util2.fixBlocklet)(data, {
         getIP
       });
+      rollbackSessionBlockletStatus(data);
       setBlocklet(data);
     } catch (err) {
       _Toast.default.error(err.message);
@@ -134,13 +157,7 @@ function useBlocklet(_ref) {
             fixRuntime: 'merge-old',
             oldBlocklet
           });
-          if (oldBlocklet && excludeDownloadingStatus[data.status]) {
-            var _oldBlocklet$children;
-            oldBlocklet === null || oldBlocklet === void 0 ? void 0 : (_oldBlocklet$children = oldBlocklet.children) === null || _oldBlocklet$children === void 0 ? void 0 : _oldBlocklet$children.forEach(item => {
-              delete item.progress;
-            });
-            delete oldBlocklet.progress;
-          }
+          rollbackSessionBlockletStatus(data);
           return data;
         });
         setLoading(false);
@@ -190,20 +207,14 @@ function useBlocklet(_ref) {
         children.forEach(x => {
           var _x$meta, _data$component;
           if (((_x$meta = x.meta) === null || _x$meta === void 0 ? void 0 : _x$meta.bundleDid) === ((_data$component = data.component) === null || _data$component === void 0 ? void 0 : _data$component.did)) {
+            var _x$meta2;
+            (0, _storageTtl.setStorageWithTTL)(parseStatusKey((_x$meta2 = x.meta) === null || _x$meta2 === void 0 ? void 0 : _x$meta2.bundleDid), data.status, 1000 * 60 * 5);
             x.status = data.status;
           }
         });
-
-        // 判断当前下载的 children 是否都处于 extracting
-        const extracting = children.every(x => {
-          if (excludeDownloadingStatus[x.status]) {
-            return true;
-          }
-          return x.status === 'extracting';
-        });
         return _objectSpread(_objectSpread({}, oldBlocklet), {}, {
           children,
-          status: extracting ? 'extracting' : oldBlocklet.status
+          status: data.status
         });
       });
     }
@@ -215,15 +226,17 @@ function useBlocklet(_ref) {
 
         // keep largest files as progress
         const children = oldBlocklet.children || [];
-        let progress = 100;
+        let progress = oldBlocklet.progress || 0;
         children.forEach(item => {
-          var _item$meta, _data$component2;
-          if (((_item$meta = item.meta) === null || _item$meta === void 0 ? void 0 : _item$meta.bundleDid) === ((_data$component2 = data.component) === null || _data$component2 === void 0 ? void 0 : _data$component2.did)) {
+          var _item$meta3, _data$component2;
+          if (((_item$meta3 = item.meta) === null || _item$meta3 === void 0 ? void 0 : _item$meta3.bundleDid) === ((_data$component2 = data.component) === null || _data$component2 === void 0 ? void 0 : _data$component2.did)) {
+            var _item$meta4;
             item.progress = (0, _parseProgress.default)(data.current, data.total);
             item.status = data.status;
-            if (item.progress < progress) {
+            if (item.progress > progress) {
               progress = item.progress;
             }
+            (0, _storageTtl.removeStorageTTL)(parseStatusKey((_item$meta4 = item.meta) === null || _item$meta4 === void 0 ? void 0 : _item$meta4.bundleDid));
           }
         });
         return _objectSpread(_objectSpread({}, oldBlocklet), {}, {
@@ -274,8 +287,8 @@ function useBlocklet(_ref) {
         newBlocklet.status = (0, _constant.fromBlockletStatus)(data.status);
         (newBlocklet.children || []).forEach(x => {
           const y = data.children.find(z => {
-            var _z$meta, _x$meta2;
-            return ((_z$meta = z.meta) === null || _z$meta === void 0 ? void 0 : _z$meta.did) === ((_x$meta2 = x.meta) === null || _x$meta2 === void 0 ? void 0 : _x$meta2.did);
+            var _z$meta, _x$meta3;
+            return ((_z$meta = z.meta) === null || _z$meta === void 0 ? void 0 : _z$meta.did) === ((_x$meta3 = x.meta) === null || _x$meta3 === void 0 ? void 0 : _x$meta3.did);
           });
           if (y) {
             x.status = (0, _constant.fromBlockletStatus)(y.status);

package/lib/hooks/use-components-by-blocklet-meta-url.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _reactRouterDom = require("react-router-dom");
 var _node = require("../contexts/node");
 function parseBlockletMetaUrl(meta) {
-  return meta && meta.homepage && meta.did ? "".concat(meta === null || meta === void 0 ? void 0 : meta.homepage, "/api/blocklets/").concat(meta === null || meta === void 0 ? void 0 : meta.did, "/blocklet.json") : '';
+  return meta && (meta.registryUrl || meta.homepage) && meta.did ? "".concat(meta.registryUrl || meta.homepage, "/api/blocklets/").concat(meta === null || meta === void 0 ? void 0 : meta.did, "/blocklet.json") : '';
 }
 function useComponentsByBlockletMetaUrl(meta) {
   const {

package/lib/locales/ar.js

@@ -52,6 +52,24 @@ var _default = exports.default = {
       scan: 'قم بتوصيل محفظة DID الخاصة بك لتوفير جواز السفر',
       confirm: 'أكد على محفظة الهوية الرقمية الخاصة بك',
       success: 'تم اتصالك بنجاح'
+    },
+    switchDid: {
+      title: 'تبديل محفظة DID',
+      scan: 'مسح رمز الاستجابة السريعة التالي لتبديل الحساب',
+      confirm: 'قم بتأكيد التبديل في محفظة ديد الخاصة بك',
+      success: 'تم التحويل بنجاح'
+    },
+    switchSpecifiedDid: {
+      title: 'تبديل محفظة DID',
+      scan: 'تحتاج إلى تبديل DID إلى {did} لإكمال الإجراءات التالية',
+      confirm: 'قم بتأكيد التبديل في محفظة ديد الخاصة بك',
+      success: 'تم التبديل بنجاح'
+    },
+    connect: {
+      title: 'قم بتوصيل محفظة DID',
+      scan: 'قم بتوصيل محفظة DID الخاصة بك لتوفير جواز السفر',
+      confirm: 'قم بتأكيد على محفظتك الرقمية',
+      success: 'لقد تم توصيلك بنجاح'
     }
   },
   acceptServer: {
@@ -585,7 +603,8 @@ var _default = exports.default = {
       setting: 'الإعدادات',
       components: 'تبعيات المكوّن {name}',
       noDependencies: 'لا يوجد لدى {name} أي تبعيات',
-      relatedComponents: 'المكونات ذات الصلة'
+      relatedComponents: 'المكونات ذات الصلة',
+      required: 'مطلوب'
     },
     router: {
       urlPath: 'مسار عنوان URL',
@@ -668,7 +687,10 @@ var _default = exports.default = {
         noNote: 'ملاحظة الإصدار مطلوبة'
       },
       packTip: 'سيتم تضمين مكونات وتكوين التطبيق تلقائيًا في البلوكليت.',
-      resourceChangedWarning: 'لقد قمت بتعديل المورد، يرجى حفظه في الوقت المناسب'
+      resourceChangedWarning: 'لقد قمت بتعديل المورد، يرجى حفظه في الوقت المناسب',
+      installResourceTip: 'يرجى إضافة المكون في التطبيق، عنوان URL للمكون:',
+      installResourceTip2: 'إذا كنت ترغب في رؤية المزيد من النصائح، يرجى زيارة',
+      installResourceHelp: 'وثيقة المساعدة'
     }
   },
   dashboard: {

package/lib/locales/de.js

@@ -52,6 +52,24 @@ var _default = exports.default = {
       scan: 'Verbinden Sie Ihre DID-Brieftasche, um Ihren Reisepass bereitzustellen',
       confirm: 'Bestätigen Sie in Ihrer DID-Brieftasche',
       success: 'Du bist erfolgreich verbunden'
+    },
+    switchDid: {
+      title: 'Schalte DID Wallet um',
+      scan: 'Scannen Sie den folgenden QR-Code, um das Konto zu wechseln',
+      confirm: 'Bestätigen Sie den Wechsel in Ihrem DID-Wallet',
+      success: 'Erfolgreich umgeschaltet'
+    },
+    switchSpecifiedDid: {
+      title: 'Wechsle auf DID Wallet',
+      scan: 'Du musst DID auf {did} umschalten, um die folgenden Aktionen abzuschließen',
+      confirm: 'Bestätige den Wechsel in deiner DID-Brieftasche',
+      success: 'Erfolgreich gewechselt'
+    },
+    connect: {
+      title: 'Verbinden Sie das DID-Wallet',
+      scan: 'Verbinden Sie Ihre DID Wallet, um einen Pass zu hinterlegen',
+      confirm: 'Bestätige in deinem DID Wallet',
+      success: 'Du bist erfolgreich verbunden'
     }
   },
   acceptServer: {
@@ -585,7 +603,8 @@ var _default = exports.default = {
       setting: 'Einstellungen',
       components: 'Abhängigkeiten von Komponente {name}',
       noDependencies: '{name} hat keine Abhängigkeiten',
-      relatedComponents: 'Verbundene Komponenten'
+      relatedComponents: 'Verbundene Komponenten',
+      required: 'Erforderlich'
     },
     router: {
       urlPath: 'URL Pfad',
@@ -668,7 +687,10 @@ var _default = exports.default = {
         noNote: 'Versionshinweis wird benötigt'
       },
       packTip: 'Komponenten und Anwendungskonfiguration werden automatisch in das Blocklet einbezogen.',
-      resourceChangedWarning: 'Sie haben die Ressource geändert, bitte rechtzeitig speichern'
+      resourceChangedWarning: 'Sie haben die Ressource geändert, bitte rechtzeitig speichern',
+      installResourceTip: 'Bitte fügen Sie das Bauteil in einer Anwendung hinzu, Bauteil-URL:',
+      installResourceTip2: 'Wenn du mehr Tipps sehen möchtest, besuche bitte',
+      installResourceHelp: 'Hilfe-Dokument'
     }
   },
   dashboard: {

package/lib/locales/en.js

@@ -47,7 +47,19 @@ var _default = exports.default = {
   login: {
     loginTo: 'Connect to',
     description: 'Only server owner and approved members can access the dashboard',
-    dialog: {
+    switchDid: {
+      title: 'Switch DID Wallet',
+      scan: 'Scan following qrcode to switch account',
+      confirm: 'Confirm switch in your DID Wallet',
+      success: 'Successfully switched'
+    },
+    switchSpecifiedDid: {
+      title: 'Switch DID Wallet',
+      scan: 'You need switch DID to {did} to complete the following actions',
+      confirm: 'Confirm switch in your DID Wallet',
+      success: 'Successfully switched'
+    },
+    connect: {
       title: 'Connect DID Wallet',
       scan: 'Connect your DID Wallet to provide passport',
       confirm: 'Confirm on your DID Wallet',
@@ -656,8 +668,9 @@ var _default = exports.default = {
       resourceChangedWarning: 'You have modified the resource, please save it in time',
       installResourceTip: 'Please add the component in an application, component URL:',
       installResourceTip2: 'If you want to see more tips, please visit',
-      // translate to en
       installResourceHelp: 'Help Document',
+      componentIncluded: 'Included',
+      componentForceRequired: 'Forced Required',
       connect: {
         title: 'Create Blocklet DID',
         scan: 'Scan the QR code below to generate Blocklet DID',

package/lib/locales/es.js

@@ -52,6 +52,24 @@ var _default = exports.default = {
       scan: 'Conecta tu billetera DID para proporcionar el pasaporte',
       confirm: 'Confirma en tu billetera DID',
       success: 'Estás conectado con éxito'
+    },
+    switchDid: {
+      title: 'Cambiar billetera DID',
+      scan: 'Escanea el siguiente código QR para cambiar de cuenta',
+      confirm: 'Confirma el cambio en tu billetera DID',
+      success: 'Cambiado exitosamente'
+    },
+    switchSpecifiedDid: {
+      title: 'Cambiar billetera DID',
+      scan: 'Necesitas cambiar el DID a {did} para completar las siguientes acciones',
+      confirm: 'Confirma el cambio en tu billetera de DID',
+      success: 'Cambiado con éxito'
+    },
+    connect: {
+      title: 'Conectar billetera DID',
+      scan: 'Conecta tu billetera DID para proporcionar pasaporte',
+      confirm: 'Confirma en tu billetera DID',
+      success: 'Estás conectado exitosamente'
     }
   },
   acceptServer: {
@@ -585,7 +603,8 @@ var _default = exports.default = {
       setting: 'Ajustes',
       components: 'Dependencias del componente {name}',
       noDependencies: '{name} no tiene dependencias',
-      relatedComponents: 'Componentes relacionados'
+      relatedComponents: 'Componentes relacionados',
+      required: 'Requerido'
     },
     router: {
       urlPath: 'URL Path',
@@ -668,7 +687,10 @@ var _default = exports.default = {
         noNote: 'Se requiere la Nota de Lanzamiento'
       },
       packTip: 'Los componentes y la configuración de la aplicación se incluirán automáticamente en el blocklet',
-      resourceChangedWarning: 'Ha modificado el recurso, por favor guárdelo a tiempo'
+      resourceChangedWarning: 'Ha modificado el recurso, por favor guárdelo a tiempo',
+      installResourceTip: 'Por favor agrega el componente en una aplicación, URL del componente:',
+      installResourceTip2: 'Si desea ver más consejos, visite {name}',
+      installResourceHelp: 'Ayuda Documento'
     }
   },
   dashboard: {