@abtnode/ux 1.16.28-beta-23b06b63 → 1.16.28-beta-bfbab430

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

@@ -234,13 +234,13 @@ export default function ComponentCell({
           disabled: !['starting', 'stopping'].includes(app.status) && isInProgress(app.status)
         }), /*#__PURE__*/_jsx(Actions, {
           "data-cy": "component-actions",
-          actions: [hasStartEngine(blocklet.meta) ? {
+          actions: [hasStartEngine(blocklet.meta) || isResource(blocklet) ? {
             icon: /*#__PURE__*/_jsx(InfoOutlinedIcon, {}),
             text: t('common.detail'),
             onClick: () => {
               setComponentInfo(blocklet);
             }
-          } : null, !isResource(blocklet) && {
+          } : null, {
             icon: /*#__PURE__*/_jsx(RestartIcon, {}),
             text: t('common.restart'),
             onClick: () => {

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

@@ -2,12 +2,9 @@ import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { useContext } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
-import Badge from '@mui/material/Badge';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
+import { Badge, Box } from '@mui/material';
 import InfoRow from '@arcblock/ux/lib/InfoRow';
-import Box from '@mui/material/Box';
+import Dialog from '@arcblock/ux/lib/Dialog';
 import { getDisplayName, hasStartEngine } from '@blocklet/meta/lib/util';
 import { useDeletingBlockletContext } from '../../contexts/deleting-blocklets';
 import Tag from '../../tag';
@@ -16,7 +13,7 @@ import DidAddress from '../../did-address';
 import BlockletSource from '../blocklet-source';
 import BlockletStatus from '../status';
 import BlockletVersion from '../version';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const isResource = component => !component?.meta?.group;
 const getEngineRows = (engine, t) => {
   if (!engine) {
@@ -204,18 +201,16 @@ export default function ComponentInfoDialog({
   }
   return /*#__PURE__*/_jsx(Dialog, {
     open: true,
+    title: t('common.componentBasicInfo'),
+    showCloseButton: true,
     fullWidth: true,
     maxWidth: "md",
     onClose: () => {
       onClose(null);
     },
-    children: /*#__PURE__*/_jsxs(Box, {
-      paddingY: 1.5,
-      children: [/*#__PURE__*/_jsx(DialogTitle, {
-        children: t('common.componentBasicInfo')
-      }), /*#__PURE__*/_jsx(DialogContent, {
-        children: renderRows(componentRows)
-      })]
+    children: /*#__PURE__*/_jsx(Box, {
+      paddingBottom: 1.5,
+      children: renderRows(componentRows)
     }, "dialog-wrapper")
   }, "base-info-dialog");
 }

package/lib/blocklet/component/configuration.js

@@ -4,7 +4,8 @@ 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, hasStartEngine } from '@blocklet/meta/lib/util';
+import { getDisplayName } from '@blocklet/meta/lib/util';
+import { hasMountPoint } from '@blocklet/meta/lib/engine';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import Tabs from '@arcblock/ux/lib/Tabs';
@@ -22,7 +23,7 @@ export default function ComponentConfiguration({
     t
   } = useLocaleContext();
   const isComponent = !!ancestors.length;
-  const [tab, setTab] = useState(hasStartEngine(blocklet?.meta) ? 'settings' : 'environments');
+  const [tab, setTab] = useState(hasMountPoint(blocklet?.meta) ? 'settings' : 'environments');
   const name = isComponent ? getDisplayName(blocklet, true) : t('blocklet.component.container');
   if (isInstalling(blocklet.status)) {
     return null;
@@ -39,7 +40,7 @@ export default function ComponentConfiguration({
     setShowDialog(true);
   };
   const tabConfigs = {
-    settings: hasStartEngine(blocklet.meta) && {
+    settings: hasMountPoint(blocklet.meta) && {
       label: t('blocklet.component.setting'),
       value: 'settings',
       component: /*#__PURE__*/_jsx(ComponentSetting, {

package/lib/blocklet/notification/email.js

@@ -222,6 +222,7 @@ function NotificationEmail() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             label: t('notification.email.from'),
             error: !!formState.errors[field.name],
             helperText: formState.errors[field.name]?.message || '　',
@@ -240,6 +241,7 @@ function NotificationEmail() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             error: !!formState.errors[field.name],
             label: t('notification.email.host'),
             helperText: formState.errors[field.name]?.message || '　',
@@ -258,6 +260,7 @@ function NotificationEmail() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             type: "number",
             error: !!formState.errors[field.name],
             label: t('notification.email.port'),
@@ -277,6 +280,7 @@ function NotificationEmail() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             error: !!formState.errors[field.name],
             label: t('notification.email.user'),
             helperText: formState.errors[field.name]?.message || '　',
@@ -295,6 +299,7 @@ function NotificationEmail() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             type: "password",
             error: !!formState.errors[field.name],
             label: t('notification.email.password'),

package/lib/blocklet/notification/push-kit.js

@@ -12,7 +12,9 @@ import useConfirm from '../../hooks/confirm';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const defaultFormValues = {
   enabled: false,
-  endpoint: ''
+  endpoint: '',
+  did: undefined,
+  pushPath: undefined
 };
 function NotificationPushKit() {
   const {
@@ -178,12 +180,56 @@ function NotificationPushKit() {
           fullWidth: true,
           children: /*#__PURE__*/_jsx(TextField, {
             ...field,
+            required: true,
             label: t('notification.pushKit.endpoint'),
             error: !!formState.errors[field.name],
             helperText: formState.errors[field.name]?.message || '　',
             disabled: !enabled
           })
         })
+      }), /*#__PURE__*/_jsxs(Box, {
+        component: "details",
+        sx: {
+          pl: '1em'
+        },
+        children: [/*#__PURE__*/_jsx(Box, {
+          component: "summary",
+          sx: {
+            mb: 1,
+            ml: '-1em'
+          },
+          children: t('notification.pushKit.customOptions')
+        }), /*#__PURE__*/_jsx(Controller, {
+          name: "did",
+          control: control,
+          render: ({
+            field
+          }) => /*#__PURE__*/_jsx(FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/_jsx(TextField, {
+              ...field,
+              label: t('notification.pushKit.did'),
+              error: !!formState.errors[field.name],
+              helperText: formState.errors[field.name]?.message || '　',
+              disabled: !enabled
+            })
+          })
+        }), /*#__PURE__*/_jsx(Controller, {
+          name: "pushPath",
+          control: control,
+          render: ({
+            field
+          }) => /*#__PURE__*/_jsx(FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/_jsx(TextField, {
+              ...field,
+              label: t('notification.pushKit.pushPath'),
+              error: !!formState.errors[field.name],
+              helperText: formState.errors[field.name]?.message || '　',
+              disabled: !enabled
+            })
+          })
+        })]
       }), /*#__PURE__*/_jsx(Button, {
         variant: "outlined",
         color: "warning",

package/lib/locales/en.js

@@ -931,7 +931,10 @@ export default {
       testReceiver: 'PushKit receiver',
       testSend: 'Test push-kit send',
       inputTestReceiver: 'Please input test receiver did',
-      receiverRequired: 'PushKit receiver is required'
+      receiverRequired: 'PushKit receiver is required',
+      pushPath: 'Api path for push-kit (default /api/push)',
+      did: 'PushKit Blocklet DID',
+      customOptions: 'Custom Options'
     },
     email: {
       enable: 'Enable email notification',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.28-beta-23b06b63",
+  "version": "1.16.28-beta-bfbab430",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,9 +25,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.28-beta-23b06b63",
-    "@abtnode/constant": "1.16.28-beta-23b06b63",
-    "@abtnode/util": "1.16.28-beta-23b06b63",
+    "@abtnode/auth": "1.16.28-beta-bfbab430",
+    "@abtnode/constant": "1.16.28-beta-bfbab430",
+    "@abtnode/util": "1.16.28-beta-bfbab430",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.123",
     "@arcblock/did-connect": "^2.9.90",
@@ -37,10 +37,10 @@
     "@arcblock/react-hooks": "^2.9.90",
     "@arcblock/terminal": "^2.9.90",
     "@arcblock/ux": "^2.9.90",
-    "@blocklet/constant": "1.16.28-beta-23b06b63",
+    "@blocklet/constant": "1.16.28-beta-bfbab430",
     "@blocklet/launcher-layout": "2.3.21",
     "@blocklet/list": "^0.12.111",
-    "@blocklet/meta": "1.16.28-beta-23b06b63",
+    "@blocklet/meta": "1.16.28-beta-bfbab430",
     "@blocklet/ui-react": "^2.9.90",
     "@blocklet/uploader": "^0.1.6",
     "@emotion/react": "^11.10.4",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "4e16d8cb992139e25f6702268895917561a1d2f1"
+  "gitHead": "f1fbf0752de46be00d1faa0d54eb7d28016e0bb9"
 }