@origen-ui/admin-cli 1.1.0 → 2.0.2

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 (175) hide show
  1. package/README.md +41 -9
  2. package/package.json +26 -2
  3. package/templates/current/clean/.node-version +1 -0
  4. package/templates/current/clean/CHANGELOG.md +125 -0
  5. package/templates/current/clean/README.md +2 -1
  6. package/templates/current/clean/component-catalog.json +58 -17
  7. package/templates/current/clean/e2e/admin-shell.spec.ts +6 -0
  8. package/templates/current/clean/e2e/demo-shell.spec.ts +94 -50
  9. package/templates/current/clean/package.json +39 -25
  10. package/templates/current/clean/playwright.config.ts +1 -0
  11. package/templates/current/clean/playwright.demo.config.ts +1 -1
  12. package/templates/current/clean/pnpm-workspace.yaml +18 -0
  13. package/templates/current/clean/scaffold.lock.json +2 -2
  14. package/templates/current/clean/scripts/check-admin-scaffold.mjs +5 -1
  15. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  16. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  17. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  18. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  19. package/templates/current/clean/scripts/clean-overlay/src/main.ts +23 -14
  20. package/templates/current/clean/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  21. package/templates/current/clean/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  22. package/templates/current/clean/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  23. package/templates/current/clean/scripts/clean-overlay/src/router/paths.ts +21 -0
  24. package/templates/current/clean/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  25. package/templates/current/clean/scripts/demo-api.ts +88 -12
  26. package/templates/current/clean/scripts/generate-api.ts +87 -3
  27. package/templates/current/clean/scripts/remove-examples.mjs +4 -4
  28. package/templates/current/clean/scripts/vite-build-policy.spec.ts +1 -0
  29. package/templates/current/clean/src/api/generated/data-contracts.ts +2 -5
  30. package/templates/current/clean/src/api/generated/http-client.ts +28 -26
  31. 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
  32. 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
  33. 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
  34. 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 +8 -10
  35. 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 +11 -12
  36. 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 +8 -10
  37. 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 +8 -10
  38. package/templates/current/clean/src/api/generated//350/256/244/350/257/201.ts +3 -6
  39. package/templates/current/clean/src/app/errorMessage.spec.ts +76 -0
  40. package/templates/current/clean/src/app/errorMessage.ts +53 -0
  41. package/templates/current/clean/src/app/menu-host.spec.ts +77 -0
  42. package/templates/current/clean/src/app/menu.spec.ts +39 -0
  43. package/templates/current/clean/src/app/menu.ts +48 -12
  44. package/templates/current/clean/src/app/runtimeConfig.ts +1 -1
  45. package/templates/current/clean/src/demo-api.spec.ts +314 -3
  46. package/templates/current/clean/src/features/auth/pages/Login.vue +9 -2
  47. package/templates/current/clean/src/features/auth/store/auth.ts +6 -19
  48. package/templates/current/clean/src/features/errors/pages/Forbidden.vue +7 -2
  49. package/templates/current/clean/src/features/errors/pages/NotFound.vue +7 -2
  50. package/templates/current/clean/src/features/errors/pages/ServerError.vue +7 -2
  51. package/templates/current/clean/src/features/errors/pages/error-pages.spec.ts +11 -2
  52. package/templates/current/clean/src/features/system/access/api/admin-repository.ts +2 -6
  53. package/templates/current/clean/src/features/system/access/api/rbac.ts +19 -9
  54. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  55. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  56. package/templates/current/clean/src/features/workspace/pages/Profile.vue +1 -1
  57. package/templates/current/clean/src/layouts/AdminLayout.vue +3 -0
  58. package/templates/current/clean/src/layouts/TopBar.vue +37 -6
  59. package/templates/current/clean/src/layouts/topBarMenuSearch.spec.ts +24 -1
  60. package/templates/current/clean/src/layouts/topBarMenuSearch.ts +10 -0
  61. package/templates/current/clean/src/locales/en-US.json +30 -3
  62. package/templates/current/clean/src/locales/en-US.runtime.ts +2 -0
  63. package/templates/current/clean/src/locales/index.ts +39 -26
  64. package/templates/current/clean/src/locales/zh-CN.json +30 -3
  65. package/templates/current/clean/src/locales/zh-CN.runtime.ts +2 -0
  66. package/templates/current/clean/src/locales/zh-TW.json +30 -3
  67. package/templates/current/clean/src/locales/zh-TW.runtime.ts +2 -0
  68. package/templates/current/clean/src/main.ts +23 -14
  69. package/templates/current/clean/src/router/bootstrap.ts +10 -16
  70. package/templates/current/clean/src/router/componentCache.ts +12 -0
  71. package/templates/current/clean/src/router/componentRegistry.ts +2 -13
  72. package/templates/current/clean/src/router/dynamicMenuRefresh.spec.ts +101 -0
  73. package/templates/current/clean/src/router/dynamicMenuRefresh.ts +24 -0
  74. package/templates/current/clean/src/router/dynamicRoutes.spec.ts +34 -4
  75. package/templates/current/clean/src/router/dynamicRoutes.ts +14 -3
  76. package/templates/current/clean/src/router/paths.spec.ts +50 -0
  77. package/templates/current/clean/src/router/paths.ts +21 -0
  78. package/templates/current/clean/src/router/queryEncryption.spec.ts +10 -1
  79. package/templates/current/clean/src/router/routeQuery.spec.ts +2 -1
  80. package/templates/current/clean/src/router/routeQuery.ts +4 -1
  81. package/templates/current/clean/src/router/staticRoutes.ts +6 -6
  82. package/templates/current/clean/src/templates/og-table.ts +2 -4
  83. package/templates/current/clean/tsconfig.json +0 -1
  84. package/templates/current/clean/vite.build-policy.ts +55 -8
  85. package/templates/current/clean/vite.config.ts +30 -0
  86. package/templates/current/examples/.node-version +1 -0
  87. package/templates/current/examples/CHANGELOG.md +125 -0
  88. package/templates/current/examples/README.md +2 -1
  89. package/templates/current/examples/component-catalog.json +58 -17
  90. package/templates/current/examples/e2e/admin-shell.spec.ts +6 -0
  91. package/templates/current/examples/e2e/demo-shell.spec.ts +94 -50
  92. package/templates/current/examples/package.json +39 -25
  93. package/templates/current/examples/playwright.config.ts +1 -0
  94. package/templates/current/examples/playwright.demo.config.ts +1 -1
  95. package/templates/current/examples/pnpm-workspace.yaml +18 -0
  96. package/templates/current/examples/scaffold.lock.json +2 -2
  97. package/templates/current/examples/scripts/check-admin-scaffold.mjs +5 -1
  98. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  99. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  100. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  101. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  102. package/templates/current/examples/scripts/clean-overlay/src/main.ts +23 -14
  103. package/templates/current/examples/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  104. package/templates/current/examples/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  105. package/templates/current/examples/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  106. package/templates/current/examples/scripts/clean-overlay/src/router/paths.ts +21 -0
  107. package/templates/current/examples/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  108. package/templates/current/examples/scripts/demo-api.ts +88 -12
  109. package/templates/current/examples/scripts/generate-api.ts +87 -3
  110. package/templates/current/examples/scripts/remove-examples.mjs +4 -4
  111. package/templates/current/examples/scripts/vite-build-policy.spec.ts +1 -0
  112. package/templates/current/examples/src/api/generated/data-contracts.ts +2 -5
  113. package/templates/current/examples/src/api/generated/http-client.ts +28 -26
  114. 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
  115. 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
  116. 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
  117. 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 +8 -10
  118. 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 +11 -12
  119. 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 +8 -10
  120. 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 +8 -10
  121. package/templates/current/examples/src/api/generated//350/256/244/350/257/201.ts +3 -6
  122. package/templates/current/examples/src/app/errorMessage.spec.ts +76 -0
  123. package/templates/current/examples/src/app/errorMessage.ts +53 -0
  124. package/templates/current/examples/src/app/menu-host.spec.ts +77 -0
  125. package/templates/current/examples/src/app/menu.spec.ts +39 -0
  126. package/templates/current/examples/src/app/menu.ts +48 -12
  127. package/templates/current/examples/src/app/runtimeConfig.ts +1 -1
  128. package/templates/current/examples/src/demo-api.spec.ts +314 -3
  129. package/templates/current/examples/src/features/auth/pages/Login.vue +9 -2
  130. package/templates/current/examples/src/features/auth/store/auth.ts +6 -19
  131. package/templates/current/examples/src/features/errors/pages/Forbidden.vue +2 -1
  132. package/templates/current/examples/src/features/errors/pages/NotFound.vue +2 -1
  133. package/templates/current/examples/src/features/errors/pages/ServerError.vue +2 -1
  134. package/templates/current/examples/src/features/feature-composables.spec.ts +11 -1
  135. package/templates/current/examples/src/features/system/access/api/admin-repository.ts +2 -6
  136. package/templates/current/examples/src/features/system/access/api/rbac.ts +19 -9
  137. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  138. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  139. package/templates/current/examples/src/features/system/menus/components/MenuEditorForm.vue +115 -28
  140. package/templates/current/examples/src/features/system/menus/composables/useMenuManagement.ts +162 -66
  141. package/templates/current/examples/src/features/system/menus/menuDraft.spec.ts +204 -0
  142. package/templates/current/examples/src/features/system/menus/menuDraft.ts +116 -0
  143. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.spec.ts +268 -0
  144. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.ts +317 -0
  145. package/templates/current/examples/src/features/system/roles/components/RoleEditorForm.vue +1 -0
  146. package/templates/current/examples/src/features/workspace/pages/Profile.vue +1 -1
  147. package/templates/current/examples/src/layouts/AdminLayout.vue +3 -0
  148. package/templates/current/examples/src/layouts/TopBar.vue +37 -6
  149. package/templates/current/examples/src/layouts/topBarMenuSearch.spec.ts +24 -1
  150. package/templates/current/examples/src/layouts/topBarMenuSearch.ts +10 -0
  151. package/templates/current/examples/src/locales/en-US.json +30 -3
  152. package/templates/current/examples/src/locales/en-US.runtime.ts +2 -0
  153. package/templates/current/examples/src/locales/index.ts +39 -26
  154. package/templates/current/examples/src/locales/zh-CN.json +30 -3
  155. package/templates/current/examples/src/locales/zh-CN.runtime.ts +2 -0
  156. package/templates/current/examples/src/locales/zh-TW.json +30 -3
  157. package/templates/current/examples/src/locales/zh-TW.runtime.ts +2 -0
  158. package/templates/current/examples/src/main.ts +24 -22
  159. package/templates/current/examples/src/router/bootstrap.ts +10 -16
  160. package/templates/current/examples/src/router/componentCache.ts +18 -0
  161. package/templates/current/examples/src/router/componentRegistry.ts +1 -18
  162. package/templates/current/examples/src/router/dynamicMenuRefresh.spec.ts +101 -0
  163. package/templates/current/examples/src/router/dynamicMenuRefresh.ts +24 -0
  164. package/templates/current/examples/src/router/dynamicRoutes.spec.ts +20 -2
  165. package/templates/current/examples/src/router/dynamicRoutes.ts +14 -3
  166. package/templates/current/examples/src/router/paths.spec.ts +50 -0
  167. package/templates/current/examples/src/router/paths.ts +21 -0
  168. package/templates/current/examples/src/router/queryEncryption.spec.ts +10 -1
  169. package/templates/current/examples/src/router/routeQuery.spec.ts +2 -1
  170. package/templates/current/examples/src/router/routeQuery.ts +4 -1
  171. package/templates/current/examples/src/router/staticRoutes.ts +3 -3
  172. package/templates/current/examples/src/templates/og-table.ts +2 -4
  173. package/templates/current/examples/tsconfig.json +0 -1
  174. package/templates/current/examples/vite.build-policy.ts +55 -8
  175. package/templates/current/examples/vite.config.ts +30 -0
@@ -1,17 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import { ElButton, ElResult } from 'element-plus'
3
+ import { useI18n } from 'vue-i18n'
3
4
  import { useRouter } from 'vue-router'
5
+ import { HOME_ROUTE } from '../../../router/paths'
4
6
 
5
7
  defineOptions({ name: 'NotFoundPage' })
6
8
 
7
9
  const router = useRouter()
10
+ const { t } = useI18n()
8
11
  </script>
9
12
 
10
13
  <template>
11
14
  <main class="error-page">
12
- <ElResult icon="warning" title="404" sub-title="你访问的页面不存在或已经被移除。">
15
+ <ElResult icon="warning" :title="t('errors.notFound.code')" :sub-title="t('errors.notFound.message')">
13
16
  <template #extra>
14
- <ElButton type="primary" @click="router.push('/workspace')"> 回到工作台 </ElButton>
17
+ <ElButton type="primary" @click="router.push(HOME_ROUTE)">
18
+ {{ t('errors.notFound.backHome') }}
19
+ </ElButton>
15
20
  </template>
16
21
  </ElResult>
17
22
  </main>
@@ -1,17 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import { ElButton, ElResult } from 'element-plus'
3
+ import { useI18n } from 'vue-i18n'
3
4
  import { useRouter } from 'vue-router'
5
+ import { HOME_ROUTE } from '../../../router/paths'
4
6
 
5
7
  defineOptions({ name: 'ServerErrorPage' })
6
8
 
7
9
  const router = useRouter()
10
+ const { t } = useI18n()
8
11
  </script>
9
12
 
10
13
  <template>
11
14
  <main class="error-page">
12
- <ElResult icon="error" title="500" sub-title="服务暂时不可用,请稍后再试。">
15
+ <ElResult icon="error" :title="t('errors.serverError.code')" :sub-title="t('errors.serverError.message')">
13
16
  <template #extra>
14
- <ElButton type="primary" @click="router.push('/workspace')"> 回到工作台 </ElButton>
17
+ <ElButton type="primary" @click="router.push(HOME_ROUTE)">
18
+ {{ t('errors.serverError.backHome') }}
19
+ </ElButton>
15
20
  </template>
16
21
  </ElResult>
17
22
  </main>
@@ -1,9 +1,18 @@
1
1
  import { mount } from '@vue/test-utils'
2
2
  import { beforeEach, describe, expect, it, vi } from 'vitest'
3
+ import { createI18n } from 'vue-i18n'
4
+ import zhCN from '../../../locales/zh-CN.json'
5
+ import { HOME_ROUTE } from '../../../router/paths'
3
6
  import Forbidden from './Forbidden.vue'
4
7
  import NotFound from './NotFound.vue'
5
8
  import ServerError from './ServerError.vue'
6
9
 
10
+ const i18n = createI18n({
11
+ legacy: false,
12
+ locale: 'zh-CN',
13
+ messages: { 'zh-CN': zhCN },
14
+ })
15
+
7
16
  const { push } = vi.hoisted(() => ({
8
17
  push: vi.fn(),
9
18
  }))
@@ -22,11 +31,11 @@ describe('clean error page navigation', () => {
22
31
  ['404', NotFound],
23
32
  ['500', ServerError],
24
33
  ])('returns to the empty workspace from the %s page', async (_status, component) => {
25
- const wrapper = mount(component)
34
+ const wrapper = mount(component, { global: { plugins: [i18n] } })
26
35
 
27
36
  await wrapper.get('button').trigger('click')
28
37
 
29
38
  expect(push).toHaveBeenCalledOnce()
30
- expect(push).toHaveBeenCalledWith('/workspace')
39
+ expect(push).toHaveBeenCalledWith(HOME_ROUTE)
31
40
  })
32
41
  })
@@ -2,7 +2,7 @@ import type { PageResult } from '@origen-ui/shared'
2
2
  import type { AdminMessageKey } from '../../../../locales'
3
3
  import type { PageRequest, RbacRole, RbacStatus, RbacUser } from './rbac'
4
4
  import { apiClient } from '../../../../api/client'
5
- import { getAdminI18n } from '../../../../locales'
5
+ import { translateAdminMessage } from '../../../../locales'
6
6
 
7
7
  export type AdminRecordStatus = RbacStatus
8
8
 
@@ -248,11 +248,7 @@ export function createRoleDraft(row?: AdminRoleRecord): AdminRoleDraft {
248
248
  }
249
249
 
250
250
  function rbacText(key: string, named?: Record<string, unknown>): string {
251
- const global = getAdminI18n()?.global as unknown as
252
- | { t: (key: string, named?: Record<string, unknown>) => string } |
253
- undefined
254
- if (!global) return key
255
- return named ? global.t(key as AdminMessageKey, named) : global.t(key as AdminMessageKey)
251
+ return translateAdminMessage(key, { named })
256
252
  }
257
253
 
258
254
  function requiredString(value: unknown, labelKey: string): string {
@@ -1,7 +1,6 @@
1
1
  import type { PageResult, SelectOption } from '@origen-ui/shared'
2
- import type { AdminMessageKey } from '../../../../locales'
3
2
  import { apiClient } from '../../../../api/client'
4
- import { getAdminI18n } from '../../../../locales'
3
+ import { translateAdminMessage } from '../../../../locales'
5
4
 
6
5
  export type RbacStatus = 'active' | 'suspended'
7
6
  export type MenuKind = 'directory' | 'page' | 'button'
@@ -35,6 +34,8 @@ export interface RbacMenu {
35
34
  kind: MenuKind
36
35
  code: string
37
36
  title: string
37
+ /** Optional i18n key resolved by the app title resolver; falls back to `title`. */
38
+ titleKey?: string
38
39
  path?: string
39
40
  componentKey?: string
40
41
  icon?: string
@@ -45,12 +46,14 @@ export interface RbacMenu {
45
46
  cache: boolean
46
47
  tabHidden: boolean
47
48
  redirect?: string
49
+ /** Optimistic-lock revision; assigned on create and incremented on every update. */
50
+ version: number
48
51
  createdAt: string
49
52
  updatedAt: string
50
53
  children?: RbacMenu[]
51
54
  }
52
55
 
53
- export type RbacMenuDraft = Omit<RbacMenu, 'id' | 'createdAt' | 'updatedAt'>
56
+ export type RbacMenuDraft = Omit<RbacMenu, 'id' | 'createdAt' | 'updatedAt' | 'version'>
54
57
 
55
58
  export interface RbacAuditEvent {
56
59
  id: string
@@ -74,8 +77,7 @@ export interface RbacPageCapability {
74
77
  }
75
78
 
76
79
  export function rbacText(key: string): string {
77
- const global = getAdminI18n()?.global as unknown as { t: (key: string) => string } | undefined
78
- return global?.t(key as AdminMessageKey) ?? key
80
+ return translateAdminMessage(key)
79
81
  }
80
82
 
81
83
  export interface PageRequest<TQuery extends object> {
@@ -231,15 +233,23 @@ export async function createMenu(draft: RbacMenuDraft, signal: AbortSignal): Pro
231
233
  return apiClient.post<RbacMenu>('/system/menus', draft, { signal, silent: true })
232
234
  }
233
235
 
236
+ /** Business code returned by the server when a menu update loses a version race. */
237
+ export const MENU_VERSION_CONFLICT_CODE = 40901
238
+
234
239
  export async function updateMenu(
235
240
  menuId: string,
236
241
  draft: RbacMenuDraft,
242
+ version: number,
237
243
  signal: AbortSignal,
238
244
  ): Promise<RbacMenu> {
239
- return apiClient.put<RbacMenu>(`/system/menus/${encodeURIComponent(menuId)}`, draft, {
240
- signal,
241
- silent: true,
242
- })
245
+ return apiClient.put<RbacMenu>(
246
+ `/system/menus/${encodeURIComponent(menuId)}`,
247
+ { ...draft, version },
248
+ {
249
+ signal,
250
+ silent: true,
251
+ },
252
+ )
243
253
  }
244
254
 
245
255
  export async function setMenusStatus(
@@ -0,0 +1,134 @@
1
+ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
2
+ import { useAuthorizationPolling } from './useAuthorizationPolling'
3
+
4
+ interface HarnessOptions {
5
+ local?: number | undefined
6
+ remote?: number
7
+ confirmed?: boolean
8
+ }
9
+
10
+ function createHarness({ local, remote = 1, confirmed = true }: HarnessOptions = {}) {
11
+ const fetchRemoteRevision = vi.fn(async () => remote)
12
+ const getLocalRevision = vi.fn(() => local)
13
+ const confirmDrift = vi.fn(async () => confirmed)
14
+ const onDrift = vi.fn(async () => {})
15
+ const polling = useAuthorizationPolling({
16
+ intervalMs: 30_000,
17
+ fetchRemoteRevision,
18
+ getLocalRevision,
19
+ confirmDrift,
20
+ onDrift,
21
+ })
22
+ return { polling, fetchRemoteRevision, getLocalRevision, confirmDrift, onDrift }
23
+ }
24
+
25
+ describe('useAuthorizationPolling', () => {
26
+ beforeEach(() => {
27
+ vi.useFakeTimers()
28
+ })
29
+
30
+ afterEach(() => {
31
+ vi.useRealTimers()
32
+ })
33
+
34
+ it('skips checks while the session has no revision', async () => {
35
+ const { polling, fetchRemoteRevision, confirmDrift } = createHarness({ local: undefined })
36
+
37
+ await polling.checkOnce()
38
+
39
+ expect(fetchRemoteRevision).not.toHaveBeenCalled()
40
+ expect(confirmDrift).not.toHaveBeenCalled()
41
+ })
42
+
43
+ it('does nothing when revisions match', async () => {
44
+ const { polling, confirmDrift, onDrift } = createHarness({ local: 1, remote: 1 })
45
+
46
+ await polling.checkOnce()
47
+
48
+ expect(confirmDrift).not.toHaveBeenCalled()
49
+ expect(onDrift).not.toHaveBeenCalled()
50
+ })
51
+
52
+ it('prompts and refreshes on drift when confirmed', async () => {
53
+ const { polling, confirmDrift, onDrift } = createHarness({
54
+ local: 1,
55
+ remote: 2,
56
+ confirmed: true,
57
+ })
58
+
59
+ await polling.checkOnce()
60
+
61
+ expect(confirmDrift).toHaveBeenCalledTimes(1)
62
+ expect(onDrift).toHaveBeenCalledTimes(1)
63
+ })
64
+
65
+ it('keeps polling when the user postpones the refresh', async () => {
66
+ const { polling, confirmDrift, onDrift } = createHarness({
67
+ local: 1,
68
+ remote: 2,
69
+ confirmed: false,
70
+ })
71
+
72
+ await polling.checkOnce()
73
+ expect(onDrift).not.toHaveBeenCalled()
74
+
75
+ await polling.checkOnce()
76
+ expect(confirmDrift).toHaveBeenCalledTimes(2)
77
+ expect(onDrift).not.toHaveBeenCalled()
78
+ })
79
+
80
+ it('stays silent when a revision fetch fails', async () => {
81
+ const fetchRemoteRevision = vi.fn(async () => {
82
+ throw new Error('network down')
83
+ })
84
+ const { checkOnce } = useAuthorizationPolling({
85
+ intervalMs: 30_000,
86
+ fetchRemoteRevision,
87
+ getLocalRevision: () => 1,
88
+ confirmDrift: vi.fn(async () => true),
89
+ onDrift: vi.fn(async () => {}),
90
+ })
91
+
92
+ await expect(checkOnce()).resolves.toBeUndefined()
93
+ })
94
+
95
+ it('ignores overlapping checks while one is in flight', async () => {
96
+ let resolveFetch: (value: number) => void = () => {}
97
+ const fetchRemoteRevision = vi.fn(
98
+ () =>
99
+ new Promise<number>((resolve) => {
100
+ resolveFetch = resolve
101
+ }),
102
+ )
103
+ const confirmDrift = vi.fn(async () => true)
104
+ const onDrift = vi.fn(async () => {})
105
+ const polling = useAuthorizationPolling({
106
+ intervalMs: 30_000,
107
+ fetchRemoteRevision,
108
+ getLocalRevision: () => 1,
109
+ confirmDrift,
110
+ onDrift,
111
+ })
112
+
113
+ const first = polling.checkOnce()
114
+ const second = polling.checkOnce()
115
+ resolveFetch(2)
116
+ await Promise.all([first, second])
117
+
118
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
119
+ expect(confirmDrift).toHaveBeenCalledTimes(1)
120
+ expect(onDrift).toHaveBeenCalledTimes(1)
121
+ })
122
+
123
+ it('starts and stops on the configured interval', async () => {
124
+ const { polling, fetchRemoteRevision } = createHarness({ local: 1, remote: 1 })
125
+
126
+ polling.start()
127
+ await vi.advanceTimersByTimeAsync(30_000)
128
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
129
+
130
+ polling.stop()
131
+ await vi.advanceTimersByTimeAsync(60_000)
132
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
133
+ })
134
+ })
@@ -0,0 +1,96 @@
1
+ import { getCurrentInstance, onBeforeUnmount, onMounted } from 'vue'
2
+ import { translateAdminMessage } from '../../../../locales'
3
+ import { useAuthStore } from '../../../auth/store/auth'
4
+ import { rbacRevision } from '../api/rbac'
5
+ import { useAuthorizationRefresh } from './useAuthorizationRefresh'
6
+
7
+ export const DEFAULT_AUTHORIZATION_POLLING_INTERVAL_MS = 30_000
8
+
9
+ export interface AuthorizationPollingOptions {
10
+ /** 轮询间隔,默认 30s。 */
11
+ intervalMs?: number
12
+ /** 注入点(测试):远端 revision 来源,默认 /system/rbac/revision。 */
13
+ fetchRemoteRevision?: () => Promise<number>
14
+ /** 注入点(测试):本地会话 revision,默认 auth.session.authorizationRevision。 */
15
+ getLocalRevision?: () => number | undefined
16
+ /** 注入点(测试):漂移确认交互;resolve(true) 表示立即刷新。 */
17
+ confirmDrift?: () => Promise<boolean>
18
+ /** 注入点(测试):确认后的刷新动作,默认 refreshAuthorization 回路。 */
19
+ onDrift?: () => Promise<void>
20
+ }
21
+
22
+ /** 默认确认交互:消息框确认,拒绝(关闭/取消)视为稍后处理。 */
23
+ async function confirmByMessageBox(): Promise<boolean> {
24
+ const { ElMessageBox } = await import('element-plus/es/components/message-box/index.mjs')
25
+ try {
26
+ await ElMessageBox.confirm(
27
+ translateAdminMessage('system.access.revision.body'),
28
+ translateAdminMessage('system.access.revision.title'),
29
+ {
30
+ confirmButtonText: translateAdminMessage('system.access.revision.refreshNow'),
31
+ cancelButtonText: translateAdminMessage('common.actions.cancel'),
32
+ type: 'warning',
33
+ },
34
+ )
35
+ return true
36
+ } catch {
37
+ return false
38
+ }
39
+ }
40
+
41
+ /**
42
+ * 跨会话权限感知:周期比对服务端 RBAC revision 与本地会话,发现漂移后
43
+ * 提示用户确认再刷新(refreshAuthorization + 动态菜单重建)。取"提示确认"
44
+ * 而非静默替换,避免打断正在填写的表单;轮询失败静默,不干扰主流程。
45
+ * 在组件 setup 中调用时自动随挂载启停;亦可手动 start/stop。
46
+ */
47
+ export function useAuthorizationPolling(options: AuthorizationPollingOptions = {}) {
48
+ const intervalMs = options.intervalMs ?? DEFAULT_AUTHORIZATION_POLLING_INTERVAL_MS
49
+ const fetchRemoteRevision = options.fetchRemoteRevision ?? rbacRevision
50
+ const getLocalRevision =
51
+ options.getLocalRevision ?? (() => useAuthStore().session?.authorizationRevision)
52
+ const confirmDrift = options.confirmDrift ?? confirmByMessageBox
53
+ const onDrift = options.onDrift ?? useAuthorizationRefresh()
54
+
55
+ let timer: ReturnType<typeof setInterval> | undefined
56
+ let checking = false
57
+
58
+ async function checkOnce(): Promise<void> {
59
+ if (checking) return
60
+ const local = getLocalRevision()
61
+ if (local === undefined) return
62
+ checking = true
63
+ try {
64
+ const remote = await fetchRemoteRevision()
65
+ if (remote === local) return
66
+ // 后台标签页不打扰;回到前台后的下一轮检测到漂移会再次提示。
67
+ if (typeof document !== 'undefined' && document.hidden) return
68
+ if (!(await confirmDrift())) return
69
+ await onDrift()
70
+ } catch {
71
+ // 保守吞掉:revision 拉取/刷新异常不冒泡到全局错误提示。
72
+ } finally {
73
+ checking = false
74
+ }
75
+ }
76
+
77
+ function start(): void {
78
+ if (timer !== undefined) return
79
+ timer = setInterval(() => {
80
+ void checkOnce()
81
+ }, intervalMs)
82
+ }
83
+
84
+ function stop(): void {
85
+ if (timer === undefined) return
86
+ clearInterval(timer)
87
+ timer = undefined
88
+ }
89
+
90
+ if (getCurrentInstance()) {
91
+ onMounted(start)
92
+ onBeforeUnmount(stop)
93
+ }
94
+
95
+ return { start, stop, checkOnce }
96
+ }
@@ -25,7 +25,7 @@ const sessionId = computed(() =>
25
25
  </ElAvatar>
26
26
  <div>
27
27
  <h2>{{ user?.displayName ?? t('workspace.profile.admin') }}</h2>
28
- <p>{{ user?.email ?? 'admin@example.com' }}</p>
28
+ <p>{{ user?.email ?? t('workspace.profile.noEmail') }}</p>
29
29
  </div>
30
30
  <ElTag type="success" effect="plain">
31
31
  <ElIcon><CircleCheckFilled /></ElIcon> {{ t('workspace.profile.online') }}
@@ -5,6 +5,7 @@ import { ElDrawer } from 'element-plus'
5
5
  import { useI18n } from 'vue-i18n'
6
6
  import AdminWatermark from '../features/shell/components/AdminWatermark.vue'
7
7
  import { useSidebarStore } from '../features/shell/store/sidebar'
8
+ import { useAuthorizationPolling } from '../features/system/access/composables/useAuthorizationPolling'
8
9
  import BreadcrumbBar from './BreadcrumbBar.vue'
9
10
  import SideMenu from './SideMenu.vue'
10
11
  import TopBar from './TopBar.vue'
@@ -13,6 +14,8 @@ import WorkspaceTabs from './WorkspaceTabs.vue'
13
14
  defineOptions({ name: 'AdminLayout' })
14
15
  const sidebar = useSidebarStore()
15
16
  const { t } = useI18n()
17
+ // 会话内轮询 RBAC revision:服务端权限/菜单变更经确认后刷新,随布局卸载停止。
18
+ useAuthorizationPolling()
16
19
  </script>
17
20
 
18
21
  <template>
@@ -18,7 +18,12 @@ import { useI18n } from 'vue-i18n'
18
18
  import { useAuthStore } from '../features/auth/store/auth'
19
19
  import { useSidebarStore } from '../features/shell/store/sidebar'
20
20
  import { getRouting } from '../router/bootstrap'
21
- import { flattenMenuSearchOptions } from './topBarMenuSearch'
21
+ import { replaceDynamicMenusWithAccessibleFallback } from '../router/dynamicMenuRefresh'
22
+ import {
23
+ flattenMenuSearchOptions,
24
+ isMenuRefreshDisabled,
25
+ isMenuSearchDisabled,
26
+ } from './topBarMenuSearch'
22
27
 
23
28
  defineOptions({ name: 'TopBar' })
24
29
  const ThemePanel = defineAsyncComponent({
@@ -33,6 +38,7 @@ const auth = useAuthStore()
33
38
  const user = computed(() => auth.session?.user)
34
39
  const menuSearchValue = shallowRef<string>()
35
40
  const menuRefreshFailed = shallowRef(false)
41
+ const menuRefreshing = shallowRef(false)
36
42
  const language = useOrigenUiLanguage()!
37
43
  const languageOptions = computed(() => [
38
44
  { value: 'zh-CN', label: t('shell.languageZhCN') },
@@ -42,20 +48,33 @@ const languageOptions = computed(() => [
42
48
  const menuSearchOptions = computed(() => flattenMenuSearchOptions(getRouting().menu.value))
43
49
 
44
50
  async function refreshLocalizedMenus(): Promise<void> {
51
+ if (isMenuRefreshDisabled(menuRefreshing.value, language.status.value === 'loading')) return
52
+ menuRefreshing.value = true
45
53
  try {
46
- await getRouting().replaceDynamicRoutes(undefined, { fallback: '/dashboard' })
54
+ await replaceDynamicMenusWithAccessibleFallback(getRouting())
47
55
  menuRefreshFailed.value = false
48
56
  } catch {
49
57
  menuRefreshFailed.value = true
50
58
  ElMessage.error({ message: t('shell.menuRefreshFailed'), showClose: true })
59
+ } finally {
60
+ menuRefreshing.value = false
51
61
  }
52
62
  }
53
63
 
54
64
  async function switchLanguage(locale: string): Promise<void> {
55
- if (!language || language.current.value === locale) return
65
+ if (
66
+ !language ||
67
+ menuRefreshing.value ||
68
+ language.status.value === 'loading' ||
69
+ language.current.value === locale
70
+ ) {
71
+ return
72
+ }
56
73
  try {
57
74
  const result = await language.setLocale(locale)
58
- if (!result.applied) return
75
+ if (!result.applied) {
76
+ return
77
+ }
59
78
  } catch {
60
79
  ElMessage.error({ message: t('shell.languageLoadFailed'), showClose: true })
61
80
  return
@@ -100,6 +119,7 @@ async function logout(): Promise<void> {
100
119
  <ElSelect
101
120
  v-model="menuSearchValue"
102
121
  class="top-bar__search"
122
+ :disabled="isMenuSearchDisabled(menuRefreshing, language.status.value === 'loading')"
103
123
  :placeholder="t('shell.searchMenu')"
104
124
  filterable
105
125
  clearable
@@ -140,12 +160,23 @@ async function logout(): Promise<void> {
140
160
  <ElDropdownItem
141
161
  v-for="item in languageOptions"
142
162
  :key="item.value"
143
- :disabled="language.current.value === item.value"
163
+ :disabled="
164
+ language.current.value === item.value
165
+ || menuRefreshing
166
+ || language.status.value === 'loading'
167
+ "
144
168
  @click="switchLanguage(item.value)"
145
169
  >
146
170
  {{ item.label }}
147
171
  </ElDropdownItem>
148
- <ElDropdownItem v-if="menuRefreshFailed" divided @click="refreshLocalizedMenus">
172
+ <ElDropdownItem
173
+ v-if="menuRefreshFailed"
174
+ divided
175
+ :disabled="
176
+ isMenuRefreshDisabled(menuRefreshing, language.status.value === 'loading')
177
+ "
178
+ @click="refreshLocalizedMenus"
179
+ >
149
180
  <ElIcon><Refresh /></ElIcon>
150
181
  {{ t('shell.retryMenuRefresh') }}
151
182
  </ElDropdownItem>
@@ -1,6 +1,29 @@
1
1
  import type { RouteMenuItem } from '@origen-ui/router'
2
2
  import { describe, expect, it } from 'vitest'
3
- import { flattenMenuSearchOptions } from './topBarMenuSearch'
3
+ import {
4
+ flattenMenuSearchOptions,
5
+ isMenuRefreshDisabled,
6
+ isMenuSearchDisabled,
7
+ } from './topBarMenuSearch'
8
+
9
+ describe('isMenuSearchDisabled', () => {
10
+ it('disables menu search while localized routes are loading or refreshing', () => {
11
+ expect(isMenuSearchDisabled(true, false)).toBe(true)
12
+ expect(isMenuSearchDisabled(false, true)).toBe(true)
13
+ })
14
+
15
+ it('keeps menu search enabled when route state is settled', () => {
16
+ expect(isMenuSearchDisabled(false, false)).toBe(false)
17
+ })
18
+ })
19
+
20
+ describe('isMenuRefreshDisabled', () => {
21
+ it('prevents a refresh while another refresh or locale transition is active', () => {
22
+ expect(isMenuRefreshDisabled(true, false)).toBe(true)
23
+ expect(isMenuRefreshDisabled(false, true)).toBe(true)
24
+ expect(isMenuRefreshDisabled(false, false)).toBe(false)
25
+ })
26
+ })
4
27
 
5
28
  describe('flattenMenuSearchOptions', () => {
6
29
  it('returns only navigable leaves with their visible hierarchy', () => {
@@ -7,6 +7,16 @@ export interface TopBarMenuSearchOption {
7
7
  to: RouteLocationRaw
8
8
  }
9
9
 
10
+ /** Keep menu search unavailable while its route-backed options are being replaced. */
11
+ export function isMenuSearchDisabled(menuRefreshing: boolean, languageLoading: boolean): boolean {
12
+ return menuRefreshing || languageLoading
13
+ }
14
+
15
+ /** Prevent menu refreshes from racing a locale transition. */
16
+ export function isMenuRefreshDisabled(menuRefreshing: boolean, languageLoading: boolean): boolean {
17
+ return menuRefreshing || languageLoading
18
+ }
19
+
10
20
  /** Builds searchable destinations from the visible leaf menu items. */
11
21
  export function flattenMenuSearchOptions(
12
22
  items: readonly RouteMenuItem[],
@@ -138,7 +138,9 @@
138
138
  },
139
139
  "errors": {
140
140
  "unknownPageError": "An unexpected page error occurred",
141
- "startupFailed": "The application failed to start"
141
+ "startupFailed": "The application failed to start",
142
+ "networkError": "A network error occurred. Please try again later.",
143
+ "invalidResponse": "The service returned an invalid response."
142
144
  }
143
145
  },
144
146
  "workspace": {
@@ -202,7 +204,8 @@
202
204
  "permissionItems": "permissions",
203
205
  "securityStatus": "Security Status",
204
206
  "currentSession": "Current Session",
205
- "sessionDescription": "This device accesses the admin workspace through a protected session."
207
+ "sessionDescription": "This device accesses the admin workspace through a protected session.",
208
+ "noEmail": "No email set"
206
209
  }
207
210
  },
208
211
  "errors": {
@@ -440,15 +443,32 @@
440
443
  "pathRequired": "Please enter the menu route path",
441
444
  "submenuRelativePath": "Child menus must use relative route paths",
442
445
  "rootPathSlash": "Root menu paths must start with /",
443
- "componentRequired": "Please select a registered page capability"
446
+ "componentRequired": "Please select a registered page capability",
447
+ "treeCycle": "Menu parent chain contains a cycle",
448
+ "treeOrphanParent": "Parent menu does not exist or was removed",
449
+ "treeDuplicateId": "Duplicate menu identifier",
450
+ "treeDuplicateCode": "Duplicate menu code",
451
+ "treeDuplicatePath": "Duplicate resolved route path",
452
+ "treeAmbiguousParent": "Ambiguous parent route path",
453
+ "treeUnresolvedParent": "Unresolved parent route path",
454
+ "treePrecheckFailed": "Menu tree validation failed",
455
+ "treeTitleKeyMissing": "Menu title is missing a translation key",
456
+ "treeDetail": "Detail: {detail}",
457
+ "titleKeyRequired": "Enter a translation key for the menu title",
458
+ "versionConflict": "Menu was modified by someone else. Refresh and retry"
444
459
  },
445
460
  "form": {
446
461
  "kind": "Node Type",
462
+ "redirect": "Directory Redirect",
463
+ "redirectPlaceholder": "Leave empty to fall back to the home route",
447
464
  "parentButton": "Parent Page",
448
465
  "parentDirectory": "Parent Directory",
449
466
  "rootDirectory": "Root Directory",
450
467
  "title": "Menu Name",
451
468
  "titlePlaceholder": "e.g. Component coverage",
469
+ "titleKey": "Title Translation Key",
470
+ "titleKeyPlaceholder": "e.g. menus.coverage.title",
471
+ "titleKeyRuleMessage": "Start with a letter; letters, digits, dots or hyphens allowed",
452
472
  "code": "Menu Code",
453
473
  "codePlaceholder": "e.g. user-list",
454
474
  "codeRuleMessage": "Use 3-48 lowercase letters, digits or hyphens",
@@ -472,6 +492,13 @@
472
492
  "tabHidden": "Hide Tab"
473
493
  }
474
494
  },
495
+ "access": {
496
+ "revision": {
497
+ "title": "Permissions updated",
498
+ "body": "Menu or permission configuration has changed. Refresh now?",
499
+ "refreshNow": "Refresh now"
500
+ }
501
+ },
475
502
  "audit": {
476
503
  "title": "Audit Log",
477
504
  "occurredAt": "Time",
@@ -1,5 +1,6 @@
1
1
  import { OG_DIALOG_LOCALE_EN_US } from '@origen-ui/dialog/locale'
2
2
  import { OG_EDITOR_LOCALE_EN_US } from '@origen-ui/editor/locale'
3
+ import { OG_FORM_TABLE_LOCALE_EN_US } from '@origen-ui/form-table/locale'
3
4
  import { OG_FORM_LOCALE_EN_US } from '@origen-ui/form/locale'
4
5
  import { OG_SEARCH_LOCALE_EN_US } from '@origen-ui/search/locale'
5
6
  import { OG_TABLE_LOCALE_EN_US } from '@origen-ui/table/locale'
@@ -13,6 +14,7 @@ export const origenUi = {
13
14
  dialog: OG_DIALOG_LOCALE_EN_US,
14
15
  editor: OG_EDITOR_LOCALE_EN_US,
15
16
  form: OG_FORM_LOCALE_EN_US,
17
+ formTable: OG_FORM_TABLE_LOCALE_EN_US,
16
18
  search: OG_SEARCH_LOCALE_EN_US,
17
19
  table: OG_TABLE_LOCALE_EN_US,
18
20
  tabs: OG_TABS_LOCALE_EN_US,