@abtnode/ux 1.16.18-beta-adeeb0b3 → 1.16.18-beta-aa01bd8e

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/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,

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/locales/en.js

@@ -570,6 +570,7 @@ module.exports = {
         fromUrl: 'Add Component From Url'
       },
       addNext: 'Add {name}',
+      upgradeNext: 'Upgrade {name}',
       setting: 'Settings'
     },
     router: {

package/lib/locales/zh.js

@@ -577,6 +577,7 @@ module.exports = {
         fromUrl: '通过 URL 选择组件'
       },
       addNext: '添加 {name}',
+      upgradeNext: '升级 {name}',
       setting: '参数设置'
     },
     router: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.18-beta-adeeb0b3",
+  "version": "1.16.18-beta-aa01bd8e",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,24 +27,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.18-beta-adeeb0b3",
-    "@abtnode/constant": "1.16.18-beta-adeeb0b3",
-    "@abtnode/util": "1.16.18-beta-adeeb0b3",
+    "@abtnode/auth": "1.16.18-beta-aa01bd8e",
+    "@abtnode/constant": "1.16.18-beta-aa01bd8e",
+    "@abtnode/util": "1.16.18-beta-aa01bd8e",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.93",
-    "@arcblock/did-connect": "^2.8.5",
+    "@arcblock/did": "^1.18.95",
+    "@arcblock/did-connect": "^2.8.8",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.8.5",
-    "@arcblock/nft-display": "2.8.5",
-    "@arcblock/react-hooks": "^2.8.5",
-    "@arcblock/terminal": "^2.8.5",
-    "@arcblock/ux": "^2.8.5",
-    "@blocklet/constant": "1.16.18-beta-adeeb0b3",
-    "@blocklet/launcher-layout": "2.2.22",
-    "@blocklet/list": "^0.12.46",
-    "@blocklet/meta": "1.16.18-beta-adeeb0b3",
-    "@blocklet/ui-react": "^2.8.5",
-    "@blocklet/uploader": "^0.0.32",
+    "@arcblock/icons": "^2.8.8",
+    "@arcblock/nft-display": "2.8.8",
+    "@arcblock/react-hooks": "^2.8.8",
+    "@arcblock/terminal": "^2.8.8",
+    "@arcblock/ux": "^2.8.8",
+    "@blocklet/constant": "1.16.18-beta-aa01bd8e",
+    "@blocklet/launcher-layout": "2.2.27",
+    "@blocklet/list": "^0.12.50",
+    "@blocklet/meta": "1.16.18-beta-aa01bd8e",
+    "@blocklet/ui-react": "^2.8.8",
+    "@blocklet/uploader": "^0.0.34",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -54,7 +54,7 @@
     "@mui/material": "^5.14.10",
     "@mui/styles": "^5.14.10",
     "@mui/x-date-pickers": "^6.14.0",
-    "@ocap/client": "1.18.93",
+    "@ocap/client": "1.18.95",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "1bef55d8f6ec840d5336e5a8c113771535a1416f",
+  "gitHead": "2bfa63d05ad290f13eee359661e4175b857d9f9d",
   "exports": {
     ".": {
       "import": "./es/index.js",