@blocklet/meta 1.17.5-beta-20251211-104355-426d7eb6 → 1.17.5-beta-20251214-122206-29056e8c

package/lib/parse-navigation-from-blocklet.js

@@ -14,6 +14,7 @@ exports.joinLink = joinLink;
 exports.flattenNavigation = flattenNavigation;
 exports.splitNavigationBySection = splitNavigationBySection;
 const constant_1 = require("@abtnode/constant");
+const constant_2 = require("@blocklet/constant");
 const unionWith_1 = __importDefault(require("lodash/unionWith"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
@@ -521,8 +522,9 @@ function cleanOrphanNavigation(list) {
     });
 }
 const sortRootNavigation = (navigation) => {
-    const [root, other] = (0, partition_1.default)(navigation, (x) => x.id === '/team');
-    return [...root, ...other];
+    const [system, rest] = (0, partition_1.default)(navigation, (x) => x.id === constant_2.NAV_GROUP_SYSTEM);
+    const [services, others] = (0, partition_1.default)(rest, (x) => x.id === constant_2.NAV_GROUP_SERVICES);
+    return [...system, ...services, ...others];
 };
 exports.sortRootNavigation = sortRootNavigation;
 // FIXME: Pillar, 这个函数是一个过渡方案, 用来清理 navigation 中的历史数据, 之后可以删除
@@ -530,7 +532,7 @@ const cleanOldNavigationHistory = (navigation) => {
     const [, other] = (0, partition_1.default)(navigation, (x) => {
         const title = typeof x.title === 'string' ? x.title : x.title?.en;
         // 这里找不到多余的可以用来判断的数据, 只好用 title 来判断
-        return (x.id === '/team' && title === 'Access') || (x.id === '/dashboard' && title === 'Blocklet');
+        return x.id === constant_2.NAV_GROUP_TEAM || (x.id === '/dashboard' && title === 'Blocklet');
     });
     return other;
 };
@@ -545,6 +547,7 @@ function parseNavigation(blocklet = {}, options = {}) {
         });
     });
     const orgIsEnabled = (0, get_1.default)(blocklet, 'settings.org.enabled', false);
+    const internalGroupPaths = [constant_2.NAV_GROUP_TEAM, constant_2.NAV_GROUP_SYSTEM, constant_2.NAV_GROUP_SERVICES];
     // 移除存在 db 中的默认导航
     if (blocklet?.settings?.navigations) {
         if (!Array.isArray(blocklet.settings.navigations)) {
@@ -552,7 +555,8 @@ function parseNavigation(blocklet = {}, options = {}) {
         }
         else {
             blocklet.settings.navigations = [...blocklet.settings.navigations]
-                .filter((item) => !(item?.parent === '/team' && item.from === 'team-tmpl'))
+                // 移除内置导航
+                .filter((item) => !(item.from === 'team-tmpl' && internalGroupPaths.includes(item?.parent)))
                 .map((item) => {
                 // 兼容历史数据，如果存储的没有 private 字段但是 blocklet.yml 有这个字段，则将 blocklet.yml 的 private 字段赋值给 blocklet.settings.navigations
                 // private 字段不会被修改，只会在 blocklet.yml 中存在

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.5-beta-20251211-104355-426d7eb6",
+  "version": "1.17.5-beta-20251214-122206-29056e8c",
   "description": "Library to parse/validate/fix blocklet meta",
   "homepage": "https://www.arcblock.io/docs/blocklet-spec",
   "main": "./lib/index.js",
@@ -24,19 +24,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/db-cache": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/docker-utils": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@arcblock/did": "^1.27.12",
-    "@arcblock/did-ext": "^1.27.12",
-    "@arcblock/did-util": "^1.27.12",
-    "@arcblock/jwt": "^1.27.12",
-    "@blocklet/constant": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@ocap/asset": "^1.27.12",
-    "@ocap/mcrypto": "^1.27.12",
-    "@ocap/types": "^1.27.12",
-    "@ocap/util": "^1.27.12",
-    "@ocap/wallet": "^1.27.12",
+    "@abtnode/constant": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/db-cache": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/docker-utils": "1.17.5-beta-20251214-122206-29056e8c",
+    "@arcblock/did": "^1.27.14",
+    "@arcblock/did-ext": "^1.27.14",
+    "@arcblock/did-util": "^1.27.14",
+    "@arcblock/jwt": "^1.27.14",
+    "@blocklet/constant": "1.17.5-beta-20251214-122206-29056e8c",
+    "@ocap/asset": "^1.27.14",
+    "@ocap/mcrypto": "^1.27.14",
+    "@ocap/types": "^1.27.14",
+    "@ocap/util": "^1.27.14",
+    "@ocap/wallet": "^1.27.14",
     "ajv": "^8.11.0",
     "axios": "^1.7.9",
     "cjk-length": "^1.0.0",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "9ea2a8077a8edbf5021281e823719758eb9fe02c"
+  "gitHead": "6839aebc2fdccbfbe7448f1e38f90be300ee4051"
 }