@abtnode/ux 1.16.6-beta-56be9f01 → 1.16.6-beta-e2082fec

package/lib/blocklet/audit-logs.js

@@ -11,6 +11,7 @@ var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar")
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _constant = require("@abtnode/constant");
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _Pagination = _interopRequireDefault(require("@mui/lab/Pagination"));
@@ -34,7 +35,7 @@ const getUserLink = _ref => {
   } = _ref;
   if (inService) {
     // TODO
-    return "/members?did=".concat(log.actor.did);
+    return "".concat(_constant.WELLKNOWN_BLOCKLET_ADMIN_PATH, "/members?did=").concat(log.actor.did);
   }
   if (log.scope === info.did) {
     return "/team/members?did=".concat(log.actor.did);
@@ -183,10 +184,12 @@ function AuditLogs() {
 }
 function WrappedAuditLogs(_ref3) {
   let {
-    scope
+    scope,
+    categories
   } = _ref3;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_auditLog.AuditLogProvider, {
     scope: scope,
+    categories: categories,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AuditLogs, {})
   });
 }

package/lib/contexts/audit-log.js

@@ -24,7 +24,8 @@ exports.AuditLogConsumer = Consumer;
 function AuditLogProvider(_ref) {
   let {
     children,
-    scope = ''
+    scope = '',
+    categories = []
   } = _ref;
   const {
     api: client
@@ -38,6 +39,45 @@ function AuditLogProvider(_ref) {
   });
   const [loading, setLoading] = (0, _react.useState)(false);
   const [category, setCategory] = (0, _useLocalStorage.default)("audit-log-category-".concat(scope), 'all');
+  const categoryList = [{
+    value: 'all',
+    label: 'All',
+    description: ''
+  }, {
+    value: 'blocklet',
+    label: 'Blocklet Management',
+    description: ''
+  }, {
+    value: 'server',
+    label: 'Server Management',
+    description: ''
+  }, {
+    value: 'team',
+    label: 'Team Management',
+    description: ''
+  }, {
+    value: 'security',
+    label: 'Security',
+    description: ''
+  }, {
+    value: 'certificates',
+    label: 'Certificate Management',
+    description: ''
+  }, {
+    value: 'integrations',
+    label: 'Integration Management',
+    description: ''
+  }, {
+    value: 'gateway',
+    label: 'Gateway',
+    description: ''
+  }];
+  const filterCategories = categoryList.filter(item => {
+    if (categories.length) {
+      return item.value === 'all' || categories.includes(item.value);
+    }
+    return true;
+  });
   const fetchLogs = async function fetchLogs() {
     let {
       page = 1,
@@ -52,6 +92,7 @@ function AuditLogProvider(_ref) {
     try {
       // eslint-disable-next-line no-shadow
       const res = await client.getAuditLogs({
+        // 由于 blocklet 中的 audit-log 本身就不包含 server 类型的，所以这里的 category 查询不需要对 server 类型的做额外的处理
         input: {
           paging: {
             page
@@ -89,39 +130,7 @@ function AuditLogProvider(_ref) {
       category,
       scope
     },
-    categories: [{
-      value: 'all',
-      label: 'All',
-      description: ''
-    }, {
-      value: 'blocklet',
-      label: 'Blocklet Management',
-      description: ''
-    }, {
-      value: 'server',
-      label: 'Server Management',
-      description: ''
-    }, {
-      value: 'team',
-      label: 'Team Management',
-      description: ''
-    }, {
-      value: 'security',
-      label: 'Security',
-      description: ''
-    }, {
-      value: 'certificates',
-      label: 'Certificate Management',
-      description: ''
-    }, {
-      value: 'integrations',
-      label: 'Integration Management',
-      description: ''
-    }, {
-      value: 'gateway',
-      label: 'Gateway',
-      description: ''
-    }],
+    categories: filterCategories,
     setCategory,
     data: auditLogs,
     paging

package/lib/team/members/index.js

@@ -25,6 +25,8 @@ var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/Ex
 var _Datatable = _interopRequireWildcard(require("@arcblock/ux/lib/Datatable"));
 var _RelativeTime = _interopRequireDefault(require("@arcblock/ux/lib/RelativeTime"));
 var _constant = require("@abtnode/constant");
+var _useUrlState = _interopRequireDefault(require("@ahooksjs/use-url-state"));
+var _ahooks = require("ahooks");
 var _toast = _interopRequireDefault(require("../../toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -146,6 +148,9 @@ function MemberList(_ref2) {
   const [users, setUsers] = (0, _react.useState)([]);
   const [rowCount, setRowCount] = (0, _react.useState)();
   const [userCounts, setUserCounts] = (0, _react.useState)([]);
+  const [urlState] = (0, _useUrlState.default)({
+    did: undefined
+  });
   const durableKey = "members-".concat(teamDid);
   const tableDurableData = (0, _Datatable.getDurableData)(durableKey);
   const [search, setSearch] = (0, _react.useState)({
@@ -155,6 +160,18 @@ function MemberList(_ref2) {
     pageSize: tableDurableData.rowsPerPage || 10,
     page: tableDurableData.page ? tableDurableData.page + 1 : 1
   });
+  (0, _ahooks.useMount)(async () => {
+    if (urlState.did) {
+      const {
+        user
+      } = await api.getUser({
+        did: urlState.did
+      });
+      if (user) {
+        setMemberDialog(user);
+      }
+    }
+  });
   const sideList = (roles || []).map(x => ({
     name: x.name,
     title: x.title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.6-beta-56be9f01",
+  "version": "1.16.6-beta-e2082fec",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -22,21 +22,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-56be9f01",
-    "@abtnode/constant": "1.16.6-beta-56be9f01",
-    "@abtnode/util": "1.16.6-beta-56be9f01",
-    "@arcblock/did": "^1.18.76",
-    "@arcblock/did-connect": "^2.5.34",
+    "@abtnode/auth": "1.16.6-beta-e2082fec",
+    "@abtnode/constant": "1.16.6-beta-e2082fec",
+    "@abtnode/util": "1.16.6-beta-e2082fec",
+    "@ahooksjs/use-url-state": "^3.5.1",
+    "@arcblock/did": "^1.18.77",
+    "@arcblock/did-connect": "^2.5.36",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.34",
-    "@arcblock/react-hooks": "^2.5.34",
-    "@arcblock/terminal": "^2.5.34",
-    "@arcblock/ux": "^2.5.34",
-    "@blocklet/constant": "1.16.6-beta-56be9f01",
-    "@blocklet/launcher-layout": "2.0.34",
+    "@arcblock/icons": "^2.5.36",
+    "@arcblock/react-hooks": "^2.5.36",
+    "@arcblock/terminal": "^2.5.36",
+    "@arcblock/ux": "^2.5.36",
+    "@blocklet/constant": "1.16.6-beta-e2082fec",
+    "@blocklet/launcher-layout": "2.0.36",
     "@blocklet/list": "^0.11.22",
-    "@blocklet/meta": "1.16.6-beta-56be9f01",
-    "@blocklet/ui-react": "^2.5.34",
+    "@blocklet/meta": "1.16.6-beta-e2082fec",
+    "@blocklet/ui-react": "^2.5.36",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -45,7 +46,7 @@
     "@mui/lab": "^5.0.0-alpha.102",
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
-    "@ocap/client": "1.18.76",
+    "@ocap/client": "1.18.77",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -91,5 +92,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
+  "gitHead": "851e0ab17f1c6e160aedc47fcdbf7dd54dfa7237"
 }