@abtnode/ux 1.16.17-beta-09df289d → 1.16.17-beta-4f13d99d

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

@@ -4,13 +4,13 @@ import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import Breadcrumbs from '@mui/material/Breadcrumbs';
+import InputAdornment from '@mui/material/InputAdornment';
 import styled from '@emotion/styled';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Box from '@mui/material/Box';
 import Button from '@arcblock/ux/lib/Button';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
 import Toast from '@arcblock/ux/lib/Toast';
-import DidAddress from '../../did-address';
 import { useNodeContext } from '../../contexts/node';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { useSessionContext } from '../../contexts/session';
@@ -66,6 +66,14 @@ export default function CreateProject({
     setOpenConnect(false);
   };
   const onCreate = () => {
+    if (!blockletDid) {
+      Toast.error(t('blocklet.publish.errorTip.noDid'));
+      return;
+    }
+    if (!blockletTitle) {
+      Toast.error(t('blocklet.publish.errorTip.noTitle'));
+      return;
+    }
     setLoading(true);
     api.createProject({
       input: {
@@ -100,26 +108,29 @@ export default function CreateProject({
       style: {
         maxWidth: 500
       },
-      children: [/*#__PURE__*/_jsxs(Box, {
+      children: [/*#__PURE__*/_jsx(TextField, {
+        required: true,
         sx: {
-          mb: 3
+          mb: 4
         },
-        display: "flex",
-        alignItems: "center",
-        children: [/*#__PURE__*/_jsxs(Typography, {
-          variant: "h6",
-          sx: {
-            mr: 3
-          },
-          children: ["Blocklet DID:", ' ']
-        }), blockletDid ? /*#__PURE__*/_jsx(DidAddress, {
-          size: 14,
-          responsive: true,
-          did: blockletDid
-        }) : /*#__PURE__*/_jsx(Button, {
-          onClick: () => setOpenConnect(true),
-          children: t('blocklet.publish.createBlockletDid')
-        })]
+        label: "Blocklet DID",
+        fullWidth: true,
+        readonly: true,
+        autoComplete: "off",
+        variant: "outlined",
+        onClick: () => !blockletDid && setOpenConnect(true),
+        InputProps: {
+          'data-cy': 'export-blocklet-did',
+          endAdornment: /*#__PURE__*/_jsx(InputAdornment, {
+            position: "end",
+            children: /*#__PURE__*/_jsx(Button, {
+              onClick: () => setOpenConnect(true),
+              children: t(blockletDid ? 'common.update' : 'common.create')
+            })
+          })
+        },
+        helperText: "",
+        value: blockletDid || ''
       }), openConnect && /*#__PURE__*/_jsx(DidConnect, {
         open: true,
         popup: true,
@@ -142,10 +153,11 @@ export default function CreateProject({
           success: t('blocklet.publish.connect.success')
         }
       }), /*#__PURE__*/_jsx(TextField, {
+        required: true,
         label: `Blocklet ${t('common.title')}`,
         autoComplete: "off",
         variant: "outlined",
-        inputProps: {
+        InputProps: {
           'data-cy': 'export-blocklet-title'
         },
         fullWidth: true,
@@ -173,7 +185,7 @@ export default function CreateProject({
       })]
     }), /*#__PURE__*/_jsx(Button, {
       variant: "contained",
-      disabled: loading || !blockletDid || !blockletTitle,
+      disabled: loading,
       onClick: onCreate,
       children: t('common.create')
     })]

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

@@ -12,6 +12,7 @@ import Breadcrumbs from '@mui/material/Breadcrumbs';
 import Box from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
+import InputAdornment from '@mui/material/InputAdornment';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -23,15 +24,53 @@ import BlockletBundleAvatar from '../bundle-avatar';
 import { useNodeContext } from '../../contexts/node';
 import { useBlockletContext } from '../../contexts/blocklet';
 import EmptySpinner from '../../empty-spinner';
+import { formatError } from '../../util';
 import Resource from './resource';
-
-// eslint-disable-next-line import/no-unresolved
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+const allowedFileTypes = ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
+const maxFileSize = 1024 * 1024 * 10; // 10 MB
+
+// eslint-disable-next-line import/no-unresolved
 const UploaderComponent = /*#__PURE__*/lazy(() => import('@blocklet/uploader/react').then(res => ({
   default: res.Uploader
 })));
+const validateParams = (params, status, t) => {
+  const errors = [];
+  if (!params.blockletTitle) {
+    errors.push({
+      param: 'blockletTitle',
+      message: t('blocklet.publish.errorTip.noTitle')
+    });
+  }
+  if (!params.blockletVersion) {
+    errors.push({
+      param: 'blockletVersion',
+      message: t('blocklet.publish.errorTip.noVersion')
+    });
+  } else if (!semver.valid(params.blockletVersion)) {
+    errors.push({
+      param: 'blockletVersion',
+      message: 'Invalid Blocklet Version'
+    });
+  }
+  if (status === PROJECT.RELEASE_STATUS.published) {
+    if (!params.blockletDescription) {
+      errors.push({
+        param: 'blockletDescription',
+        message: t('blocklet.publish.errorTip.noDescription')
+      });
+    }
+    if (!params.note) {
+      errors.push({
+        param: 'note',
+        message: t('blocklet.publish.errorTip.noNote')
+      });
+    }
+  }
+  return errors.length ? errors : null;
+};
 const addComponentTabs = ({
   tabs,
   blocklet,
@@ -59,7 +98,11 @@ const addComponentTabs = ({
     value: key
   });
 };
-const pickParams = release => pick(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'note']);
+const pickParams = release => {
+  const params = pick(release, ['blockletVersion', 'blockletTitle', 'blockletDescription', 'blockletLogo', 'blockletIntroduction', 'blockletScreenshots', 'note']);
+  params.blockletScreenshots ||= [];
+  return params;
+};
 export default function CreateRelease({
   ...rest
 }) {
@@ -75,6 +118,7 @@ export default function CreateRelease({
     blocklet
   } = useBlockletContext();
   const [params, setParams] = useSetState(null);
+  const [paramsErrTip, setParamsErrTip] = useState({});
   const [loading, setLoading] = useState(false);
   const [release, setRelease] = useState(null);
   const {
@@ -114,7 +158,7 @@ export default function CreateRelease({
       setParams(pickParams(data));
     }).catch(err => {
       setLoading(false);
-      Toast.error(err.message);
+      Toast.error(formatError(err));
     });
   };
   const getRelease = () => {
@@ -130,7 +174,7 @@ export default function CreateRelease({
       setRelease(res?.release);
     }).catch(err => {
       setLoading(false);
-      Toast.error(err.message);
+      Toast.error(formatError(err));
     });
   };
   const getData = () => {
@@ -150,30 +194,24 @@ export default function CreateRelease({
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   const onRelease = status => {
-    if (!params.blockletTitle) {
-      Toast.error(t('blocklet.publish.errorTip.noTitle'));
-      return;
-    }
-    if (!params.blockletVersion) {
-      Toast.error(t('blocklet.publish.errorTip.noVersion'));
+    const errors = validateParams(params, status, t);
+    if (errors) {
+      Toast.error(errors.map(x => x.message).join('; '));
+      setParamsErrTip(errors.reduce((acc, x) => ({
+        ...acc,
+        [x.param]: x.message
+      }), {}));
       return;
     }
-    if (status === PROJECT.RELEASE_STATUS.published) {
-      if (!params.blockletDescription) {
-        Toast.error(t('blocklet.publish.errorTip.noDescription'));
-        return;
-      }
-      if (!params.note) {
-        Toast.error(t('blocklet.publish.errorTip.noNote'));
-        return;
-      }
-    }
     const _params = {
       ...params
     };
     _params.blockletVersion = semver.valid(_params.blockletVersion);
     if (!_params.blockletVersion) {
       Toast.error('Invalid Blocklet Version');
+      setParamsErrTip({
+        blockletVersion: 'Invalid Blocklet Version'
+      });
       return;
     }
     _params.blockletTitle = (_params.blockletTitle || '').trim();
@@ -203,7 +241,7 @@ export default function CreateRelease({
         });
       }
     }).catch(err => {
-      Toast.error(err.message);
+      Toast.error(formatError(err));
     });
   };
   if (!params && loading) {
@@ -295,7 +333,7 @@ export default function CreateRelease({
           children: [/*#__PURE__*/_jsx(TextField, {
             label: `Blocklet ${t('common.title')}`,
             placeholder: `Blocklet ${t('common.title')}`,
-            inputProps: {
+            InputProps: {
               'data-cy': 'blocklet-title',
               readOnly
             },
@@ -304,14 +342,19 @@ export default function CreateRelease({
             fullWidth: true,
             value: params.blockletTitle || '',
             onChange: e => {
+              setParamsErrTip({
+                blockletTitle: ''
+              });
               setParams({
                 blockletTitle: e.target.value
               });
-            }
+            },
+            error: !!paramsErrTip.blockletTitle,
+            helperText: paramsErrTip.blockletTitle || ''
           }), /*#__PURE__*/_jsx(TextField, {
             label: `Blocklet ${t('common.description')}`,
             placeholder: `Blocklet ${t('common.description')}`,
-            inputProps: {
+            InputProps: {
               'data-cy': 'blocklet-description',
               readOnly
             },
@@ -320,31 +363,45 @@ export default function CreateRelease({
             fullWidth: true,
             value: params.blockletDescription || '',
             onChange: e => {
+              setParamsErrTip({
+                blockletDescription: ''
+              });
               setParams({
                 blockletDescription: e.target.value
               });
             },
+            error: !!paramsErrTip.blockletDescription,
+            helperText: paramsErrTip.blockletDescription || '',
             sx: {
               mt: 3
             }
           }), /*#__PURE__*/_jsx(TextField, {
             label: `Blocklet ${t('common.introduction')}`,
             placeholder: `Blocklet ${t('common.introduction')}`,
-            inputProps: {
+            InputProps: {
               'data-cy': 'export-blocklet-introduction',
-              readOnly
+              readOnly,
+              endAdornment: /*#__PURE__*/_jsxs(InputAdornment, {
+                position: "end",
+                children: [params?.blockletIntroduction?.length || 0, " / ", PROJECT.MAX_INTRO_LENGTH]
+              })
             },
             autoComplete: "off",
             variant: "outlined",
             fullWidth: true,
             multiline: true,
-            rows: 4,
+            minRows: 4,
             value: params.blockletIntroduction || '',
             onChange: e => {
+              setParamsErrTip({
+                blockletIntroduction: ''
+              });
               setParams({
-                blockletIntroduction: e.target.value
+                blockletIntroduction: e.target.value.slice(0, PROJECT.MAX_INTRO_LENGTH)
               });
             },
+            error: !!paramsErrTip.blockletIntroduction,
+            helperText: paramsErrTip.blockletIntroduction || '',
             sx: {
               mt: 3
             }
@@ -365,7 +422,7 @@ export default function CreateRelease({
           children: [/*#__PURE__*/_jsx(TextField, {
             label: `Blocklet ${t('common.version')}`,
             placeholder: `Blocklet ${t('common.version')}`,
-            inputProps: {
+            InputProps: {
               'data-cy': 'blocklet-version',
               readOnly
             },
@@ -374,27 +431,41 @@ export default function CreateRelease({
             fullWidth: true,
             value: params.blockletVersion,
             onChange: e => {
+              setParamsErrTip({
+                blockletVersion: ''
+              });
               setParams({
                 blockletVersion: e.target.value
               });
-            }
+            },
+            error: !!paramsErrTip.blockletVersion,
+            helperText: paramsErrTip.blockletVersion || ''
           }), /*#__PURE__*/_jsx(TextField, {
             label: t('blocklet.publish.releaseNote'),
             autoComplete: "off",
             variant: "outlined",
-            inputProps: {
+            InputProps: {
               'data-cy': 'release-note',
-              readOnly
+              readOnly,
+              endAdornment: /*#__PURE__*/_jsxs(InputAdornment, {
+                position: "end",
+                children: [params?.note?.length || 0, " / ", PROJECT.MAX_NOTE_LENGTH]
+              })
             },
             fullWidth: true,
             multiline: true,
-            rows: 4,
+            minRows: 4,
             value: params.note,
             onChange: e => {
+              setParamsErrTip({
+                note: ''
+              });
               setParams({
-                note: e.target.value
+                note: e.target.value.slice(0, PROJECT.MAX_NOTE_LENGTH)
               });
             },
+            error: !!paramsErrTip.note,
+            helperText: paramsErrTip.note || '',
             sx: {
               mt: 3
             }
@@ -494,11 +565,19 @@ export default function CreateRelease({
             setParams({
               blockletLogo: result.data.filename
             });
+            uploaderLogoRef.current.close();
           },
-          plugins: ['ImageEditor', 'Url', 'Webcam'],
+          plugins: [],
           apiPathProps: {
             uploader: uploadLogoPrefix,
             disableMediaKitPrefix: true
+          },
+          coreProps: {
+            restrictions: {
+              allowedFileTypes,
+              maxFileSize,
+              maxNumberOfFiles: 1
+            }
           }
         }, "uploader-screenshot"), /*#__PURE__*/_jsx(UploaderComponent, {
           id: "\u200Buploader-screenshot",
@@ -510,11 +589,19 @@ export default function CreateRelease({
             setParams({
               blockletScreenshots
             });
+            uploaderScreenshotRef.current.close();
           },
-          plugins: ['ImageEditor', 'Url', 'Webcam'],
+          plugins: [],
           apiPathProps: {
             uploader: uploadScreenshotPrefix,
             disableMediaKitPrefix: true
+          },
+          coreProps: {
+            restrictions: {
+              allowedFileTypes,
+              maxFileSize,
+              maxNumberOfFiles: 5 - screenshotUrls.length
+            }
           }
         }, "uploader-screenshot")]
       }), /*#__PURE__*/_jsxs(Box, {
@@ -640,4 +727,11 @@ const Main = styled.div`
       color: inherit;
     }
   }
+  .MuiInputBase-multiline .MuiInputAdornment-positionEnd {
+    align-self: flex-end;
+    .MuiTypography-root {
+      font-size: 0.8rem;
+    }
+    font-size: 0.8rem;
+  }
 `;

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

@@ -9,6 +9,8 @@ import DeleteIcon from '@mui/icons-material/Delete';
 import Datatable from '@arcblock/ux/lib/Datatable';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
+import Tag from '@arcblock/ux/lib/Tag';
+import RelativeTime from '@arcblock/ux/lib/RelativeTime';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { useNodeContext } from '../../contexts/node';
 import EmptySpinner from '../../empty-spinner';
@@ -104,7 +106,7 @@ export default function ProjectList() {
     });
   }
   const columns = [{
-    label: t('common.name'),
+    label: 'Blocklet',
     name: 'blockletTitle',
     options: {
       customBodyRenderLite: rawIndex => {
@@ -116,7 +118,7 @@ export default function ProjectList() {
       }
     }
   }, {
-    label: t('common.address'),
+    label: 'DID',
     name: 'blockletDid',
     options: {
       customBodyRender: e => {
@@ -127,6 +129,28 @@ export default function ProjectList() {
         });
       }
     }
+  }, {
+    label: 'Version',
+    name: 'blockletVersion',
+    options: {
+      customBodyRender: value => {
+        return value ? /*#__PURE__*/_jsx(Tag, {
+          type: "success",
+          children: value
+        }) : '';
+      }
+    }
+  }, {
+    label: t('common.updatedAt'),
+    name: 'updatedAt',
+    options: {
+      customBodyRender: value => {
+        return /*#__PURE__*/_jsx(RelativeTime, {
+          value: Number(value),
+          locale: locale
+        });
+      }
+    }
   }, {
     label: t('common.actions'),
     name: 'actions',

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

@@ -16,6 +16,8 @@ import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
 import Tag from '@arcblock/ux/lib/Tag';
+import RelativeTime from '@arcblock/ux/lib/RelativeTime';
+import { PROJECT } from '@blocklet/constant';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { useNodeContext } from '../../contexts/node';
 import EmptySpinner from '../../empty-spinner';
@@ -187,6 +189,21 @@ export default function ReleaseList() {
         });
       }
     }
+  }, {
+    label: t('common.lastPublishedAt'),
+    name: 'updatedAt',
+    options: {
+      customBodyRenderLite: rawIndex => {
+        const release = releases[rawIndex];
+        if (release.status !== PROJECT.RELEASE_STATUS.published) {
+          return '';
+        }
+        return /*#__PURE__*/_jsx(RelativeTime, {
+          value: Number(release.updatedAt),
+          locale: locale
+        });
+      }
+    }
   }, {
     label: t('common.actions'),
     name: 'actions',
@@ -195,11 +212,15 @@ export default function ReleaseList() {
         const release = releases[rawIndex];
         return /*#__PURE__*/_jsxs(Box, {
           display: "flex",
+          alignItems: "center",
           children: [/*#__PURE__*/_jsx(IconButton, {
             color: "primary",
             "aria-label": "download",
             disabled: release.status !== 'published',
             children: release.status === 'published' ? /*#__PURE__*/_jsx("a", {
+              style: {
+                display: 'flex'
+              },
               href: joinUrl(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${project.id}/${release.id}/download/${(release.files || [])[0]}`),
               children: /*#__PURE__*/_jsx(DownloadIcon, {
                 sx: {

package/es/blocklet/router/util.js

@@ -2,6 +2,7 @@
 import { ROUTING_RULE_TYPES, DEFAULT_IP_DOMAIN_SUFFIX, DOMAIN_FOR_IP_SITE_REGEXP, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_IP_SITE } from '@abtnode/constant';
 import isPathPrefixEqual from '@abtnode/util/lib/is-path-prefix-equal';
 import { BLOCKLET_DYNAMIC_PATH_PREFIX } from '@blocklet/constant';
+import hasStartEngine from '@blocklet/meta/lib/has-start-engine';
 const validateRuleByServiceType = (params, localeContext) => {
   if (params.type === ROUTING_RULE_TYPES.REDIRECT) {
     if (!params.url) {
@@ -74,7 +75,7 @@ export const validatePathPrefix = ({
 }) => {
   // validate children
   if (curBlocklet) {
-    let exist = (curBlocklet.children || []).find(x => isPathPrefixEqual(x.mountPoint, params.pathPrefix));
+    let exist = (curBlocklet.children || []).find(x => hasStartEngine(x.meta) && isPathPrefixEqual(x.mountPoint, params.pathPrefix));
     if (curBlocklet.meta.group !== 'gateway' && params.pathPrefix === '/') {
       exist = '/';
     }

package/es/blocklet/storage/connect-to.js

@@ -14,7 +14,7 @@ import { axios } from '../../util/api';
 import { formatError, getWebWalletUrl } from '../../util';
 import { useNodeContext } from '../../contexts/node';
 import useBlockletInfoForConnectDIDSpaces from '../../hooks/use-blocklet-info-for-connect-did-spaces';
-import { getDIDSpaceDidFromEndpoint, isValidSpaceGatewayUrl } from '../../util/spaces';
+import { extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, isValidSpaceGatewayUrl } from '../../util/spaces';
 import { useBlockletStorageContext } from '../../contexts/blocklet-storage';
 /**
  * @description
@@ -121,6 +121,7 @@ function ConnectTo({
         ...preValue,
         open: false
       }));
+      setUrl(null);
       setAuthorizeFromNftConnect(preValue => ({
         ...preValue,
         open: false
@@ -190,7 +191,9 @@ function ConnectTo({
   const handleUseSpaceGatewayConnect = async () => {
     try {
       setLoading(true);
-      const fullUrl = url.startsWith('http') ? url : `https://${url}`;
+      const tempUrl = url.startsWith('http') ? url : `https://${url}`;
+      const fullUrl = extraDIDSpacesCoreUrl(tempUrl);
+      const spaceDid = new URL(tempUrl).searchParams.get('spaceDid');
       if (!(await isValidSpaceGatewayUrl(fullUrl))) {
         throw new Error(t('storage.spaces.gateway.add.invalidUrl'));
       }
@@ -209,7 +212,8 @@ function ConnectTo({
           scopes: blockletInfo.scopes,
           appUrl: blockletInfo.appUrl,
           referrer: blockletInfo.referrer,
-          nodeDid: info.did
+          nodeDid: info.did,
+          spaceDid
         }
       }));
       setOpen(false);

package/es/blocklet/storage/item.js

@@ -192,7 +192,8 @@ function SpaceItem({
         scopes,
         appUrl,
         referrer,
-        nodeDid
+        nodeDid,
+        spaceDid: spaceGateway.did
       }
     }));
   };

package/es/locales/en.js

@@ -632,6 +632,7 @@ module.exports = {
       saveDraft: 'Save Draft',
       releaseNote: 'Release Note',
       errorTip: {
+        noDid: 'Blocklet DID is required',
         noTitle: 'Blocklet Title is required',
         noVersion: 'Blocklet Version is required',
         noDescription: 'Blocklet Description is required',
@@ -1313,7 +1314,8 @@ module.exports = {
       launchFailed: 'Failed to launch the app, please try again',
       installedButStopped: 'The app is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
       installedButError: 'The app is successfully installed, but failed to start',
-      restoreFailed: 'Failed to restore app, please try again'
+      restoreFailed: 'Failed to restore app, please try again',
+      resourceBlocklet: 'Resource Blocklet cannot be installed as an application, you can mount this blocklet into existing applications.'
     },
     steps: {
       introduction: 'Introduction',

package/es/locales/zh.js

@@ -639,6 +639,7 @@ module.exports = {
       saveDraft: '保存草稿',
       releaseNote: '发布说明',
       errorTip: {
+        noDid: '请填写 Blocklet DID',
         noTitle: '请填写 Blocklet 名称',
         noVersion: '请填写 Blocklet 版本号',
         noDescription: '请填写 Blocklet 描述',
@@ -1318,7 +1319,8 @@ module.exports = {
       launchFailed: '启动应用失败，请重试',
       installedButStopped: '应用安装成功，但是无法启动，解决启动问题之后后可手动启动',
       installedButError: '应用已经安装，但是运行出错了',
-      restoreFailed: '还原应用失败,请重试'
+      restoreFailed: '还原应用失败,请重试',
+      resourceBlocklet: '资源 Blocklet 无法作为应用被安装，你可以将该 Blocklet 挂载到现有的应用中。'
     },
     steps: {
       introduction: '简介',

package/es/team/members/toggle-user-approval.js

@@ -2,6 +2,7 @@ import { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
+import { hasActiveOwnerPassport } from '@abtnode/util/lib/passport';
 import Confirm from '../../confirm';
 import { useNodeContext } from '../../contexts/node';
 import { useTeamContext } from '../../contexts/team';
@@ -82,7 +83,9 @@ export default function ToggleUserApproval({
     color: user.approved ? 'error' : 'primary'
   };
   let can;
-  if (!inService) {
+  if (hasActiveOwnerPassport(user)) {
+    can = false;
+  } else if (!inService) {
     can = nodeInfo.nodeOwner && !isNodeOwner(nodeInfo, user.did) && !isSelf(session.user, user.did);
   } else {
     can = !isSelf(session.user, user.did);