@abtnode/ux 1.16.22 → 1.16.23-beta-f3f10110

package/es/blocklet/component/configuration.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import IconButton from '@mui/material/IconButton';
 import Box from '@mui/material/Box';
 import EditIcon from '@mui/icons-material/Edit';
-import { getDisplayName } from '@blocklet/meta/lib/util';
+import { getDisplayName, hasStartEngine } from '@blocklet/meta/lib/util';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import Tabs from '@arcblock/ux/lib/Tabs';
@@ -23,7 +23,7 @@ export default function ComponentConfiguration({
     t
   } = useLocaleContext();
   const isComponent = !!ancestors.length;
-  const [tab, setTab] = useState('settings');
+  const [tab, setTab] = useState(hasStartEngine(blocklet?.meta) ? 'settings' : 'environments');
   const name = isComponent ? getDisplayName(blocklet, true) : t('blocklet.component.container');
   if (isInstalling(blocklet.status)) {
     return null;
@@ -40,7 +40,7 @@ export default function ComponentConfiguration({
     setShowDialog(true);
   };
   const tabConfigs = {
-    settings: {
+    settings: hasStartEngine(blocklet.meta) && {
       label: t('blocklet.component.setting'),
       value: 'settings',
       component: /*#__PURE__*/_jsx(ComponentSetting, {
@@ -57,7 +57,8 @@ export default function ComponentConfiguration({
       })
     }
   };
-  const tabs = Object.values(tabConfigs).map(({
+  const tabConfigsArr = Object.values(tabConfigs).filter(Boolean);
+  const tabs = tabConfigsArr.map(({
     label,
     value
   }) => ({
@@ -67,7 +68,7 @@ export default function ComponentConfiguration({
   const onTabChange = newTab => {
     setTab(newTab);
   };
-  const tabConfig = tabConfigs[tab] || tabConfigs.settings;
+  const tabConfig = tabConfigs[tab] || tabConfigsArr[0];
   return [typeof children === 'function' ? children({
     open: onOpen
   }) : /*#__PURE__*/_jsx(IconButton, {

package/es/blocklet/component/index.js

@@ -365,7 +365,7 @@ function ComponentItem({
             children: /*#__PURE__*/_jsx(LaunchIcon, {})
           })
         })
-      }), hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ComponentConfiguration, {
+      }), /*#__PURE__*/_jsx(ComponentConfiguration, {
         blocklet: blocklet,
         ancestors: ancestors,
         children: ({

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

@@ -28,8 +28,7 @@ const Types = [{
     en: 'Application',
     zh: '应用'
   },
-  value: 'pack',
-  disabled: true
+  value: 'pack'
 }];
 export default function CreateProject({
   ...rest

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

@@ -19,6 +19,7 @@ import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
 import Empty from '@arcblock/ux/lib/Empty';
 import Tabs from '@arcblock/ux/lib/Tabs';
+import Alert from '@arcblock/ux/lib/Alert';
 import { PROJECT } from '@blocklet/constant';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import BlockletBundleAvatar from '../bundle-avatar';
@@ -128,6 +129,7 @@ export default function CreateRelease({
   } = useNodeContext();
   const uploaderLogoRef = useRef(null);
   const uploaderScreenshotRef = useRef(null);
+  const [projectType, setProjectType] = useState();
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
@@ -143,7 +145,9 @@ export default function CreateRelease({
   const [tab, setTab] = useState(tabs[0]?.value);
   const isPublished = release?.status === 'published';
   const readOnly = isPublished;
-  const getProject = () => {
+  const getProject = ({
+    typeOnly
+  } = {}) => {
     api.getProject({
       input: {
         did: blocklet.meta.did,
@@ -152,12 +156,17 @@ export default function CreateRelease({
     }).then(res => {
       setLoading(false);
       const data = res.project || {};
+      if (typeOnly) {
+        setProjectType(data.type);
+        return;
+      }
       if (!data.blockletVersion) {
         data.blockletVersion = '1.0.0';
       } else if (semver.valid(data.blockletVersion)) {
         data.blockletVersion = semver.inc(data.blockletVersion, 'patch');
       }
       setParams(pickParams(data));
+      setProjectType(data.type);
     }).catch(err => {
       setLoading(false);
       Toast.error(formatError(err));
@@ -186,6 +195,9 @@ export default function CreateRelease({
         return;
       }
       getRelease();
+      getProject({
+        typeOnly: true
+      });
     }
     if (mode === 'create') {
       getProject();
@@ -351,8 +363,15 @@ export default function CreateRelease({
         })]
       })]
     }), /*#__PURE__*/_jsxs(Box, {
-      pt: 3,
-      children: [/*#__PURE__*/_jsxs(Box, {
+      children: [projectType === 'pack' && /*#__PURE__*/_jsx(Alert, {
+        type: "info",
+        style: {
+          width: '100%'
+        },
+        children: t('blocklet.publish.packTip')
+      }), /*#__PURE__*/_jsx(Box, {
+        pt: 3
+      }), /*#__PURE__*/_jsxs(Box, {
         display: "flex",
         className: "section",
         children: [/*#__PURE__*/_jsx(Typography, {

package/es/blocklet/publish/resource.js

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import joinUrl from 'url-join';
@@ -24,6 +24,12 @@ const fillParent = (nodes, parentId) => {
   });
   return nodes;
 };
+function arraysAreEqual(arr1, arr2) {
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+  return arr1.every((value, index) => value === arr2[index]);
+}
 export default function Resource({
   app,
   component,
@@ -41,7 +47,14 @@ export default function Resource({
   } = useNodeContext();
   const [resources, setResources] = useState([]);
   const [selectedResourceIds, setSelectedResourceIds] = useState([]);
+  const [initialResourceIds, setInitialResourceIds] = useState([]);
   const [loading, setLoading] = useState(false);
+  const warning = useMemo(() => {
+    if (arraysAreEqual(selectedResourceIds, initialResourceIds)) {
+      return null;
+    }
+    return t('blocklet.publish.resourceChangedWarning');
+  }, [selectedResourceIds, initialResourceIds, t]);
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
@@ -80,6 +93,7 @@ export default function Resource({
       Toast.success(t('common.saveSuccess'));
       setLoading(false);
       saveSelected(selectedResourceIds);
+      setInitialResourceIds(selectedResourceIds);
       onSave(selectedResourceIds);
     } catch (err) {
       setLoading(false);
@@ -103,6 +117,7 @@ export default function Resource({
     }).then(res => {
       const list = res?.resources || [];
       setSelectedResourceIds(list);
+      setInitialResourceIds(list);
     }).catch(err => {
       Toast.error(err.message);
     });
@@ -138,6 +153,11 @@ export default function Resource({
         })
       })]
     })
+  }), !!warning && /*#__PURE__*/_jsx(Box, {
+    color: "warning.main",
+    mt: 1,
+    fontSize: 14,
+    children: warning
   }), !!error && /*#__PURE__*/_jsx(Box, {
     color: "error.main",
     mt: 1,

package/es/locales/en.js

@@ -643,6 +643,8 @@ export default {
       createBlockletDid: 'Create from DID Wallet',
       createReleaseSuccess: 'Release created successfully',
       saveDraftSuccess: 'Draft saved successfully',
+      packTip: 'Components and application configuration will be automatically included in the blocklet',
+      resourceChangedWarning: 'You have modified the resource, please save it in time',
       connect: {
         title: 'Create Blocklet DID',
         scan: 'Scan the QR code below to generate Blocklet DID',

package/es/locales/zh.js

@@ -652,6 +652,8 @@ export default {
       createBlockletDid: '通过 DID 钱包创建',
       createReleaseSuccess: '发布成功',
       saveDraftSuccess: '保存成功',
+      packTip: 'Blocklet 中将自动包含组件和应用配置',
+      resourceChangedWarning: '您修改了资源，请及时保存',
       connect: {
         title: '创建 Blocklet DID',
         scan: '扫描下面的二维码来生成 Blocklet DID',

package/lib/blocklet/component/configuration.js

@@ -32,7 +32,7 @@ function ComponentConfiguration(_ref) {
     t
   } = (0, _context.useLocaleContext)();
   const isComponent = !!ancestors.length;
-  const [tab, setTab] = (0, _react.useState)('settings');
+  const [tab, setTab] = (0, _react.useState)((0, _util.hasStartEngine)(blocklet === null || blocklet === void 0 ? void 0 : blocklet.meta) ? 'settings' : 'environments');
   const name = isComponent ? (0, _util.getDisplayName)(blocklet, true) : t('blocklet.component.container');
   if ((0, _util2.isInstalling)(blocklet.status)) {
     return null;
@@ -49,7 +49,7 @@ function ComponentConfiguration(_ref) {
     setShowDialog(true);
   };
   const tabConfigs = {
-    settings: {
+    settings: (0, _util.hasStartEngine)(blocklet.meta) && {
       label: t('blocklet.component.setting'),
       value: 'settings',
       component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_setting.default, {
@@ -66,7 +66,8 @@ function ComponentConfiguration(_ref) {
       })
     }
   };
-  const tabs = Object.values(tabConfigs).map(_ref2 => {
+  const tabConfigsArr = Object.values(tabConfigs).filter(Boolean);
+  const tabs = tabConfigsArr.map(_ref2 => {
     let {
       label,
       value
@@ -79,7 +80,7 @@ function ComponentConfiguration(_ref) {
   const onTabChange = newTab => {
     setTab(newTab);
   };
-  const tabConfig = tabConfigs[tab] || tabConfigs.settings;
+  const tabConfig = tabConfigs[tab] || tabConfigsArr[0];
   return [typeof children === 'function' ? children({
     open: onOpen
   }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {

package/lib/blocklet/component/index.js

@@ -391,7 +391,7 @@ function ComponentItem(_ref) {
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Launch.default, {})
           })
         })
-      }), (0, _util.hasStartEngine)(blocklet.meta) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_configuration.default, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_configuration.default, {
         blocklet: blocklet,
         ancestors: ancestors,
         children: _ref3 => {

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

@@ -42,8 +42,7 @@ const Types = [{
     en: 'Application',
     zh: '应用'
   },
-  value: 'pack',
-  disabled: true
+  value: 'pack'
 }];
 function CreateProject(_ref) {
   let rest = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));

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

@@ -25,6 +25,7 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
+var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _constant = require("@blocklet/constant");
 var _constant2 = require("@abtnode/constant");
 var _bundleAvatar = _interopRequireDefault(require("../bundle-avatar"));
@@ -144,6 +145,7 @@ function CreateRelease(_ref2) {
   } = (0, _node.useNodeContext)();
   const uploaderLogoRef = (0, _react.useRef)(null);
   const uploaderScreenshotRef = (0, _react.useRef)(null);
+  const [projectType, setProjectType] = (0, _react.useState)();
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
@@ -162,7 +164,10 @@ function CreateRelease(_ref2) {
   const [tab, setTab] = (0, _react.useState)((_tabs$ = tabs[0]) === null || _tabs$ === void 0 ? void 0 : _tabs$.value);
   const isPublished = (release === null || release === void 0 ? void 0 : release.status) === 'published';
   const readOnly = isPublished;
-  const getProject = () => {
+  const getProject = function getProject() {
+    let {
+      typeOnly
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     api.getProject({
       input: {
         did: blocklet.meta.did,
@@ -171,12 +176,17 @@ function CreateRelease(_ref2) {
     }).then(res => {
       setLoading(false);
       const data = res.project || {};
+      if (typeOnly) {
+        setProjectType(data.type);
+        return;
+      }
       if (!data.blockletVersion) {
         data.blockletVersion = '1.0.0';
       } else if (_semver.default.valid(data.blockletVersion)) {
         data.blockletVersion = _semver.default.inc(data.blockletVersion, 'patch');
       }
       setParams(pickParams(data));
+      setProjectType(data.type);
     }).catch(err => {
       setLoading(false);
       _Toast.default.error((0, _util.formatError)(err));
@@ -205,6 +215,9 @@ function CreateRelease(_ref2) {
         return;
       }
       getRelease();
+      getProject({
+        typeOnly: true
+      });
     }
     if (mode === 'create') {
       getProject();
@@ -365,8 +378,15 @@ function CreateRelease(_ref2) {
         })]
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-      pt: 3,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: [projectType === 'pack' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
+        type: "info",
+        style: {
+          width: '100%'
+        },
+        children: t('blocklet.publish.packTip')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        pt: 3
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         className: "section",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {

package/lib/blocklet/publish/resource.js

@@ -32,6 +32,12 @@ const fillParent = (nodes, parentId) => {
   });
   return nodes;
 };
+function arraysAreEqual(arr1, arr2) {
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+  return arr1.every((value, index) => value === arr2[index]);
+}
 function Resource(_ref) {
   let {
     app,
@@ -50,7 +56,14 @@ function Resource(_ref) {
   } = (0, _node.useNodeContext)();
   const [resources, setResources] = (0, _react.useState)([]);
   const [selectedResourceIds, setSelectedResourceIds] = (0, _react.useState)([]);
+  const [initialResourceIds, setInitialResourceIds] = (0, _react.useState)([]);
   const [loading, setLoading] = (0, _react.useState)(false);
+  const warning = (0, _react.useMemo)(() => {
+    if (arraysAreEqual(selectedResourceIds, initialResourceIds)) {
+      return null;
+    }
+    return t('blocklet.publish.resourceChangedWarning');
+  }, [selectedResourceIds, initialResourceIds, t]);
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
@@ -89,6 +102,7 @@ function Resource(_ref) {
       _Toast.default.success(t('common.saveSuccess'));
       setLoading(false);
       saveSelected(selectedResourceIds);
+      setInitialResourceIds(selectedResourceIds);
       onSave(selectedResourceIds);
     } catch (err) {
       setLoading(false);
@@ -113,6 +127,7 @@ function Resource(_ref) {
     }).then(res => {
       const list = (res === null || res === void 0 ? void 0 : res.resources) || [];
       setSelectedResourceIds(list);
+      setInitialResourceIds(list);
     }).catch(err => {
       _Toast.default.error(err.message);
     });
@@ -148,6 +163,11 @@ function Resource(_ref) {
         })
       })]
     })
+  }), !!warning && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    color: "warning.main",
+    mt: 1,
+    fontSize: 14,
+    children: warning
   }), !!error && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
     color: "error.main",
     mt: 1,

package/lib/locales/en.js

@@ -649,6 +649,8 @@ var _default = exports.default = {
       createBlockletDid: 'Create from DID Wallet',
       createReleaseSuccess: 'Release created successfully',
       saveDraftSuccess: 'Draft saved successfully',
+      packTip: 'Components and application configuration will be automatically included in the blocklet',
+      resourceChangedWarning: 'You have modified the resource, please save it in time',
       connect: {
         title: 'Create Blocklet DID',
         scan: 'Scan the QR code below to generate Blocklet DID',

package/lib/locales/zh.js

@@ -658,6 +658,8 @@ var _default = exports.default = {
       createBlockletDid: '通过 DID 钱包创建',
       createReleaseSuccess: '发布成功',
       saveDraftSuccess: '保存成功',
+      packTip: 'Blocklet 中将自动包含组件和应用配置',
+      resourceChangedWarning: '您修改了资源，请及时保存',
       connect: {
         title: '创建 Blocklet DID',
         scan: '扫描下面的二维码来生成 Blocklet DID',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.22",
+  "version": "1.16.23-beta-f3f10110",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,9 +27,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.22",
-    "@abtnode/constant": "1.16.22",
-    "@abtnode/util": "1.16.22",
+    "@abtnode/auth": "1.16.23-beta-f3f10110",
+    "@abtnode/constant": "1.16.23-beta-f3f10110",
+    "@abtnode/util": "1.16.23-beta-f3f10110",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.108",
     "@arcblock/did-connect": "^2.9.13",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.9.13",
     "@arcblock/terminal": "^2.9.13",
     "@arcblock/ux": "^2.9.13",
-    "@blocklet/constant": "1.16.22",
+    "@blocklet/constant": "1.16.23-beta-f3f10110",
     "@blocklet/launcher-layout": "2.2.51",
     "@blocklet/list": "^0.12.65",
-    "@blocklet/meta": "1.16.22",
+    "@blocklet/meta": "1.16.23-beta-f3f10110",
     "@blocklet/ui-react": "^2.9.13",
     "@blocklet/uploader": "^0.0.64",
     "@emotion/react": "^11.10.4",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "eba523c2d8f62f2a1c742b23e3280774bf9bc4cf",
+  "gitHead": "e2ca9c09a18b650624d45e966fdd8fa10abd5d47",
   "exports": {
     ".": {
       "import": "./es/index.js",