@abtnode/ux 1.8.36 → 1.8.37

package/lib/blocklet/actions.js

@@ -93,9 +93,7 @@ function BlockletActions(_ref) {
           }
           if (action === 'start' && !inService && !skipSetup && !((_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.initialized)) {
             // 启动 blocklet 并跳转到 setup 流程界面时携带 serverUrl 查询参数
-            const {
-              serverUrl
-            } = (0, _util3.getLaunchURL)(blocklet, node.info);
+            const serverUrl = (0, _util3.getServerUrl)(node.info);
             const url = new URL(recommendedUrl);
             url.searchParams.set('serverUrl', serverUrl);
             window.open(url.href);

package/lib/blocklet/agreement-app.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = AgreementApp;
+var _jsxRuntime = require("react/jsx-runtime");
+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; }
+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; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+function AgreementApp(_ref) {
+  let props = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", _objectSpread(_objectSpread({}, props), {}, {
+    style: {
+      width: '100%'
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
+      children: "End User License Agreement for Application"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+      children: "Blocklet Server License Agreement ArcBlock, Inc. version 2020-08-28"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+      children: "BLOCKLET SERVER LICENSE AGREEMENT"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+      children: "\u6682\u65E0"
+    })]
+  }));
+}

package/lib/blocklet/agreement.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Agreement;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _reactRouterDom = require("react-router-dom");
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _serverEula = _interopRequireDefault(require("@blocklet/launcher-layout/lib/wizard/server-eula"));
+var _wizardDesc = _interopRequireDefault(require("@blocklet/launcher-layout/lib/wizard/wizard-desc"));
+var _agreementApp = _interopRequireDefault(require("./agreement-app"));
+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) } })); }
+// TODO: 加载 Blocklet 定义的 Agreement
+function Agreement(_ref) {
+  let {
+    meta,
+    onClickNext,
+    handleDescEle
+  } = _ref;
+  const navigate = (0, _reactRouterDom.useNavigate)();
+  const {
+    t,
+    locale
+  } = (0, _context.useLocaleContext)();
+  const clickNext = onClickNext || (() => {
+    navigate("/launch-blocklet/install".concat(window.location.search));
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "app-content",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "agreement",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "agreement-content",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_wizardDesc.default, {
+            blockletMeta: {
+              data: meta
+            },
+            locale: locale,
+            handleDescEle: handleDescEle
+          })
+        })
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "button-container",
+      "data-cy": "agree-all",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_serverEula.default, {
+        onContinue: clickNext,
+        description: /*#__PURE__*/(0, _jsxRuntime.jsx)(_agreementApp.default, {}),
+        texts: {
+          listenName: t('launchBlocklet.license'),
+          buttonNext: t('launchBlocklet.next')
+        }
+      })
+    })]
+  });
+}
+Agreement.propTypes = {
+  meta: _propTypes.default.object.isRequired,
+  onClickNext: _propTypes.default.func,
+  handleDescEle: _propTypes.default.node
+};
+Agreement.defaultProps = {
+  onClickNext: null,
+  handleDescEle: ''
+};
+const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  width: 100%;\n  height: 100%;\n  flex: 1;\n  .app-content {\n    padding: 2px 24px 24px;\n    ", " {\n      padding-top: 10px;\n    }\n    width: 100%;\n    flex: 1;\n    letter-spacing: normal;\n  }\n  .agreement {\n    position: relative;\n    display: flex;\n    flex-direction: column;\n    width: 100%;\n    height: 100%;\n    border: 1px solid ", ";\n    border-radius: 12px;\n    ", " {\n      margin-top: 24px;\n    }\n    ", " {\n      margin-top: 16px;\n    }\n    .agreement-content {\n      position: absolute;\n      left: 0;\n      top: 0;\n      width: 100%;\n      height: 100%;\n      font-size: 14px;\n      overflow-y: auto;\n      ", " {\n        padding: 0 24px;\n      }\n      ", " {\n        padding: 0 16px;\n      }\n      &:after {\n        display: block;\n        content: '';\n        height: 24px;\n      }\n    }\n  }\n  .button-container {\n    padding-top: 24px;\n    padding-bottom: 34px;\n    ", " {\n      padding-right: 24px;\n      margin-left: auto;\n    }\n    ", " {\n      padding-top: 0;\n      padding-bottom: 16px;\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'), props => props.theme.palette.grey['100'], props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.down('md'));

package/lib/blocklet/avatar.js

@@ -19,15 +19,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-const getDeployedFrom = (blocklet, node) => {
-  let {
-    deployedFrom
-  } = blocklet || {};
-  if (!deployedFrom && blocklet.source === 'registry') {
-    deployedFrom = node.info.blockletRegistry;
-  }
-  return deployedFrom;
-};
 function BlockletAvatar(_ref) {
   var _blocklet$meta;
   let {
@@ -46,8 +37,8 @@ function BlockletAvatar(_ref) {
     variant
   } = rest;
   if (!inService) {
-    const deployedFrom = getDeployedFrom(blocklet, node);
     if (blocklet.source === 'registry' && blocklet.meta.logo) {
+      const deployedFrom = blocklet.deployedFrom || '/';
       logoUrl = (0, _urlJoin.default)(deployedFrom, (0, _util.formatRegistryLogoPath)(blocklet.meta.bundleDid, blocklet.meta.logo));
     } else {
       const prefix = window.env.apiPrefix || '/';