qdadm 1.13.1 → 1.19.2

package/src/composables/useListPage.ts

@@ -34,6 +34,7 @@ import { useHooks } from './useHooks.js'
 import { useEntityItemPage, type ParentConfig, type UseEntityItemPageReturn } from './useEntityItemPage.js'
 import { useActiveStack } from '../chain/useActiveStack.js'
 import { FilterQuery } from '../query/FilterQuery'
+import { useI18n } from '../i18n/useI18n'
 
 // Import types from dedicated types file
 import type {
@@ -80,63 +81,21 @@ export type {
   UseListPageReturn,
 } from './useListPage.types'
 
-// Cookie utilities for pagination persistence
-const COOKIE_NAME = 'qdadm_pageSize'
-const COOKIE_EXPIRY_DAYS = 365
-
-function getCookie(name: string): string | null {
-  const match = document.cookie.match(new RegExp('(^| )' + name + '=([^;]+)'))
-  return match?.[2] ?? null
-}
-
-function setCookie(name: string, value: string | number, days: number): void {
-  const expires = new Date(Date.now() + days * 864e5).toUTCString()
-  document.cookie = `${name}=${value}; expires=${expires}; path=/; SameSite=Lax`
-}
-
-function getSavedPageSize(defaultSize: number): number {
-  const saved = getCookie(COOKIE_NAME)
-  if (saved) {
-    const parsed = parseInt(saved, 10)
-    if ([10, 50, 100].includes(parsed)) return parsed
-  }
-  return defaultSize
-}
-
-// Default label fallback: convert snake_case to Title Case
-function snakeToTitle(str: string): string {
-  if (!str) return 'Unknown'
-  return String(str)
-    .split('_')
-    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-    .join(' ')
-}
-
-// Standard pagination options
-export const PAGE_SIZE_OPTIONS = [10, 50, 100]
-
-// Session storage utilities for filter persistence
-const FILTER_SESSION_PREFIX = 'qdadm_filters_'
-
-function getSessionFilters(key: string): Record<string, unknown> | null {
-  try {
-    const stored = sessionStorage.getItem(FILTER_SESSION_PREFIX + key)
-    return stored ? JSON.parse(stored) : null
-  } catch {
-    return null
-  }
-}
-
-function setSessionFilters(key: string, filters: Record<string, unknown>): void {
-  try {
-    sessionStorage.setItem(FILTER_SESSION_PREFIX + key, JSON.stringify(filters))
-  } catch {
-    // Ignore storage errors
-  }
-}
+// Stateless utilities (cookies, session storage, formatters, constants).
+import {
+  PAGE_SIZE_OPTIONS,
+  SMART_FILTER_THRESHOLD,
+  clearSessionFilters,
+  getSavedPageSize,
+  getSessionFilters,
+  persistPageSize,
+  setSessionFilters,
+  snakeToTitle,
+} from './useListPage.utils'
 
-// Smart filter auto-discovery threshold
-const SMART_FILTER_THRESHOLD = 50
+// Re-export PAGE_SIZE_OPTIONS so existing consumers (qdadm/index.ts,
+// composables/index.ts) keep their import path.
+export { PAGE_SIZE_OPTIONS } from './useListPage.utils'
 
 
 /**
@@ -168,6 +127,9 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
   // Mobile detection (viewport width < 768px)
   const isMobile = ref(window.innerWidth < 768)
 
+  // i18n integration — column headers resolve via entities.{entity}.fields.{field}
+  const { i18n: kernelI18n, locale: i18nLocale } = useI18n()
+
   // Get EntityManager via orchestrator
   const orchestrator = inject<Orchestrator | null>('qdadmOrchestrator')
 
@@ -293,15 +255,44 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
 
   // ============ COLUMNS ============
   const columnsMap = ref<Map<string, ColumnConfig>>(new Map())
+  // Track inline-supplied column headers so relabel() can fall back to them
+  // when the i18n bundle has no translation for the field.
+  const columnInlineHeaders = new Map<string, string | undefined>()
+
+  /**
+   * Resolve a column header: i18n hit on entities.{entity}.fields.{field} wins,
+   * otherwise the inline `header` option, otherwise a capitalized field name.
+   */
+  function resolveColumnHeader(field: string, inline?: string): string {
+    if (entity && kernelI18n) {
+      const trace = kernelI18n.resolve(`entities.${entity}.fields.${field}`)
+      if (trace.hit) return trace.result
+    }
+    return inline || field.charAt(0).toUpperCase() + field.slice(1)
+  }
 
   function addColumn(field: string, columnConfig: Partial<ColumnConfig> = {}): void {
+    columnInlineHeaders.set(field, columnConfig.header)
     columnsMap.value.set(field, {
       field,
-      header: columnConfig.header || field.charAt(0).toUpperCase() + field.slice(1),
+      header: resolveColumnHeader(field, columnConfig.header),
       ...columnConfig,
+      // Re-apply resolved header after spread so it wins over a stale inline.
+      ...(columnConfig.header ? {} : { header: resolveColumnHeader(field) }),
     })
   }
 
+  // Re-resolve column headers when locale changes.
+  watch(i18nLocale, () => {
+    if (!entity || !kernelI18n) return
+    for (const [field, current] of columnsMap.value.entries()) {
+      const newHeader = resolveColumnHeader(field, columnInlineHeaders.get(field))
+      if (current.header !== newHeader) {
+        columnsMap.value.set(field, { ...current, header: newHeader })
+      }
+    }
+  })
+
   function removeColumn(field: string): void {
     columnsMap.value.delete(field)
   }
@@ -596,7 +587,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
     filterValues.value = cleared
     searchQuery.value = ''
     if (persistFilters) {
-      sessionStorage.removeItem(FILTER_SESSION_PREFIX + filterSessionKey)
+      clearSessionFilters(filterSessionKey)
     }
     if (syncUrlParams) {
       const query = { ...route.query } as Record<string, string>
@@ -1003,7 +994,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
   function onPage(event: { page: number; rows: number }): void {
     page.value = event.page + 1
     pageSize.value = event.rows
-    setCookie(COOKIE_NAME, event.rows, COOKIE_EXPIRY_DAYS)
+    persistPageSize(event.rows)
     loadItems()
   }
 

package/src/composables/useListPage.utils.ts

@@ -0,0 +1,101 @@
+/**
+ * useListPage helpers — stateless utilities used by the list page composable.
+ *
+ * Kept module-local so they're trivially importable from the orchestrator
+ * file (`useListPage.ts`) and from any future split modules without dragging
+ * the full `useListPage` runtime context along.
+ */
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Pagination cookie persistence
+// ─────────────────────────────────────────────────────────────────────────────
+
+const COOKIE_NAME = 'qdadm_pageSize'
+const COOKIE_EXPIRY_DAYS = 365
+
+export function getCookie(name: string): string | null {
+  const match = document.cookie.match(new RegExp('(^| )' + name + '=([^;]+)'))
+  return match?.[2] ?? null
+}
+
+export function setCookie(name: string, value: string | number, days: number): void {
+  const expires = new Date(Date.now() + days * 864e5).toUTCString()
+  document.cookie = `${name}=${value}; expires=${expires}; path=/; SameSite=Lax`
+}
+
+/**
+ * Read the saved page size from cookie. Returns the default when absent or
+ * not in the canonical {@link PAGE_SIZE_OPTIONS} list.
+ */
+export function getSavedPageSize(defaultSize: number): number {
+  const saved = getCookie(COOKIE_NAME)
+  if (saved) {
+    const parsed = parseInt(saved, 10)
+    if (PAGE_SIZE_OPTIONS.includes(parsed)) return parsed
+  }
+  return defaultSize
+}
+
+export function persistPageSize(size: number): void {
+  setCookie(COOKIE_NAME, size, COOKIE_EXPIRY_DAYS)
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Default label formatter (snake_case → Title Case)
+// ─────────────────────────────────────────────────────────────────────────────
+
+export function snakeToTitle(str: string): string {
+  if (!str) return 'Unknown'
+  return String(str)
+    .split('_')
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ')
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Pagination options
+// ─────────────────────────────────────────────────────────────────────────────
+
+/** Canonical page size options offered to the user. */
+export const PAGE_SIZE_OPTIONS = [10, 50, 100]
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Filter session storage
+// ─────────────────────────────────────────────────────────────────────────────
+
+const FILTER_SESSION_PREFIX = 'qdadm_filters_'
+
+export function getSessionFilters(key: string): Record<string, unknown> | null {
+  try {
+    const stored = sessionStorage.getItem(FILTER_SESSION_PREFIX + key)
+    return stored ? JSON.parse(stored) : null
+  } catch {
+    return null
+  }
+}
+
+export function setSessionFilters(key: string, filters: Record<string, unknown>): void {
+  try {
+    sessionStorage.setItem(FILTER_SESSION_PREFIX + key, JSON.stringify(filters))
+  } catch {
+    // Ignore storage errors (quota exceeded, disabled by user, …).
+  }
+}
+
+export function clearSessionFilters(key: string): void {
+  try {
+    sessionStorage.removeItem(FILTER_SESSION_PREFIX + key)
+  } catch {
+    // Ignore storage errors.
+  }
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Smart filter discovery
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Threshold below which the list switches to client-side filtering when
+ * `filterMode: 'auto'` is in effect.
+ */
+export const SMART_FILTER_THRESHOLD = 50

package/src/composables/useNavigation.ts

@@ -13,6 +13,7 @@ import { computed, inject, ref, onMounted, type ComputedRef, type Ref } from 'vu
 import { useRoute, useRouter } from 'vue-router'
 import { getNavSections, alterMenuSections, isMenuAltered } from '../module/moduleRegistry'
 import { useSemanticBreadcrumb } from './useSemanticBreadcrumb'
+import { useI18n } from '../i18n/useI18n'
 import type { HookRegistry } from '../hooks/HookRegistry'
 
 /**
@@ -81,6 +82,9 @@ export function useNavigation(): UseNavigationReturn {
   const orchestrator = inject<Orchestrator | null>('qdadmOrchestrator', null)
   const hooks = inject<HookRegistry | null>('qdadmHooks', null)
 
+  // i18n integration — labels resolve through nav.sections.* / nav.routes.*
+  const { i18n: kernelI18n, locale: i18nLocale } = useI18n()
+
   // Semantic breadcrumb for entity-based active detection
   const { breadcrumb } = useSemanticBreadcrumb()
 
@@ -112,18 +116,37 @@ export function useNavigation(): UseNavigationReturn {
     }
   })
 
+  /**
+   * Resolve a label through i18n with the given convention key, falling back
+   * to the inline label when the bundle has no matching translation.
+   */
+  function resolveNavLabel(key: string, fallback: string): string {
+    if (!kernelI18n) return fallback
+    const trace = kernelI18n.resolve(key)
+    return trace.hit ? trace.result : fallback
+  }
+
   // Get nav sections from registry, filtering items based on permissions
-  // Depends on alterVersion to trigger re-computation after alteration
+  // Depends on alterVersion + i18nLocale to trigger re-computation after
+  // alteration or locale change.
   const navSections = computed(() => {
-    // Force dependency on alterVersion for reactivity
+    // Force dependencies for reactivity
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     alterVersion.value
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    i18nLocale.value
 
     const sections = getNavSections()
     return sections
       .map((section) => ({
         ...section,
-        items: section.items.filter((item) => canAccessNavItem(item)),
+        title: resolveNavLabel(`nav.sections.${section.title}`, section.title),
+        items: section.items
+          .filter((item) => canAccessNavItem(item))
+          .map((item) => ({
+            ...item,
+            label: resolveNavLabel(`nav.routes.${item.route}`, item.label),
+          })),
       }))
       .filter((section) => section.items.length > 0) // Hide empty sections
   })

package/src/composables/useOptionsLookup.ts

@@ -170,7 +170,11 @@ export function useOptionsLookup(config: UseOptionsLookupConfig): UseOptionsLook
   if (config.entity) {
     try {
       const orc = useOrchestrator()
-      getManager = orc.getManager as typeof getManager
+      // Generic-vs-non-generic: getManager is parameterised by an
+      // EntityRecord type variable that the local alias intentionally
+      // erases. Bridge through `unknown` so strict TS doesn't reject
+      // the cross-shape assignment.
+      getManager = orc.getManager as unknown as typeof getManager
     } catch {
       // Orchestrator not available
     }

package/src/gen/generateManagers.test.js

@@ -474,6 +474,15 @@ describe('fieldTypeToTsType', () => {
     expect(fieldTypeToTsType('number', false)).toBe('number | null')
     expect(fieldTypeToTsType('boolean', false)).toBe('boolean | null')
   })
+
+  it('falls back to unknown for unrecognized types instead of emitting literal undefined', () => {
+    // Repro for v1.19.1 bug: connectors could yield types outside UnifiedFieldType
+    // (e.g. OpenAPI oneOf/discriminator). Without a default branch the IIFE
+    // returned `undefined` and template-literal interpolation wrote the string
+    // "undefined" into the generated .ts file.
+    expect(fieldTypeToTsType('mystery-type', true)).toBe('unknown')
+    expect(fieldTypeToTsType('mystery-type', false)).toBe('unknown | null')
+  })
 })
 
 describe('generateEntityInterface', () => {
@@ -498,4 +507,22 @@ describe('generateEntityInterface', () => {
 
     expect(result).not.toContain('password')
   })
+
+  it('skips dotted-name children of nested object fields', () => {
+    // Repro for v1.19.1 bug: OpenAPIConnector flattens one level of nested
+    // object props as dotted keys for runtime metadata. The interface emitter
+    // must not write those keys at the top level — they're invalid TS syntax,
+    // and the parent object field already carries Record<string, unknown>.
+    const result = generateEntityInterface('commands', {
+      id: { name: 'id', type: 'uuid' },
+      filter: { name: 'filter', type: 'object' },
+      'filter.botUuids': { name: 'filter.botUuids', type: 'array' },
+      'filter.tags': { name: 'filter.tags', type: 'array' }
+    }, 'id')
+
+    expect(result).toContain('filter?: Record<string, unknown> | null')
+    expect(result).not.toContain('filter.botUuids')
+    expect(result).not.toContain('filter.tags')
+    expect(result).not.toMatch(/^\s*filter\./m)
+  })
 })

package/src/gen/generateManagers.ts

@@ -88,6 +88,12 @@ export function fieldTypeToTsType(type: UnifiedFieldType, required: boolean): st
         return 'unknown[]'
       case 'object':
         return 'Record<string, unknown>'
+      default:
+        // Fallback for types widened beyond UnifiedFieldType at runtime
+        // (e.g. OpenAPI oneOf/discriminator that FieldMapper couldn't classify).
+        // Without this, the IIFE returns undefined and we'd emit the literal
+        // string "undefined" into the generated .ts file.
+        return 'unknown'
     }
   })()
   return required ? tsType : `${tsType} | null`
@@ -107,6 +113,12 @@ export function generateEntityInterface(
 
   for (const [fieldName, field] of Object.entries(fields)) {
     if (field.hidden) continue
+    // Connectors (e.g. OpenAPIConnector) flatten one level of nested object
+    // properties as dotted keys ("filter.botUuids") for runtime form/column
+    // metadata. The parent object field is already typed as
+    // Record<string, unknown>, and dotted keys are not legal at the top level
+    // of a TS interface body — skip them here.
+    if (fieldName.includes('.')) continue
     const isRequired = field.required || fieldName === idField
     const tsType = fieldTypeToTsType(field.type, isRequired)
     const optional = isRequired ? '' : '?'