qdadm 0.48.0 → 0.49.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdadm",
-  "version": "0.48.0",
+  "version": "0.49.1",
   "description": "Vue 3 framework for admin dashboards with PrimeVue",
   "author": "quazardous",
   "license": "MIT",

package/src/components/layout/AppLayout.vue

@@ -177,9 +177,12 @@ function setBreadcrumbEntity(data, level = 1) {
 provide('qdadmSetBreadcrumbEntity', setBreadcrumbEntity)
 provide('qdadmBreadcrumbEntities', breadcrumbEntities)
 
-// Clear entity data on route change (before new page mounts)
+// Clear entity data and overrides on route change (before new page mounts)
+// This ensures list pages get default breadcrumb, detail pages can override via PageNav
 watch(() => route.fullPath, () => {
   breadcrumbEntities.value = new Map()
+  breadcrumbOverride.value = null
+  navlinksOverride.value = null
 })
 
 // Navigation context (breadcrumb + navlinks from route config)

package/src/components/layout/PageNav.vue

@@ -17,15 +17,17 @@
  * - entity: Current entity data (for dynamic labels in breadcrumb)
  * - parentEntity: Parent entity data (for parent label in breadcrumb)
  */
-import { computed, ref, watch, onMounted, onUnmounted, inject } from 'vue'
+import { computed, ref, watch, inject } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { getSiblingRoutes } from '../../module/moduleRegistry.js'
+import { getSiblingRoutes, getChildRoutes } from '../../module/moduleRegistry.js'
 import { useOrchestrator } from '../../orchestrator/useOrchestrator.js'
 
 // Inject override refs from AppLayout
 const breadcrumbOverride = inject('qdadmBreadcrumbOverride', null)
 const navlinksOverride = inject('qdadmNavlinksOverride', null)
 const homeRouteName = inject('qdadmHomeRoute', null)
+// Entity data set by useEntityItemPage via setBreadcrumbEntity
+const breadcrumbEntities = inject('qdadmBreadcrumbEntities', null)
 
 const props = defineProps({
   entity: { type: Object, default: null },
@@ -85,10 +87,22 @@ const breadcrumbItems = computed(() => {
     if (entityName) {
       const manager = getManager(entityName)
       if (manager) {
+        // Entity list link
         items.push({
           label: manager.labelPlural || manager.name,
           to: { name: manager.routePrefix }
         })
+
+        // If on detail page (has :id param), add current entity item
+        const entityId = route.params.id
+        if (entityId) {
+          // Get entity data from props or from breadcrumbEntities (set by useEntityItemPage)
+          const entityData = props.entity || breadcrumbEntities?.value?.get(1)
+          const entityLabel = entityData
+            ? manager.getEntityLabel(entityData)
+            : '...'
+          items.push({ label: entityLabel })
+        }
       }
     }
     return items
@@ -129,7 +143,7 @@ const breadcrumbItems = computed(() => {
 })
 
 // Sibling navlinks (routes with same parent)
-const navlinks = computed(() => {
+const siblingNavlinks = computed(() => {
   if (!parentConfig.value) return []
 
   const { entity: parentEntityName, param } = parentConfig.value
@@ -148,52 +162,91 @@ const navlinks = computed(() => {
   })
 })
 
-// Also include parent "Details" link
+// Child navlinks (when on parent detail page, show links to children)
+const childNavlinks = computed(() => {
+  // Only when NOT on a child route (no parentConfig)
+  if (parentConfig.value) return []
+
+  const entityName = route.meta?.entity
+  if (!entityName) return []
+
+  const children = getChildRoutes(entityName)
+  if (children.length === 0) return []
+
+  const entityId = route.params.id
+
+  // Build navlinks to child routes
+  return children.map(childRoute => {
+    const childManager = childRoute.meta?.entity ? getManager(childRoute.meta.entity) : null
+    const label = childRoute.meta?.navLabel || childManager?.labelPlural || childRoute.name
+    const parentParam = childRoute.meta?.parent?.param || 'id'
+
+    return {
+      label,
+      to: { name: childRoute.name, params: { [parentParam]: entityId } },
+      active: false
+    }
+  })
+})
+
+// Combined navlinks with "Details" link
 const allNavlinks = computed(() => {
-  if (!parentConfig.value) return []
+  // Case 1: On a child route - show siblings + Details link to parent
+  if (parentConfig.value) {
+    const { entity: parentEntityName, param, itemRoute } = parentConfig.value
+    const parentId = route.params[param]
+    const parentManager = getManager(parentEntityName)
 
-  const { entity: parentEntityName, param, itemRoute } = parentConfig.value
-  const parentId = route.params[param]
-  const parentManager = getManager(parentEntityName)
+    if (!parentManager) return siblingNavlinks.value
 
-  if (!parentManager) return navlinks.value
+    const defaultSuffix = parentManager.readOnly ? '-show' : '-edit'
+    const parentRouteName = itemRoute || `${parentManager.routePrefix}${defaultSuffix}`
+    const isOnParentRoute = route.name === parentRouteName
+
+    // Details link to parent item page
+    // CONVENTION: Entity item routes MUST use :id as param name (e.g., /books/:id)
+    // This is a qdadm convention - all entity detail/edit routes expect 'id' param
+    const detailsLink = {
+      label: 'Details',
+      to: { name: parentRouteName, params: { id: parentId } },
+      active: isOnParentRoute
+    }
+
+    return [detailsLink, ...siblingNavlinks.value]
+  }
 
-  const defaultSuffix = parentManager.readOnly ? '-show' : '-edit'
-  const parentRouteName = itemRoute || `${parentManager.routePrefix}${defaultSuffix}`
-  const isOnParentRoute = route.name === parentRouteName
+  // Case 2: On parent detail page - show children + Details (active)
+  if (childNavlinks.value.length > 0) {
+    const detailsLink = {
+      label: 'Details',
+      to: { name: route.name, params: route.params },
+      active: true
+    }
 
-  // Details link to parent item page
-  const detailsLink = {
-    label: 'Details',
-    to: { name: parentRouteName, params: { id: parentId } },
-    active: isOnParentRoute
+    return [detailsLink, ...childNavlinks.value]
   }
 
-  return [detailsLink, ...navlinks.value]
+  return []
 })
 
 // Sync breadcrumb and navlinks to AppLayout via provide/inject
-watch(breadcrumbItems, (items) => {
+// Watch computed values + route changes + entity data to ensure updates
+watch([breadcrumbItems, () => route.fullPath, breadcrumbEntities], ([items]) => {
   if (breadcrumbOverride) {
     breadcrumbOverride.value = items
   }
-}, { immediate: true })
+}, { immediate: true, deep: true })
 
-watch(allNavlinks, (links) => {
+watch([allNavlinks, () => route.fullPath], ([links]) => {
   if (navlinksOverride) {
     navlinksOverride.value = links
   }
 }, { immediate: true })
 
-// Clear overrides when component unmounts (so other pages get default breadcrumb)
-onUnmounted(() => {
-  if (breadcrumbOverride) {
-    breadcrumbOverride.value = null
-  }
-  if (navlinksOverride) {
-    navlinksOverride.value = null
-  }
-})
+// Note: We intentionally do NOT clear overrides in onUnmounted.
+// When navigating between routes, the new PageNav's watch will overwrite the values.
+// Clearing in onUnmounted causes a race condition where the old PageNav clears
+// AFTER the new PageNav has already set its values.
 </script>
 
 <template>

package/src/module/moduleRegistry.js

@@ -49,13 +49,21 @@ let alterationPromise = null
 const registry = {
   /**
    * Add routes for this module
-   * @param {string} prefix - Path prefix for all routes (e.g., 'agents')
+   *
+   * CONVENTION: Entity item routes MUST use :id as param name
+   * - List route: 'books' → /books
+   * - Item route: 'books/:id' → /books/:id (MUST be :id, not :bookId or :uuid)
+   * - Child route: 'books/:id/reviews' → parent.param = 'id'
+   *
+   * This convention is required for PageNav, breadcrumbs, and navigation to work correctly.
+   *
+   * @param {string} prefix - Path prefix for all routes (e.g., 'books' or 'books/:id/reviews')
    * @param {Array} moduleRoutes - Route definitions with relative paths
    * @param {object} options - Route options
    * @param {string} [options.entity] - Entity name for permission checking
    * @param {object} [options.parent] - Parent entity config for child routes
    * @param {string} options.parent.entity - Parent entity name (e.g., 'books')
-   * @param {string} options.parent.param - Route param for parent ID (e.g., 'bookId')
+   * @param {string} options.parent.param - Route param for parent ID (MUST be 'id')
    * @param {string} options.parent.foreignKey - Foreign key field (e.g., 'book_id')
    * @param {string} [options.parent.itemRoute] - Override parent item route (auto: parentEntity.routePrefix + '-edit')
    * @param {string} [options.label] - Label for navlinks (defaults to entity labelPlural)
@@ -341,6 +349,18 @@ export function getSiblingRoutes(parentEntity, parentParam) {
   })
 }
 
+/**
+ * Get child routes (routes that have this entity as parent)
+ * @param {string} entityName - Entity name to find children for
+ * @returns {Array} Routes with this entity as parent
+ */
+export function getChildRoutes(entityName) {
+  return routes.filter(route => {
+    const parent = route.meta?.parent
+    return parent?.entity === entityName
+  })
+}
+
 /**
  * Check if a route belongs to a family
  */