@abtnode/ux 1.16.18-beta-7aa6be5a → 1.16.18-beta-bb4ebacc

package/lib/blocklet/component/select-store.js

@@ -15,7 +15,7 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _ArrowDropDown = _interopRequireDefault(require("@mui/icons-material/ArrowDropDown"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
-var _constants = require("../../util/constants");
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
 var _node = require("../../contexts/node");
 var _blocklet = require("../../contexts/blocklet");
 var _add = _interopRequireDefault(require("../../store/add"));
@@ -25,12 +25,19 @@ 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(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) { 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(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+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); }
 function SelectStore(_ref) {
   let {
     onChange: _onChange,
     loading,
     children,
-    extra
+    extra,
+    stores: customStores,
+    storageKey
   } = _ref;
   const {
     t
@@ -44,16 +51,20 @@ function SelectStore(_ref) {
   } = (0, _blocklet.useBlockletContext)();
   const [open, setOpen] = (0, _react.useState)(false);
   const storeSelectRef = (0, _react.useRef)(null);
-  const storageKey = inService ? _constants.STORAGE_KEY_STORE_BLOCKLET : _constants.STORAGE_KEY_STORE_SERVER;
-  const [storeUrl, setStoreUrl] = (0, _useLocalStorage.default)(storageKey);
+  const [storeUrlMem, setStoreUrlMem] = (0, _react.useState)();
+  const [storeUrlLs, setStoreUrlLs] = (0, _useLocalStorage.default)(storageKey || 'tmp');
+  const [storeUrl, setStoreUrl] = storageKey ? [storeUrlLs, setStoreUrlLs] : [storeUrlMem, setStoreUrlMem];
   const {
-    storeList,
+    storeList: appStoreList,
     teamDid
   } = (0, _util.getStoreList)({
     fromBlocklet: inService,
     blocklet,
     nodeInfo
   });
+  const storeList = (0, _uniqBy.default)([...customStores.map(x => _objectSpread(_objectSpread({}, x), {}, {
+    protected: true
+  })), ...appStoreList], 'url');
   const currentRegistry = storeUrl && storeList.find(x => storeUrl === x.url) || storeList[0];
   const isServerlessMode = nodeInfo.mode === _constant.NODE_MODES.SERVERLESS;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -143,11 +154,18 @@ SelectStore.propTypes = {
   onChange: _propTypes.default.func,
   loading: _propTypes.default.bool,
   children: _propTypes.default.any.isRequired,
-  extra: _propTypes.default.node
+  extra: _propTypes.default.node,
+  storageKey: _propTypes.default.string,
+  stores: _propTypes.default.arrayOf(_propTypes.default.shape({
+    name: _propTypes.default.string.isRequired,
+    url: _propTypes.default.string.isRequired
+  }))
 };
 SelectStore.defaultProps = {
   onChange: () => {},
   loading: false,
-  extra: ''
+  extra: '',
+  stores: [],
+  storageKey: ''
 };
 const SelectStoreTitle = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  margin-bottom: 16px;\n\n  span {\n    font-size: 16px;\n    color: ", ";\n    // font-weight: bold;\n  }\n"])), props => props.theme.palette.common.black);

package/lib/blocklet/component/store-blocklet-list.js

@@ -21,7 +21,7 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util2 = require("../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion"];
+const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType"];
 /* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable react/jsx-wrap-multilines */
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -153,25 +153,36 @@ function BlockletList(_ref3) {
       storeUrl,
       handleBlockletRender,
       extraFilter,
-      serverVersion
+      serverVersion,
+      resourceType
     } = _ref3,
     rest = _objectWithoutProperties(_ref3, _excluded);
   const {
     locale
   } = (0, _context.useLocaleContext)();
+  const [initialized, setInitialized] = (0, _react.useState)(false);
   const [filters, setFilters] = (0, _react.useState)({});
   const handleChange = changeData => {
     setFilters(changeData);
   };
   const endpoint = storeUrl;
   (0, _react.useEffect)(() => {
-    setFilters({});
-  }, [endpoint]);
+    setFilters({
+      resourceType
+    });
+  }, [endpoint, resourceType]);
+  (0, _react.useEffect)(() => {
+    setInitialized(true);
+    setFilters({
+      resourceType
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
     FallbackComponent: _ErrorBoundary.ErrorFallback,
     resetKeys: [endpoint],
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, rest), {}, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_list.default, {
+      children: initialized && /*#__PURE__*/(0, _jsxRuntime.jsx)(_list.default, {
         blockletRender: blockletRenderProps => {
           const defaultProps = _objectSpread(_objectSpread({}, blockletRenderProps), {}, {
             handleButtonClick,
@@ -188,7 +199,8 @@ function BlockletList(_ref3) {
         onSearchSelect: handleSearchSelect,
         filters: filters,
         extraFilter: extraFilter,
-        serverVersion: serverVersion
+        serverVersion: serverVersion,
+        fetchCategoryDelay: 500
       })
     }))
   });
@@ -199,13 +211,15 @@ BlockletList.propTypes = {
   handleSearchSelect: _propTypes.default.func,
   handleBlockletRender: _propTypes.default.func,
   extraFilter: _propTypes.default.func,
-  serverVersion: _propTypes.default.string
+  serverVersion: _propTypes.default.string,
+  resourceType: _propTypes.default.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
   handleSearchSelect: null,
   handleBlockletRender: null,
   extraFilter: undefined,
-  serverVersion: ''
+  serverVersion: '',
+  resourceType: ''
 };
 const StyledBlocklet = (0, _styled.default)(_Blocklet.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ms-highlight {\n    color: ", ";\n  }\n"])), props => props.theme.palette.primary.main);

package/lib/blocklet/configuration.js

@@ -9,15 +9,12 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Switch = _interopRequireDefault(require("@mui/material/Switch"));
 var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Loop = _interopRequireDefault(require("@mui/icons-material/Loop"));
-var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _constant = require("@abtnode/constant");
 var _constant2 = require("@blocklet/constant");
 var _util = require("@blocklet/meta/lib/util");
@@ -32,10 +29,13 @@ var _clearCache = _interopRequireDefault(require("../clear-cache"));
 var _appSk = _interopRequireDefault(require("./preferences/app-sk"));
 var _transferOwner = _interopRequireDefault(require("./transfer-owner"));
 var _useAppLogo = _interopRequireDefault(require("../hooks/use-app-logo"));
+var _logoUploader = _interopRequireDefault(require("./logo-uploader"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 const _excluded = ["blocklet", "onUpdate", "hasPermission"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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; }
@@ -44,18 +44,10 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 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); }
 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; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const languages = Object.keys(_constant2.SUPPORTED_LANGUAGES).map(x => ({
   code: x,
   name: _constant2.SUPPORTED_LANGUAGES[x].nativeName
 }));
-
-// eslint-disable-next-line import/no-unresolved
-const UploaderComponent = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('@blocklet/uploader/react'))).then(res => ({
-  default: res.Uploader
-})));
-const uploadPrefix = '/blocklet/logo/upload';
 function BlockletEnvironment(_ref) {
   var _blocklet$settings;
   let {
@@ -82,7 +74,6 @@ function BlockletEnvironment(_ref) {
   const whoCanAccess = (0, _util.getWhoCanAccess)(blocklet);
   const publicToStore = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.publicToStore;
   const disabled = loading || !hasPermission;
-  const uploaderLogoRef = (0, _react.useRef)(null);
   const {
     logoUrl,
     rectLogoUrl,
@@ -90,20 +81,6 @@ function BlockletEnvironment(_ref) {
   } = (0, _useAppLogo.default)({
     blocklet
   });
-  const [apiPathProps, setApiPathProps] = (0, _react.useState)();
-  const uploadLogoPrefix = (0, _urlJoin.default)(prefix, uploadPrefix, 'square', blocklet.meta.did);
-  const uploadLogoRectPrefix = (0, _urlJoin.default)(prefix, uploadPrefix, 'rect', blocklet.meta.did);
-  const uploadLogoFaviconPrefix = (0, _urlJoin.default)(prefix, uploadPrefix, 'favicon', blocklet.meta.did);
-  const openUploader = uploaderPrefix => {
-    if (!hasPermission) {
-      return;
-    }
-    setApiPathProps({
-      uploader: uploaderPrefix,
-      disableMediaKitPrefix: true
-    });
-    uploaderLogoRef.current.open();
-  };
   const {
     did
   } = blocklet.meta;
@@ -289,11 +266,6 @@ function BlockletEnvironment(_ref) {
       setLoading(false);
     }
   };
-  const uploaderStyle = {
-    '&::after': {
-      content: "\"".concat(t('common.switch'), "\"")
-    }
-  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, _objectSpread(_objectSpread({}, rest), {}, {
     children: [configurableEnvs.map(item => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       className: "config-form",
@@ -325,19 +297,15 @@ function BlockletEnvironment(_ref) {
         width: 'auto'
       },
       children: t('blocklet.config.logoSquare')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      className: (0, _classnames.default)('uploader-wrapper', hasPermission && 'enabled'),
-      sx: uploaderStyle,
-      onClick: () => openUploader(uploadLogoPrefix),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-        sx: {
-          height: 80,
-          width: 80
-        },
-        variant: "square",
-        alt: "Blocklet Logo",
-        src: logoUrl
-      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, {
+      did: blocklet.meta.did,
+      height: 80,
+      width: 80,
+      type: "square",
+      prefix: prefix,
+      url: logoUrl,
+      enabled: hasPermission,
+      headers: getSessionInHeader
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-label",
       fontSize: 14,
@@ -347,17 +315,14 @@ function BlockletEnvironment(_ref) {
       mb: 1.5,
       className: "config-desc",
       children: t('blocklet.config.logoRectDesc')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      className: (0, _classnames.default)('uploader-wrapper', hasPermission && 'enabled'),
-      sx: uploaderStyle,
-      onClick: () => openUploader(uploadLogoRectPrefix),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-        alt: "Blocklet Rect Logo",
-        src: rectLogoUrl,
-        style: {
-          height: '80px'
-        }
-      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, {
+      did: blocklet.meta.did,
+      height: 80,
+      type: "rect",
+      prefix: prefix,
+      url: rectLogoUrl,
+      enabled: hasPermission,
+      headers: getSessionInHeader
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-label",
       fontSize: 14,
@@ -367,41 +332,16 @@ function BlockletEnvironment(_ref) {
       mb: 1.5,
       className: "config-desc",
       children: t('blocklet.config.logoFaviconDesc')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, {
+      did: blocklet.meta.did,
+      height: 25,
+      width: 25,
+      type: "favicon",
+      prefix: prefix,
+      url: faviconUrl,
+      enabled: hasPermission,
+      headers: getSessionInHeader
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      sx: {
-        display: 'inline-flex',
-        cursor: hasPermission ? 'pointer' : 'default'
-      },
-      onClick: () => openUploader(uploadLogoFaviconPrefix),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-        variant: "square",
-        sx: {
-          width: 20,
-          height: 20
-        },
-        alt: "Blocklet Favicon Logo",
-        src: faviconUrl
-      })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(UploaderComponent, {
-      id: "\u200Buploader-logo",
-      ref: uploaderLogoRef,
-      popup: true,
-      onUploadFinish: () => {
-        uploaderLogoRef.current.close();
-      },
-      plugins: [],
-      apiPathProps: apiPathProps,
-      coreProps: {
-        restrictions: {
-          allowedFileTypes: ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'],
-          maxFileSize: 1024 * 1024 * 10,
-          maxNumberOfFiles: 1
-        }
-      },
-      tusProps: {
-        headers: getSessionInHeader
-      }
-    }, "uploader-logo"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-form",
       children: whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-item",
@@ -599,4 +539,4 @@ BlockletEnvironment.defaultProps = {
   onUpdate: () => {},
   hasPermission: false
 };
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding-top: 24px;\n  .config-form {\n    flex-grow: 1;\n    overflow-y: auto;\n    ", " {\n      width: 100%;\n      flex-shrink: 0;\n      padding: 0 24px;\n      transform: translate(0, 0);\n    }\n  }\n\n  .config-item {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 16px 0;\n  }\n\n  .config-label {\n    font-weight: bold;\n  }\n\n  .config-desc {\n    font-weight: normal;\n    font-size: 12px;\n    color: #666;\n  }\n\n  .form-item {\n    margin-top: 0;\n  }\n\n  .uploader-wrapper {\n    display: inline-flex;\n    position: relative;\n    font-size: 0px;\n    &.enabled {\n      cursor: pointer;\n    }\n    &::after {\n      display: none;\n    }\n    &.enabled::after {\n      display: block;\n      opacity: 0;\n      position: absolute;\n      bottom: 0;\n      background: rgba(0, 0, 0, 0.2);\n      left: 0;\n      right: 0;\n      height: 2.2em;\n      color: white;\n      text-align: center;\n      font-size: 12px;\n      line-height: 2em;\n      transition: opacity 0.3s ease;\n    }\n    &:hover::after {\n      opacity: 1;\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'));
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding-top: 24px;\n  .config-form {\n    flex-grow: 1;\n    overflow-y: auto;\n    ", " {\n      width: 100%;\n      flex-shrink: 0;\n      padding: 0 24px;\n      transform: translate(0, 0);\n    }\n  }\n\n  .config-item {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    margin: 16px 0;\n  }\n\n  .config-label {\n    font-weight: bold;\n  }\n\n  .config-desc {\n    font-weight: normal;\n    font-size: 12px;\n    color: #666;\n  }\n\n  .form-item {\n    margin-top: 0;\n  }\n"])), props => props.theme.breakpoints.down('md'));

package/lib/blocklet/logo-uploader.js

@@ -0,0 +1,112 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = LogoUploader;
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _noop = _interopRequireDefault(require("lodash/noop"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } // eslint-disable-next-line import/no-unresolved
+const Uploader = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('@blocklet/uploader/react'))).then(res => ({
+  default: res.Uploader
+})));
+const uploadPrefix = '/blocklet/logo/upload';
+function LogoUploader(_ref) {
+  let {
+    url,
+    height,
+    width,
+    enabled,
+    type,
+    did,
+    prefix,
+    headers,
+    onUploaded
+  } = _ref;
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const uploaderRef = (0, _react.useRef)(null);
+  const onOpen = () => {
+    var _uploaderRef$current;
+    (_uploaderRef$current = uploaderRef.current) === null || _uploaderRef$current === void 0 ? void 0 : _uploaderRef$current.open();
+  };
+  const onFinish = () => {
+    var _uploaderRef$current2;
+    onUploaded();
+    (_uploaderRef$current2 = uploaderRef.current) === null || _uploaderRef$current2 === void 0 ? void 0 : _uploaderRef$current2.close();
+  };
+  const uploaderStyle = {
+    cursor: enabled ? 'pointer' : 'default',
+    '&::after': {
+      content: "\"".concat(t('common.switch'), "\"")
+    }
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
+    id: "uploader-".concat(did, "-").concat(type),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Uploader, {
+      ref: uploaderRef,
+      popup: true,
+      onUploadFinish: onFinish,
+      plugins: ['ImageEditor'],
+      apiPathProps: {
+        uploader: (0, _urlJoin.default)(prefix, uploadPrefix, type, did),
+        disableMediaKitPrefix: true
+      },
+      coreProps: {
+        restrictions: {
+          allowedFileTypes: ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'],
+          maxFileSize: 1024 * 1024 * 10,
+          maxNumberOfFiles: 1
+        }
+      },
+      tusProps: {
+        headers
+      }
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      className: (0, _classnames.default)('uploader-wrapper', enabled && 'enabled'),
+      sx: uploaderStyle,
+      onClick: onOpen,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        alt: "Logo",
+        src: url,
+        style: {
+          height,
+          width
+        }
+      })
+    })]
+  }, "uploader-".concat(did, "-").concat(type));
+}
+
+// infer props for Uploader
+LogoUploader.propTypes = {
+  url: _propTypes.default.string.isRequired,
+  type: _propTypes.default.oneOf(['square', 'rect', 'favicon']).isRequired,
+  did: _propTypes.default.string.isRequired,
+  prefix: _propTypes.default.string.isRequired,
+  headers: _propTypes.default.func,
+  onUploaded: _propTypes.default.func,
+  height: _propTypes.default.number,
+  width: _propTypes.default.any,
+  enabled: _propTypes.default.bool
+};
+LogoUploader.defaultProps = {
+  height: 80,
+  width: 'auto',
+  enabled: true,
+  headers: () => ({}),
+  onUploaded: _noop.default
+};
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .uploader-wrapper {\n    display: inline-flex;\n    position: relative;\n    font-size: 0px;\n    &.enabled {\n      cursor: pointer;\n    }\n    &::after {\n      display: none;\n    }\n    &.enabled::after {\n      display: block;\n      opacity: 0;\n      position: absolute;\n      bottom: 0;\n      background: rgba(0, 0, 0, 0.2);\n      left: 0;\n      right: 0;\n      height: 2.2em;\n      color: white;\n      text-align: center;\n      font-size: 12px;\n      line-height: 2em;\n      transition: opacity 0.3s ease;\n    }\n    &:hover::after {\n      opacity: 1;\n    }\n  }\n"])));

package/lib/blocklet/oauth/federated-site-list.js

@@ -216,7 +216,7 @@ function FederatedSiteList(_ref) {
       });
     }
     return list;
-  }, [federatedConfig.appId, federatedSites, isMaster]);
+  }, [federatedConfig.appId, federatedSites, isMaster, t]);
   const tableOptions = (0, _ahooks.useCreation)(() => {
     return {
       sort: true,

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

@@ -65,6 +65,9 @@ function CreateProject(_ref) {
   } = (0, _node.useNodeContext)();
   const [blockletDid, setBlockletDid] = (0, _react.useState)();
   const [openConnect, setOpenConnect] = (0, _react.useState)(false);
+  const {
+    componentDid
+  } = (0, _reactRouterDom.useParams)();
   const handleCreateBlockletDidError = err => {
     _Toast.default.error(err.message);
     setOpenConnect(false);
@@ -94,7 +97,8 @@ function CreateProject(_ref) {
         did: blocklet.meta.did,
         blockletTitle: blockletTitle || '',
         blockletDid,
-        type
+        type,
+        componentDid
       }
     }).then(() => {
       setLoading(false);

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

@@ -124,7 +124,8 @@ function CreateRelease(_ref2) {
   const navigate = (0, _reactRouterDom.useNavigate)();
   const {
     projectId,
-    releaseId: inputReleaseId
+    releaseId: inputReleaseId,
+    componentDid
   } = (0, _reactRouterDom.useParams)();
   const {
     t
@@ -144,7 +145,7 @@ function CreateRelease(_ref2) {
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
-  const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => x.meta.capabilities.resourceExportApi);
+  const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => x.meta.capabilities.resourceExportApi).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,
@@ -580,7 +581,7 @@ function CreateRelease(_ref2) {
             });
             uploaderLogoRef.current.close();
           },
-          plugins: [],
+          plugins: ['ImageEditor'],
           apiPathProps: {
             uploader: uploadLogoPrefix,
             disableMediaKitPrefix: true
@@ -605,7 +606,7 @@ function CreateRelease(_ref2) {
             });
             uploaderScreenshotRef.current.close();
           },
-          plugins: [],
+          plugins: ['ImageEditor'],
           apiPathProps: {
             uploader: uploadScreenshotPrefix,
             disableMediaKitPrefix: true

package/lib/blocklet/publish/index.js

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BlockletPublish;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _blocklet = require("../../contexts/blocklet");
 var _projectList = _interopRequireDefault(require("./project-list"));
 var _createProject = _interopRequireDefault(require("./create-project"));
 var _releaseList = _interopRequireDefault(require("./release-list"));
@@ -15,8 +16,33 @@ var _createRelease = _interopRequireDefault(require("./create-release"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function BlockletPublish() {
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const location = (0, _reactRouterDom.useLocation)();
+
+  // post message to parent window when route changed
+  const {
+    componentDid
+  } = (0, _reactRouterDom.useParams)();
+  (0, _react.useEffect)(() => {
+    if (componentDid && window.parent) {
+      const path = "".concat(location.pathname).concat(location.search);
+      window.parent.postMessage({
+        event: 'popstate',
+        page: 'publish',
+        componentDid,
+        path
+      }, '*');
+    }
+  }, [componentDid, location]);
+  if (!blocklet) {
+    return null;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Main, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Routes, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {

package/lib/blocklet/publish/project-list.js

@@ -41,11 +41,15 @@ function ProjectList() {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
   const [deleteConfirm, setDeleteConfirm] = (0, _react.useState)(null);
+  const {
+    componentDid = ''
+  } = (0, _reactRouterDom.useParams)();
   const [projects, setProjects] = (0, _react.useState)(null);
   const getProjects = () => {
     api.getProjects({
       input: {
-        did: blocklet.meta.did
+        did: blocklet.meta.did,
+        componentDid
       }
     }).then(res => {
       const list = (res === null || res === void 0 ? void 0 : res.projects) || [];

package/lib/hooks/use-navigation.js

@@ -40,7 +40,7 @@ const injectNavigationData = {
     from: 'tmpl'
   }],
   dashboard: [{
-    id: '/access',
+    id: '/team',
     title: {
       en: 'Access',
       zh: '访问控制'

package/lib/hooks/use-passport-id.js

@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = usePassportId;
-var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function usePassportId() {
-  const [passportId, setPassportId, clearPassportId] = (0, _useLocalStorage.default)('passportId', '');
+  const clearPassportId = () => {
+    localStorage.removeItem('passportId');
+  };
+  const setPassportId = value => {
+    localStorage.setItem('passportId', value);
+  };
   const getPassportId = () => {
-    setTimeout(() => {
-      clearPassportId();
-    }, 0);
-    return passportId || '';
+    const passportId = localStorage.getItem('passportId') || '';
+    clearPassportId();
+    return passportId;
   };
   return {
     getPassportId,