@abtnode/ux 1.16.21-beta-bd0e2503 → 1.16.21-beta-420f105a

package/es/blocklet/component/add-component-core.js

@@ -153,6 +153,7 @@ export default function AddComponentCore({
   mode,
   stores,
   resourceType,
+  resourceDid,
   storageKey,
   inDialog
 }) {
@@ -740,6 +741,7 @@ export default function AddComponentCore({
             },
             storeUrl: currentRegistry.url,
             resourceType: resourceType,
+            resourceDid: resourceDid,
             handleButtonClick: chooseParams => {
               setConfigValue({
                 chooseParams: {
@@ -1114,6 +1116,7 @@ AddComponentCore.propTypes = {
   inDialog: PropTypes.bool,
   stores: PropTypes.arrayOf(PropTypes.string),
   resourceType: PropTypes.string,
+  resourceDid: PropTypes.string,
   storageKey: PropTypes.string
 };
 AddComponentCore.defaultProps = {
@@ -1121,6 +1124,7 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
+  resourceDid: '',
   storageKey: '',
   inDialog: true
 };

package/es/blocklet/component/index.js

@@ -38,7 +38,6 @@ import Tag from '../../tag';
 import BlockletSource from '../blocklet-source';
 import BlockletStatus from '../status';
 import BlockletVersion from '../version';
-import ResourceType from '../resource-type';
 import Confirm from '../../confirm';
 import { useNodeContext } from '../../contexts/node';
 import { formatPerson, formatError, sleep, BlockletAdminRoles, formatToDatetime } from '../../util';
@@ -120,6 +119,7 @@ const getComponentName = (componentId, app) => {
   }
   return names.join(' / ');
 };
+const isPack = component => component?.meta?.group === 'pack';
 function ComponentItem({
   blocklet,
   ancestors,
@@ -299,11 +299,6 @@ function ComponentItem({
             },
             status: status,
             source: blocklet.source
-          }), !hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ResourceType, {
-            style: {
-              marginLeft: 4
-            },
-            blocklet: blocklet
           }), /*#__PURE__*/_jsx(BlockletMode, {
             style: {
               marginLeft: 4
@@ -399,7 +394,7 @@ function ComponentItem({
           onClick: () => {
             setComponentInfo(blocklet);
           }
-        } : null, {
+        } : null, !isPack(blocklet) && {
           icon: /*#__PURE__*/_jsx(RestartIcon, {}),
           text: t('common.restart'),
           onClick: () => {
@@ -417,7 +412,7 @@ function ComponentItem({
             });
           },
           disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
-        }, {
+        }, !isPack(blocklet) && {
           icon: /*#__PURE__*/_jsx(ReloadIcon, {}),
           text: t('common.reload'),
           onClick: async () => {

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

@@ -135,6 +135,7 @@ export default function BlockletList({
   extraFilter,
   serverVersion,
   resourceType,
+  resourceDid,
   ...rest
 }) {
   const {
@@ -148,13 +149,15 @@ export default function BlockletList({
   const endpoint = storeUrl;
   useEffect(() => {
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
-  }, [endpoint, resourceType]);
+  }, [endpoint, resourceType, resourceDid]);
   useEffect(() => {
     setInitialized(true);
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -197,7 +200,8 @@ BlockletList.propTypes = {
   handleBlockletRender: PropTypes.func,
   extraFilter: PropTypes.func,
   serverVersion: PropTypes.string,
-  resourceType: PropTypes.string
+  resourceType: PropTypes.string,
+  resourceDid: PropTypes.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
@@ -205,7 +209,8 @@ BlockletList.defaultProps = {
   handleBlockletRender: null,
   extraFilter: undefined,
   serverVersion: '',
-  resourceType: ''
+  resourceType: '',
+  resourceDid: ''
 };
 const StyledBlocklet = styled(Blocklet)`
   .ms-highlight {

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

@@ -131,7 +131,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).filter(x => !componentDid || x.meta.did === componentDid);
+  const resourceComponents = (blocklet?.children || []).filter(x => x.meta.resource?.exportApi).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,

package/es/blocklet/publish/resource.js

@@ -45,9 +45,9 @@ export default function Resource({
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
-    resourceExportApi = '/'
-  } = component?.meta.capabilities || {};
-  const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
+    exportApi = '/'
+  } = component?.meta.resource || {};
+  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);

package/es/util/index.js

@@ -14,7 +14,7 @@ import axios from '@abtnode/util/lib/axios';
 import dayjs from '@abtnode/util/lib/dayjs';
 import formatError from '@abtnode/util/lib/format-error';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
-import { evaluateURLs, isDidDomain, isIpEcho, isSlpDomain } from '@abtnode/util/lib/url-evaluation';
+import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
 import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
 import { BLOCKLET_MODES } from '@blocklet/constant';
 import urlPathFriendly from '@blocklet/meta/lib/url-path-friendly';
@@ -48,18 +48,12 @@ export function getAccessUrl(hostname, path = '', params = undefined) {
   if (!hostname) {
     return '';
   }
-  let protocol = 'http';
-  if (window.location.protocol === 'https:') {
-    if (isIpEcho(hostname) || isSlpDomain(hostname) || isDidDomain(hostname)) {
-      protocol = 'https';
-    }
-  }
   let port = '';
   const browserPort = Number(window.location.port);
   if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
     port = `:${browserPort}`;
   }
-  const urlObj = new URL(`${protocol}://${hostname}${port}`);
+  const urlObj = new URL(`${window.location.protocol}//${hostname}${port}`);
   urlObj.pathname = path;
   const url = urlObj.href.replace(/\/$/, '');
   if (!params || !Object.keys(params)) {

package/lib/blocklet/component/add-component-core.js

@@ -174,6 +174,7 @@ function AddComponentCore(_ref3) {
     mode,
     stores,
     resourceType,
+    resourceDid,
     storageKey,
     inDialog
   } = _ref3;
@@ -750,6 +751,7 @@ function AddComponentCore(_ref3) {
             },
             storeUrl: currentRegistry.url,
             resourceType: resourceType,
+            resourceDid: resourceDid,
             handleButtonClick: chooseParams => {
               setConfigValue({
                 chooseParams: _objectSpread(_objectSpread({}, chooseParams), {}, {
@@ -1121,6 +1123,7 @@ AddComponentCore.propTypes = {
   inDialog: _propTypes.default.bool,
   stores: _propTypes.default.arrayOf(_propTypes.default.string),
   resourceType: _propTypes.default.string,
+  resourceDid: _propTypes.default.string,
   storageKey: _propTypes.default.string
 };
 AddComponentCore.defaultProps = {
@@ -1128,6 +1131,7 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
+  resourceDid: '',
   storageKey: '',
   inDialog: true
 };

package/lib/blocklet/component/index.js

@@ -44,7 +44,6 @@ var _tag = _interopRequireDefault(require("../../tag"));
 var _blockletSource = _interopRequireDefault(require("../blocklet-source"));
 var _status = _interopRequireDefault(require("../status"));
 var _version = _interopRequireDefault(require("../version"));
-var _resourceType = _interopRequireDefault(require("../resource-type"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _node = require("../../contexts/node");
 var _util2 = require("../../util");
@@ -138,6 +137,10 @@ const getComponentName = (componentId, app) => {
   }
   return names.join(' / ');
 };
+const isPack = component => {
+  var _component$meta;
+  return (component === null || component === void 0 ? void 0 : (_component$meta = component.meta) === null || _component$meta === void 0 ? void 0 : _component$meta.group) === 'pack';
+};
 function ComponentItem(_ref) {
   var _blocklet$dependents, _blocklet$meta$resour, _blocklet$dependents2, _blocklet$meta, _blocklet$dependents3;
   let {
@@ -322,11 +325,6 @@ function ComponentItem(_ref) {
             },
             status: status,
             source: blocklet.source
-          }), !(0, _util.hasStartEngine)(blocklet.meta) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_resourceType.default, {
-            style: {
-              marginLeft: 4
-            },
-            blocklet: blocklet
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_mode.default, {
             style: {
               marginLeft: 4
@@ -425,7 +423,7 @@ function ComponentItem(_ref) {
           onClick: () => {
             setComponentInfo(blocklet);
           }
-        } : null, {
+        } : null, !isPack(blocklet) && {
           icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Replay.default, {}),
           text: t('common.restart'),
           onClick: () => {
@@ -443,7 +441,7 @@ function ComponentItem(_ref) {
             });
           },
           disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
-        }, {
+        }, !isPack(blocklet) && {
           icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Autorenew.default, {}),
           text: t('common.reload'),
           onClick: async () => {

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", "resourceType"];
+const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType", "resourceDid"];
 /* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable react/jsx-wrap-multilines */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -154,7 +154,8 @@ function BlockletList(_ref3) {
       handleBlockletRender,
       extraFilter,
       serverVersion,
-      resourceType
+      resourceType,
+      resourceDid
     } = _ref3,
     rest = _objectWithoutProperties(_ref3, _excluded);
   const {
@@ -168,13 +169,15 @@ function BlockletList(_ref3) {
   const endpoint = storeUrl;
   (0, _react.useEffect)(() => {
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
-  }, [endpoint, resourceType]);
+  }, [endpoint, resourceType, resourceDid]);
   (0, _react.useEffect)(() => {
     setInitialized(true);
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -212,7 +215,8 @@ BlockletList.propTypes = {
   handleBlockletRender: _propTypes.default.func,
   extraFilter: _propTypes.default.func,
   serverVersion: _propTypes.default.string,
-  resourceType: _propTypes.default.string
+  resourceType: _propTypes.default.string,
+  resourceDid: _propTypes.default.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
@@ -220,6 +224,7 @@ BlockletList.defaultProps = {
   handleBlockletRender: null,
   extraFilter: undefined,
   serverVersion: '',
-  resourceType: ''
+  resourceType: '',
+  resourceDid: ''
 };
 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-release.js

@@ -147,7 +147,10 @@ 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).filter(x => !componentDid || x.meta.did === componentDid);
+  const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => {
+    var _x$meta$resource;
+    return (_x$meta$resource = x.meta.resource) === null || _x$meta$resource === void 0 ? void 0 : _x$meta$resource.exportApi;
+  }).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,

package/lib/blocklet/publish/resource.js

@@ -54,9 +54,9 @@ function Resource(_ref) {
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
-    resourceExportApi = '/'
-  } = (component === null || component === void 0 ? void 0 : component.meta.capabilities) || {};
-  const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
+    exportApi = '/'
+  } = (component === null || component === void 0 ? void 0 : component.meta.resource) || {};
+  const urlObj = new URL((0, _urlJoin.default)('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);

package/lib/util/index.js

@@ -95,18 +95,12 @@ function getAccessUrl(hostname) {
   if (!hostname) {
     return '';
   }
-  let protocol = 'http';
-  if (window.location.protocol === 'https:') {
-    if ((0, _urlEvaluation.isIpEcho)(hostname) || (0, _urlEvaluation.isSlpDomain)(hostname) || (0, _urlEvaluation.isDidDomain)(hostname)) {
-      protocol = 'https';
-    }
-  }
   let port = '';
   const browserPort = Number(window.location.port);
   if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
     port = ":".concat(browserPort);
   }
-  const urlObj = new URL("".concat(protocol, "://").concat(hostname).concat(port));
+  const urlObj = new URL("".concat(window.location.protocol, "//").concat(hostname).concat(port));
   urlObj.pathname = path;
   const url = urlObj.href.replace(/\/$/, '');
   if (!params || !Object.keys(params)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.21-beta-bd0e2503",
+  "version": "1.16.21-beta-420f105a",
   "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.21-beta-bd0e2503",
-    "@abtnode/constant": "1.16.21-beta-bd0e2503",
-    "@abtnode/util": "1.16.21-beta-bd0e2503",
+    "@abtnode/auth": "1.16.21-beta-420f105a",
+    "@abtnode/constant": "1.16.21-beta-420f105a",
+    "@abtnode/util": "1.16.21-beta-420f105a",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.107",
     "@arcblock/did-connect": "^2.8.23",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.8.23",
     "@arcblock/terminal": "^2.8.23",
     "@arcblock/ux": "^2.8.23",
-    "@blocklet/constant": "1.16.21-beta-bd0e2503",
+    "@blocklet/constant": "1.16.21-beta-420f105a",
     "@blocklet/launcher-layout": "2.2.48",
     "@blocklet/list": "^0.12.60",
-    "@blocklet/meta": "1.16.21-beta-bd0e2503",
+    "@blocklet/meta": "1.16.21-beta-420f105a",
     "@blocklet/ui-react": "^2.8.23",
     "@blocklet/uploader": "^0.0.56",
     "@emotion/react": "^11.10.4",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "f4550e061b661cb67d7f1413ada51f3f6491f0b8",
+  "gitHead": "f38219e9051563984543127087d6d88fc8b1be98",
   "exports": {
     ".": {
       "import": "./es/index.js",