@origen-ui/admin-cli 1.0.3 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (237) hide show
  1. package/README.md +11 -7
  2. package/package.json +19 -3
  3. package/templates/current/clean/CHANGELOG.md +137 -0
  4. package/templates/current/clean/component-catalog.json +58 -17
  5. package/templates/current/clean/e2e/admin-shell.spec.ts +6 -0
  6. package/templates/current/clean/e2e/demo-shell.spec.ts +90 -46
  7. package/templates/current/clean/package.json +55 -41
  8. package/templates/current/clean/playwright.config.ts +1 -0
  9. package/templates/current/clean/playwright.demo.config.ts +1 -1
  10. package/templates/current/clean/scaffold.lock.json +2 -2
  11. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  12. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  13. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  14. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  15. package/templates/current/clean/scripts/clean-overlay/src/main.ts +23 -14
  16. package/templates/current/clean/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  17. package/templates/current/clean/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  18. package/templates/current/clean/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  19. package/templates/current/clean/scripts/clean-overlay/src/router/paths.ts +21 -0
  20. package/templates/current/clean/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  21. package/templates/current/clean/scripts/demo-api.ts +84 -8
  22. package/templates/current/clean/scripts/generate-api.ts +87 -3
  23. package/templates/current/clean/scripts/vite-build-policy.spec.ts +72 -0
  24. package/templates/current/clean/src/App.vue +10 -3
  25. package/templates/current/clean/src/api/client.ts +90 -10
  26. package/templates/current/clean/src/api/generated/data-contracts.ts +0 -3
  27. package/templates/current/clean/src/api/generated/http-client.ts +28 -26
  28. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/206/205/345/256/271/346/226/207/347/253/240.ts +5 -8
  29. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/256/241/350/256/241.ts +1 -4
  30. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/346/226/207/344/273/266/344/270/212/344/274/240.ts +2 -5
  31. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/347/224/250/346/210/267.ts +6 -9
  32. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/217/234/345/215/225.ts +7 -10
  33. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/247/222/350/211/262.ts +6 -9
  34. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/256/242/345/215/225/350/215/211/347/250/277.ts +6 -9
  35. package/templates/current/clean/src/api/generated//350/256/244/350/257/201.ts +3 -6
  36. package/templates/current/clean/src/app/adminLocale.ts +90 -0
  37. package/templates/current/clean/src/app/createAdminUi.spec.ts +65 -9
  38. package/templates/current/clean/src/app/createAdminUi.ts +14 -29
  39. package/templates/current/clean/src/app/embedded-token.spec.ts +40 -0
  40. package/templates/current/clean/src/app/embedded.spec.ts +135 -0
  41. package/templates/current/clean/src/app/embedded.ts +255 -0
  42. package/templates/current/clean/src/app/errorMessage.spec.ts +76 -0
  43. package/templates/current/clean/src/app/errorMessage.ts +53 -0
  44. package/templates/current/clean/src/app/localeFormat.ts +52 -0
  45. package/templates/current/clean/src/app/menu-host.spec.ts +77 -0
  46. package/templates/current/clean/src/app/menu.spec.ts +65 -0
  47. package/templates/current/clean/src/app/menu.ts +52 -12
  48. package/templates/current/clean/src/app/menuTypes.ts +1 -0
  49. package/templates/current/clean/src/app/origenUiLocale.spec.ts +6 -5
  50. package/templates/current/clean/src/app/origenUiLocale.ts +3 -58
  51. package/templates/current/clean/src/app/permission.spec.ts +26 -0
  52. package/templates/current/clean/src/app/runtimeConfig.ts +9 -8
  53. package/templates/current/clean/src/demo-api.spec.ts +311 -0
  54. package/templates/current/clean/src/env.d.ts +18 -0
  55. package/templates/current/clean/src/features/appearance/components/ThemePanel.vue +21 -17
  56. package/templates/current/clean/src/features/appearance/store/theme.ts +2 -1
  57. package/templates/current/clean/src/features/auth/pages/Login.vue +22 -12
  58. package/templates/current/clean/src/features/auth/store/auth.ts +6 -9
  59. package/templates/current/clean/src/features/errors/pages/Forbidden.vue +7 -2
  60. package/templates/current/clean/src/features/errors/pages/NotFound.vue +7 -2
  61. package/templates/current/clean/src/features/errors/pages/ServerError.vue +7 -2
  62. package/templates/current/clean/src/features/errors/pages/error-pages.spec.ts +11 -2
  63. package/templates/current/clean/src/features/security/components/DevtoolsProtectionOverlay.vue +5 -2
  64. package/templates/current/clean/src/features/security/devtoolsProtection.spec.ts +7 -10
  65. package/templates/current/clean/src/features/security/devtoolsProtection.ts +2 -1
  66. package/templates/current/clean/src/features/system/access/api/admin-repository.spec.ts +14 -0
  67. package/templates/current/clean/src/features/system/access/api/admin-repository.ts +34 -15
  68. package/templates/current/clean/src/features/system/access/api/rbac.ts +52 -32
  69. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  70. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  71. package/templates/current/clean/src/features/workspace/pages/Empty.vue +4 -1
  72. package/templates/current/clean/src/features/workspace/pages/Profile.vue +14 -12
  73. package/templates/current/clean/src/layouts/AdminLayout.vue +6 -1
  74. package/templates/current/clean/src/layouts/TopBar.vue +60 -11
  75. package/templates/current/clean/src/layouts/topBarMenuSearch.spec.ts +24 -1
  76. package/templates/current/clean/src/layouts/topBarMenuSearch.ts +10 -0
  77. package/templates/current/clean/src/locales/en-US.json +517 -0
  78. package/templates/current/clean/src/locales/en-US.runtime.ts +22 -0
  79. package/templates/current/clean/src/locales/index.ts +144 -47
  80. package/templates/current/clean/src/locales/messages-types.ts +62 -0
  81. package/templates/current/clean/src/locales/messages.spec.ts +113 -6
  82. package/templates/current/clean/src/locales/vue-i18n.d.ts +5 -0
  83. package/templates/current/clean/src/locales/zh-CN.json +517 -0
  84. package/templates/current/clean/src/locales/zh-CN.runtime.ts +22 -0
  85. package/templates/current/clean/src/locales/zh-TW.json +517 -0
  86. package/templates/current/clean/src/locales/zh-TW.runtime.ts +22 -0
  87. package/templates/current/clean/src/main.ts +23 -14
  88. package/templates/current/clean/src/router/bootstrap.ts +20 -11
  89. package/templates/current/clean/src/router/componentCache.ts +12 -0
  90. package/templates/current/clean/src/router/componentRegistry.ts +2 -13
  91. package/templates/current/clean/src/router/dynamicMenuRefresh.spec.ts +101 -0
  92. package/templates/current/clean/src/router/dynamicMenuRefresh.ts +24 -0
  93. package/templates/current/clean/src/router/dynamicRoutes.spec.ts +34 -4
  94. package/templates/current/clean/src/router/dynamicRoutes.ts +19 -4
  95. package/templates/current/clean/src/router/paths.spec.ts +50 -0
  96. package/templates/current/clean/src/router/paths.ts +21 -0
  97. package/templates/current/clean/src/router/queryEncryption.spec.ts +30 -4
  98. package/templates/current/clean/src/router/queryEncryption.ts +48 -44
  99. package/templates/current/clean/src/router/staticRoutes.ts +6 -6
  100. package/templates/current/clean/src/router/useRouteQueryDefaults.spec.ts +2 -1
  101. package/templates/current/clean/src/router/useRouteQueryDefaults.types.ts +2 -1
  102. package/templates/current/clean/src/templates/og-table.ts +79 -37
  103. package/templates/current/clean/src/templates/templates.spec.ts +19 -0
  104. package/templates/current/clean/tsconfig.json +0 -1
  105. package/templates/current/clean/vite.build-policy.ts +161 -289
  106. package/templates/current/clean/vite.config.ts +34 -5
  107. package/templates/current/examples/CHANGELOG.md +137 -0
  108. package/templates/current/examples/component-catalog.json +58 -17
  109. package/templates/current/examples/e2e/admin-shell.spec.ts +6 -0
  110. package/templates/current/examples/e2e/demo-shell.spec.ts +90 -46
  111. package/templates/current/examples/package.json +55 -41
  112. package/templates/current/examples/playwright.config.ts +1 -0
  113. package/templates/current/examples/playwright.demo.config.ts +1 -1
  114. package/templates/current/examples/scaffold.lock.json +2 -2
  115. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  116. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  117. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  118. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  119. package/templates/current/examples/scripts/clean-overlay/src/main.ts +23 -14
  120. package/templates/current/examples/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  121. package/templates/current/examples/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  122. package/templates/current/examples/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  123. package/templates/current/examples/scripts/clean-overlay/src/router/paths.ts +21 -0
  124. package/templates/current/examples/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  125. package/templates/current/examples/scripts/demo-api.ts +84 -8
  126. package/templates/current/examples/scripts/generate-api.ts +87 -3
  127. package/templates/current/examples/scripts/vite-build-policy.spec.ts +72 -0
  128. package/templates/current/examples/src/App.vue +10 -3
  129. package/templates/current/examples/src/api/client.ts +90 -10
  130. package/templates/current/examples/src/api/generated/data-contracts.ts +0 -3
  131. package/templates/current/examples/src/api/generated/http-client.ts +28 -26
  132. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/206/205/345/256/271/346/226/207/347/253/240.ts +5 -8
  133. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/256/241/350/256/241.ts +1 -4
  134. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/346/226/207/344/273/266/344/270/212/344/274/240.ts +2 -5
  135. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/347/224/250/346/210/267.ts +6 -9
  136. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/217/234/345/215/225.ts +7 -10
  137. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/247/222/350/211/262.ts +6 -9
  138. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/256/242/345/215/225/350/215/211/347/250/277.ts +6 -9
  139. package/templates/current/examples/src/api/generated//350/256/244/350/257/201.ts +3 -6
  140. package/templates/current/examples/src/app/adminLocale.ts +90 -0
  141. package/templates/current/examples/src/app/createAdminUi.spec.ts +65 -9
  142. package/templates/current/examples/src/app/createAdminUi.ts +14 -29
  143. package/templates/current/examples/src/app/embedded-token.spec.ts +40 -0
  144. package/templates/current/examples/src/app/embedded.spec.ts +135 -0
  145. package/templates/current/examples/src/app/embedded.ts +255 -0
  146. package/templates/current/examples/src/app/errorMessage.spec.ts +76 -0
  147. package/templates/current/examples/src/app/errorMessage.ts +53 -0
  148. package/templates/current/examples/src/app/localeFormat.ts +52 -0
  149. package/templates/current/examples/src/app/menu-host.spec.ts +77 -0
  150. package/templates/current/examples/src/app/menu.spec.ts +65 -0
  151. package/templates/current/examples/src/app/menu.ts +52 -12
  152. package/templates/current/examples/src/app/menuTypes.ts +1 -0
  153. package/templates/current/examples/src/app/origenUiLocale.spec.ts +6 -5
  154. package/templates/current/examples/src/app/origenUiLocale.ts +3 -58
  155. package/templates/current/examples/src/app/permission.spec.ts +26 -0
  156. package/templates/current/examples/src/app/runtimeConfig.ts +9 -8
  157. package/templates/current/examples/src/demo-api.spec.ts +311 -0
  158. package/templates/current/examples/src/env.d.ts +18 -0
  159. package/templates/current/examples/src/features/appearance/components/ThemePanel.vue +21 -17
  160. package/templates/current/examples/src/features/appearance/store/theme.ts +2 -1
  161. package/templates/current/examples/src/features/auth/pages/Login.vue +22 -12
  162. package/templates/current/examples/src/features/auth/store/auth.ts +6 -9
  163. package/templates/current/examples/src/features/errors/pages/Forbidden.vue +7 -2
  164. package/templates/current/examples/src/features/errors/pages/NotFound.vue +7 -2
  165. package/templates/current/examples/src/features/errors/pages/ServerError.vue +7 -2
  166. package/templates/current/examples/src/features/errors/pages/error-pages.spec.ts +9 -1
  167. package/templates/current/examples/src/features/feature-composables.spec.ts +47 -10
  168. package/templates/current/examples/src/features/security/components/DevtoolsProtectionOverlay.vue +5 -2
  169. package/templates/current/examples/src/features/security/devtoolsProtection.spec.ts +7 -10
  170. package/templates/current/examples/src/features/security/devtoolsProtection.ts +2 -1
  171. package/templates/current/examples/src/features/system/access/api/admin-repository.spec.ts +14 -0
  172. package/templates/current/examples/src/features/system/access/api/admin-repository.ts +34 -15
  173. package/templates/current/examples/src/features/system/access/api/rbac.ts +52 -32
  174. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  175. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  176. package/templates/current/examples/src/features/system/audit/composables/useAuditManagement.ts +43 -38
  177. package/templates/current/examples/src/features/system/menus/components/MenuEditorForm.vue +137 -47
  178. package/templates/current/examples/src/features/system/menus/composables/useMenuManagement.ts +215 -107
  179. package/templates/current/examples/src/features/system/menus/menuDraft.spec.ts +204 -0
  180. package/templates/current/examples/src/features/system/menus/menuDraft.ts +116 -0
  181. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.spec.ts +268 -0
  182. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.ts +317 -0
  183. package/templates/current/examples/src/features/system/menus/pages/MenuList.vue +3 -1
  184. package/templates/current/examples/src/features/system/roles/components/RoleEditorForm.vue +19 -15
  185. package/templates/current/examples/src/features/system/roles/composables/useRoleManagement.ts +49 -53
  186. package/templates/current/examples/src/features/system/roles/pages/RoleList.vue +3 -1
  187. package/templates/current/examples/src/features/system/users/components/UserEditorForm.vue +22 -19
  188. package/templates/current/examples/src/features/system/users/composables/useUserManagement.ts +59 -64
  189. package/templates/current/examples/src/features/system/users/pages/UserList.vue +3 -1
  190. package/templates/current/examples/src/features/workspace/pages/Dashboard.spec.ts +9 -0
  191. package/templates/current/examples/src/features/workspace/pages/Dashboard.vue +54 -26
  192. package/templates/current/examples/src/features/workspace/pages/Empty.vue +4 -1
  193. package/templates/current/examples/src/features/workspace/pages/Profile.vue +14 -12
  194. package/templates/current/examples/src/layouts/AdminLayout.vue +6 -1
  195. package/templates/current/examples/src/layouts/TopBar.vue +60 -11
  196. package/templates/current/examples/src/layouts/topBarMenuSearch.spec.ts +24 -1
  197. package/templates/current/examples/src/layouts/topBarMenuSearch.ts +10 -0
  198. package/templates/current/examples/src/locales/en-US.json +517 -0
  199. package/templates/current/examples/src/locales/en-US.runtime.ts +22 -0
  200. package/templates/current/examples/src/locales/index.ts +144 -47
  201. package/templates/current/examples/src/locales/messages-types.ts +62 -0
  202. package/templates/current/examples/src/locales/messages.spec.ts +113 -6
  203. package/templates/current/examples/src/locales/vue-i18n.d.ts +5 -0
  204. package/templates/current/examples/src/locales/zh-CN.json +517 -0
  205. package/templates/current/examples/src/locales/zh-CN.runtime.ts +22 -0
  206. package/templates/current/examples/src/locales/zh-TW.json +517 -0
  207. package/templates/current/examples/src/locales/zh-TW.runtime.ts +22 -0
  208. package/templates/current/examples/src/main.ts +43 -15
  209. package/templates/current/examples/src/router/bootstrap.ts +20 -11
  210. package/templates/current/examples/src/router/componentCache.ts +18 -0
  211. package/templates/current/examples/src/router/componentRegistry.ts +1 -18
  212. package/templates/current/examples/src/router/dynamicMenuRefresh.spec.ts +101 -0
  213. package/templates/current/examples/src/router/dynamicMenuRefresh.ts +24 -0
  214. package/templates/current/examples/src/router/dynamicRoutes.spec.ts +37 -2
  215. package/templates/current/examples/src/router/dynamicRoutes.ts +19 -4
  216. package/templates/current/examples/src/router/paths.spec.ts +50 -0
  217. package/templates/current/examples/src/router/paths.ts +21 -0
  218. package/templates/current/examples/src/router/queryEncryption.spec.ts +30 -4
  219. package/templates/current/examples/src/router/queryEncryption.ts +48 -44
  220. package/templates/current/examples/src/router/staticRoutes.ts +4 -4
  221. package/templates/current/examples/src/router/useRouteQueryDefaults.spec.ts +2 -1
  222. package/templates/current/examples/src/router/useRouteQueryDefaults.types.ts +2 -1
  223. package/templates/current/examples/src/templates/og-table.ts +79 -37
  224. package/templates/current/examples/src/templates/templates.spec.ts +19 -0
  225. package/templates/current/examples/tsconfig.json +0 -1
  226. package/templates/current/examples/vite.build-policy.ts +161 -289
  227. package/templates/current/examples/vite.config.ts +34 -5
  228. package/templates/current/clean/scripts/check-admin-bundle.mjs +0 -214
  229. package/templates/current/clean/scripts/performance/baselines/bundle-gzip-v2-pre-entry-unification.json +0 -38
  230. package/templates/current/clean/src/locales/en-US.ts +0 -55
  231. package/templates/current/clean/src/locales/zh-CN.ts +0 -55
  232. package/templates/current/clean/src/locales/zh-TW.ts +0 -44
  233. package/templates/current/examples/scripts/check-admin-bundle.mjs +0 -214
  234. package/templates/current/examples/scripts/performance/baselines/bundle-gzip-v2-pre-entry-unification.json +0 -38
  235. package/templates/current/examples/src/locales/en-US.ts +0 -55
  236. package/templates/current/examples/src/locales/zh-CN.ts +0 -55
  237. package/templates/current/examples/src/locales/zh-TW.ts +0 -44
@@ -5,29 +5,37 @@ import type {
5
5
  OgTableRequestContext,
6
6
  TableColumn,
7
7
  } from '@origen-ui/table'
8
- import type { MenuEditorDraft } from '../components/MenuEditorForm.vue'
8
+ import type { MenuKind, RbacMenu, RbacMenuDraft, RbacStatus } from '../../access/api/rbac'
9
+ import type { AuthorizationRefresh } from '../../access/composables/useAuthorizationRefresh'
10
+ import type { MenuEditorDraft } from '../menuDraft'
11
+ import type { MenuTreeConflict, MenuTreeConflictKind } from '../menuTreePrecheck'
9
12
  import { useDialog } from '@origen-ui/dialog'
10
13
  import { ElMessage } from 'element-plus'
14
+ import { computed } from 'vue'
15
+ import { useI18n } from 'vue-i18n'
16
+ import { formatAdminShortDateTime } from '../../../../app/localeFormat'
11
17
  import { useAuthStore } from '../../../auth/store/auth'
12
18
  import {
13
19
  createMenu,
14
20
  getPageCapability,
15
21
  listMenus,
16
- type MenuKind,
22
+ MENU_VERSION_CONFLICT_CODE,
17
23
  menuPageParentOptions,
18
24
  menuParentOptions,
19
25
  pageCatalogOptions,
20
- type RbacMenu,
21
- type RbacMenuDraft,
22
- type RbacStatus,
26
+ rbacText,
23
27
  removeMenus,
24
28
  setMenusStatus,
25
29
  updateMenu,
26
30
  } from '../../access/api/rbac'
31
+ import { useAuthorizationRefresh } from '../../access/composables/useAuthorizationRefresh'
32
+ import { parseMenuDraft } from '../menuDraft'
27
33
  import {
28
- type AuthorizationRefresh,
29
- useAuthorizationRefresh,
30
- } from '../../access/composables/useAuthorizationRefresh'
34
+ applyMenuDraftToRows,
35
+ collectMenuTreeConflicts,
36
+ fetchCompleteMenuPages,
37
+ filterIntroducedConflicts,
38
+ } from '../menuTreePrecheck'
31
39
 
32
40
  export interface MenuQuery {
33
41
  kind?: MenuKind
@@ -39,28 +47,8 @@ interface UseMenuManagementOptions {
39
47
  refreshAuthorization?: AuthorizationRefresh
40
48
  }
41
49
 
42
- const statusOptions = [
43
- { label: '已发布', value: 'active' },
44
- { label: '未发布', value: 'suspended' },
45
- ] as const
46
-
47
- const kindOptions = [
48
- { label: '页面', value: 'page' },
49
- { label: '目录', value: 'directory' },
50
- { label: '按钮权限', value: 'button' },
51
- ] as const
52
-
53
50
  function formatDate(value: unknown): string {
54
- const date = new Date(String(value))
55
- return Number.isNaN(date.valueOf())
56
- ? '-'
57
- : new Intl.DateTimeFormat('zh-CN', {
58
- month: '2-digit',
59
- day: '2-digit',
60
- hour: '2-digit',
61
- minute: '2-digit',
62
- hour12: false,
63
- }).format(date)
51
+ return formatAdminShortDateTime(value)
64
52
  }
65
53
 
66
54
  function flattenMenus(nodes: readonly RbacMenu[]): RbacMenu[] {
@@ -72,6 +60,7 @@ function createDraft(row?: RbacMenu): MenuEditorDraft {
72
60
  parentId: row?.parentId ?? '',
73
61
  kind: row?.kind ?? 'page',
74
62
  title: row?.title ?? '',
63
+ titleKey: row?.titleKey ?? '',
75
64
  code: row?.code ?? '',
76
65
  path: row?.path ?? '',
77
66
  componentKey: row?.componentKey ?? '',
@@ -82,54 +71,29 @@ function createDraft(row?: RbacMenu): MenuEditorDraft {
82
71
  visible: row?.visible ?? true,
83
72
  cache: row?.cache ?? true,
84
73
  tabHidden: row?.tabHidden ?? false,
74
+ redirect: row?.redirect ?? '',
85
75
  }
86
76
  }
87
77
 
88
- function parseDraft(value: Record<string, unknown> | undefined): RbacMenuDraft {
89
- const draft = value as Partial<MenuEditorDraft> | undefined
90
- const kind = draft?.kind
91
- const title = draft?.title?.trim()
92
- const code = draft?.code?.trim()
93
- const path = draft?.path?.trim()
94
- const parentId = draft?.parentId?.trim() || undefined
95
- const componentKey = draft?.componentKey?.trim() || undefined
96
- const permission = draft?.permission?.trim() || undefined
97
-
98
- if ((kind !== 'page' && kind !== 'directory' && kind !== 'button') || !title || !code)
99
- throw new Error('请完整填写菜单基础信息')
100
- if (!/^[a-z][a-z0-9-]{2,47}$/.test(code)) throw new Error('菜单编码格式不正确')
101
- if (kind === 'button' && (!parentId || !permission))
102
- throw new Error('按钮权限必须选择所属页面并填写权限编码')
103
- if (kind !== 'button') {
104
- if (!path) throw new Error('请填写菜单路由路径')
105
- if (parentId ? path.startsWith('/') : !path.startsWith('/'))
106
- throw new Error(parentId ? '子菜单应使用相对路由路径' : '根菜单路由必须以 / 开头')
107
- }
108
- if (kind === 'page' && !getPageCapability(componentKey)) throw new Error('请选择已注册的页面能力')
109
-
110
- return {
111
- parentId,
112
- kind,
113
- title,
114
- code,
115
- path: kind === 'button' ? undefined : path,
116
- componentKey: kind === 'page' ? componentKey : undefined,
117
- permission: kind === 'button' ? permission : undefined,
118
- icon: kind === 'button' ? undefined : draft?.icon?.trim() || undefined,
119
- order: Math.max(1, Math.floor(Number(draft?.order) || 1)),
120
- status: draft?.status === 'suspended' ? 'suspended' : 'active',
121
- visible: kind === 'button' ? false : draft?.visible !== false,
122
- cache: kind === 'button' ? false : draft?.cache !== false,
123
- tabHidden: kind === 'button' ? true : draft?.tabHidden === true,
124
- redirect: kind === 'directory' ? '/dashboard' : undefined,
125
- }
126
- }
127
-
78
+ // 表单 schema 已承载全部校验(必填/裁剪/跨字段斜杠规则/组件能力约束,
79
+ // 规则实现见 ../menuDraft.ts),这里只透传提交前的归一化结果。
128
80
  export function useMenuManagement(options: UseMenuManagementOptions) {
129
81
  const auth = useAuthStore()
130
82
  const dialog = useDialog()
83
+ const { t } = useI18n()
131
84
  const refreshAuthorization = options.refreshAuthorization ?? useAuthorizationRefresh()
132
85
 
86
+ const statusOptions = computed<SelectOption[]>(() => [
87
+ { label: t('system.menus.published'), value: 'active' },
88
+ { label: t('system.menus.unpublished'), value: 'suspended' },
89
+ ])
90
+
91
+ const kindOptions = computed<SelectOption[]>(() => [
92
+ { label: t('system.menus.kindPage'), value: 'page' },
93
+ { label: t('system.menus.kindDirectory'), value: 'directory' },
94
+ { label: t('system.menus.kindButton'), value: 'button' },
95
+ ])
96
+
133
97
  async function reconcile(): Promise<void> {
134
98
  await refreshAuthorization()
135
99
  await options.refresh()
@@ -143,15 +107,124 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
143
107
  return pageCatalogOptions(bound)
144
108
  }
145
109
 
110
+ const treeConflictMessages: Record<MenuTreeConflictKind, string> = {
111
+ 'cycle': 'system.menus.errors.treeCycle',
112
+ 'orphan-parent': 'system.menus.errors.treeOrphanParent',
113
+ 'duplicate-id': 'system.menus.errors.treeDuplicateId',
114
+ 'duplicate-code': 'system.menus.errors.treeDuplicateCode',
115
+ 'duplicate-path': 'system.menus.errors.treeDuplicatePath',
116
+ 'ambiguous-parent': 'system.menus.errors.treeAmbiguousParent',
117
+ 'unresolved-parent': 'system.menus.errors.treeUnresolvedParent',
118
+ 'path-missing': 'system.menus.errors.pathRequired',
119
+ 'title-key-missing': 'system.menus.errors.treeTitleKeyMissing',
120
+ 'unknown': 'system.menus.errors.treePrecheckFailed',
121
+ }
122
+
123
+ async function fetchPrecheckRows(
124
+ signal: AbortSignal,
125
+ ): Promise<readonly RbacMenu[] | undefined> {
126
+ const firstPage = await listMenus(
127
+ {
128
+ page: 1,
129
+ pageSize: 1000,
130
+ keyword: '',
131
+ query: {},
132
+ sort: { prop: 'order', order: 'ascending' },
133
+ },
134
+ signal,
135
+ )
136
+ const rows = await fetchCompleteMenuPages(
137
+ firstPage,
138
+ (page, pageSize) =>
139
+ listMenus(
140
+ {
141
+ page,
142
+ pageSize,
143
+ keyword: '',
144
+ query: {},
145
+ sort: { prop: 'order', order: 'ascending' },
146
+ },
147
+ signal,
148
+ ),
149
+ )
150
+ if (!rows) notifyConflict({ kind: 'unknown' })
151
+ return rows
152
+ }
153
+
154
+ function notifyConflict(conflict: MenuTreeConflict): void {
155
+ if (conflict.diagnostic) console.error('[admin] menu tree precheck diagnostic', conflict.diagnostic)
156
+ const detail = conflict.detail
157
+ ? ` ${t('system.menus.errors.treeDetail', { detail: conflict.detail })}`
158
+ : ''
159
+ ElMessage.error(`${t(treeConflictMessages[conflict.kind])}${detail}`)
160
+ }
161
+
162
+ // 试算「保存后」的整树并只阻断本次保存引入的冲突——存量冲突由运行时
163
+ // 装载兜底,不应把整个菜单管理页卡死在历史数据上。
164
+ async function rejectTreeConflicts(
165
+ row: RbacMenu | undefined,
166
+ draft: RbacMenuDraft,
167
+ signal: AbortSignal,
168
+ ): Promise<boolean> {
169
+ const rows = await fetchPrecheckRows(signal)
170
+ if (!rows) return true
171
+ const introduced = filterIntroducedConflicts(
172
+ collectMenuTreeConflicts(rows),
173
+ collectMenuTreeConflicts(applyMenuDraftToRows(rows, draft, row?.id)),
174
+ )
175
+ if (!introduced.length) return false
176
+ notifyConflict(introduced[0]!)
177
+ return true
178
+ }
179
+
180
+ // 发布/下线同样改变运行时可见的树:激活会把剪枝子树重新注入运行时,
181
+ // 需与保存同门槛试算;下线的剪枝只会让冲突消失,天然不会被阻断。
182
+ async function rejectStatusConflicts(
183
+ ids: readonly string[],
184
+ status: RbacStatus,
185
+ signal: AbortSignal,
186
+ ): Promise<boolean> {
187
+ const rows = await fetchPrecheckRows(signal)
188
+ if (!rows) return true
189
+ const idSet = new Set(ids)
190
+ const introduced = filterIntroducedConflicts(
191
+ collectMenuTreeConflicts(rows),
192
+ collectMenuTreeConflicts(
193
+ rows.map((row) => (idSet.has(row.id) ? { ...row, status } : row)),
194
+ ),
195
+ )
196
+ if (!introduced.length) return false
197
+ notifyConflict(introduced[0]!)
198
+ return true
199
+ }
200
+
201
+ function isMenuVersionConflict(error: unknown): boolean {
202
+ return (
203
+ typeof error === 'object' &&
204
+ error !== null &&
205
+ (error as { kind?: unknown }).kind === 'business' &&
206
+ (error as { code?: unknown }).code === MENU_VERSION_CONFLICT_CODE
207
+ )
208
+ }
209
+
146
210
  async function save(
147
211
  row: RbacMenu | undefined,
148
212
  model: Record<string, unknown> | undefined,
149
213
  signal: AbortSignal,
150
214
  ): Promise<boolean> {
151
- const draft = parseDraft(model)
152
- if (row) await updateMenu(row.id, draft, signal)
153
- else await createMenu(draft, signal)
154
- ElMessage.success(row ? '菜单已更新,授权范围已重新计算' : '菜单已创建并发布到动态路由')
215
+ const draft = parseMenuDraft(model)
216
+ if (await rejectTreeConflicts(row, draft, signal)) return false
217
+ try {
218
+ if (row) await updateMenu(row.id, draft, row.version, signal)
219
+ else await createMenu(draft, signal)
220
+ } catch (error) {
221
+ if (isMenuVersionConflict(error)) {
222
+ ElMessage.error(t('system.menus.errors.versionConflict'))
223
+ return false
224
+ }
225
+ throw error
226
+ }
227
+ ElMessage.success(row ? t('system.menus.menuUpdated') : t('system.menus.menuCreated'))
155
228
  await reconcile()
156
229
  return true
157
230
  }
@@ -174,7 +247,7 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
174
247
  const pageParentOptions = menuPageParentOptions(menus, row?.id)
175
248
  dialog.open({
176
249
  dialogKey: row ? `menu-editor-${row.id}` : 'menu-editor-create',
177
- title: row ? '编辑菜单' : '新增动态菜单',
250
+ title: row ? t('system.menus.editMenu') : t('system.menus.addMenu'),
178
251
  presentation: { width: 760 },
179
252
  protectUnsaved: true,
180
253
  errorFeedback: true,
@@ -194,93 +267,128 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
194
267
  status: RbacStatus,
195
268
  signal?: AbortSignal,
196
269
  ): Promise<void> {
197
- await setMenusStatus(ids, status, signal ?? new AbortController().signal)
198
- ElMessage.success(status === 'active' ? '菜单已发布' : '菜单已停止发布')
270
+ const abort = signal ?? new AbortController().signal
271
+ if (await rejectStatusConflicts(ids, status, abort)) return
272
+ await setMenusStatus(ids, status, abort)
273
+ ElMessage.success(
274
+ status === 'active' ? t('system.menus.menuPublished') : t('system.menus.menuUnpublished'),
275
+ )
199
276
  await reconcile()
200
277
  }
201
278
 
202
279
  async function remove(ids: readonly string[], signal?: AbortSignal): Promise<void> {
203
280
  await removeMenus(ids, signal ?? new AbortController().signal)
204
- ElMessage.success(ids.length > 1 ? '所选菜单已删除' : '菜单已删除')
281
+ ElMessage.success(
282
+ ids.length > 1 ? t('system.menus.selectedDeleted') : t('system.menus.menuDeleted'),
283
+ )
205
284
  await reconcile()
206
285
  }
207
286
 
208
- const columns: TableColumn<RbacMenu>[] = [
287
+ const columns = computed<TableColumn<RbacMenu>[]>(() => [
209
288
  { type: 'selection', key: 'selection', width: 48 },
210
- { prop: 'title', label: '菜单名称', minWidth: 180 },
211
- { prop: 'code', label: '编码', minWidth: 158, copyable: true },
289
+ { prop: 'title', label: t('system.menus.menuName'), minWidth: 180 },
290
+ { prop: 'code', label: t('system.menus.code'), minWidth: 158, copyable: true },
212
291
  {
213
292
  prop: 'path',
214
- label: '路由路径',
293
+ label: t('system.menus.path'),
215
294
  minWidth: 190,
216
295
  copyable: true,
217
296
  format: (value) => String(value ?? ''),
218
297
  },
219
298
  {
220
299
  prop: 'permission',
221
- label: '权限编码',
300
+ label: t('system.menus.permission'),
222
301
  minWidth: 184,
223
302
  copyable: true,
224
303
  format: (value) => String(value ?? ''),
225
304
  },
226
305
  {
227
306
  prop: 'kind',
228
- label: '类型',
307
+ label: t('system.menus.kind'),
229
308
  width: 96,
230
309
  format: (value) =>
231
- value === 'directory' ? '目录' : value === 'button' ? '按钮权限' : '页面',
310
+ value === 'directory'
311
+ ? t('system.menus.kindDirectory')
312
+ : value === 'button'
313
+ ? t('system.menus.kindButton')
314
+ : t('system.menus.kindPage'),
232
315
  },
233
316
  {
234
317
  prop: 'componentKey',
235
- label: '页面能力',
318
+ label: t('system.menus.componentKey'),
236
319
  minWidth: 152,
237
- format: (value) => getPageCapability(String(value))?.label ?? '-',
320
+ format: (value) => {
321
+ const capability = getPageCapability(String(value))
322
+ return capability ? rbacText(capability.labelKey) : '-'
323
+ },
238
324
  },
239
325
  {
240
326
  prop: 'status',
241
- label: '状态',
327
+ label: t('system.menus.status'),
242
328
  width: 90,
243
- format: (value) => (value === 'active' ? '已发布' : '未发布'),
329
+ format: (value) =>
330
+ value === 'active' ? t('system.menus.published') : t('system.menus.unpublished'),
331
+ },
332
+ {
333
+ prop: 'updatedAt',
334
+ label: t('system.menus.updatedAt'),
335
+ minWidth: 134,
336
+ sortable: 'custom',
337
+ format: formatDate,
244
338
  },
245
- { prop: 'updatedAt', label: '最近更新', minWidth: 134, sortable: 'custom', format: formatDate },
246
339
  {
247
340
  type: 'action',
248
341
  key: 'actions',
249
- label: '操作',
342
+ label: t('common.actions.operations'),
250
343
  width: 218,
251
344
  fixed: 'right',
252
345
  actions: [
253
- { key: 'edit', label: '编辑', permission: 'system:menu:write', onClick: openEditor },
346
+ {
347
+ key: 'edit',
348
+ label: t('common.actions.edit'),
349
+ permission: 'system:menu:write',
350
+ onClick: openEditor,
351
+ },
254
352
  {
255
353
  key: 'toggle-status',
256
- label: '发布切换',
354
+ label: t('common.actions.toggleStatus'),
257
355
  permission: 'system:menu:publish',
258
- confirm: '确认更新该菜单的发布状态吗?',
356
+ confirm: t('system.menus.confirmTogglePublish'),
259
357
  onClick: (row) => setStatus([row.id], row.status === 'active' ? 'suspended' : 'active'),
260
358
  },
261
359
  {
262
360
  key: 'remove',
263
- label: '删除',
361
+ label: t('common.actions.delete'),
264
362
  permission: 'system:menu:write',
265
- confirm: '删除后路由、导航和标签页将立即收敛,确认继续吗?',
363
+ confirm: t('system.menus.confirmDelete'),
266
364
  onClick: (row) => remove([row.id]),
267
365
  },
268
366
  ],
269
367
  },
270
- ]
368
+ ])
271
369
 
272
370
  const dataSource: OgTableDataSource<RbacMenu, MenuQuery> = {
273
371
  list: (request, context: OgTableRequestContext): Promise<PageResult<RbacMenu>> =>
274
372
  listMenus(request, context.signal),
275
373
  }
276
374
 
277
- const config: OgTableConfig<RbacMenu, MenuQuery> = {
375
+ const config = computed<OgTableConfig<RbacMenu, MenuQuery>>(() => ({
278
376
  search: {
279
- quickSearch: { placeholder: '搜索菜单名称、编码或路由路径' },
377
+ quickSearch: { placeholder: t('system.menus.searchPlaceholder') },
280
378
  columns: 4,
281
379
  fields: [
282
- { prop: 'kind', label: '节点类型', type: 'select', options: [...kindOptions] },
283
- { prop: 'status', label: '发布状态', type: 'select', options: [...statusOptions] },
380
+ {
381
+ prop: 'kind',
382
+ label: t('system.menus.nodeType'),
383
+ type: 'select',
384
+ options: kindOptions.value,
385
+ },
386
+ {
387
+ prop: 'status',
388
+ label: t('system.menus.publishStatus'),
389
+ type: 'select',
390
+ options: statusOptions.value,
391
+ },
284
392
  ],
285
393
  },
286
394
  pagination: false,
@@ -291,9 +399,9 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
291
399
  batch: [
292
400
  {
293
401
  key: 'publish',
294
- label: '批量发布',
402
+ label: t('system.menus.batchPublish'),
295
403
  permission: 'system:menu:publish',
296
- confirm: '确认发布所选菜单吗?',
404
+ confirm: t('system.menus.confirmBatchPublish'),
297
405
  onClick: (rows) =>
298
406
  setStatus(
299
407
  rows.map((row) => row.id),
@@ -302,9 +410,9 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
302
410
  },
303
411
  {
304
412
  key: 'unpublish',
305
- label: '批量停用',
413
+ label: t('system.menus.batchUnpublish'),
306
414
  permission: 'system:menu:publish',
307
- confirm: '确认停止发布所选菜单吗?',
415
+ confirm: t('system.menus.confirmBatchUnpublish'),
308
416
  onClick: (rows) =>
309
417
  setStatus(
310
418
  rows.map((row) => row.id),
@@ -313,15 +421,15 @@ export function useMenuManagement(options: UseMenuManagementOptions) {
313
421
  },
314
422
  {
315
423
  key: 'remove',
316
- label: '批量删除',
424
+ label: t('system.menus.batchDelete'),
317
425
  permission: 'system:menu:write',
318
- confirm: '确认删除所选菜单吗?',
426
+ confirm: t('system.menus.confirmBatchDelete'),
319
427
  onClick: (rows) => remove(rows.map((row) => row.id)),
320
428
  },
321
429
  ],
322
430
  },
323
431
  toolbar: { refresh: true, density: true, columns: true, reset: true },
324
- }
432
+ }))
325
433
 
326
434
  return { columns, config, dataSource, openEditor }
327
435
  }
@@ -0,0 +1,204 @@
1
+ import { describe, expect, it } from 'vitest'
2
+ import {
3
+ parseMenuDraft,
4
+ validateMenuComponentKeyRule,
5
+ validateMenuParentRule,
6
+ validateMenuPathRule,
7
+ validateMenuTitleKeyRule,
8
+ validateMenuTitleRule,
9
+ } from './menuDraft'
10
+
11
+ const model = (kind: 'page' | 'directory' | 'button', parentId?: string) => ({ kind, parentId })
12
+
13
+ describe('validateMenuPathRule', () => {
14
+ it('requires root paths to start with a slash', () => {
15
+ expect(validateMenuPathRule('users', model('page'))).toBe('system.menus.errors.rootPathSlash')
16
+ expect(validateMenuPathRule('/users', model('page'))).toBeUndefined()
17
+ })
18
+
19
+ it('requires child paths to stay relative', () => {
20
+ expect(validateMenuPathRule('/users', model('page', 'p1'))).toBe(
21
+ 'system.menus.errors.submenuRelativePath',
22
+ )
23
+ expect(validateMenuPathRule('users', model('page', 'p1'))).toBeUndefined()
24
+ })
25
+
26
+ it('skips buttons and rejects blank paths for page kinds', () => {
27
+ expect(validateMenuPathRule('anything', model('button'))).toBeUndefined()
28
+ expect(validateMenuPathRule('', model('page'))).toBe('system.menus.errors.pathRequired')
29
+ expect(validateMenuPathRule(' ', model('directory', 'p1'))).toBe(
30
+ 'system.menus.errors.pathRequired',
31
+ )
32
+ })
33
+ })
34
+
35
+ describe('validateMenuTitleRule', () => {
36
+ it('rejects blank titles and accepts trimmed content', () => {
37
+ expect(validateMenuTitleRule(' ')).toBe('system.menus.errors.formRequired')
38
+ expect(validateMenuTitleRule('用户管理')).toBeUndefined()
39
+ })
40
+ })
41
+
42
+ describe('validateMenuTitleKeyRule', () => {
43
+ it('requires translation keys for system page and directory nodes', () => {
44
+ expect(validateMenuTitleKeyRule('', model('page'))).toBe('system.menus.errors.titleKeyRequired')
45
+ expect(validateMenuTitleKeyRule('menus.users.title', model('directory'))).toBeUndefined()
46
+ expect(validateMenuTitleKeyRule('', model('button'))).toBeUndefined()
47
+ })
48
+ })
49
+
50
+ describe('validateMenuParentRule', () => {
51
+ it('requires a parent page for buttons only', () => {
52
+ expect(validateMenuParentRule('', model('button'))).toBe(
53
+ 'system.menus.errors.buttonRequiresPage',
54
+ )
55
+ expect(validateMenuParentRule(' ', model('button'))).toBe(
56
+ 'system.menus.errors.buttonRequiresPage',
57
+ )
58
+ expect(validateMenuParentRule('p1', model('button'))).toBeUndefined()
59
+ expect(validateMenuParentRule('', model('directory'))).toBeUndefined()
60
+ })
61
+ })
62
+
63
+ describe('validateMenuComponentKeyRule', () => {
64
+ const allowed = ['dashboard', 'user-list']
65
+
66
+ it('rejects page nodes with unknown or blank component keys', () => {
67
+ expect(validateMenuComponentKeyRule('legacy-page', model('page'), allowed)).toBe(
68
+ 'system.menus.errors.componentRequired',
69
+ )
70
+ expect(validateMenuComponentKeyRule('', model('page'), allowed)).toBe(
71
+ 'system.menus.errors.componentRequired',
72
+ )
73
+ expect(validateMenuComponentKeyRule('dashboard', model('page'), allowed)).toBeUndefined()
74
+ })
75
+
76
+ it('ignores non-page kinds', () => {
77
+ expect(validateMenuComponentKeyRule('anything', model('directory'), allowed)).toBeUndefined()
78
+ })
79
+ })
80
+
81
+ describe('parseMenuDraft', () => {
82
+ it('converges button fields and strips route-only data', () => {
83
+ expect(
84
+ parseMenuDraft({
85
+ kind: 'button',
86
+ title: ' 导出 ',
87
+ code: 'export',
88
+ path: '/ignored',
89
+ icon: 'Download',
90
+ visible: true,
91
+ cache: true,
92
+ tabHidden: false,
93
+ permission: 'system:user:export',
94
+ parentId: 'p1',
95
+ order: 2,
96
+ status: 'active',
97
+ }),
98
+ ).toMatchObject({
99
+ kind: 'button',
100
+ title: '导出',
101
+ path: undefined,
102
+ icon: undefined,
103
+ visible: false,
104
+ cache: false,
105
+ tabHidden: true,
106
+ permission: 'system:user:export',
107
+ parentId: 'p1',
108
+ redirect: undefined,
109
+ })
110
+ })
111
+
112
+ it('defaults empty directory redirects to the home route', () => {
113
+ expect(
114
+ parseMenuDraft({ kind: 'directory', title: 'S', code: 'sys', path: '/sys' })?.redirect,
115
+ ).toBe('/dashboard')
116
+ expect(
117
+ parseMenuDraft({
118
+ kind: 'directory',
119
+ title: 'S',
120
+ code: 'sys',
121
+ path: '/sys',
122
+ redirect: '/sys/ops',
123
+ })?.redirect,
124
+ ).toBe('/sys/ops')
125
+ expect(
126
+ parseMenuDraft({ kind: 'page', title: 'P', code: 'p', path: '/p' })?.redirect,
127
+ ).toBeUndefined()
128
+ })
129
+
130
+ it('keeps page fields, trims text, and drops route-only data', () => {
131
+ expect(
132
+ parseMenuDraft({
133
+ kind: 'page',
134
+ title: ' 用户 ',
135
+ code: 'users',
136
+ path: ' users ',
137
+ componentKey: 'user-list',
138
+ icon: ' Users ',
139
+ visible: false,
140
+ order: 5,
141
+ status: 'active',
142
+ }),
143
+ ).toMatchObject({
144
+ kind: 'page',
145
+ title: '用户',
146
+ path: 'users',
147
+ componentKey: 'user-list',
148
+ icon: 'Users',
149
+ visible: false,
150
+ permission: undefined,
151
+ redirect: undefined,
152
+ })
153
+ })
154
+
155
+ it('normalizes order and status and falls back unknown kinds to page', () => {
156
+ expect(
157
+ parseMenuDraft({ kind: 'magic', title: 'T', code: 't', path: '/t', order: 'abc' }),
158
+ ).toMatchObject({
159
+ kind: 'page',
160
+ order: 1,
161
+ status: 'active',
162
+ })
163
+ expect(
164
+ parseMenuDraft({
165
+ kind: 'page',
166
+ title: 'T',
167
+ code: 't',
168
+ path: '/t',
169
+ order: 3.7,
170
+ status: 'suspended',
171
+ }),
172
+ ).toMatchObject({ order: 3, status: 'suspended' })
173
+ })
174
+ })
175
+
176
+ describe('parseMenuDraft titleKey', () => {
177
+ it('keeps trimmed keys for page and directory and drops them for buttons', () => {
178
+ expect(
179
+ parseMenuDraft({ kind: 'page', title: 'T', code: 't', path: '/t', titleKey: ' menus.t ' }),
180
+ ).toMatchObject({ titleKey: 'menus.t' })
181
+ expect(
182
+ parseMenuDraft({
183
+ kind: 'directory',
184
+ title: 'D',
185
+ code: 'd',
186
+ path: '/d',
187
+ titleKey: ' menus.d ',
188
+ }),
189
+ ).toMatchObject({ titleKey: 'menus.d' })
190
+ expect(
191
+ parseMenuDraft({
192
+ kind: 'button',
193
+ title: 'B',
194
+ code: 'b',
195
+ parentId: 'p',
196
+ permission: 'x:y',
197
+ titleKey: ' menus.b ',
198
+ }),
199
+ ).toMatchObject({ titleKey: undefined })
200
+ expect(
201
+ parseMenuDraft({ kind: 'page', title: 'T', code: 't', path: '/t', titleKey: ' ' }),
202
+ ).toMatchObject({ titleKey: undefined })
203
+ })
204
+ })