@abtnode/ux 1.16.29-beta-1fedbcdd → 1.16.29-beta-8671c2cf

package/lib/blocklet/component/blocklet-owner-info.js

@@ -0,0 +1,35 @@
+import { Box } from '@mui/material';
+import DID from '@arcblock/ux/lib/DID';
+import PropTypes from 'prop-types';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export default function BlockletOwnerInfo({
+  owner,
+  locale
+}) {
+  return /*#__PURE__*/_jsxs(Box, {
+    sx: {
+      display: 'flex',
+      alignItems: 'center',
+      gap: 1
+    },
+    children: [owner.fullName, owner.did ? /*#__PURE__*/_jsx(DID, {
+      sx: {
+        lineHeight: 'initial',
+        '&::before': {
+          content: '"("'
+        },
+        '&::after': {
+          content: '")"'
+        }
+      },
+      did: owner.did,
+      compact: true,
+      size: 14,
+      locale: locale
+    }) : null]
+  });
+}
+BlockletOwnerInfo.propTypes = {
+  owner: PropTypes.object.isRequired,
+  locale: PropTypes.string.isRequired
+};

package/lib/blocklet/component/component-info-dialog.js

@@ -6,13 +6,15 @@ import { Badge, Box } from '@mui/material';
 import InfoRow from '@arcblock/ux/lib/InfoRow';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import { getDisplayName, hasStartEngine } from '@blocklet/meta/lib/util';
+import { formatPerson } from '@blocklet/meta/lib/fix';
 import { useDeletingBlockletContext } from '../../contexts/deleting-blocklets';
 import Tag from '../../tag';
-import { formatPerson, formatToDatetime } from '../../util';
+import { formatToDatetime } from '../../util';
 import DidAddress from '../../did-address';
 import BlockletSource from '../blocklet-source';
 import BlockletStatus from '../status';
 import BlockletVersion from '../version';
+import BlockletOwnerInfo from './blocklet-owner-info';
 import { jsx as _jsx } from "react/jsx-runtime";
 const isResource = component => !component?.meta?.group;
 const getEngineRows = (engine, t) => {
@@ -171,7 +173,10 @@ export default function ComponentInfoDialog({
     })
   }, {
     name: t('common.author'),
-    value: formatPerson(componentInfo.meta.author)
+    value: componentInfo.meta.owner ? /*#__PURE__*/_jsx(BlockletOwnerInfo, {
+      owner: componentInfo.meta.owner,
+      locale: locale
+    }) : formatPerson(componentInfo.meta.author)
   }, {
     name: t('common.engine'),
     value: getEngineRows(componentInfo.engine, t).map(({

package/lib/blocklet/install-from-url.js

@@ -1,5 +1,6 @@
 import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import { formatPerson } from '@blocklet/meta/lib/fix';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import Spinner from '@mui/material/CircularProgress';
 import DialogContentText from '@mui/material/DialogContentText';
@@ -16,9 +17,10 @@ import Alert from '@mui/material/Alert';
 import { getDisplayName } from '@blocklet/meta/lib/util';
 import { useNodeContext } from '../contexts/node';
 import { useSessionContext } from '../contexts/session';
-import { formatError, formatPerson } from '../util';
+import { formatError } from '../util';
 import { getWalletType } from './util';
 import DidAddress from '../did-address';
+import BlockletOwnerInfo from './component/blocklet-owner-info';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export default function InstallFromUrl({
   defaultUrl,
@@ -37,7 +39,8 @@ export default function InstallFromUrl({
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
   const {
-    t
+    t,
+    locale
   } = useLocaleContext();
   const initMeta = {
     dist: {}
@@ -134,7 +137,10 @@ export default function InstallFromUrl({
     })
   }, {
     name: t('common.author'),
-    value: formatPerson(meta.author)
+    value: meta.owner ? /*#__PURE__*/_jsx(BlockletOwnerInfo, {
+      owner: meta.owner,
+      locale: locale
+    }) : formatPerson(meta.author)
   }, {
     name: t('blocklet.dist.downloadLink'),
     value: meta.dist.tarball

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

@@ -1,5 +1,5 @@
 const parseResourceRelateComponents = (nowBlockletComponents, blocklet, resourceRelateComponents, disabledSelectComponents) => {
-  const blockletComponents = [...nowBlockletComponents];
+  const blockletComponents = nowBlockletComponents ? [...nowBlockletComponents] : [];
   const componentMaps = (blocklet?.children || []).reduce((acc, curr) => {
     acc[curr.meta.did] = true;
     return acc;

package/lib/util/index.js

@@ -226,20 +226,6 @@ export const checkInputByType = (type, value) => {
   return false;
 };
 export const formatUrl = url => humanizeUrl(url.split('?').shift());
-export const formatPerson = person => {
-  if (!person) {
-    return '-';
-  }
-  if (typeof person === 'string') {
-    return person;
-  }
-  const name = person.name || '';
-  const u = person.url || person.web;
-  const url = u ? ` (${u})` : '';
-  const e = person.email || person.mail;
-  const email = e ? ` <${e}>` : '';
-  return name + email + url;
-};
 export const shouldCheckDomainStatus = domain => domain &&
 // eslint-disable-line
 ![DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE].includes(domain);

package/package.json

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