@abtnode/ux 1.16.29-beta-112566d5 → 1.16.29-beta-1fedbcdd

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

@@ -1,14 +1,14 @@
-import { useMemo } from 'react';
-import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import classnames from 'classnames';
 import pick from 'lodash/pick';
-import Checkbox from '@mui/material/Checkbox';
-import Box from '@mui/material/Box';
+import PropTypes from 'prop-types';
+import { useMemo } from 'react';
 import Datatable from '@arcblock/ux/lib/Datatable';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { Alert } from '@mui/material';
+import Box from '@mui/material/Box';
+import Checkbox from '@mui/material/Checkbox';
 import { EmptyIcon } from '@arcblock/icons';
+import { Alert } from '@mui/material';
 import BlockletBundleAvatar from '../../bundle-avatar';
 import StopBox from './stop-box';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";

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

@@ -1,29 +1,30 @@
 import { UNOWNED_DID, WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
+import Dialog from '@arcblock/ux/lib/Dialog';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { Box, Breadcrumbs, Button, Typography, Dialog as MaterialDialog, IconButton, useMediaQuery } from '@mui/material';
-import styled from '@emotion/styled';
-import { Link, useNavigate } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import { joinURL } from 'ufo';
+import Toast from '@arcblock/ux/lib/Toast/index';
 import { PROJECT } from '@blocklet/constant';
-import Spinner from '@mui/material/CircularProgress';
+import styled from '@emotion/styled';
+import { Icon } from '@iconify/react';
 import CloudUploadRoundedIcon from '@mui/icons-material/CloudUploadRounded';
-import semver from 'semver';
-import { useState } from 'react';
-import Toast from '@arcblock/ux/lib/Toast/index';
-import pAll from 'p-all';
-import Dialog from '@arcblock/ux/lib/Dialog';
+import { Box, Breadcrumbs, Button, IconButton, Dialog as MaterialDialog, Typography, useMediaQuery } from '@mui/material';
+import Spinner from '@mui/material/CircularProgress';
 import pick from 'lodash/pick';
-import { Icon } from '@iconify/react';
-import ConnectStoreList from './connect-store-list';
-import { validateParams } from '../utils/validate-params';
-import { waitGetConnectedStore } from '../utils/wait-connect';
-import uploadImageToProject from '../utils/upload-image-to-project';
-import { uploadResource } from './resource-select';
+import pAll from 'p-all';
+import PropTypes from 'prop-types';
+import { useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import semver from 'semver';
+import { joinURL } from 'ufo';
 import ClickToCopy from '../../../click-to-copy';
-import { formatError } from '../../../util';
 import { useNodeContext } from '../../../contexts/node';
+import { formatError } from '../../../util';
 import ShortenLabel from '../../component/shorten-label';
+import parseResourceRelateComponents from '../utils/parse-resource-relate-components';
+import uploadImageToProject from '../utils/upload-image-to-project';
+import { validateParams } from '../utils/validate-params';
+import { waitGetConnectedStore } from '../utils/wait-connect';
+import ConnectStoreList from './connect-store-list';
+import { uploadResource } from './resource-select';
 import UploadedToast from './uploaded-toast';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const serverEndpoint = window.env?.serverEndpoint;
@@ -90,32 +91,7 @@ function Header({
     const _params = {
       ...params
     };
-    const componentMaps = (blocklet?.children || []).reduce((acc, curr) => {
-      acc[curr.meta.did] = true;
-      return acc;
-    }, {});
-    Object.keys(resourceRelateComponents).forEach(blockletDid => {
-      if (!componentMaps[blockletDid]) {
-        return;
-      }
-      let included = false;
-      if (!disabledSelectComponents) {
-        _params.blockletComponents.forEach(item => {
-          if (item.did === blockletDid) {
-            item.included = true;
-            item.required = true;
-            included = true;
-          }
-        });
-      }
-      if (!included) {
-        _params.blockletComponents.push({
-          did: blockletDid,
-          included: true,
-          required: true
-        });
-      }
-    });
+    _params.blockletComponents = parseResourceRelateComponents(_params.blockletComponents, blocklet, resourceRelateComponents, disabledSelectComponents);
     _params.blockletVersion = semver.valid(_params.blockletVersion);
     if (!_params.blockletVersion) {
       Toast.error('Invalid Blocklet Version');
@@ -273,31 +249,34 @@ function Header({
       const url = new URL(serverEndpoint);
       url.pathname = joinURL(url.pathname, '/launch-blocklet/agreement');
       url.searchParams.set('blocklet_meta_url', blockletMetaUrl);
-      installButton = /*#__PURE__*/_jsx("a", {
+      installButton = isMobile ? /*#__PURE__*/_jsx(IconButton, {
+        component: "a",
         href: url.href,
         target: "_blank",
         rel: "noreferrer",
-        children: isMobile ? /*#__PURE__*/_jsx(IconButton, {
-          color: "primary",
-          sx: {
-            mr: 1
-          },
-          onClick: () => setInstallResourceTip(blockletMetaUrl),
-          children: /*#__PURE__*/_jsx(Icon, {
-            icon: "ic:baseline-install-desktop"
-          })
-        }) : /*#__PURE__*/_jsx(Button, {
-          variant: "outlined",
-          sx: {
-            mr: 1
-          },
-          onClick: () => setInstallResourceTip(blockletMetaUrl),
-          children: t('common.install')
+        color: "primary",
+        sx: {
+          mr: 1
+        },
+        onClick: () => setInstallResourceTip(blockletMetaUrl),
+        children: /*#__PURE__*/_jsx(Icon, {
+          icon: "ic:baseline-install-desktop"
         })
+      }) : /*#__PURE__*/_jsx(Button, {
+        href: url.href,
+        target: "_blank",
+        rel: "noreferrer",
+        variant: "outlined",
+        sx: {
+          mr: 1
+        },
+        onClick: () => setInstallResourceTip(blockletMetaUrl),
+        children: t('common.install')
       });
     } else {
       installButton = /*#__PURE__*/_jsxs(_Fragment, {
         children: [isMobile ? /*#__PURE__*/_jsx(IconButton, {
+          disabled: loading,
           color: "primary",
           sx: {
             mr: 1
@@ -307,6 +286,7 @@ function Header({
             icon: "ic:baseline-install-desktop"
           })
         }) : /*#__PURE__*/_jsx(Button, {
+          disabled: loading,
           variant: "outlined",
           sx: {
             mr: 1
@@ -397,15 +377,15 @@ function Header({
             color: "inherit"
           }), t('blocklet.publish.createRelease')]
         }), isPublished && /*#__PURE__*/_jsxs(_Fragment, {
-          children: [installButton, /*#__PURE__*/_jsx("a", {
+          children: [installButton, isMobile ? null : /*#__PURE__*/_jsx(Button, {
+            component: "a",
+            disabled: loading,
             href: joinURL(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${projectId}/${releaseId}/download/${(release.files || [])[0]}`),
-            children: isMobile ? null : /*#__PURE__*/_jsx(Button, {
-              variant: "outlined",
-              sx: {
-                mr: 1
-              },
-              children: t('common.download')
-            })
+            variant: "outlined",
+            sx: {
+              mr: 1
+            },
+            children: t('common.download')
           }), /*#__PURE__*/_jsxs(Button, {
             disabled: loading,
             variant: "contained",

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

@@ -122,6 +122,18 @@ export default function CreateRelease({
   const [resourceComponentsMap, _setResourceComponentsMap] = useSetState({});
   const dependentComponentsMode = initUrl?.searchParams.get('dependentComponentsMode');
   const disabledSelectComponents = dependentComponentsMode === 'readonly';
+  const resourceRelateComponents = useMemo(() => {
+    const result = {};
+    Object.keys(resourceComponentsMap).forEach(key => {
+      const item = resourceComponentsMap[key];
+      if (item) {
+        item.forEach(k => {
+          result[k] = true;
+        });
+      }
+    });
+    return result;
+  }, [resourceComponentsMap]);
   const setResourceComponentsMap = useCallback(setter => {
     if (disabledSelectComponents) {
       setParams({
@@ -146,7 +158,7 @@ export default function CreateRelease({
       });
     }
   }, [projectId, setParamsErrTip]);
-  const projectType = useMemo(() => params?.blockletComponents?.some(x => x.included) || params?.uploadedResource ? 'pack' : 'resource', [params?.blockletComponents, params?.uploadedResource]);
+  const projectType = useMemo(() => params?.blockletComponents?.some(x => x.included) || Object.keys(resourceRelateComponents).length || params?.uploadedResource ? 'pack' : 'resource', [params?.blockletComponents, params?.uploadedResource, resourceRelateComponents]);
   const tabs = [];
   const resourceComponents = (blocklet?.children || []).filter(x => x.meta.resource?.exportApi).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
@@ -160,18 +172,6 @@ export default function CreateRelease({
   const [tab, setTab] = useState(tabs[0]?.value);
   const isPublished = !releaseUsedLast && release?.status === 'published';
   const readOnly = isPublished;
-  const resourceRelateComponents = useMemo(() => {
-    const result = {};
-    Object.keys(resourceComponentsMap).forEach(key => {
-      const item = resourceComponentsMap[key];
-      if (item) {
-        item.forEach(k => {
-          result[k] = true;
-        });
-      }
-    });
-    return result;
-  }, [resourceComponentsMap]);
   const updateParamsByUrl = useMemoizedFn(() => {
     if (!initUrl) {
       return;
@@ -183,7 +183,7 @@ export default function CreateRelease({
         blockletTitle: old?.blockletTitle || initUrl.searchParams.get('title'),
         blockletDescription: old?.blockletDescription || initUrl.searchParams.get('description'),
         blockletIntroduction: old?.blockletIntroduction || initUrl.searchParams.get('introduction') || initUrl.searchParams.get('description'),
-        blockletComponents: old?.blockletComponents || JSON.parse(initUrl.searchParams.get('components') || '[]'),
+        blockletComponents: old?.blockletComponents?.length ? old?.blockletComponents : JSON.parse(initUrl.searchParams.get('components') || '[]'),
         note: old?.note || initUrl.searchParams.get('note') || 'No note'
       };
     });
@@ -308,7 +308,7 @@ export default function CreateRelease({
   }
   const resourceItem = resourceComponents.find(x => x.meta.did === tab);
   const allResourceComponentsStop = resourceComponents.every(x => x.status !== 'running');
-  if (allResourceComponentsStop) {
+  if (allResourceComponentsStop && resourceComponents?.length) {
     return /*#__PURE__*/_jsx(StopBox, {
       children: t('blocklet.publish.allComponentsNotRunning')
     });

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

@@ -1,20 +1,21 @@
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { hasStartEngine } from '@blocklet/meta/lib/engine';
 import styled from '@emotion/styled';
+import { Box } from '@mui/material';
 import classnames from 'classnames';
+import pAll from 'p-all';
 import PropTypes from 'prop-types';
 import React, { useEffect, useRef } from 'react';
 import useSetState from 'react-use/lib/useSetState';
 import { joinURL } from 'ufo';
-import { Box } from '@mui/material';
-import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { hasStartEngine } from '@blocklet/meta/lib/engine';
-import pAll from 'p-all';
-import Toast from '@arcblock/ux/lib/Toast/index';
 import { EmptyIcon } from '@arcblock/icons';
+import Toast from '@arcblock/ux/lib/Toast/index';
+import { getDisplayName } from '@blocklet/meta/lib/util';
 import { useNodeContext } from '../../../contexts/node';
 import { axios } from '../../../util/api';
+import keepNowResources from './keep-now-resources';
 import StopBox from './stop-box';
 import Tree from './tree';
-import keepNowResources from './keep-now-resources';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const fillParent = (nodes, parentId) => {
   nodes.forEach(node => {
@@ -32,7 +33,7 @@ const parseUrl = (component, projectId, releaseId, locale, initUrl) => {
   const {
     exportApi = '/'
   } = component?.meta.resource || {};
-  const urlObj = new URL(joinURL('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
+  const urlObj = new URL(joinURL('http://127.0.0.1', component?.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
   urlObj.searchParams.set('local', locale);
@@ -159,7 +160,7 @@ export default function ResourceSelect({
             return;
           }
           // If the component does not have a mount point or does not start the engine, the resource is not requested
-          if (!child?.mountPoint || !hasStartEngine(child?.meta)) {
+          if (!child?.mountPoint || !hasStartEngine(child?.meta) || !child?.meta?.resource?.exportApi) {
             return;
           }
           try {
@@ -203,12 +204,15 @@ export default function ResourceSelect({
   }, [releaseId, projectId, readOnly, locale, initUrl, setResources]);
   useEffect(() => {
     if (initialResources && Object.keys(initialResources).length) {
-      app.children.forEach(child => {
+      pAll(app.children.map(async child => {
         const list = initialResources[child.meta.did];
         if (list?.length) {
+          const resTree = await axios.get(parseUrl(child, projectId, releaseId, locale, initUrl));
+          const tree = fillParent(resTree?.data?.resources || []);
           setSelectedResourceIds({
             [child.meta.did]: list
           });
+          setSelectedComponentsMapByIds(child.meta.did, tree, list);
           if (!readOnly) {
             saveSelectedEventsRef.current[child?.meta.did] = {
               resources: list,
@@ -216,7 +220,7 @@ export default function ResourceSelect({
             };
           }
         }
-      });
+      }));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [app, initialResources, readOnly]);
@@ -225,14 +229,14 @@ export default function ResourceSelect({
     Empty = /*#__PURE__*/_jsx(StopBox, {
       Icon: EmptyIcon,
       children: t('blocklet.publish.resourceEmptyTip', {
-        name: component.meta.title
+        name: getDisplayName(component)
       })
     });
   }
   if (component?.status !== 'running') {
     Empty = /*#__PURE__*/_jsx(StopBox, {
       children: t('blocklet.publish.componentNotRunning', {
-        name: component.meta.title
+        name: getDisplayName(component)
       })
     });
   }

package/lib/blocklet/publish/utils/parse-resource-relate-components.js

@@ -0,0 +1,31 @@
+const parseResourceRelateComponents = (nowBlockletComponents, blocklet, resourceRelateComponents, disabledSelectComponents) => {
+  const blockletComponents = [...nowBlockletComponents];
+  const componentMaps = (blocklet?.children || []).reduce((acc, curr) => {
+    acc[curr.meta.did] = true;
+    return acc;
+  }, {});
+  Object.keys(resourceRelateComponents).forEach(blockletDid => {
+    if (!componentMaps[blockletDid]) {
+      return;
+    }
+    let included = false;
+    if (!disabledSelectComponents) {
+      blockletComponents.forEach(item => {
+        if (item.did === blockletDid) {
+          item.included = true;
+          item.required = true;
+          included = true;
+        }
+      });
+    }
+    if (!included) {
+      blockletComponents.push({
+        did: blockletDid,
+        included: true,
+        required: true
+      });
+    }
+  });
+  return blockletComponents;
+};
+export default parseResourceRelateComponents;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-beta-112566d5",
+  "version": "1.16.29-beta-1fedbcdd",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,24 +25,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-beta-112566d5",
-    "@abtnode/constant": "1.16.29-beta-112566d5",
-    "@abtnode/util": "1.16.29-beta-112566d5",
+    "@abtnode/auth": "1.16.29-beta-1fedbcdd",
+    "@abtnode/constant": "1.16.29-beta-1fedbcdd",
+    "@abtnode/util": "1.16.29-beta-1fedbcdd",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.126",
-    "@arcblock/did-connect": "^2.10.5",
+    "@arcblock/did-connect": "^2.10.7",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.5",
-    "@arcblock/nft-display": "2.10.5",
-    "@arcblock/react-hooks": "^2.10.5",
-    "@arcblock/terminal": "^2.10.5",
-    "@arcblock/ux": "^2.10.5",
-    "@blocklet/constant": "1.16.29-beta-112566d5",
-    "@blocklet/js-sdk": "1.16.29-beta-112566d5",
-    "@blocklet/launcher-layout": "2.3.30",
+    "@arcblock/icons": "^2.10.7",
+    "@arcblock/nft-display": "2.10.7",
+    "@arcblock/react-hooks": "^2.10.7",
+    "@arcblock/terminal": "^2.10.7",
+    "@arcblock/ux": "^2.10.7",
+    "@blocklet/constant": "1.16.29-beta-1fedbcdd",
+    "@blocklet/js-sdk": "1.16.29-beta-1fedbcdd",
+    "@blocklet/launcher-layout": "2.3.33",
     "@blocklet/list": "^0.13.9",
-    "@blocklet/meta": "1.16.29-beta-112566d5",
-    "@blocklet/ui-react": "^2.10.5",
+    "@blocklet/meta": "1.16.29-beta-1fedbcdd",
+    "@blocklet/ui-react": "^2.10.7",
     "@blocklet/uploader": "0.1.19",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "4c6213560b79dc862b0b5e48b50f65c39de54aef"
+  "gitHead": "e66e220d775e821c85b8bd6286342c202ad143f0"
 }