qdadm 0.50.0 → 0.51.4

package/package.json

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

package/src/composables/useEntityItemFormPage.js

@@ -87,6 +87,7 @@ import { useBreadcrumb } from './useBreadcrumb'
 import { useEntityItemPage } from './useEntityItemPage'
 import { registerGuardDialog, unregisterGuardDialog } from './useGuardStore'
 import { deepClone } from '../utils/transformers'
+import { getSiblingRoutes } from '../module/moduleRegistry'
 
 export function useEntityItemFormPage(config = {}) {
   const {
@@ -98,7 +99,7 @@ export function useEntityItemFormPage(config = {}) {
     // Form options
     loadOnMount = true,
     enableGuard = true,
-    redirectOnCreate = true,  // Redirect to edit mode after create
+    // redirectOnCreate removed: "Create" now resets form, "Create & Close" navigates
     usePatch = false,         // Use PATCH instead of PUT for updates
     // Hooks for custom behavior
     transformLoad = (data) => data,
@@ -109,7 +110,9 @@ export function useEntityItemFormPage(config = {}) {
     // Validation options
     validateOnBlur = true,         // Validate field on blur
     validateOnSubmit = true,       // Validate all fields before submit
-    showErrorSummary = false       // Show error summary at top of form
+    showErrorSummary = false,      // Show error summary at top of form
+    // Field generation
+    generateFormFields = true      // Auto-generate fields from manager schema
   } = config
 
   const router = useRouter()
@@ -316,12 +319,24 @@ export function useEntityItemFormPage(config = {}) {
       }
 
       if (andClose) {
-        router.push({ name: routePrefix })
-      } else if (!isEdit.value && redirectOnCreate) {
-        // Redirect to edit mode after create
-        const newId = responseData[manager.idField] || responseData.id || responseData.key
-        router.replace({ name: `${routePrefix}-${editRouteSuffix}`, params: { id: newId } })
+        // Navigate to list route (or previous page)
+        const listRoute = findListRoute()
+        router.push(listRoute)
+      } else if (!isEdit.value) {
+        // "Create" without close: reset form for new entry, stay on route
+        data.value = deepClone(initialData)
+        originalData.value = null
+        takeSnapshot()
+        errors.value = {}
+        submitted.value = false
+        toast.add({
+          severity: 'info',
+          summary: 'Ready',
+          detail: 'Form reset for new entry',
+          life: 2000
+        })
       }
+      // Edit mode without close: just stay on page (data already updated)
 
       return responseData
     } catch (error) {
@@ -393,12 +408,59 @@ export function useEntityItemFormPage(config = {}) {
 
   // ============ NAVIGATION ============
 
+  /**
+   * Find the list route for redirects after save/cancel
+   * For child entities: finds sibling list route with parent params
+   * For top-level entities: uses routePrefix
+   *
+   * When parent has multiple child entity types (e.g., bots → commands AND bots → logs),
+   * we find the list route matching the current entity's route prefix.
+   */
+  function findListRoute() {
+    // If has parent config, find sibling list route
+    if (parentConfig.value) {
+      const { entity: parentEntityName, param } = parentConfig.value
+      const siblings = getSiblingRoutes(parentEntityName, param)
+
+      // Extract base route name from current route (e.g., 'bot-commands-create' → 'bot-commands')
+      const currentRouteName = route.name || ''
+      const baseRouteName = currentRouteName.replace(/-(create|edit|new)$/, '')
+
+      // Find list routes among siblings (exclude create/edit/new routes)
+      const listRoutes = siblings.filter(r => {
+        const name = r.name || ''
+        const path = r.path || ''
+        return !name.match(/-(create|edit|new)$/) && !path.match(/\/(create|edit|new)$/)
+      })
+
+      // Prefer route matching current entity's base name
+      let listRoute = listRoutes.find(r => r.name === baseRouteName)
+
+      // Fallback: try route containing routePrefix (e.g., 'bot-commands' contains 'command')
+      if (!listRoute && routePrefix) {
+        listRoute = listRoutes.find(r => r.name?.includes(routePrefix))
+      }
+
+      // Last fallback: first list route
+      if (!listRoute && listRoutes.length > 0) {
+        listRoute = listRoutes[0]
+      }
+
+      if (listRoute?.name) {
+        return { name: listRoute.name, params: route.params }
+      }
+    }
+
+    // Default: top-level entity list
+    return { name: routePrefix }
+  }
+
   function cancel() {
-    router.push({ name: routePrefix })
+    router.push(findListRoute())
   }
 
   function goToList() {
-    router.push({ name: routePrefix })
+    router.push(findListRoute())
   }
 
   // ============ FIELDS ============
@@ -598,11 +660,41 @@ export function useEntityItemFormPage(config = {}) {
     } else if (currentIndex === -1) {
       // New field, add at end
       fieldOrder.value.push(name)
+    } else {
+      // Existing field without repositioning, restore at original position
+      fieldOrder.value.splice(currentIndex, 0, name)
     }
 
     return builderApi
   }
 
+  /**
+   * Update an existing field configuration
+   *
+   * Use this to modify properties of auto-generated fields.
+   * Throws error if field doesn't exist (use addField for new fields).
+   *
+   * @param {string} name - Field name to update
+   * @param {object} fieldConfig - Properties to merge with existing config
+   * @returns {object} - The builder instance for chaining
+   *
+   * @example
+   * form.updateField('book_id', { disabled: true })
+   * form.updateField('email', { validate: v => v.includes('@') || 'Invalid' })
+   */
+  function updateField(name, fieldConfig) {
+    if (!fieldsMap.value.has(name)) {
+      throw new Error(`Field '${name}' does not exist. Use addField() to create new fields.`)
+    }
+
+    // Merge with existing config (keeps position)
+    const existingConfig = fieldsMap.value.get(name)
+    const mergedConfig = { ...existingConfig, ...fieldConfig }
+    fieldsMap.value.set(name, mergedConfig)
+
+    return builderApi
+  }
+
   /**
    * Exclude a field from generation
    * Call before generateFields() or use exclude option
@@ -1123,6 +1215,7 @@ export function useEntityItemFormPage(config = {}) {
     confirmDelete,
     reset,
     goToList,
+    findListRoute,
 
     // Dirty tracking
     takeSnapshot,
@@ -1134,6 +1227,7 @@ export function useEntityItemFormPage(config = {}) {
     generateFields,
     resolveReferences,
     addField,
+    updateField,
     removeField,
     excludeField,
     getFieldConfig,
@@ -1188,5 +1282,15 @@ export function useEntityItemFormPage(config = {}) {
     events: formEvents
   }
 
+  // Auto-generate fields from manager schema if enabled
+  if (generateFormFields) {
+    generateFields()
+  }
+
+  // Auto-disable parent foreignKey field (it's auto-filled from route)
+  if (parentConfig.value?.foreignKey && fieldsMap.value.has(parentConfig.value.foreignKey)) {
+    updateField(parentConfig.value.foreignKey, { disabled: true })
+  }
+
   return builderApi
 }