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

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

@@ -9,7 +9,7 @@ import Button from '@arcblock/ux/lib/Button';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
 import Typography from '@mui/material/Typography';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import { STORAGE_KEY_STORE_BLOCKLET, STORAGE_KEY_STORE_SERVER } from '../../util/constants';
+import uniqBy from 'lodash/uniqBy';
 import { useNodeContext } from '../../contexts/node';
 import { useBlockletContext } from '../../contexts/blocklet';
 import AddStore from '../../store/add';
@@ -22,7 +22,9 @@ export default function SelectStore({
   onChange,
   loading,
   children,
-  extra
+  extra,
+  stores: customStores,
+  storageKey
 }) {
   const {
     t
@@ -36,16 +38,21 @@ export default function SelectStore({
   } = useBlockletContext();
   const [open, setOpen] = useState(false);
   const storeSelectRef = useRef(null);
-  const storageKey = inService ? STORAGE_KEY_STORE_BLOCKLET : STORAGE_KEY_STORE_SERVER;
-  const [storeUrl, setStoreUrl] = useLocalStorage(storageKey);
+  const [storeUrlMem, setStoreUrlMem] = useState();
+  const [storeUrlLs, setStoreUrlLs] = useLocalStorage(storageKey || 'tmp');
+  const [storeUrl, setStoreUrl] = storageKey ? [storeUrlLs, setStoreUrlLs] : [storeUrlMem, setStoreUrlMem];
   const {
-    storeList,
+    storeList: appStoreList,
     teamDid
   } = getStoreList({
     fromBlocklet: inService,
     blocklet,
     nodeInfo
   });
+  const storeList = uniqBy([...customStores.map(x => ({
+    ...x,
+    protected: true
+  })), ...appStoreList], 'url');
   const currentRegistry = storeUrl && storeList.find(x => storeUrl === x.url) || storeList[0];
   const isServerlessMode = nodeInfo.mode === NODE_MODES.SERVERLESS;
   return /*#__PURE__*/_jsxs(_Fragment, {
@@ -134,12 +141,19 @@ SelectStore.propTypes = {
   onChange: PropTypes.func,
   loading: PropTypes.bool,
   children: PropTypes.any.isRequired,
-  extra: PropTypes.node
+  extra: PropTypes.node,
+  storageKey: PropTypes.string,
+  stores: PropTypes.arrayOf(PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    url: PropTypes.string.isRequired
+  }))
 };
 SelectStore.defaultProps = {
   onChange: () => {},
   loading: false,
-  extra: ''
+  extra: '',
+  stores: [],
+  storageKey: ''
 };
 const SelectStoreTitle = styled.div`
   display: flex;

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

@@ -134,25 +134,36 @@ export default function BlockletList({
   handleBlockletRender,
   extraFilter,
   serverVersion,
+  resourceType,
   ...rest
 }) {
   const {
     locale
   } = useLocaleContext();
+  const [initialized, setInitialized] = useState(false);
   const [filters, setFilters] = useState({});
   const handleChange = changeData => {
     setFilters(changeData);
   };
   const endpoint = storeUrl;
   useEffect(() => {
-    setFilters({});
-  }, [endpoint]);
+    setFilters({
+      resourceType
+    });
+  }, [endpoint, resourceType]);
+  useEffect(() => {
+    setInitialized(true);
+    setFilters({
+      resourceType
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/_jsx(ErrorBoundary, {
     FallbackComponent: ErrorFallback,
     resetKeys: [endpoint],
     children: /*#__PURE__*/_jsx("div", {
       ...rest,
-      children: /*#__PURE__*/_jsx(InnerList, {
+      children: initialized && /*#__PURE__*/_jsx(InnerList, {
         blockletRender: blockletRenderProps => {
           const defaultProps = {
             ...blockletRenderProps,
@@ -173,7 +184,8 @@ export default function BlockletList({
         onSearchSelect: handleSearchSelect,
         filters: filters,
         extraFilter: extraFilter,
-        serverVersion: serverVersion
+        serverVersion: serverVersion,
+        fetchCategoryDelay: 500
       })
     })
   });
@@ -184,14 +196,16 @@ BlockletList.propTypes = {
   handleSearchSelect: PropTypes.func,
   handleBlockletRender: PropTypes.func,
   extraFilter: PropTypes.func,
-  serverVersion: PropTypes.string
+  serverVersion: PropTypes.string,
+  resourceType: PropTypes.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
   handleSearchSelect: null,
   handleBlockletRender: null,
   extraFilter: undefined,
-  serverVersion: ''
+  serverVersion: '',
+  resourceType: ''
 };
 const StyledBlocklet = styled(Blocklet)`
   .ms-highlight {

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

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
@@ -52,6 +52,9 @@ export default function CreateProject({
   } = useNodeContext();
   const [blockletDid, setBlockletDid] = useState();
   const [openConnect, setOpenConnect] = useState(false);
+  const {
+    componentDid
+  } = useParams();
   const handleCreateBlockletDidError = err => {
     Toast.error(err.message);
     setOpenConnect(false);
@@ -80,7 +83,8 @@ export default function CreateProject({
         did: blocklet.meta.did,
         blockletTitle: blockletTitle || '',
         blockletDid,
-        type
+        type,
+        componentDid
       }
     }).then(() => {
       setLoading(false);

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

@@ -108,7 +108,8 @@ export default function CreateRelease({
   const navigate = useNavigate();
   const {
     projectId,
-    releaseId: inputReleaseId
+    releaseId: inputReleaseId,
+    componentDid
   } = useParams();
   const {
     t
@@ -128,7 +129,7 @@ export default function CreateRelease({
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
-  const resourceComponents = (blocklet?.children || []).filter(x => x.meta.capabilities.resourceExportApi);
+  const resourceComponents = (blocklet?.children || []).filter(x => x.meta.capabilities.resourceExportApi).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,

package/es/blocklet/publish/index.js

@@ -1,7 +1,8 @@
-import React from 'react';
-import { Routes, Route } from 'react-router-dom';
+import React, { useEffect } from 'react';
+import { Routes, Route, useLocation, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 import Box from '@mui/material/Box';
+import { useBlockletContext } from '../../contexts/blocklet';
 import ProjectList from './project-list';
 import CreateProject from './create-project';
 import ReleasesList from './release-list';
@@ -9,6 +10,29 @@ import CreateRelease from './create-release';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function BlockletPublish() {
+  const {
+    blocklet
+  } = useBlockletContext();
+  const location = useLocation();
+
+  // post message to parent window when route changed
+  const {
+    componentDid
+  } = useParams();
+  useEffect(() => {
+    if (componentDid && window.parent) {
+      const path = `${location.pathname}${location.search}`;
+      window.parent.postMessage({
+        event: 'popstate',
+        page: 'publish',
+        componentDid,
+        path
+      }, '*');
+    }
+  }, [componentDid, location]);
+  if (!blocklet) {
+    return null;
+  }
   return /*#__PURE__*/_jsx(Main, {
     children: /*#__PURE__*/_jsxs(Routes, {
       children: [/*#__PURE__*/_jsx(Route, {

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

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 import React, { useState, useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Box from '@mui/material/Box';
@@ -31,11 +31,15 @@ export default function ProjectList() {
     blocklet
   } = useBlockletContext();
   const [deleteConfirm, setDeleteConfirm] = useState(null);
+  const {
+    componentDid = ''
+  } = useParams();
   const [projects, setProjects] = useState(null);
   const getProjects = () => {
     api.getProjects({
       input: {
-        did: blocklet.meta.did
+        did: blocklet.meta.did,
+        componentDid
       }
     }).then(res => {
       const list = res?.projects || [];

package/es/hooks/use-navigation.js

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

package/es/locales/en.js

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

package/es/locales/zh.js

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