@abtnode/ux 1.16.25-next-bc2f4c63 → 1.16.26-beta-e0056285

package/es/analytics/disk.js

@@ -6,7 +6,7 @@ import LinearProgress from '@mui/material/LinearProgress';
 import Box from '@mui/material/Box';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Card from './card';
-import { formatDiskSize } from '../util/index';
+import { filesize } from '../util/index';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const BorderLinearProgress = withStyles(theme => ({
   root: {
@@ -51,8 +51,7 @@ LinearProgressWithLabel.propTypes = {
   value: PropTypes.number.isRequired
 };
 export default function DiskMonitor({
-  disk,
-  platform
+  disk
 }) {
   const {
     t
@@ -61,21 +60,21 @@ export default function DiskMonitor({
     id: 1,
     className: 'used',
     title: t('system.used'),
-    metric: formatDiskSize(disk.used, platform)
+    metric: filesize(disk.used)
   }, {
     id: 2,
     className: 'free',
     title: t('system.free'),
-    metric: formatDiskSize(disk.free, platform)
+    metric: filesize(disk.free)
   }, {
     id: 3,
     className: 'total',
     title: t('system.total'),
-    metric: formatDiskSize(disk.total, platform)
+    metric: filesize(disk.total)
   }];
   return /*#__PURE__*/_jsx(Card, {
     title: `${t('common.disk')} (${disk.device})`,
-    value: formatDiskSize(disk.used, platform),
+    value: filesize(disk.used),
     graph: /*#__PURE__*/_jsx(Box, {
       mt: 3,
       children: /*#__PURE__*/_jsx(LinearProgressWithLabel, {
@@ -96,8 +95,7 @@ DiskMonitor.propTypes = {
     free: PropTypes.number,
     total: PropTypes.number,
     device: PropTypes.string
-  }),
-  platform: PropTypes.string
+  })
 };
 DiskMonitor.defaultProps = {
   disk: {
@@ -105,6 +103,5 @@ DiskMonitor.defaultProps = {
     free: 0,
     total: 1,
     device: ''
-  },
-  platform: ''
+  }
 };

package/es/analytics/memory.js

@@ -1,10 +1,9 @@
 /* eslint-disable react/jsx-one-expression-per-line */
 import PropTypes from 'prop-types';
-import filesize from 'filesize';
 import Box from '@mui/material/Box';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Chart from './chart';
-import { formatTime } from '../util';
+import { formatTime, filesize } from '../util';
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 export default function MemoryMonitor({
   instanceCount,

package/es/analytics/runtime.js

@@ -1,6 +1,5 @@
 import React, { useEffect, useMemo } from 'react';
 import styled from '@emotion/styled';
-import filesize from 'filesize';
 import prettyMs from 'pretty-ms-i18n';
 import Box from '@mui/material/Box';
 import Datatable from '@arcblock/ux/lib/Datatable';
@@ -8,7 +7,7 @@ import Typography from '@mui/material/Typography';
 import { getDisplayName, forEachBlockletSync } from '@blocklet/meta/lib/util';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { useBlockletContext } from '../contexts/blocklet';
-import { formatLocale } from '../util';
+import { formatLocale, filesize } from '../util';
 import RuntimeInfo from '../blocklet/runtime-info';
 import BundleAvatar from '../blocklet/bundle-avatar';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";

package/es/analytics/traffic.js

@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import dayjs from '@abtnode/util/lib/dayjs';
 import nthArg from 'lodash/nthArg';
 import joinUrl from 'url-join';
-import filesize from 'filesize';
 import useAsyncRetry from 'react-use/lib/useAsyncRetry';
 import Iframe from 'react-iframe';
 import Alert from '@mui/material/Alert';
@@ -22,7 +21,7 @@ import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { startOfWeek, endOfWeek, addWeeks, startOfMonth, endOfMonth, addMonths, startOfYear, endOfYear, addYears } from 'date-fns';
-import { formatError, formatToDate } from '../util';
+import { formatError, formatToDate, filesize } from '../util';
 import { useNodeContext } from '../contexts/node';
 import Chart from './chart';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";

package/es/blocklet/actions.js

@@ -296,7 +296,17 @@ export default function BlockletActions({
   } : null;
   const cancelDownloadAction = {
     action: 'remove',
-    icon: Icons.Remove,
+    icon: ({
+      sx,
+      ...restProps
+    }) => /*#__PURE__*/_jsx(Icons.Cancel, {
+      sx: {
+        ...sx,
+        paddingRight: '2px',
+        zoom: 0.95
+      },
+      ...restProps
+    }),
     name: t('common.cancel'),
     handler: createHandler('cancelDownload', node.api.cancelDownloadBlocklet, true)
   };

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

@@ -683,6 +683,9 @@ export default function AddComponentCore({
     key: 'selectComponent',
     name: t('blocklet.component.selectComponent'),
     body: /*#__PURE__*/_jsxs(TypographyWrapper, {
+      sx: {
+        width: 400
+      },
       component: "div",
       children: [params.showFromUrlDialog && /*#__PURE__*/_jsx(InstallFromUrl
       // if not set defaultUrl, the dialog will always show step 1 when the dialog is opened
@@ -1237,6 +1240,11 @@ const ContentWrapper = styled(Box)`
   }
   return `
       position: relative;
+      .ll-container { // 通过 Launcher Layout 组件约定的 .ll-container class 自定义 Layout 样式
+        width: 100%;
+        height: 100%;
+      }
+
       .root-header {
         z-index: auto !important;
         position: fixed !important;

package/es/blocklet/component/component-cell.js

@@ -196,7 +196,8 @@ export default function ComponentCell({
   }, {
     name: t('common.did'),
     value: /*#__PURE__*/_jsx(DidAddress, {
-      did: componentInfo.meta.did
+      did: componentInfo.meta.did,
+      showQrcode: true
     })
   }, {
     name: t('common.author'),

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

@@ -57,10 +57,10 @@ export default function SelectStore({
     children: [/*#__PURE__*/_jsxs(SelectStoreTitle, {
       children: [/*#__PURE__*/_jsx(Button, {
         ref: storeSelectRef,
-        color: "secondary",
+        color: "primary",
         "data-cy": "add-component-select-store",
         endIcon: /*#__PURE__*/_jsx(ArrowDropDownIcon, {
-          color: "secondary"
+          color: "primary"
         }),
         onClick: () => {
           setOpen(true);
@@ -69,11 +69,11 @@ export default function SelectStore({
           padding: '0 2px'
         },
         children: /*#__PURE__*/_jsx(Typography, {
-          color: "secondary",
+          color: "primary",
           children: currentRegistry.name
         })
       }), /*#__PURE__*/_jsx(Typography, {
-        color: "secondary",
+        color: "primary",
         children: extra
       })]
     }), /*#__PURE__*/_jsxs(TextField, {
@@ -110,6 +110,10 @@ export default function SelectStore({
       margin: "normal",
       children: [storeList?.map(x => {
         return /*#__PURE__*/_jsx(MenuItem, {
+          sx: {
+            width: '400px',
+            maxWidth: '90vw'
+          },
           value: x,
           "data-cy": x.url,
           children: /*#__PURE__*/_jsx(StoreItem, {

package/es/blocklet/disk-info.js

@@ -2,11 +2,11 @@
 import { useContext } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
-import filesize from 'filesize';
 import Typography from '@mui/material/Typography';
 import Link from '@mui/material/Link';
 import InfoRow from '@arcblock/ux/lib/InfoRow';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { filesize } from '../util';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function BlockletDiskInfo({
   blocklet,

package/es/blocklet/icons.js

@@ -6,6 +6,7 @@ import Reload from '@mui/icons-material/Autorenew';
 import Config from '@mui/icons-material/Settings';
 import Log from '@mui/icons-material/Receipt';
 import Group from '@mui/icons-material/Group';
+import Cancel from '@mui/icons-material/NotInterested';
 export default {
   Start,
   Stop,
@@ -14,5 +15,6 @@ export default {
   Remove,
   Config,
   Log,
-  Group
+  Group,
+  Cancel
 };

package/es/blocklet/overview.js

@@ -42,18 +42,21 @@ export default function BlockletOverview() {
   const infoRows = [appDid ? {
     name: t('blocklet.appId'),
     value: /*#__PURE__*/_jsx(DidAddress, {
-      did: appDid
+      did: appDid,
+      showQrcode: true
     })
   } : null, appPid ? {
     name: t('blocklet.appPid'),
     value: /*#__PURE__*/_jsx(DidAddress, {
-      did: appPid
+      did: appPid,
+      showQrcode: true
     })
   } : null, migratedFrom?.length > 1 ? {
     name: t('blocklet.alsoKnownAs'),
     value: /*#__PURE__*/_jsxs("div", {
       children: [(showAllDIDs ? migratedFrom.slice(1) : migratedFrom.slice(1, 2)).map(x => /*#__PURE__*/_jsx(DidAddress, {
-        did: x.appDid
+        did: x.appDid,
+        showQrcode: true
       })), migratedFrom.length > 2 && /*#__PURE__*/_jsx(Button, {
         style: {
           marginLeft: '18px'
@@ -78,7 +81,8 @@ export default function BlockletOverview() {
     value: /*#__PURE__*/_jsx(DidAddress, {
       external: true,
       href: getExplorerLink(blocklet?.controller?.chainHost, blocklet?.controller?.nftId, 'asset'),
-      did: blocklet?.controller?.nftId
+      did: blocklet?.controller?.nftId,
+      showQrcode: true
     })
   } : null, {
     name: t('blocklet.installedAt'),
@@ -89,8 +93,9 @@ export default function BlockletOverview() {
   }, {
     name: t('common.owner'),
     value: blocklet.settings?.owner ? /*#__PURE__*/_jsx(DidAddress, {
-      did: blocklet.settings.owner.did
-    }) : '--'
+      did: blocklet.settings.owner.did,
+      showQrcode: true
+    }) : '-'
   }, {
     name: t('blocklet.config.walletType.name'),
     value: WalletType[chainType || 'arcblock'] || chainType
@@ -102,7 +107,8 @@ export default function BlockletOverview() {
     infoRows.push({
       name: t('common.serverDid'),
       value: /*#__PURE__*/_jsx(DidAddress, {
-        did: nodeInfo.did
+        did: nodeInfo.did,
+        showQrcode: true
       })
     }, {
       name: t('common.serverVersion'),

package/es/blocklet/publish/connect-store-list.js

@@ -0,0 +1,62 @@
+import { useMemo } from 'react';
+import PropTypes from 'prop-types';
+import { List, ListItem, ListItemText } from '@mui/material';
+import AddStore from '../../store/add';
+import StoreItem from '../../store/item';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+function ConnectStoreList({
+  blocklet,
+  releaseId,
+  projectId,
+  releaseType,
+  publishedStoreIds,
+  onPublish
+}) {
+  const storeList = blocklet?.settings?.storeList || [];
+  const connectedMap = useMemo(() => {
+    if (!blocklet?.settings?.connectedStores) {
+      return {};
+    }
+    return blocklet?.settings?.connectedStores?.reduce((acc, x) => {
+      acc[x.storeUrl] = x;
+      return acc;
+    }, {});
+  }, [blocklet?.settings?.connectedStores]);
+  const did = blocklet?.meta?.did;
+  const handleAddStore = () => {};
+  return /*#__PURE__*/_jsxs(List, {
+    children: [storeList?.map(x => /*#__PURE__*/_jsx(ListItem, {
+      "data-cy": "store-switch",
+      children: /*#__PURE__*/_jsx(ListItemText, {
+        children: /*#__PURE__*/_jsx(StoreItem, {
+          releaseId: releaseId,
+          projectId: projectId,
+          releaseType: releaseType,
+          kind: "publish",
+          teamDid: did,
+          store: x,
+          published: publishedStoreIds?.indexOf(x.id) > -1,
+          connected: !!connectedMap[x.url],
+          onPublish: onPublish
+        })
+      })
+    }, x.url)), /*#__PURE__*/_jsx(AddStore, {
+      onAdd: handleAddStore,
+      teamDid: did,
+      blockletRegistryList: storeList
+    })]
+  });
+}
+ConnectStoreList.propTypes = {
+  blocklet: PropTypes.object.isRequired,
+  projectId: PropTypes.string.isRequired,
+  releaseId: PropTypes.string.isRequired,
+  releaseType: PropTypes.string.isRequired,
+  onPublish: PropTypes.func,
+  publishedStoreIds: PropTypes.arrayOf(PropTypes.string)
+};
+ConnectStoreList.defaultProps = {
+  publishedStoreIds: [],
+  onPublish: () => {}
+};
+export default ConnectStoreList;