Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4fc0f1fee | ||
|
|
f8403ddfbc | ||
|
|
428da471d1 | ||
|
|
271844efb1 | ||
|
|
07cad19988 | ||
|
|
8dacad7a59 | ||
|
|
5912216a89 | ||
|
|
139ba183de | ||
|
|
9fef009610 | ||
|
|
4a3bceffa1 | ||
|
|
50d8dde6d5 | ||
|
|
9b40f9f2c7 | ||
|
|
721963449b | ||
|
|
22ba9a8d05 | ||
|
|
695d56a6d3 | ||
|
|
5c31045e83 |
@@ -215,14 +215,14 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Component Pieces -->
|
<!-- Component Pieces (real MachinePieceLinks) -->
|
||||||
<div v-if="component.pieces && component.pieces.length > 0" class="space-y-2">
|
<div v-if="linkedPieces.length > 0" class="space-y-2">
|
||||||
<p class="text-xs font-semibold text-base-content/50 uppercase tracking-wide">
|
<p class="text-xs font-semibold text-base-content/50 uppercase tracking-wide">
|
||||||
Pièces du composant
|
Pièces du composant
|
||||||
</p>
|
</p>
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<PieceItem
|
<PieceItem
|
||||||
v-for="piece in component.pieces"
|
v-for="piece in linkedPieces"
|
||||||
:key="piece.id"
|
:key="piece.id"
|
||||||
:piece="piece"
|
:piece="piece"
|
||||||
:is-edit-mode="isEditMode"
|
:is-edit-mode="isEditMode"
|
||||||
@@ -233,6 +233,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Structure pieces (read-only, from composant definition) -->
|
||||||
|
<div v-if="structurePieces.length > 0" class="space-y-2">
|
||||||
|
<p class="text-xs font-semibold text-base-content/50 uppercase tracking-wide">
|
||||||
|
Pièces incluses par défaut
|
||||||
|
</p>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<PieceItem
|
||||||
|
v-for="piece in structurePieces"
|
||||||
|
:key="piece.id"
|
||||||
|
:piece="piece"
|
||||||
|
:is-edit-mode="false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Sub Components -->
|
<!-- Sub Components -->
|
||||||
<div v-if="childComponents.length > 0" class="space-y-2">
|
<div v-if="childComponents.length > 0" class="space-y-2">
|
||||||
<p class="text-xs font-semibold text-base-content/50 uppercase tracking-wide">
|
<p class="text-xs font-semibold text-base-content/50 uppercase tracking-wide">
|
||||||
@@ -341,6 +356,14 @@ const childComponents = computed(() => {
|
|||||||
return Array.isArray(list) ? list : []
|
return Array.isArray(list) ? list : []
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// --- Pieces split: real links vs structure definitions ---
|
||||||
|
const allPieces = computed(() => {
|
||||||
|
const list = props.component.pieces
|
||||||
|
return Array.isArray(list) ? list : []
|
||||||
|
})
|
||||||
|
const linkedPieces = computed(() => allPieces.value.filter((p) => !p._structurePiece))
|
||||||
|
const structurePieces = computed(() => allPieces.value.filter((p) => p._structurePiece))
|
||||||
|
|
||||||
// --- Constructeurs ---
|
// --- Constructeurs ---
|
||||||
const { constructeurs } = useConstructeurs()
|
const { constructeurs } = useConstructeurs()
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
:locked-type-label="displayedRootTypeLabel"
|
:locked-type-label="displayedRootTypeLabel"
|
||||||
:allow-subcomponents="allowSubcomponents"
|
:allow-subcomponents="allowSubcomponents"
|
||||||
:max-subcomponent-depth="maxSubcomponentDepth"
|
:max-subcomponent-depth="maxSubcomponentDepth"
|
||||||
:restricted-mode="restrictedMode"
|
|
||||||
is-root
|
is-root
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -56,10 +55,6 @@ const props = defineProps({
|
|||||||
type: Number,
|
type: Number,
|
||||||
default: Infinity,
|
default: Infinity,
|
||||||
},
|
},
|
||||||
restrictedMode: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits(['update:modelValue'])
|
const emit = defineEmits(['update:modelValue'])
|
||||||
|
|||||||
116
app/components/ComposantSelect.vue
Normal file
116
app/components/ComposantSelect.vue
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
<template>
|
||||||
|
<div class="space-y-1">
|
||||||
|
<SearchSelect
|
||||||
|
:model-value="modelValue ?? undefined"
|
||||||
|
:options="composantOptions"
|
||||||
|
:loading="loading"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:empty-text="emptyText"
|
||||||
|
size="sm"
|
||||||
|
option-value="id"
|
||||||
|
option-label="name"
|
||||||
|
:disabled="disabled"
|
||||||
|
@update:modelValue="updateValue"
|
||||||
|
>
|
||||||
|
<template #option-description="{ option }">
|
||||||
|
<span class="text-xs text-base-content/60">
|
||||||
|
{{ formatDescription(option) }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</SearchSelect>
|
||||||
|
<p v-if="helperText" class="text-xs text-base-content/60">
|
||||||
|
{{ helperText }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, watch } from 'vue'
|
||||||
|
import SearchSelect from '~/components/common/SearchSelect.vue'
|
||||||
|
import { useComposants } from '~/composables/useComposants'
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
modelValue?: string | null
|
||||||
|
placeholder?: string
|
||||||
|
emptyText?: string
|
||||||
|
helperText?: string
|
||||||
|
disabled?: boolean
|
||||||
|
typeComposantId?: string | null
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
modelValue: '',
|
||||||
|
placeholder: 'Sélectionner un composant…',
|
||||||
|
emptyText: 'Aucun composant disponible',
|
||||||
|
helperText: '',
|
||||||
|
disabled: false,
|
||||||
|
typeComposantId: null,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'update:modelValue', value: string | null): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { composants, loading, loadComposants } = useComposants()
|
||||||
|
|
||||||
|
const composantOptions = computed(() => {
|
||||||
|
const baseOptions = Array.isArray(composants.value) ? composants.value : []
|
||||||
|
if (!props.typeComposantId) {
|
||||||
|
return baseOptions
|
||||||
|
}
|
||||||
|
|
||||||
|
const allowedTypeId = String(props.typeComposantId)
|
||||||
|
return baseOptions.filter((composant: any) => {
|
||||||
|
const typeId =
|
||||||
|
composant?.typeComposantId ||
|
||||||
|
composant?.typeComposant?.id ||
|
||||||
|
null
|
||||||
|
return typeId ? String(typeId) === allowedTypeId : false
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
if (composantOptions.value.length === 0) {
|
||||||
|
loadComposants({ itemsPerPage: 200 }).catch((error: unknown) => {
|
||||||
|
console.error('Erreur lors du chargement des composants:', error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
(value) => {
|
||||||
|
if (typeof value === 'string' && value) {
|
||||||
|
const exists = composantOptions.value.some((c: any) => c.id === value)
|
||||||
|
if (!exists && !loading.value) {
|
||||||
|
loadComposants({ itemsPerPage: 200, force: true }).catch((error: unknown) => {
|
||||||
|
console.error('Erreur lors du chargement des composants:', error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
const updateValue = (value: string | number | null | undefined) => {
|
||||||
|
if (value === undefined || value === null || value === '') {
|
||||||
|
emit('update:modelValue', null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
emit('update:modelValue', String(value))
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDescription = (option: any) => {
|
||||||
|
const parts: string[] = []
|
||||||
|
if (option?.reference) {
|
||||||
|
parts.push(option.reference)
|
||||||
|
}
|
||||||
|
if (option?.prix !== undefined && option.prix !== null) {
|
||||||
|
const price = Number(option.prix)
|
||||||
|
if (!Number.isNaN(price)) {
|
||||||
|
parts.push(`${price.toFixed(2)} €`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return parts.length ? parts.join(' • ') : 'Sans référence'
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -24,6 +24,12 @@
|
|||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
<h3 class="text-lg font-semibold">
|
<h3 class="text-lg font-semibold">
|
||||||
{{ pieceData.name }}
|
{{ pieceData.name }}
|
||||||
|
<span
|
||||||
|
v-if="displayQuantity > 1"
|
||||||
|
class="text-sm font-normal text-base-content/60 ml-1"
|
||||||
|
>
|
||||||
|
×{{ displayQuantity }}
|
||||||
|
</span>
|
||||||
</h3>
|
</h3>
|
||||||
<div class="flex flex-wrap gap-2 mt-2">
|
<div class="flex flex-wrap gap-2 mt-2">
|
||||||
<span v-if="piece.parentComponentName" class="badge badge-ghost badge-sm">
|
<span v-if="piece.parentComponentName" class="badge badge-ghost badge-sm">
|
||||||
@@ -63,6 +69,23 @@
|
|||||||
<div v-show="!isCollapsed" class="space-y-4">
|
<div v-show="!isCollapsed" class="space-y-4">
|
||||||
<div class="p-4 bg-base-100 border border-base-200 rounded-lg">
|
<div class="p-4 bg-base-100 border border-base-200 rounded-lg">
|
||||||
<div class="space-y-2 text-sm">
|
<div class="space-y-2 text-sm">
|
||||||
|
<div v-if="isEditMode" class="form-control">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text text-sm">Quantité</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
v-model.number="pieceData.quantity"
|
||||||
|
type="number"
|
||||||
|
min="1"
|
||||||
|
step="1"
|
||||||
|
class="input input-bordered input-sm md:input-md w-24"
|
||||||
|
@blur="updatePiece"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div v-else-if="displayQuantity > 1">
|
||||||
|
<span class="font-medium">Quantité:</span>
|
||||||
|
<span class="ml-2">{{ displayQuantity }}</span>
|
||||||
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="font-medium">Référence:</span>
|
<span class="font-medium">Référence:</span>
|
||||||
<input
|
<input
|
||||||
@@ -272,6 +295,11 @@ const pieceData = reactive({
|
|||||||
reference: props.piece.reference || '',
|
reference: props.piece.reference || '',
|
||||||
prix: props.piece.prix || '',
|
prix: props.piece.prix || '',
|
||||||
productId: props.piece.product?.id || props.piece.productId || null,
|
productId: props.piece.product?.id || props.piece.productId || null,
|
||||||
|
quantity: props.piece.quantity ?? 1,
|
||||||
|
})
|
||||||
|
|
||||||
|
const displayQuantity = computed(() => {
|
||||||
|
return pieceData.quantity ?? 1
|
||||||
})
|
})
|
||||||
|
|
||||||
// --- Products ---
|
// --- Products ---
|
||||||
@@ -432,13 +460,14 @@ const updatePiece = () => {
|
|||||||
let parsedPrice = null
|
let parsedPrice = null
|
||||||
if (prixValue !== null && prixValue !== undefined && String(prixValue).trim().length > 0) {
|
if (prixValue !== null && prixValue !== undefined && String(prixValue).trim().length > 0) {
|
||||||
const numeric = Number(prixValue)
|
const numeric = Number(prixValue)
|
||||||
if (!Number.isNaN(numeric)) parsedPrice = numeric
|
if (!Number.isNaN(numeric)) parsedPrice = String(numeric)
|
||||||
}
|
}
|
||||||
const product = selectedProduct.value ? { ...selectedProduct.value } : null
|
const product = selectedProduct.value ? { ...selectedProduct.value } : null
|
||||||
emit('update', {
|
emit('update', {
|
||||||
...props.piece,
|
...props.piece,
|
||||||
...pieceData,
|
...pieceData,
|
||||||
prix: parsedPrice,
|
prix: parsedPrice,
|
||||||
|
quantity: pieceData.quantity ?? 1,
|
||||||
productId: pieceData.productId || null,
|
productId: pieceData.productId || null,
|
||||||
product,
|
product,
|
||||||
constructeurIds: pieceConstructeurIds.value,
|
constructeurIds: pieceConstructeurIds.value,
|
||||||
@@ -478,11 +507,12 @@ watch(
|
|||||||
)
|
)
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => [props.piece.name, props.piece.reference, props.piece.prix],
|
() => [props.piece.name, props.piece.reference, props.piece.prix, props.piece.quantity],
|
||||||
() => {
|
() => {
|
||||||
pieceData.name = props.piece.name || ''
|
pieceData.name = props.piece.name || ''
|
||||||
pieceData.reference = props.piece.reference || ''
|
pieceData.reference = props.piece.reference || ''
|
||||||
pieceData.prix = props.piece.prix || ''
|
pieceData.prix = props.piece.prix || ''
|
||||||
|
pieceData.quantity = props.piece.quantity ?? 1
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -490,6 +520,7 @@ onMounted(() => {
|
|||||||
pieceData.name = props.piece.name || ''
|
pieceData.name = props.piece.name || ''
|
||||||
pieceData.reference = props.piece.reference || ''
|
pieceData.reference = props.piece.reference || ''
|
||||||
pieceData.prix = props.piece.prix || ''
|
pieceData.prix = props.piece.prix || ''
|
||||||
|
pieceData.quantity = props.piece.quantity ?? 1
|
||||||
loadProducts().catch(() => {})
|
loadProducts().catch(() => {})
|
||||||
if (pieceData.productId) ensureProductLoaded(pieceData.productId)
|
if (pieceData.productId) ensureProductLoaded(pieceData.productId)
|
||||||
if (!props.piece.documents?.length) refreshDocuments()
|
if (!props.piece.documents?.length) refreshDocuments()
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
<select
|
<select
|
||||||
v-model="product.typeProductId"
|
v-model="product.typeProductId"
|
||||||
class="select select-bordered select-xs"
|
class="select select-bordered select-xs"
|
||||||
:disabled="isProductLocked(product)"
|
|
||||||
@change="handleProductTypeSelect(product)"
|
@change="handleProductTypeSelect(product)"
|
||||||
>
|
>
|
||||||
<option value="">
|
<option value="">
|
||||||
@@ -46,26 +45,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-if="!isProductLocked(product)"
|
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-error btn-xs btn-square"
|
class="btn btn-error btn-xs btn-square"
|
||||||
@click="removeProduct(index)"
|
@click="removeProduct(index)"
|
||||||
>
|
>
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
<div v-else class="tooltip tooltip-left" data-tip="Ce produit ne peut pas être supprimé car des éléments utilisent cette catégorie">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-ghost btn-xs btn-square opacity-30 cursor-not-allowed"
|
|
||||||
disabled
|
|
||||||
>
|
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<button v-if="!restrictedMode" type="button" class="btn btn-outline btn-xs" @click="addProduct">
|
<button type="button" class="btn btn-outline btn-xs" @click="addProduct">
|
||||||
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
||||||
Ajouter
|
Ajouter
|
||||||
</button>
|
</button>
|
||||||
@@ -111,7 +100,7 @@
|
|||||||
class="input input-bordered input-xs"
|
class="input input-bordered input-xs"
|
||||||
placeholder="Nom du champ"
|
placeholder="Nom du champ"
|
||||||
>
|
>
|
||||||
<select v-model="field.type" class="select select-bordered select-xs" :disabled="isFieldLocked(field)">
|
<select v-model="field.type" class="select select-bordered select-xs">
|
||||||
<option value="text">
|
<option value="text">
|
||||||
Texte
|
Texte
|
||||||
</option>
|
</option>
|
||||||
@@ -131,7 +120,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-center gap-2 text-xs">
|
<div class="flex items-center gap-2 text-xs">
|
||||||
<input v-model="field.required" type="checkbox" class="checkbox checkbox-xs" :disabled="isFieldLocked(field)">
|
<input v-model="field.required" type="checkbox" class="checkbox checkbox-xs">
|
||||||
Obligatoire
|
Obligatoire
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -140,27 +129,16 @@
|
|||||||
v-model="field.optionsText"
|
v-model="field.optionsText"
|
||||||
class="textarea textarea-bordered textarea-xs h-20"
|
class="textarea textarea-bordered textarea-xs h-20"
|
||||||
placeholder="Option 1 Option 2"
|
placeholder="Option 1 Option 2"
|
||||||
:disabled="isFieldLocked(field)"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="!isFieldLocked(field)"
|
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-error btn-xs btn-square"
|
class="btn btn-error btn-xs btn-square"
|
||||||
@click="removeField(index)"
|
@click="removeField(index)"
|
||||||
>
|
>
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
<div v-else class="tooltip tooltip-left" data-tip="Ce champ ne peut pas être supprimé car des éléments utilisent cette catégorie">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-ghost btn-xs btn-square opacity-30 cursor-not-allowed"
|
|
||||||
disabled
|
|
||||||
>
|
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -183,7 +161,6 @@ defineOptions({ name: 'PieceModelStructureEditor' })
|
|||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue?: PieceModelStructure | null
|
modelValue?: PieceModelStructure | null
|
||||||
restrictedMode?: boolean
|
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -194,9 +171,6 @@ const {
|
|||||||
fields,
|
fields,
|
||||||
products,
|
products,
|
||||||
productTypeOptions,
|
productTypeOptions,
|
||||||
restrictedMode,
|
|
||||||
isFieldLocked,
|
|
||||||
isProductLocked,
|
|
||||||
formatProductTypeOption,
|
formatProductTypeOption,
|
||||||
handleProductTypeSelect,
|
handleProductTypeSelect,
|
||||||
addProduct,
|
addProduct,
|
||||||
|
|||||||
116
app/components/PieceSelect.vue
Normal file
116
app/components/PieceSelect.vue
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
<template>
|
||||||
|
<div class="space-y-1">
|
||||||
|
<SearchSelect
|
||||||
|
:model-value="modelValue ?? undefined"
|
||||||
|
:options="pieceOptions"
|
||||||
|
:loading="loading"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:empty-text="emptyText"
|
||||||
|
size="sm"
|
||||||
|
option-value="id"
|
||||||
|
option-label="name"
|
||||||
|
:disabled="disabled"
|
||||||
|
@update:modelValue="updateValue"
|
||||||
|
>
|
||||||
|
<template #option-description="{ option }">
|
||||||
|
<span class="text-xs text-base-content/60">
|
||||||
|
{{ formatDescription(option) }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</SearchSelect>
|
||||||
|
<p v-if="helperText" class="text-xs text-base-content/60">
|
||||||
|
{{ helperText }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, watch } from 'vue'
|
||||||
|
import SearchSelect from '~/components/common/SearchSelect.vue'
|
||||||
|
import { usePieces } from '~/composables/usePieces'
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
modelValue?: string | null
|
||||||
|
placeholder?: string
|
||||||
|
emptyText?: string
|
||||||
|
helperText?: string
|
||||||
|
disabled?: boolean
|
||||||
|
typePieceId?: string | null
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
modelValue: '',
|
||||||
|
placeholder: 'Sélectionner une pièce…',
|
||||||
|
emptyText: 'Aucune pièce disponible',
|
||||||
|
helperText: '',
|
||||||
|
disabled: false,
|
||||||
|
typePieceId: null,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'update:modelValue', value: string | null): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { pieces, loading, loadPieces } = usePieces()
|
||||||
|
|
||||||
|
const pieceOptions = computed(() => {
|
||||||
|
const baseOptions = Array.isArray(pieces.value) ? pieces.value : []
|
||||||
|
if (!props.typePieceId) {
|
||||||
|
return baseOptions
|
||||||
|
}
|
||||||
|
|
||||||
|
const allowedTypeId = String(props.typePieceId)
|
||||||
|
return baseOptions.filter((piece: any) => {
|
||||||
|
const typeId =
|
||||||
|
piece?.typePieceId ||
|
||||||
|
piece?.typePiece?.id ||
|
||||||
|
null
|
||||||
|
return typeId ? String(typeId) === allowedTypeId : false
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
if (pieceOptions.value.length === 0) {
|
||||||
|
loadPieces({ itemsPerPage: 200 }).catch((error: unknown) => {
|
||||||
|
console.error('Erreur lors du chargement des pièces:', error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
(value) => {
|
||||||
|
if (typeof value === 'string' && value) {
|
||||||
|
const exists = pieceOptions.value.some((piece: any) => piece.id === value)
|
||||||
|
if (!exists && !loading.value) {
|
||||||
|
loadPieces({ itemsPerPage: 200, force: true }).catch((error: unknown) => {
|
||||||
|
console.error('Erreur lors du chargement des pièces:', error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
const updateValue = (value: string | number | null | undefined) => {
|
||||||
|
if (value === undefined || value === null || value === '') {
|
||||||
|
emit('update:modelValue', null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
emit('update:modelValue', String(value))
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDescription = (option: any) => {
|
||||||
|
const parts: string[] = []
|
||||||
|
if (option?.reference) {
|
||||||
|
parts.push(option.reference)
|
||||||
|
}
|
||||||
|
if (option?.prix !== undefined && option.prix !== null) {
|
||||||
|
const price = Number(option.prix)
|
||||||
|
if (!Number.isNaN(price)) {
|
||||||
|
parts.push(`${price.toFixed(2)} €`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return parts.length ? parts.join(' • ') : 'Sans référence'
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -81,10 +81,10 @@ onMounted(() => {
|
|||||||
watch(
|
watch(
|
||||||
() => props.modelValue,
|
() => props.modelValue,
|
||||||
(value) => {
|
(value) => {
|
||||||
if (typeof value === 'string') {
|
if (typeof value === 'string' && value) {
|
||||||
const exists = productOptions.value.some((product) => product.id === value)
|
const exists = productOptions.value.some((product) => product.id === value)
|
||||||
if (!exists && productOptions.value.length === 0 && !loading.value) {
|
if (!exists && !loading.value) {
|
||||||
loadProducts().catch((error) => {
|
loadProducts({ force: true }).catch((error) => {
|
||||||
console.error('Erreur lors du chargement des produits:', error)
|
console.error('Erreur lors du chargement des produits:', error)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
class="input input-bordered input-xs"
|
class="input input-bordered input-xs"
|
||||||
placeholder="Nom du champ"
|
placeholder="Nom du champ"
|
||||||
/>
|
/>
|
||||||
<select v-model="field.type" class="select select-bordered select-xs" :disabled="isCustomFieldLocked(index)">
|
<select v-model="field.type" class="select select-bordered select-xs">
|
||||||
<option value="text">Texte</option>
|
<option value="text">Texte</option>
|
||||||
<option value="number">Nombre</option>
|
<option value="number">Nombre</option>
|
||||||
<option value="select">Liste</option>
|
<option value="select">Liste</option>
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2 text-xs">
|
<div class="flex items-center gap-2 text-xs">
|
||||||
<input v-model="field.required" type="checkbox" class="checkbox checkbox-xs" :disabled="isCustomFieldLocked(index)" />
|
<input v-model="field.required" type="checkbox" class="checkbox checkbox-xs" />
|
||||||
Obligatoire
|
Obligatoire
|
||||||
</div>
|
</div>
|
||||||
<textarea
|
<textarea
|
||||||
@@ -126,26 +126,15 @@
|
|||||||
v-model="field.optionsText"
|
v-model="field.optionsText"
|
||||||
class="textarea textarea-bordered textarea-xs h-20"
|
class="textarea textarea-bordered textarea-xs h-20"
|
||||||
placeholder="Option 1 Option 2"
|
placeholder="Option 1 Option 2"
|
||||||
:disabled="isCustomFieldLocked(index)"
|
|
||||||
></textarea>
|
></textarea>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-if="!isCustomFieldLocked(index)"
|
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-error btn-xs btn-square"
|
class="btn btn-error btn-xs btn-square"
|
||||||
@click="removeCustomField(index)"
|
@click="removeCustomField(index)"
|
||||||
>
|
>
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
<div v-else class="tooltip tooltip-left" data-tip="Ce champ ne peut pas être supprimé car des éléments utilisent cette catégorie">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-ghost btn-xs btn-square opacity-30 cursor-not-allowed"
|
|
||||||
disabled
|
|
||||||
>
|
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -189,7 +178,6 @@
|
|||||||
<select
|
<select
|
||||||
v-model="product.typeProductId"
|
v-model="product.typeProductId"
|
||||||
class="select select-bordered select-xs"
|
class="select select-bordered select-xs"
|
||||||
:disabled="isProductLocked(index)"
|
|
||||||
@change="handleProductTypeSelect(product)"
|
@change="handleProductTypeSelect(product)"
|
||||||
>
|
>
|
||||||
<option value="">
|
<option value="">
|
||||||
@@ -205,22 +193,13 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button v-if="!isProductLocked(index)" type="button" class="btn btn-error btn-xs btn-square" @click="removeProduct(index)">
|
<button type="button" class="btn btn-error btn-xs btn-square" @click="removeProduct(index)">
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
<div v-else class="tooltip tooltip-left" data-tip="Ce produit ne peut pas être supprimé car des éléments utilisent cette catégorie">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-ghost btn-xs btn-square opacity-30 cursor-not-allowed"
|
|
||||||
disabled
|
|
||||||
>
|
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button v-if="!restrictedMode" type="button" class="btn btn-outline btn-xs" @click="addProduct">
|
<button type="button" class="btn btn-outline btn-xs" @click="addProduct">
|
||||||
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
||||||
Ajouter
|
Ajouter
|
||||||
</button>
|
</button>
|
||||||
@@ -261,7 +240,6 @@
|
|||||||
<select
|
<select
|
||||||
v-model="piece.typePieceId"
|
v-model="piece.typePieceId"
|
||||||
class="select select-bordered select-xs"
|
class="select select-bordered select-xs"
|
||||||
:disabled="isPieceLocked(index)"
|
|
||||||
@change="handlePieceTypeSelect(piece)"
|
@change="handlePieceTypeSelect(piece)"
|
||||||
>
|
>
|
||||||
<option value="">
|
<option value="">
|
||||||
@@ -280,19 +258,26 @@
|
|||||||
{{ piece.typePieceId ? `Sélection : ${getPieceTypeLabel(piece.typePieceId) || 'Inconnue'}` : 'Aucune famille sélectionnée' }}
|
{{ piece.typePieceId ? `Sélection : ${getPieceTypeLabel(piece.typePieceId) || 'Inconnue'}` : 'Aucune famille sélectionnée' }}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-control">
|
||||||
|
<label class="label py-1"><span class="label-text text-xs">Quantité</span></label>
|
||||||
|
<input
|
||||||
|
v-model.number="piece.quantity"
|
||||||
|
type="number"
|
||||||
|
:min="1"
|
||||||
|
step="1"
|
||||||
|
placeholder="Qté"
|
||||||
|
class="input input-bordered input-sm md:input-md w-20"
|
||||||
|
@input="piece.quantity = Math.max(1, piece.quantity || 1)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button v-if="!isPieceLocked(index)" type="button" class="btn btn-error btn-xs btn-square" @click="removePiece(index)">
|
<button type="button" class="btn btn-error btn-xs btn-square" @click="removePiece(index)">
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
<div v-else class="tooltip tooltip-left" data-tip="Cette pièce ne peut pas être supprimée">
|
|
||||||
<button type="button" class="btn btn-ghost btn-xs btn-square opacity-30 cursor-not-allowed" disabled>
|
|
||||||
<IconLucideTrash class="w-4 h-4" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button v-if="!restrictedMode" type="button" class="btn btn-outline btn-xs" @click="addPiece">
|
<button type="button" class="btn btn-outline btn-xs" @click="addPiece">
|
||||||
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
<IconLucidePlus class="w-3 h-3 mr-2" aria-hidden="true" />
|
||||||
Ajouter
|
Ajouter
|
||||||
</button>
|
</button>
|
||||||
@@ -334,14 +319,12 @@
|
|||||||
:product-types="productTypes"
|
:product-types="productTypes"
|
||||||
:allow-subcomponents="childAllowSubcomponents"
|
:allow-subcomponents="childAllowSubcomponents"
|
||||||
:max-subcomponent-depth="maxSubcomponentDepth"
|
:max-subcomponent-depth="maxSubcomponentDepth"
|
||||||
:restricted-mode="restrictedMode"
|
|
||||||
:is-locked="isSubcomponentLocked(index)"
|
|
||||||
@remove="removeSubComponent(index)"
|
@remove="removeSubComponent(index)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-if="canManageSubcomponents && !restrictedMode"
|
v-if="canManageSubcomponents"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-outline btn-xs"
|
class="btn btn-outline btn-xs"
|
||||||
@click="addSubComponent"
|
@click="addSubComponent"
|
||||||
@@ -374,7 +357,6 @@ const props = withDefaults(defineProps<{
|
|||||||
lockedTypeLabel?: string
|
lockedTypeLabel?: string
|
||||||
allowSubcomponents?: boolean
|
allowSubcomponents?: boolean
|
||||||
maxSubcomponentDepth?: number
|
maxSubcomponentDepth?: number
|
||||||
restrictedMode?: boolean
|
|
||||||
isLocked?: boolean
|
isLocked?: boolean
|
||||||
}>(), {
|
}>(), {
|
||||||
depth: 0,
|
depth: 0,
|
||||||
@@ -386,19 +368,13 @@ const props = withDefaults(defineProps<{
|
|||||||
lockedTypeLabel: '',
|
lockedTypeLabel: '',
|
||||||
allowSubcomponents: true,
|
allowSubcomponents: true,
|
||||||
maxSubcomponentDepth: Infinity,
|
maxSubcomponentDepth: Infinity,
|
||||||
restrictedMode: false,
|
|
||||||
isLocked: false,
|
isLocked: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits(['remove'])
|
const emit = defineEmits(['remove'])
|
||||||
|
|
||||||
const {
|
const {
|
||||||
isCustomFieldLocked,
|
|
||||||
isPieceLocked,
|
|
||||||
isProductLocked,
|
|
||||||
isSubcomponentLocked,
|
|
||||||
isLocked,
|
isLocked,
|
||||||
restrictedMode,
|
|
||||||
componentTypes,
|
componentTypes,
|
||||||
pieceTypes,
|
pieceTypes,
|
||||||
productTypes,
|
productTypes,
|
||||||
|
|||||||
112
app/components/SyncConfirmationModal.vue
Normal file
112
app/components/SyncConfirmationModal.vue
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { SyncPreviewResult } from '~/services/modelTypes';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
preview: SyncPreviewResult | null;
|
||||||
|
open: boolean;
|
||||||
|
loading: boolean;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
confirm: [];
|
||||||
|
cancel: [];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const dialogRef = ref<HTMLDialogElement>();
|
||||||
|
|
||||||
|
watch(() => props.open, (isOpen) => {
|
||||||
|
if (isOpen) {
|
||||||
|
dialogRef.value?.showModal();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dialogRef.value?.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const hasDeletions = computed(() => {
|
||||||
|
if (!props.preview) return false;
|
||||||
|
return Object.values(props.preview.deletions).some(v => v > 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
const hasModifications = computed(() => {
|
||||||
|
if (!props.preview) return false;
|
||||||
|
return Object.values(props.preview.modifications).some(v => v > 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalAdditions = computed(() => {
|
||||||
|
if (!props.preview) return 0;
|
||||||
|
return Object.values(props.preview.additions).reduce((sum, v) => sum + v, 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalDeletions = computed(() => {
|
||||||
|
if (!props.preview) return 0;
|
||||||
|
return Object.values(props.preview.deletions).reduce((sum, v) => sum + v, 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalModifications = computed(() => {
|
||||||
|
if (!props.preview) return 0;
|
||||||
|
return Object.values(props.preview.modifications).reduce((sum, v) => sum + v, 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
function handleCancel() {
|
||||||
|
emit('cancel');
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleConfirm() {
|
||||||
|
emit('confirm');
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<dialog ref="dialogRef" class="modal" @close="handleCancel">
|
||||||
|
<div class="modal-box">
|
||||||
|
<h3 class="text-lg font-bold">
|
||||||
|
Synchronisation des éléments liés
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
<div v-if="preview" class="py-4 space-y-3">
|
||||||
|
<p>
|
||||||
|
Cette modification impactera
|
||||||
|
<strong>{{ preview.itemCount }}</strong>
|
||||||
|
élément(s) lié(s).
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ul class="list-disc list-inside space-y-1">
|
||||||
|
<li v-if="totalAdditions > 0" class="text-success">
|
||||||
|
{{ totalAdditions }} ajout(s)
|
||||||
|
</li>
|
||||||
|
<li v-if="totalDeletions > 0" class="text-error">
|
||||||
|
{{ totalDeletions }} suppression(s)
|
||||||
|
</li>
|
||||||
|
<li v-if="totalModifications > 0" class="text-warning">
|
||||||
|
{{ totalModifications }} modification(s)
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div v-if="hasDeletions" role="alert" class="alert alert-warning">
|
||||||
|
<span>Des éléments seront supprimés. Cette action est irréversible.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="hasModifications" role="alert" class="alert alert-info">
|
||||||
|
<span>Des valeurs de champs personnalisés seront réinitialisées.</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-action">
|
||||||
|
<button class="btn btn-ghost" :disabled="loading" @click="handleCancel">
|
||||||
|
Annuler
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-primary" :disabled="loading" @click="handleConfirm">
|
||||||
|
<span v-if="loading" class="loading loading-spinner loading-sm" />
|
||||||
|
Confirmer la synchronisation
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="dialog" class="modal-backdrop">
|
||||||
|
<button @click="handleCancel">
|
||||||
|
close
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</dialog>
|
||||||
|
</template>
|
||||||
@@ -72,23 +72,23 @@
|
|||||||
placeholder="Rechercher un ou plusieurs fournisseurs..."
|
placeholder="Rechercher un ou plusieurs fournisseurs..."
|
||||||
@update:modelValue="$emit('update:constructeur-ids', $event)"
|
@update:modelValue="$emit('update:constructeur-ids', $event)"
|
||||||
/>
|
/>
|
||||||
<div v-else class="input input-bordered bg-base-200">
|
<div v-else class="border border-base-300 rounded-btn bg-base-200 px-4 py-2 min-h-12 flex items-center">
|
||||||
<div v-if="machineConstructeursDisplay.length" class="space-y-1">
|
<div v-if="machineConstructeursDisplay.length" class="flex flex-wrap gap-2">
|
||||||
<div
|
<span
|
||||||
v-for="constructeur in machineConstructeursDisplay"
|
v-for="constructeur in machineConstructeursDisplay"
|
||||||
:key="constructeur.id"
|
:key="constructeur.id"
|
||||||
class="flex flex-col"
|
class="badge badge-ghost gap-1"
|
||||||
>
|
>
|
||||||
<span class="font-medium">{{ constructeur.name }}</span>
|
{{ constructeur.name }}
|
||||||
<span
|
<span
|
||||||
v-if="formatConstructeurContactSummary(constructeur)"
|
v-if="formatConstructeurContactSummary(constructeur)"
|
||||||
class="text-xs text-base-content/50"
|
class="text-xs opacity-60"
|
||||||
>
|
>
|
||||||
{{ formatConstructeurContactSummary(constructeur) }}
|
· {{ formatConstructeurContactSummary(constructeur) }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<span v-else class="font-medium">Non défini</span>
|
<span v-else class="text-base-content/50">Non défini</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -28,10 +28,11 @@
|
|||||||
<div v-for="piece in pieces" :key="piece.id">
|
<div v-for="piece in pieces" :key="piece.id">
|
||||||
<PieceItem
|
<PieceItem
|
||||||
:piece="piece"
|
:piece="piece"
|
||||||
:is-edit-mode="false"
|
:is-edit-mode="isEditMode"
|
||||||
:show-delete="isEditMode"
|
:show-delete="isEditMode"
|
||||||
:collapse-all="collapsed"
|
:collapse-all="collapsed"
|
||||||
:toggle-token="collapseToggleToken"
|
:toggle-token="collapseToggleToken"
|
||||||
|
@update="$emit('update-piece', $event)"
|
||||||
@edit="$emit('edit-piece', $event)"
|
@edit="$emit('edit-piece', $event)"
|
||||||
@delete="$emit('remove-piece', piece.linkId || piece.id)"
|
@delete="$emit('remove-piece', piece.linkId || piece.id)"
|
||||||
/>
|
/>
|
||||||
@@ -62,6 +63,7 @@ defineProps<{
|
|||||||
|
|
||||||
defineEmits<{
|
defineEmits<{
|
||||||
'toggle-collapse': []
|
'toggle-collapse': []
|
||||||
|
'update-piece': [piece: any]
|
||||||
'edit-piece': [piece: any]
|
'edit-piece': [piece: any]
|
||||||
'add-piece': []
|
'add-piece': []
|
||||||
'remove-piece': [linkId: string]
|
'remove-piece': [linkId: string]
|
||||||
|
|||||||
@@ -15,8 +15,7 @@
|
|||||||
minlength="2"
|
minlength="2"
|
||||||
maxlength="120"
|
maxlength="120"
|
||||||
required
|
required
|
||||||
:disabled="restrictedMode"
|
/>
|
||||||
/>
|
|
||||||
<p v-if="errors.name" class="mt-1 text-sm text-error">{{ errors.name }}</p>
|
<p v-if="errors.name" class="mt-1 text-sm text-error">{{ errors.name }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -48,7 +47,6 @@
|
|||||||
rows="4"
|
rows="4"
|
||||||
name="notes"
|
name="notes"
|
||||||
maxlength="2000"
|
maxlength="2000"
|
||||||
:disabled="restrictedMode"
|
|
||||||
></textarea>
|
></textarea>
|
||||||
<p class="mt-1 text-xs text-base-content/70">Saisissez des informations complémentaires (facultatif).</p>
|
<p class="mt-1 text-xs text-base-content/70">Saisissez des informations complémentaires (facultatif).</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -83,7 +81,6 @@
|
|||||||
v-model="componentStructure"
|
v-model="componentStructure"
|
||||||
:allow-subcomponents="allowComponentSubcomponents"
|
:allow-subcomponents="allowComponentSubcomponents"
|
||||||
:max-subcomponent-depth="componentSubcomponentMaxDepth"
|
:max-subcomponent-depth="componentSubcomponentMaxDepth"
|
||||||
:restricted-mode="restrictedMode"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -95,7 +92,7 @@
|
|||||||
Aperçu :
|
Aperçu :
|
||||||
<span class="font-medium text-base-content">{{ pieceStructurePreview }}</span>
|
<span class="font-medium text-base-content">{{ pieceStructurePreview }}</span>
|
||||||
</p>
|
</p>
|
||||||
<PieceModelStructureEditor v-model="pieceStructure" :restricted-mode="restrictedMode" />
|
<PieceModelStructureEditor v-model="pieceStructure" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -106,30 +103,11 @@
|
|||||||
Aperçu :
|
Aperçu :
|
||||||
<span class="font-medium text-base-content">{{ productStructurePreview }}</span>
|
<span class="font-medium text-base-content">{{ productStructurePreview }}</span>
|
||||||
</p>
|
</p>
|
||||||
<PieceModelStructureEditor v-model="productStructure" :restricted-mode="restrictedMode" />
|
<PieceModelStructureEditor v-model="productStructure" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="restrictedMode && restrictedModeMessage"
|
|
||||||
class="alert alert-info"
|
|
||||||
role="status"
|
|
||||||
aria-live="polite"
|
|
||||||
>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
|
|
||||||
<span>{{ restrictedModeMessage }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="disableSubmit"
|
|
||||||
class="alert alert-warning"
|
|
||||||
role="alert"
|
|
||||||
aria-live="polite"
|
|
||||||
>
|
|
||||||
<span>{{ disableSubmitMessage }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<footer class="flex flex-col gap-3 border-t border-base-300 pt-4 sm:flex-row sm:justify-end">
|
<footer class="flex flex-col gap-3 border-t border-base-300 pt-4 sm:flex-row sm:justify-end">
|
||||||
<button type="button" class="btn btn-ghost" :disabled="saving" @click="emit('cancel')">
|
<button type="button" class="btn btn-ghost" :disabled="saving" @click="emit('cancel')">
|
||||||
Annuler
|
Annuler
|
||||||
@@ -172,10 +150,6 @@ const props = withDefaults(defineProps<{
|
|||||||
structureLoading?: boolean
|
structureLoading?: boolean
|
||||||
allowComponentSubcomponents?: boolean
|
allowComponentSubcomponents?: boolean
|
||||||
componentSubcomponentMaxDepth?: number
|
componentSubcomponentMaxDepth?: number
|
||||||
disableSubmit?: boolean
|
|
||||||
disableSubmitMessage?: string
|
|
||||||
restrictedMode?: boolean
|
|
||||||
restrictedModeMessage?: string
|
|
||||||
readonly?: boolean
|
readonly?: boolean
|
||||||
}>(), {
|
}>(), {
|
||||||
initialData: null,
|
initialData: null,
|
||||||
@@ -184,10 +158,6 @@ const props = withDefaults(defineProps<{
|
|||||||
structureLoading: false,
|
structureLoading: false,
|
||||||
allowComponentSubcomponents: true,
|
allowComponentSubcomponents: true,
|
||||||
componentSubcomponentMaxDepth: 1,
|
componentSubcomponentMaxDepth: 1,
|
||||||
disableSubmit: false,
|
|
||||||
disableSubmitMessage: '',
|
|
||||||
restrictedMode: false,
|
|
||||||
restrictedModeMessage: '',
|
|
||||||
readonly: false,
|
readonly: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -205,19 +175,7 @@ const componentSubcomponentMaxDepth = computed(() =>
|
|||||||
? props.componentSubcomponentMaxDepth
|
? props.componentSubcomponentMaxDepth
|
||||||
: 1,
|
: 1,
|
||||||
)
|
)
|
||||||
const disableSubmit = computed(() => props.disableSubmit === true)
|
|
||||||
const disableSubmitMessage = computed(() =>
|
|
||||||
(props.disableSubmitMessage && props.disableSubmitMessage.trim())
|
|
||||||
? props.disableSubmitMessage
|
|
||||||
: 'Cette catégorie ne peut pas être modifiée car des éléments y sont déjà liés.',
|
|
||||||
)
|
|
||||||
const isReadonly = computed(() => props.readonly === true)
|
const isReadonly = computed(() => props.readonly === true)
|
||||||
const restrictedMode = computed(() => props.restrictedMode === true || isReadonly.value)
|
|
||||||
const restrictedModeMessage = computed(() =>
|
|
||||||
(props.restrictedModeMessage && props.restrictedModeMessage.trim())
|
|
||||||
? props.restrictedModeMessage
|
|
||||||
: '',
|
|
||||||
)
|
|
||||||
|
|
||||||
const form = reactive<ModelTypePayload>({
|
const form = reactive<ModelTypePayload>({
|
||||||
name: '',
|
name: '',
|
||||||
@@ -294,7 +252,7 @@ const resetForm = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const submitLabel = computed(() => (props.mode === 'edit' ? 'Enregistrer' : 'Créer'))
|
const submitLabel = computed(() => (props.mode === 'edit' ? 'Enregistrer' : 'Créer'))
|
||||||
const isSubmitDisabled = computed(() => saving.value || structureLoading.value || disableSubmit.value || isReadonly.value)
|
const isSubmitDisabled = computed(() => saving.value || structureLoading.value || isReadonly.value)
|
||||||
|
|
||||||
const validate = () => {
|
const validate = () => {
|
||||||
errors.name = undefined
|
errors.name = undefined
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
import { computed, ref } from 'vue'
|
|
||||||
import { useApi } from '~/composables/useApi'
|
|
||||||
import { useToast } from '~/composables/useToast'
|
|
||||||
|
|
||||||
type GuardLabels = {
|
|
||||||
singular: string
|
|
||||||
plural: string
|
|
||||||
verifying: string
|
|
||||||
}
|
|
||||||
|
|
||||||
type GuardConfig = {
|
|
||||||
endpoint: string
|
|
||||||
filterKey: string
|
|
||||||
labels: GuardLabels
|
|
||||||
}
|
|
||||||
|
|
||||||
const extractTotal = (payload: any, fallbackLength: number) => {
|
|
||||||
if (typeof payload?.totalItems === 'number') {
|
|
||||||
return payload.totalItems
|
|
||||||
}
|
|
||||||
if (typeof payload?.['hydra:totalItems'] === 'number') {
|
|
||||||
return payload['hydra:totalItems']
|
|
||||||
}
|
|
||||||
if (Array.isArray(payload?.member)) {
|
|
||||||
return payload.member.length
|
|
||||||
}
|
|
||||||
if (Array.isArray(payload?.['hydra:member'])) {
|
|
||||||
return payload['hydra:member'].length
|
|
||||||
}
|
|
||||||
return fallbackLength
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useCategoryEditGuard (config: GuardConfig) {
|
|
||||||
const { get } = useApi()
|
|
||||||
const { showInfo } = useToast()
|
|
||||||
|
|
||||||
const linkedCount = ref(0)
|
|
||||||
const linkedLoading = ref(false)
|
|
||||||
|
|
||||||
const loadLinkedCount = async (modelTypeId: string) => {
|
|
||||||
linkedLoading.value = true
|
|
||||||
try {
|
|
||||||
const params = new URLSearchParams()
|
|
||||||
params.set('itemsPerPage', '1')
|
|
||||||
params.set(config.filterKey, `/api/model_types/${modelTypeId}`)
|
|
||||||
|
|
||||||
const result = await get(`${config.endpoint}?${params.toString()}`)
|
|
||||||
if (!result.success) {
|
|
||||||
linkedCount.value = 0
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const fallbackLength = Array.isArray(result.data?.member)
|
|
||||||
? result.data.member.length
|
|
||||||
: Array.isArray(result.data?.['hydra:member'])
|
|
||||||
? result.data['hydra:member'].length
|
|
||||||
: 0
|
|
||||||
|
|
||||||
linkedCount.value = extractTotal(result.data, fallbackLength)
|
|
||||||
} catch (_error) {
|
|
||||||
linkedCount.value = 0
|
|
||||||
} finally {
|
|
||||||
linkedLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const isRestrictedMode = computed(
|
|
||||||
() => !linkedLoading.value && linkedCount.value > 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const isSubmitBlocked = computed(
|
|
||||||
() => linkedLoading.value,
|
|
||||||
)
|
|
||||||
|
|
||||||
const restrictedModeMessage = computed(() => {
|
|
||||||
if (linkedLoading.value) {
|
|
||||||
return config.labels.verifying
|
|
||||||
}
|
|
||||||
if (linkedCount.value <= 0) {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
if (linkedCount.value === 1) {
|
|
||||||
return `Mode restreint : 1 ${config.labels.singular} est déjà lié à cette catégorie. Vous pouvez ajouter de nouveaux champs personnalisés et renommer les existants, mais pas modifier leur type ou les supprimer.`
|
|
||||||
}
|
|
||||||
return `Mode restreint : ${linkedCount.value} ${config.labels.plural} sont déjà liés à cette catégorie. Vous pouvez ajouter de nouveaux champs personnalisés et renommer les existants, mais pas modifier leur type ou les supprimer.`
|
|
||||||
})
|
|
||||||
|
|
||||||
const submitBlockMessage = computed(() => {
|
|
||||||
if (linkedLoading.value) {
|
|
||||||
return config.labels.verifying
|
|
||||||
}
|
|
||||||
return ''
|
|
||||||
})
|
|
||||||
|
|
||||||
const guardSubmitOrNotify = () => {
|
|
||||||
if (!isSubmitBlocked.value) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
showInfo(submitBlockMessage.value || 'Veuillez patienter...')
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
linkedCount,
|
|
||||||
linkedLoading,
|
|
||||||
isRestrictedMode,
|
|
||||||
isSubmitBlocked,
|
|
||||||
restrictedModeMessage,
|
|
||||||
submitBlockMessage,
|
|
||||||
loadLinkedCount,
|
|
||||||
guardSubmitOrNotify,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -7,6 +7,7 @@ import { useProductTypes } from '~/composables/useProductTypes'
|
|||||||
import { usePieces } from '~/composables/usePieces'
|
import { usePieces } from '~/composables/usePieces'
|
||||||
import { useProducts } from '~/composables/useProducts'
|
import { useProducts } from '~/composables/useProducts'
|
||||||
import { useCustomFields } from '~/composables/useCustomFields'
|
import { useCustomFields } from '~/composables/useCustomFields'
|
||||||
|
import type { SelectionEntry } from '~/shared/utils/structureSelectionUtils'
|
||||||
import { useApi } from '~/composables/useApi'
|
import { useApi } from '~/composables/useApi'
|
||||||
import { useToast } from '~/composables/useToast'
|
import { useToast } from '~/composables/useToast'
|
||||||
import { extractRelationId } from '~/shared/apiRelations'
|
import { extractRelationId } from '~/shared/apiRelations'
|
||||||
@@ -53,7 +54,7 @@ const historyFieldLabels: Record<string, string> = {
|
|||||||
export function useComponentEdit(componentId: string) {
|
export function useComponentEdit(componentId: string) {
|
||||||
const { canEdit } = usePermissions()
|
const { canEdit } = usePermissions()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const { get } = useApi()
|
const { get, patch } = useApi()
|
||||||
const { componentTypes, loadComponentTypes } = useComponentTypes()
|
const { componentTypes, loadComponentTypes } = useComponentTypes()
|
||||||
const { pieceTypes, loadPieceTypes } = usePieceTypes()
|
const { pieceTypes, loadPieceTypes } = usePieceTypes()
|
||||||
const { productTypes, loadProductTypes } = useProductTypes()
|
const { productTypes, loadProductTypes } = useProductTypes()
|
||||||
@@ -269,6 +270,99 @@ export function useComponentEdit(componentId: string) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// --- Slot selection entries (for selectors) ---
|
||||||
|
|
||||||
|
const pieceSlotEntries = computed(() => {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (!structure?.pieces) return []
|
||||||
|
return (structure.pieces as any[]).map((slot: any, i: number) => ({
|
||||||
|
slotId: slot.slotId,
|
||||||
|
typePieceId: slot.typePieceId,
|
||||||
|
selectedPieceId: slot.selectedPieceId ?? null,
|
||||||
|
quantity: slot.quantity ?? 1,
|
||||||
|
position: slot.position ?? i,
|
||||||
|
label: pieceTypeLabelMap.value[slot.typePieceId] || `Pièce #${i + 1}`,
|
||||||
|
}))
|
||||||
|
})
|
||||||
|
|
||||||
|
const productSlotEntries = computed(() => {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (!structure?.products) return []
|
||||||
|
return (structure.products as any[]).map((slot: any, i: number) => ({
|
||||||
|
slotId: slot.slotId,
|
||||||
|
typeProductId: slot.typeProductId,
|
||||||
|
selectedProductId: slot.selectedProductId ?? null,
|
||||||
|
familyCode: slot.familyCode,
|
||||||
|
position: slot.position ?? i,
|
||||||
|
label: productTypeLabelMap.value[slot.typeProductId] || `Produit #${i + 1}`,
|
||||||
|
}))
|
||||||
|
})
|
||||||
|
|
||||||
|
const subcomponentSlotEntries = computed(() => {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (!structure?.subcomponents) return []
|
||||||
|
return (structure.subcomponents as any[]).map((slot: any, i: number) => ({
|
||||||
|
slotId: slot.slotId,
|
||||||
|
typeComposantId: slot.typeComposantId,
|
||||||
|
selectedComponentId: slot.selectedComponentId ?? null,
|
||||||
|
alias: slot.alias,
|
||||||
|
familyCode: slot.familyCode,
|
||||||
|
position: slot.position ?? i,
|
||||||
|
label: slot.alias || `Sous-composant #${i + 1}`,
|
||||||
|
}))
|
||||||
|
})
|
||||||
|
|
||||||
|
const savePieceSlotSelection = async (slotId: string, selectedPieceId: string | null) => {
|
||||||
|
const result = await patch(`/composant-piece-slots/${slotId}`, { selectedPieceId })
|
||||||
|
if (result.success) {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (structure?.pieces) {
|
||||||
|
const slot = (structure.pieces as any[]).find((s: any) => s.slotId === slotId)
|
||||||
|
if (slot) slot.selectedPieceId = selectedPieceId
|
||||||
|
}
|
||||||
|
toast.showSuccess('Pièce mise à jour')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveProductSlotSelection = async (slotId: string, selectedProductId: string | null) => {
|
||||||
|
const result = await patch(`/composant-product-slots/${slotId}`, { selectedProductId })
|
||||||
|
if (result.success) {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (structure?.products) {
|
||||||
|
const slot = (structure.products as any[]).find((s: any) => s.slotId === slotId)
|
||||||
|
if (slot) slot.selectedProductId = selectedProductId
|
||||||
|
}
|
||||||
|
toast.showSuccess('Produit mis à jour')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveSubcomponentSlotSelection = async (slotId: string, selectedComposantId: string | null) => {
|
||||||
|
const result = await patch(`/composant-subcomponent-slots/${slotId}`, { selectedComposantId })
|
||||||
|
if (result.success) {
|
||||||
|
const structure = component.value?.structure
|
||||||
|
if (structure?.subcomponents) {
|
||||||
|
const slot = (structure.subcomponents as any[]).find((s: any) => s.slotId === slotId)
|
||||||
|
if (slot) slot.selectedComponentId = selectedComposantId
|
||||||
|
}
|
||||||
|
toast.showSuccess('Sous-composant mis à jour')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveSlotQuantity = async (entry: SelectionEntry) => {
|
||||||
|
const slotId = entry.slotId
|
||||||
|
const quantity = typeof entry._definition?.quantity === 'number'
|
||||||
|
? Math.max(1, entry._definition.quantity)
|
||||||
|
: null
|
||||||
|
if (!slotId || quantity === null) return
|
||||||
|
try {
|
||||||
|
await patch(`/composant-piece-slots/${slotId}`, { quantity })
|
||||||
|
toast.showSuccess('Quantité mise à jour')
|
||||||
|
}
|
||||||
|
catch (error: any) {
|
||||||
|
toast.showError(error?.message || 'Erreur lors de la mise à jour de la quantité')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const submitEdition = async () => {
|
const submitEdition = async () => {
|
||||||
if (!component.value) {
|
if (!component.value) {
|
||||||
return
|
return
|
||||||
@@ -407,14 +501,12 @@ export function useComponentEdit(componentId: string) {
|
|||||||
])
|
])
|
||||||
loading.value = false
|
loading.value = false
|
||||||
|
|
||||||
// Defer bulk catalog loads — only needed when component has structure selections
|
// Load catalogs for slot selectors (force: true to bypass cache from list pages that load fewer items)
|
||||||
if (component.value?.structure) {
|
Promise.allSettled([
|
||||||
Promise.allSettled([
|
loadPieces({ itemsPerPage: 200, force: true }),
|
||||||
loadPieces({ itemsPerPage: 200 }),
|
loadProducts({ itemsPerPage: 200, force: true }),
|
||||||
loadProducts({ itemsPerPage: 200 }),
|
loadComposants({ itemsPerPage: 200, force: true }),
|
||||||
loadComposants({ itemsPerPage: 200 }),
|
]).catch(() => {})
|
||||||
]).catch(() => {})
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -440,6 +532,9 @@ export function useComponentEdit(componentId: string) {
|
|||||||
selectedType,
|
selectedType,
|
||||||
selectedTypeStructure,
|
selectedTypeStructure,
|
||||||
structureSelections,
|
structureSelections,
|
||||||
|
pieceSlotEntries,
|
||||||
|
productSlotEntries,
|
||||||
|
subcomponentSlotEntries,
|
||||||
|
|
||||||
// History
|
// History
|
||||||
history,
|
history,
|
||||||
@@ -453,6 +548,10 @@ export function useComponentEdit(componentId: string) {
|
|||||||
handleFilesAdded,
|
handleFilesAdded,
|
||||||
refreshDocuments,
|
refreshDocuments,
|
||||||
submitEdition,
|
submitEdition,
|
||||||
|
saveSlotQuantity,
|
||||||
|
savePieceSlotSelection,
|
||||||
|
saveProductSlotSelection,
|
||||||
|
saveSubcomponentSlotSelection,
|
||||||
resolvePieceLabel,
|
resolvePieceLabel,
|
||||||
resolveProductLabel,
|
resolveProductLabel,
|
||||||
resolveSubcomponentLabel,
|
resolveSubcomponentLabel,
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export function useEntityDocuments(deps: EntityDocumentsDeps) {
|
|||||||
// CRUD operations
|
// CRUD operations
|
||||||
const refreshDocuments = async () => {
|
const refreshDocuments = async () => {
|
||||||
const e = entity()
|
const e = entity()
|
||||||
if (!e?.id) return
|
if (!e?.id || e._structurePiece) return
|
||||||
loadingDocuments.value = true
|
loadingDocuments.value = true
|
||||||
try {
|
try {
|
||||||
const result: any = await loadDocumentsFn(e.id, { updateStore: false })
|
const result: any = await loadDocumentsFn(e.id, { updateStore: false })
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export function useMachineDetailData(machineId: string) {
|
|||||||
const { componentTypes, loadComponentTypes } = useComponentTypes()
|
const { componentTypes, loadComponentTypes } = useComponentTypes()
|
||||||
const { pieceTypes, loadPieceTypes } = usePieceTypes()
|
const { pieceTypes, loadPieceTypes } = usePieceTypes()
|
||||||
const { upsertCustomFieldValue } = useCustomFields()
|
const { upsertCustomFieldValue } = useCustomFields()
|
||||||
const { get } = useApi()
|
const { get, patch: apiPatch } = useApi()
|
||||||
const toast = useToast()
|
const toast = useToast()
|
||||||
const { constructeurs, loadConstructeurs } = useConstructeurs()
|
const { constructeurs, loadConstructeurs } = useConstructeurs()
|
||||||
const { sites, loadSites } = useSites()
|
const { sites, loadSites } = useSites()
|
||||||
@@ -274,6 +274,7 @@ export function useMachineDetailData(machineId: string) {
|
|||||||
updateMachineApi,
|
updateMachineApi,
|
||||||
updateComposantApi: updateComposantApi,
|
updateComposantApi: updateComposantApi,
|
||||||
updatePieceApi,
|
updatePieceApi,
|
||||||
|
apiPatch,
|
||||||
toast,
|
toast,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ export interface UseMachineDetailUpdatesDeps {
|
|||||||
updateMachineApi: (id: string, data: any) => Promise<unknown>
|
updateMachineApi: (id: string, data: any) => Promise<unknown>
|
||||||
updateComposantApi: (id: string, data: any) => Promise<unknown>
|
updateComposantApi: (id: string, data: any) => Promise<unknown>
|
||||||
updatePieceApi: (id: string, data: any) => Promise<unknown>
|
updatePieceApi: (id: string, data: any) => Promise<unknown>
|
||||||
|
apiPatch: (endpoint: string, data?: unknown) => Promise<any>
|
||||||
toast: { showInfo: (msg: string) => void }
|
toast: { showInfo: (msg: string) => void }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +54,7 @@ export function useMachineDetailUpdates(deps: UseMachineDetailUpdatesDeps) {
|
|||||||
updateMachineApi,
|
updateMachineApi,
|
||||||
updateComposantApi,
|
updateComposantApi,
|
||||||
updatePieceApi,
|
updatePieceApi,
|
||||||
|
apiPatch,
|
||||||
toast,
|
toast,
|
||||||
} = deps
|
} = deps
|
||||||
|
|
||||||
@@ -108,18 +110,18 @@ export function useMachineDetailUpdates(deps: UseMachineDetailUpdatesDeps) {
|
|||||||
const productId = updatedComponent.productId
|
const productId = updatedComponent.productId
|
||||||
? String(updatedComponent.productId)
|
? String(updatedComponent.productId)
|
||||||
: null
|
: null
|
||||||
const prix =
|
const prixStr =
|
||||||
updatedComponent.prix !== null &&
|
updatedComponent.prix !== null &&
|
||||||
updatedComponent.prix !== undefined &&
|
updatedComponent.prix !== undefined &&
|
||||||
String(updatedComponent.prix).trim() !== ''
|
String(updatedComponent.prix).trim() !== ''
|
||||||
? Number(updatedComponent.prix)
|
? String(updatedComponent.prix)
|
||||||
: null
|
: null
|
||||||
|
|
||||||
const result: any = await updateComposantApi(updatedComponent.id as string, {
|
const result: any = await updateComposantApi(updatedComponent.id as string, {
|
||||||
name: updatedComponent.name,
|
name: updatedComponent.name,
|
||||||
reference: updatedComponent.reference,
|
reference: updatedComponent.reference,
|
||||||
constructeurIds: cIds,
|
constructeurIds: cIds,
|
||||||
prix: Number.isNaN(prix) ? null : prix,
|
prix: prixStr,
|
||||||
productId,
|
productId,
|
||||||
} as any)
|
} as any)
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
@@ -138,18 +140,18 @@ export function useMachineDetailUpdates(deps: UseMachineDetailUpdatesDeps) {
|
|||||||
updatedPiece.constructeur,
|
updatedPiece.constructeur,
|
||||||
)
|
)
|
||||||
const productId = updatedPiece.productId ? String(updatedPiece.productId) : null
|
const productId = updatedPiece.productId ? String(updatedPiece.productId) : null
|
||||||
const prix =
|
const prixStr =
|
||||||
updatedPiece.prix !== null &&
|
updatedPiece.prix !== null &&
|
||||||
updatedPiece.prix !== undefined &&
|
updatedPiece.prix !== undefined &&
|
||||||
String(updatedPiece.prix).trim() !== ''
|
String(updatedPiece.prix).trim() !== ''
|
||||||
? Number(updatedPiece.prix)
|
? String(updatedPiece.prix)
|
||||||
: null
|
: null
|
||||||
|
|
||||||
const result: any = await updatePieceApi(updatedPiece.id as string, {
|
const result: any = await updatePieceApi(updatedPiece.id as string, {
|
||||||
name: updatedPiece.name,
|
name: updatedPiece.name,
|
||||||
reference: updatedPiece.reference,
|
reference: updatedPiece.reference || null,
|
||||||
constructeurIds: cIds,
|
constructeurIds: cIds,
|
||||||
prix: Number.isNaN(prix) ? null : prix,
|
prix: prixStr,
|
||||||
productId,
|
productId,
|
||||||
} as any)
|
} as any)
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
@@ -179,6 +181,13 @@ export function useMachineDetailUpdates(deps: UseMachineDetailUpdatesDeps) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update slot quantity if this is a composant structure piece
|
||||||
|
const slotId = updatedPiece.slotId as string | null
|
||||||
|
const quantity = typeof updatedPiece.quantity === 'number' ? Math.max(1, updatedPiece.quantity) : null
|
||||||
|
if (slotId && quantity !== null) {
|
||||||
|
await apiPatch(`/composant-piece-slots/${slotId}`, { quantity })
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de la mise à jour de la pièce:', error)
|
console.error('Erreur lors de la mise à jour de la pièce:', error)
|
||||||
}
|
}
|
||||||
@@ -187,6 +196,13 @@ export function useMachineDetailUpdates(deps: UseMachineDetailUpdatesDeps) {
|
|||||||
const updatePieceInfo = async (updatedPiece: AnyRecord) => {
|
const updatePieceInfo = async (updatedPiece: AnyRecord) => {
|
||||||
try {
|
try {
|
||||||
await _buildAndUpdatePiece(updatedPiece)
|
await _buildAndUpdatePiece(updatedPiece)
|
||||||
|
|
||||||
|
// Update link quantity if this is a direct machine piece
|
||||||
|
const linkId = updatedPiece.linkId || updatedPiece.machinePieceLinkId
|
||||||
|
const quantity = typeof updatedPiece.quantity === 'number' ? Math.max(1, updatedPiece.quantity) : null
|
||||||
|
if (linkId && quantity !== null) {
|
||||||
|
await apiPatch(`/machine_piece_links/${linkId}`, { quantity })
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de la mise à jour de la pièce:', error)
|
console.error('Erreur lors de la mise à jour de la pièce:', error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -181,6 +181,7 @@ export const buildMachineHierarchyFromLinks = (
|
|||||||
parentLinkId: resolveIdentifier(link.parentLinkId, link.parentMachinePieceLinkId, appliedPiece.parentLinkId),
|
parentLinkId: resolveIdentifier(link.parentLinkId, link.parentMachinePieceLinkId, appliedPiece.parentLinkId),
|
||||||
parentPieceLinkId: resolveIdentifier(link.parentPieceLinkId, appliedPiece.parentPieceLinkId),
|
parentPieceLinkId: resolveIdentifier(link.parentPieceLinkId, appliedPiece.parentPieceLinkId),
|
||||||
parentPieceId: resolveIdentifier(appliedPiece.parentPieceId, link.parentPieceId),
|
parentPieceId: resolveIdentifier(appliedPiece.parentPieceId, link.parentPieceId),
|
||||||
|
quantity: typeof link.quantity === 'number' ? link.quantity : 1,
|
||||||
definition: appliedPiece.definition || originalPiece?.definition || {},
|
definition: appliedPiece.definition || originalPiece?.definition || {},
|
||||||
customFields: appliedPiece.customFields || [],
|
customFields: appliedPiece.customFields || [],
|
||||||
}
|
}
|
||||||
@@ -214,10 +215,39 @@ export const buildMachineHierarchyFromLinks = (
|
|||||||
|
|
||||||
const componentName = (compOverrides?.name || appliedComponent.name || (appliedComponent.definition as AnyRecord)?.alias || (appliedComponent.definition as AnyRecord)?.name || originalComponent?.name || 'Composant') as string
|
const componentName = (compOverrides?.name || appliedComponent.name || (appliedComponent.definition as AnyRecord)?.alias || (appliedComponent.definition as AnyRecord)?.name || originalComponent?.name || 'Composant') as string
|
||||||
|
|
||||||
const pieces = Array.isArray(link.pieceLinks)
|
const linkedPieces = Array.isArray(link.pieceLinks)
|
||||||
? (link.pieceLinks as AnyRecord[]).map((pl) => createPieceNode(pl, componentName)).filter(Boolean) as AnyRecord[]
|
? (link.pieceLinks as AnyRecord[]).map((pl) => createPieceNode(pl, componentName)).filter(Boolean) as AnyRecord[]
|
||||||
: []
|
: []
|
||||||
|
|
||||||
|
// If no linked pieces exist, build read-only entries from the composant's structure
|
||||||
|
const structurePieceDefs = (!linkedPieces.length && appliedComponent.structure && typeof appliedComponent.structure === 'object')
|
||||||
|
? (Array.isArray((appliedComponent.structure as AnyRecord).pieces) ? (appliedComponent.structure as AnyRecord).pieces as AnyRecord[] : [])
|
||||||
|
: []
|
||||||
|
const structurePieces = structurePieceDefs.map((def, index) => {
|
||||||
|
const definition = (def.definition && typeof def.definition === 'object' ? def.definition : def) as AnyRecord
|
||||||
|
const resolved = (def.resolvedPiece && typeof def.resolvedPiece === 'object' ? def.resolvedPiece : null) as AnyRecord | null
|
||||||
|
const quantity = typeof definition.quantity === 'number' ? definition.quantity : (typeof def.quantity === 'number' ? def.quantity : 1)
|
||||||
|
return {
|
||||||
|
...(resolved || {}),
|
||||||
|
id: resolved?.id || `structure-piece-${composantId}-${index}`,
|
||||||
|
pieceId: resolved?.id || null,
|
||||||
|
name: resolved?.name || definition.role || definition.name || def.role || def.name || `Pièce ${index + 1}`,
|
||||||
|
reference: resolved?.reference || definition.reference || def.reference || null,
|
||||||
|
prix: resolved?.prix ?? null,
|
||||||
|
constructeurs: resolved?.constructeurs || [],
|
||||||
|
documents: [],
|
||||||
|
quantity,
|
||||||
|
slotId: def.slotId || definition.slotId || null,
|
||||||
|
typePieceId: resolved?.typePieceId || definition.typePieceId || def.typePieceId || null,
|
||||||
|
typePiece: resolved?.typePiece || null,
|
||||||
|
parentComponentLinkId: machineComponentLinkId,
|
||||||
|
parentComponentName: componentName,
|
||||||
|
_structurePiece: true,
|
||||||
|
}
|
||||||
|
}) as AnyRecord[]
|
||||||
|
|
||||||
|
const pieces = linkedPieces.length ? linkedPieces : structurePieces
|
||||||
|
|
||||||
const subComponents = Array.isArray(link.childLinks)
|
const subComponents = Array.isArray(link.childLinks)
|
||||||
? (link.childLinks as AnyRecord[]).map(createComponentNode).filter(Boolean) as AnyRecord[]
|
? (link.childLinks as AnyRecord[]).map(createComponentNode).filter(Boolean) as AnyRecord[]
|
||||||
: []
|
: []
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ export type EditorProduct = {
|
|||||||
interface Deps {
|
interface Deps {
|
||||||
props: {
|
props: {
|
||||||
modelValue?: PieceModelStructure | null
|
modelValue?: PieceModelStructure | null
|
||||||
restrictedMode?: boolean
|
|
||||||
}
|
}
|
||||||
emit: (event: 'update:modelValue', value: PieceModelStructure) => void
|
emit: (event: 'update:modelValue', value: PieceModelStructure) => void
|
||||||
}
|
}
|
||||||
@@ -202,8 +201,6 @@ export function usePieceStructureEditorLogic(deps: Deps) {
|
|||||||
const products = ref<EditorProduct[]>(hydrateProducts(props.modelValue))
|
const products = ref<EditorProduct[]>(hydrateProducts(props.modelValue))
|
||||||
const restState = ref<Record<string, unknown>>(extractRest(props.modelValue))
|
const restState = ref<Record<string, unknown>>(extractRest(props.modelValue))
|
||||||
|
|
||||||
const initialFieldUids = ref<Set<string>>(new Set(fields.value.map(f => f.uid)))
|
|
||||||
const initialProductUids = ref<Set<string>>(new Set(products.value.map(p => p.uid)))
|
|
||||||
|
|
||||||
// --- Product types ---
|
// --- Product types ---
|
||||||
|
|
||||||
@@ -250,18 +247,6 @@ export function usePieceStructureEditorLogic(deps: Deps) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Locked state ---
|
|
||||||
|
|
||||||
const isFieldLocked = (field: EditorField): boolean => {
|
|
||||||
return props.restrictedMode === true && initialFieldUids.value.has(field.uid)
|
|
||||||
}
|
|
||||||
|
|
||||||
const isProductLocked = (product: EditorProduct): boolean => {
|
|
||||||
return props.restrictedMode === true && initialProductUids.value.has(product.uid)
|
|
||||||
}
|
|
||||||
|
|
||||||
const restrictedMode = computed(() => props.restrictedMode === true)
|
|
||||||
|
|
||||||
// --- CRUD ---
|
// --- CRUD ---
|
||||||
|
|
||||||
const createEmptyProduct = (): EditorProduct => ({
|
const createEmptyProduct = (): EditorProduct => ({
|
||||||
@@ -407,8 +392,6 @@ export function usePieceStructureEditorLogic(deps: Deps) {
|
|||||||
products.value = hydrateProducts(value)
|
products.value = hydrateProducts(value)
|
||||||
products.value.forEach(product => updateProductTypeMetadata(product))
|
products.value.forEach(product => updateProductTypeMetadata(product))
|
||||||
lastEmitted = incomingSerialized
|
lastEmitted = incomingSerialized
|
||||||
initialFieldUids.value = new Set(fields.value.map(f => f.uid))
|
|
||||||
initialProductUids.value = new Set(products.value.map(p => p.uid))
|
|
||||||
},
|
},
|
||||||
{ deep: true },
|
{ deep: true },
|
||||||
)
|
)
|
||||||
@@ -426,9 +409,6 @@ export function usePieceStructureEditorLogic(deps: Deps) {
|
|||||||
fields,
|
fields,
|
||||||
products,
|
products,
|
||||||
productTypeOptions,
|
productTypeOptions,
|
||||||
restrictedMode,
|
|
||||||
isFieldLocked,
|
|
||||||
isProductLocked,
|
|
||||||
formatProductTypeOption,
|
formatProductTypeOption,
|
||||||
handleProductTypeSelect,
|
handleProductTypeSelect,
|
||||||
addProduct,
|
addProduct,
|
||||||
|
|||||||
@@ -1,51 +1,11 @@
|
|||||||
import { ref } from 'vue'
|
|
||||||
import type { EditableStructureNode } from '~/composables/useStructureNodeLogic'
|
import type { EditableStructureNode } from '~/composables/useStructureNodeLogic'
|
||||||
|
|
||||||
export interface StructureNodeCrudDeps {
|
export interface StructureNodeCrudDeps {
|
||||||
node: EditableStructureNode
|
node: EditableStructureNode
|
||||||
restrictedMode: boolean
|
|
||||||
canManageSubcomponents: () => boolean
|
canManageSubcomponents: () => boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useStructureNodeCrud(props: StructureNodeCrudDeps) {
|
export function useStructureNodeCrud(props: StructureNodeCrudDeps) {
|
||||||
// --- Lock state ---
|
|
||||||
const initialCustomFieldIndices = ref<Set<number>>(new Set())
|
|
||||||
const initialPieceIndices = ref<Set<number>>(new Set())
|
|
||||||
const initialProductIndices = ref<Set<number>>(new Set())
|
|
||||||
const initialSubcomponentIndices = ref<Set<number>>(new Set())
|
|
||||||
|
|
||||||
const initializeLockedIndices = () => {
|
|
||||||
if (props.restrictedMode) {
|
|
||||||
const customFieldsLength = Array.isArray(props.node.customFields) ? props.node.customFields.length : 0
|
|
||||||
const piecesLength = Array.isArray(props.node.pieces) ? props.node.pieces.length : 0
|
|
||||||
const productsLength = Array.isArray(props.node.products) ? props.node.products.length : 0
|
|
||||||
const subcomponentsLength = Array.isArray(props.node.subcomponents) ? props.node.subcomponents.length : 0
|
|
||||||
|
|
||||||
initialCustomFieldIndices.value = new Set(Array.from({ length: customFieldsLength }, (_, i) => i))
|
|
||||||
initialPieceIndices.value = new Set(Array.from({ length: piecesLength }, (_, i) => i))
|
|
||||||
initialProductIndices.value = new Set(Array.from({ length: productsLength }, (_, i) => i))
|
|
||||||
initialSubcomponentIndices.value = new Set(Array.from({ length: subcomponentsLength }, (_, i) => i))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
initializeLockedIndices()
|
|
||||||
|
|
||||||
const isCustomFieldLocked = (index: number): boolean => {
|
|
||||||
return props.restrictedMode === true && initialCustomFieldIndices.value.has(index)
|
|
||||||
}
|
|
||||||
|
|
||||||
const isPieceLocked = (index: number): boolean => {
|
|
||||||
return props.restrictedMode === true && initialPieceIndices.value.has(index)
|
|
||||||
}
|
|
||||||
|
|
||||||
const isProductLocked = (index: number): boolean => {
|
|
||||||
return props.restrictedMode === true && initialProductIndices.value.has(index)
|
|
||||||
}
|
|
||||||
|
|
||||||
const isSubcomponentLocked = (index: number): boolean => {
|
|
||||||
return props.restrictedMode === true && initialSubcomponentIndices.value.has(index)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Helpers ---
|
// --- Helpers ---
|
||||||
const ensureArray = (key: 'customFields' | 'pieces' | 'products' | 'subcomponents') => {
|
const ensureArray = (key: 'customFields' | 'pieces' | 'products' | 'subcomponents') => {
|
||||||
if (!Array.isArray((props.node as any)[key])) {
|
if (!Array.isArray((props.node as any)[key])) {
|
||||||
@@ -115,6 +75,7 @@ export function useStructureNodeCrud(props: StructureNodeCrudDeps) {
|
|||||||
reference: '',
|
reference: '',
|
||||||
familyCode: '',
|
familyCode: '',
|
||||||
role: '',
|
role: '',
|
||||||
|
quantity: 1,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,11 +119,6 @@ export function useStructureNodeCrud(props: StructureNodeCrudDeps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
// Lock checks
|
|
||||||
isCustomFieldLocked,
|
|
||||||
isPieceLocked,
|
|
||||||
isProductLocked,
|
|
||||||
isSubcomponentLocked,
|
|
||||||
// Helpers exposed for watchers
|
// Helpers exposed for watchers
|
||||||
reindexCustomFields,
|
reindexCustomFields,
|
||||||
// CRUD
|
// CRUD
|
||||||
|
|||||||
@@ -25,14 +25,12 @@ export interface StructureNodeLogicDeps {
|
|||||||
lockedTypeLabel: string
|
lockedTypeLabel: string
|
||||||
allowSubcomponents: boolean
|
allowSubcomponents: boolean
|
||||||
maxSubcomponentDepth: number
|
maxSubcomponentDepth: number
|
||||||
restrictedMode: boolean
|
|
||||||
isLocked: boolean
|
isLocked: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useStructureNodeLogic(props: StructureNodeLogicDeps) {
|
export function useStructureNodeLogic(props: StructureNodeLogicDeps) {
|
||||||
// --- Computed props ---
|
// --- Computed props ---
|
||||||
const isLocked = computed(() => props.isLocked === true)
|
const isLocked = computed(() => props.isLocked === true)
|
||||||
const restrictedMode = computed(() => props.restrictedMode === true)
|
|
||||||
|
|
||||||
const componentTypes = computed(() => props.componentTypes ?? [])
|
const componentTypes = computed(() => props.componentTypes ?? [])
|
||||||
const pieceTypes = computed(() => props.pieceTypes ?? [])
|
const pieceTypes = computed(() => props.pieceTypes ?? [])
|
||||||
@@ -310,7 +308,6 @@ export function useStructureNodeLogic(props: StructureNodeLogicDeps) {
|
|||||||
// --- CRUD & Lock (delegated to useStructureNodeCrud) ---
|
// --- CRUD & Lock (delegated to useStructureNodeCrud) ---
|
||||||
const crud = useStructureNodeCrud({
|
const crud = useStructureNodeCrud({
|
||||||
node: props.node,
|
node: props.node,
|
||||||
restrictedMode: props.restrictedMode,
|
|
||||||
canManageSubcomponents: () => canManageSubcomponents.value,
|
canManageSubcomponents: () => canManageSubcomponents.value,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -395,14 +392,8 @@ export function useStructureNodeLogic(props: StructureNodeLogicDeps) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
// Lock checks
|
|
||||||
isCustomFieldLocked: crud.isCustomFieldLocked,
|
|
||||||
isPieceLocked: crud.isPieceLocked,
|
|
||||||
isProductLocked: crud.isProductLocked,
|
|
||||||
isSubcomponentLocked: crud.isSubcomponentLocked,
|
|
||||||
// Computed state
|
// Computed state
|
||||||
isLocked,
|
isLocked,
|
||||||
restrictedMode,
|
|
||||||
componentTypes,
|
componentTypes,
|
||||||
pieceTypes,
|
pieceTypes,
|
||||||
productTypes,
|
productTypes,
|
||||||
|
|||||||
@@ -69,6 +69,21 @@ const badgeClass = (type: ChangeType) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const releases: Release[] = [
|
const releases: Release[] = [
|
||||||
|
{
|
||||||
|
version: 'v1.9.1',
|
||||||
|
date: '2026-03-16',
|
||||||
|
changes: [
|
||||||
|
{ type: 'feat', text: 'Normalisation JSON → tables relationnelles : les structures des composants (pièces, produits, sous-composants) et les squelettes des catégories sont désormais stockés dans des tables dédiées au lieu de colonnes JSON, améliorant la fiabilité et les performances des requêtes' },
|
||||||
|
{ type: 'feat', text: 'Synchronisation des catégories (ModelType Sync) : la modification d\'une catégorie (ajout/suppression de slots ou champs personnalisés) peut être propagée automatiquement à tous les éléments existants de cette catégorie, avec prévisualisation des changements avant application' },
|
||||||
|
{ type: 'feat', text: 'Sélection interactive des items dans les slots : sur la page d\'édition d\'un composant, il est maintenant possible de choisir directement la pièce, le produit ou le sous-composant assigné à chaque emplacement du squelette via des sélecteurs avec recherche' },
|
||||||
|
{ type: 'feat', text: 'Endpoints PATCH pour les slots composant : modification de la quantité et de l\'item sélectionné sur les slots pièce, produit et sous-composant' },
|
||||||
|
{ type: 'feat', text: 'Table de relation pièce ↔ produit (PieceProductSlot) avec versioning pour le suivi des modifications de structure' },
|
||||||
|
{ type: 'feat', text: 'Gestion des champs personnalisés sur les catégories : synchronisation automatique des définitions de champs (ajout, modification, suppression) lors de la sauvegarde d\'une catégorie' },
|
||||||
|
{ type: 'feat', text: 'Suite de tests étendue : 219 tests couvrant les stratégies de synchronisation, le contrôleur de sync et les nouvelles entités' },
|
||||||
|
{ type: 'fix', text: 'Correction de l\'affichage des sélections pré-existantes dans les slots : les pièces, produits et sous-composants déjà assignés sont maintenant correctement affichés à l\'ouverture de la page d\'édition (correction du cache catalogue)' },
|
||||||
|
{ type: 'fix', text: 'Fallback position/orderIndex sur index de tableau dans les stratégies de sync pour éviter les erreurs quand le champ est absent' },
|
||||||
|
],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
version: 'v1.9.0',
|
version: 'v1.9.0',
|
||||||
date: '2026-03-09',
|
date: '2026-03-09',
|
||||||
|
|||||||
@@ -27,10 +27,6 @@
|
|||||||
:lock-category="true"
|
:lock-category="true"
|
||||||
:saving="saving"
|
:saving="saving"
|
||||||
:readonly="!canEdit"
|
:readonly="!canEdit"
|
||||||
:disable-submit="isSubmitBlocked"
|
|
||||||
:disable-submit-message="submitBlockMessage"
|
|
||||||
:restricted-mode="isRestrictedMode"
|
|
||||||
:restricted-mode-message="restrictedModeMessage"
|
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
@cancel="handleCancel"
|
@cancel="handleCancel"
|
||||||
/>
|
/>
|
||||||
@@ -45,6 +41,14 @@
|
|||||||
show-resolved
|
show-resolved
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<SyncConfirmationModal
|
||||||
|
:preview="syncPreviewData"
|
||||||
|
:open="showSyncModal"
|
||||||
|
:loading="syncLoading"
|
||||||
|
@confirm="handleSyncConfirm"
|
||||||
|
@cancel="handleSyncCancel"
|
||||||
|
/>
|
||||||
</main>
|
</main>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -52,9 +56,8 @@
|
|||||||
import { computed, onMounted, ref } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import { useHead, useRoute, useRouter } from '#imports'
|
import { useHead, useRoute, useRouter } from '#imports'
|
||||||
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
||||||
import { getModelType, updateModelType, type ModelTypePayload } from '~/services/modelTypes'
|
import { getModelType, updateModelType, syncPreview, syncExecute, type ModelTypePayload, type SyncPreviewResult } from '~/services/modelTypes'
|
||||||
import type { ComponentModelStructure } from '~/shared/types/inventory'
|
import type { ComponentModelStructure } from '~/shared/types/inventory'
|
||||||
import { useCategoryEditGuard } from '~/composables/useCategoryEditGuard'
|
|
||||||
import { useComponentTypes } from '~/composables/useComponentTypes'
|
import { useComponentTypes } from '~/composables/useComponentTypes'
|
||||||
import { useToast } from '~/composables/useToast'
|
import { useToast } from '~/composables/useToast'
|
||||||
|
|
||||||
@@ -67,23 +70,10 @@ const { loadComponentTypes } = useComponentTypes()
|
|||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
|
const showSyncModal = ref(false)
|
||||||
const {
|
const syncLoading = ref(false)
|
||||||
isRestrictedMode,
|
const syncPreviewData = ref<SyncPreviewResult | null>(null)
|
||||||
isSubmitBlocked,
|
const pendingPayload = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
restrictedModeMessage,
|
|
||||||
submitBlockMessage,
|
|
||||||
loadLinkedCount,
|
|
||||||
guardSubmitOrNotify,
|
|
||||||
} = useCategoryEditGuard({
|
|
||||||
endpoint: '/composants',
|
|
||||||
filterKey: 'typeComposant',
|
|
||||||
labels: {
|
|
||||||
singular: 'composant',
|
|
||||||
plural: 'composants',
|
|
||||||
verifying: 'Vérification des composants liés en cours…',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const title = computed(() =>
|
const title = computed(() =>
|
||||||
initialData.value?.name
|
initialData.value?.name
|
||||||
@@ -126,7 +116,6 @@ const loadCategory = async () => {
|
|||||||
structure: (response.structure as ComponentModelStructure | null) ?? undefined,
|
structure: (response.structure as ComponentModelStructure | null) ?? undefined,
|
||||||
}
|
}
|
||||||
|
|
||||||
await loadLinkedCount(id)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
await navigateBackToList()
|
await navigateBackToList()
|
||||||
@@ -141,9 +130,6 @@ const handleCancel = () => {
|
|||||||
|
|
||||||
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
||||||
if (!canEdit.value) return
|
if (!canEdit.value) return
|
||||||
if (guardSubmitOrNotify()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const id = String(route.params.id)
|
const id = String(route.params.id)
|
||||||
saving.value = true
|
saving.value = true
|
||||||
try {
|
try {
|
||||||
@@ -151,10 +137,29 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
...payload,
|
...payload,
|
||||||
description: payload?.notes ?? null,
|
description: payload?.notes ?? null,
|
||||||
}
|
}
|
||||||
await updateModelType(id, enrichedPayload)
|
|
||||||
await loadComponentTypes({ force: true })
|
// Get sync preview BEFORE saving
|
||||||
showSuccess('Catégorie de composant mise à jour avec succès.')
|
const preview = await syncPreview(id, enrichedPayload.structure || {})
|
||||||
await navigateBackToList()
|
|
||||||
|
const hasImpact = preview && (
|
||||||
|
Object.values(preview.additions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.deletions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.modifications || {}).some(v => v > 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (hasImpact) {
|
||||||
|
// Show modal for confirmation
|
||||||
|
pendingPayload.value = enrichedPayload
|
||||||
|
syncPreviewData.value = preview
|
||||||
|
showSyncModal.value = true
|
||||||
|
} else {
|
||||||
|
// No impact — save directly + sync
|
||||||
|
await updateModelType(id, enrichedPayload)
|
||||||
|
await syncExecute(id, { confirmDeletions: false, confirmTypeChanges: false })
|
||||||
|
await loadComponentTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de composant mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
} finally {
|
} finally {
|
||||||
@@ -162,6 +167,39 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleSyncConfirm = async () => {
|
||||||
|
if (!pendingPayload.value) return
|
||||||
|
const id = String(route.params.id)
|
||||||
|
|
||||||
|
syncLoading.value = true
|
||||||
|
try {
|
||||||
|
const hasDeletions = syncPreviewData.value && Object.values(syncPreviewData.value.deletions || {}).some(v => v > 0)
|
||||||
|
const hasModifications = syncPreviewData.value && Object.values(syncPreviewData.value.modifications || {}).some(v => v > 0)
|
||||||
|
|
||||||
|
await updateModelType(id, pendingPayload.value)
|
||||||
|
await syncExecute(id, {
|
||||||
|
confirmDeletions: !!hasDeletions,
|
||||||
|
confirmTypeChanges: !!hasModifications,
|
||||||
|
})
|
||||||
|
await loadComponentTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de composant mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
} catch (error) {
|
||||||
|
showError(normalizeError(error))
|
||||||
|
} finally {
|
||||||
|
syncLoading.value = false
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSyncCancel = () => {
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadCategory()
|
loadCategory()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -152,45 +152,76 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="structureSelections.hasAny"
|
v-if="pieceSlotEntries.length || productSlotEntries.length || subcomponentSlotEntries.length"
|
||||||
class="space-y-3 rounded-lg border border-base-200 bg-base-200/30 p-4"
|
class="space-y-3 rounded-lg border border-base-200 bg-base-200/30 p-4"
|
||||||
>
|
>
|
||||||
<header class="space-y-1">
|
<header class="space-y-1">
|
||||||
<h2 class="font-semibold text-base-content">Sélections actuelles</h2>
|
<h2 class="font-semibold text-base-content">Sélections du squelette</h2>
|
||||||
<p class="text-xs text-base-content/70">
|
<p class="text-xs text-base-content/70">
|
||||||
Voici les pièces, produits et sous-composants réellement choisis pour ce composant.
|
Choisissez les pièces, produits et sous-composants pour chaque emplacement requis par la catégorie.
|
||||||
</p>
|
</p>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
<div v-if="pieceSlotEntries.length" class="space-y-2">
|
||||||
<div v-if="structureSelections.pieces.length" class="space-y-2">
|
<h3 class="font-semibold text-sm text-base-content">Pièces</h3>
|
||||||
<h3 class="font-semibold text-sm text-base-content">Pièces choisies</h3>
|
<div class="grid grid-cols-1 gap-3 md:grid-cols-2">
|
||||||
<ul class="list-disc list-inside space-y-1 text-sm">
|
<div
|
||||||
<li v-for="entry in structureSelections.pieces" :key="`selected-piece-${entry.path}-${entry.id}`">
|
v-for="slot in pieceSlotEntries"
|
||||||
<span class="font-medium">{{ entry.resolvedName }}</span>
|
:key="`piece-slot-${slot.slotId}`"
|
||||||
<span class="text-xs text-base-content/70"> — {{ entry.requirementLabel }}</span>
|
class="form-control"
|
||||||
</li>
|
>
|
||||||
</ul>
|
<label class="label">
|
||||||
|
<span class="label-text text-xs font-medium">{{ slot.label }}</span>
|
||||||
|
</label>
|
||||||
|
<PieceSelect
|
||||||
|
:model-value="slot.selectedPieceId"
|
||||||
|
:disabled="!canEdit || saving"
|
||||||
|
:type-piece-id="slot.typePieceId"
|
||||||
|
@update:model-value="(value) => savePieceSlotSelection(slot.slotId, value)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-if="structureSelections.products.length" class="space-y-2">
|
<div v-if="productSlotEntries.length" class="space-y-2">
|
||||||
<h3 class="font-semibold text-sm text-base-content">Produits choisis</h3>
|
<h3 class="font-semibold text-sm text-base-content">Produits</h3>
|
||||||
<ul class="list-disc list-inside space-y-1 text-sm">
|
<div class="grid grid-cols-1 gap-3 md:grid-cols-2">
|
||||||
<li v-for="entry in structureSelections.products" :key="`selected-product-${entry.path}-${entry.id}`">
|
<div
|
||||||
<span class="font-medium">{{ entry.resolvedName }}</span>
|
v-for="slot in productSlotEntries"
|
||||||
<span class="text-xs text-base-content/70"> — {{ entry.requirementLabel }}</span>
|
:key="`product-slot-${slot.slotId}`"
|
||||||
</li>
|
class="form-control"
|
||||||
</ul>
|
>
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text text-xs font-medium">{{ slot.label }}</span>
|
||||||
|
</label>
|
||||||
|
<ProductSelect
|
||||||
|
:model-value="slot.selectedProductId"
|
||||||
|
:disabled="!canEdit || saving"
|
||||||
|
:type-product-id="slot.typeProductId"
|
||||||
|
@update:model-value="(value) => saveProductSlotSelection(slot.slotId, value)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-if="structureSelections.components.length" class="space-y-2">
|
<div v-if="subcomponentSlotEntries.length" class="space-y-2">
|
||||||
<h3 class="font-semibold text-sm text-base-content">Sous-composants choisis</h3>
|
<h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
|
||||||
<ul class="list-disc list-inside space-y-1 text-sm">
|
<div class="grid grid-cols-1 gap-3 md:grid-cols-2">
|
||||||
<li v-for="entry in structureSelections.components" :key="`selected-component-${entry.path}-${entry.id}`">
|
<div
|
||||||
<span class="font-medium">{{ entry.resolvedName }}</span>
|
v-for="slot in subcomponentSlotEntries"
|
||||||
<span class="text-xs text-base-content/70"> — {{ entry.requirementLabel }}</span>
|
:key="`sub-slot-${slot.slotId}`"
|
||||||
</li>
|
class="form-control"
|
||||||
</ul>
|
>
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text text-xs font-medium">{{ slot.label }}</span>
|
||||||
|
</label>
|
||||||
|
<ComposantSelect
|
||||||
|
:model-value="slot.selectedComponentId"
|
||||||
|
:disabled="!canEdit || saving"
|
||||||
|
:type-composant-id="slot.typeComposantId"
|
||||||
|
@update:model-value="(value) => saveSubcomponentSlotSelection(slot.slotId, value)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -300,6 +331,9 @@ const {
|
|||||||
selectedType,
|
selectedType,
|
||||||
selectedTypeStructure,
|
selectedTypeStructure,
|
||||||
structureSelections,
|
structureSelections,
|
||||||
|
pieceSlotEntries,
|
||||||
|
productSlotEntries,
|
||||||
|
subcomponentSlotEntries,
|
||||||
history,
|
history,
|
||||||
historyLoading,
|
historyLoading,
|
||||||
historyError,
|
historyError,
|
||||||
@@ -308,6 +342,10 @@ const {
|
|||||||
removeDocument,
|
removeDocument,
|
||||||
handleFilesAdded,
|
handleFilesAdded,
|
||||||
submitEdition,
|
submitEdition,
|
||||||
|
saveSlotQuantity,
|
||||||
|
savePieceSlotSelection,
|
||||||
|
saveProductSlotSelection,
|
||||||
|
saveSubcomponentSlotSelection,
|
||||||
resolvePieceLabel,
|
resolvePieceLabel,
|
||||||
resolveProductLabel,
|
resolveProductLabel,
|
||||||
resolveSubcomponentLabel,
|
resolveSubcomponentLabel,
|
||||||
|
|||||||
@@ -27,10 +27,6 @@
|
|||||||
:lock-category="true"
|
:lock-category="true"
|
||||||
:saving="saving"
|
:saving="saving"
|
||||||
:readonly="!canEdit"
|
:readonly="!canEdit"
|
||||||
:disable-submit="isSubmitBlocked"
|
|
||||||
:disable-submit-message="submitBlockMessage"
|
|
||||||
:restricted-mode="isRestrictedMode"
|
|
||||||
:restricted-mode-message="restrictedModeMessage"
|
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
@cancel="handleCancel"
|
@cancel="handleCancel"
|
||||||
/>
|
/>
|
||||||
@@ -45,6 +41,14 @@
|
|||||||
show-resolved
|
show-resolved
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<SyncConfirmationModal
|
||||||
|
:preview="syncPreviewData"
|
||||||
|
:open="showSyncModal"
|
||||||
|
:loading="syncLoading"
|
||||||
|
@confirm="handleSyncConfirm"
|
||||||
|
@cancel="handleSyncCancel"
|
||||||
|
/>
|
||||||
</main>
|
</main>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -52,9 +56,8 @@
|
|||||||
import { computed, onMounted, ref } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import { useHead, useRoute, useRouter } from '#imports'
|
import { useHead, useRoute, useRouter } from '#imports'
|
||||||
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
||||||
import { getModelType, updateModelType, type ModelTypePayload } from '~/services/modelTypes'
|
import { getModelType, updateModelType, syncPreview, syncExecute, type ModelTypePayload, type SyncPreviewResult } from '~/services/modelTypes'
|
||||||
import type { PieceModelStructure } from '~/shared/types/inventory'
|
import type { PieceModelStructure } from '~/shared/types/inventory'
|
||||||
import { useCategoryEditGuard } from '~/composables/useCategoryEditGuard'
|
|
||||||
import { usePieceTypes } from '~/composables/usePieceTypes'
|
import { usePieceTypes } from '~/composables/usePieceTypes'
|
||||||
import { useToast } from '~/composables/useToast'
|
import { useToast } from '~/composables/useToast'
|
||||||
|
|
||||||
@@ -67,23 +70,10 @@ const { loadPieceTypes } = usePieceTypes()
|
|||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
|
const showSyncModal = ref(false)
|
||||||
const {
|
const syncLoading = ref(false)
|
||||||
isRestrictedMode,
|
const syncPreviewData = ref<SyncPreviewResult | null>(null)
|
||||||
isSubmitBlocked,
|
const pendingPayload = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
restrictedModeMessage,
|
|
||||||
submitBlockMessage,
|
|
||||||
loadLinkedCount,
|
|
||||||
guardSubmitOrNotify,
|
|
||||||
} = useCategoryEditGuard({
|
|
||||||
endpoint: '/pieces',
|
|
||||||
filterKey: 'typePiece',
|
|
||||||
labels: {
|
|
||||||
singular: 'pièce',
|
|
||||||
plural: 'pièces',
|
|
||||||
verifying: 'Vérification des pièces liées en cours…',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const title = computed(() =>
|
const title = computed(() =>
|
||||||
initialData.value?.name ? `Modifier « ${initialData.value.name} »` : 'Modifier une catégorie de pièce',
|
initialData.value?.name ? `Modifier « ${initialData.value.name} »` : 'Modifier une catégorie de pièce',
|
||||||
@@ -124,7 +114,6 @@ const loadCategory = async () => {
|
|||||||
structure: (response.structure as PieceModelStructure | null) ?? undefined,
|
structure: (response.structure as PieceModelStructure | null) ?? undefined,
|
||||||
}
|
}
|
||||||
|
|
||||||
await loadLinkedCount(id)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
await navigateBackToList()
|
await navigateBackToList()
|
||||||
@@ -139,9 +128,6 @@ const handleCancel = () => {
|
|||||||
|
|
||||||
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
||||||
if (!canEdit.value) return
|
if (!canEdit.value) return
|
||||||
if (guardSubmitOrNotify()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const id = String(route.params.id)
|
const id = String(route.params.id)
|
||||||
saving.value = true
|
saving.value = true
|
||||||
try {
|
try {
|
||||||
@@ -149,10 +135,29 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
...payload,
|
...payload,
|
||||||
description: payload?.notes ?? null,
|
description: payload?.notes ?? null,
|
||||||
}
|
}
|
||||||
await updateModelType(id, enrichedPayload)
|
|
||||||
await loadPieceTypes({ force: true })
|
// Get sync preview BEFORE saving
|
||||||
showSuccess('Catégorie de pièce mise à jour avec succès.')
|
const preview = await syncPreview(id, enrichedPayload.structure || {})
|
||||||
await navigateBackToList()
|
|
||||||
|
const hasImpact = preview && (
|
||||||
|
Object.values(preview.additions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.deletions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.modifications || {}).some(v => v > 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (hasImpact) {
|
||||||
|
// Show modal for confirmation
|
||||||
|
pendingPayload.value = enrichedPayload
|
||||||
|
syncPreviewData.value = preview
|
||||||
|
showSyncModal.value = true
|
||||||
|
} else {
|
||||||
|
// No impact — save directly + sync
|
||||||
|
await updateModelType(id, enrichedPayload)
|
||||||
|
await syncExecute(id, { confirmDeletions: false, confirmTypeChanges: false })
|
||||||
|
await loadPieceTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de pièce mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
} finally {
|
} finally {
|
||||||
@@ -160,6 +165,39 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleSyncConfirm = async () => {
|
||||||
|
if (!pendingPayload.value) return
|
||||||
|
const id = String(route.params.id)
|
||||||
|
|
||||||
|
syncLoading.value = true
|
||||||
|
try {
|
||||||
|
const hasDeletions = syncPreviewData.value && Object.values(syncPreviewData.value.deletions || {}).some(v => v > 0)
|
||||||
|
const hasModifications = syncPreviewData.value && Object.values(syncPreviewData.value.modifications || {}).some(v => v > 0)
|
||||||
|
|
||||||
|
await updateModelType(id, pendingPayload.value)
|
||||||
|
await syncExecute(id, {
|
||||||
|
confirmDeletions: !!hasDeletions,
|
||||||
|
confirmTypeChanges: !!hasModifications,
|
||||||
|
})
|
||||||
|
await loadPieceTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de pièce mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
} catch (error) {
|
||||||
|
showError(normalizeError(error))
|
||||||
|
} finally {
|
||||||
|
syncLoading.value = false
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSyncCancel = () => {
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadCategory()
|
loadCategory()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -27,10 +27,6 @@
|
|||||||
:lock-category="true"
|
:lock-category="true"
|
||||||
:saving="saving"
|
:saving="saving"
|
||||||
:readonly="!canEdit"
|
:readonly="!canEdit"
|
||||||
:disable-submit="isSubmitBlocked"
|
|
||||||
:disable-submit-message="submitBlockMessage"
|
|
||||||
:restricted-mode="isRestrictedMode"
|
|
||||||
:restricted-mode-message="restrictedModeMessage"
|
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
@cancel="handleCancel"
|
@cancel="handleCancel"
|
||||||
/>
|
/>
|
||||||
@@ -45,6 +41,14 @@
|
|||||||
show-resolved
|
show-resolved
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<SyncConfirmationModal
|
||||||
|
:preview="syncPreviewData"
|
||||||
|
:open="showSyncModal"
|
||||||
|
:loading="syncLoading"
|
||||||
|
@confirm="handleSyncConfirm"
|
||||||
|
@cancel="handleSyncCancel"
|
||||||
|
/>
|
||||||
</main>
|
</main>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -52,9 +56,8 @@
|
|||||||
import { computed, onMounted, ref } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import { useHead, useRoute, useRouter } from '#imports'
|
import { useHead, useRoute, useRouter } from '#imports'
|
||||||
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
import ModelTypeForm from '~/components/model-types/ModelTypeForm.vue'
|
||||||
import { getModelType, updateModelType, type ModelTypePayload } from '~/services/modelTypes'
|
import { getModelType, updateModelType, syncPreview, syncExecute, type ModelTypePayload, type SyncPreviewResult } from '~/services/modelTypes'
|
||||||
import type { ProductModelStructure } from '~/shared/types/inventory'
|
import type { ProductModelStructure } from '~/shared/types/inventory'
|
||||||
import { useCategoryEditGuard } from '~/composables/useCategoryEditGuard'
|
|
||||||
import { useProductTypes } from '~/composables/useProductTypes'
|
import { useProductTypes } from '~/composables/useProductTypes'
|
||||||
import { useToast } from '~/composables/useToast'
|
import { useToast } from '~/composables/useToast'
|
||||||
|
|
||||||
@@ -67,23 +70,10 @@ const { loadProductTypes } = useProductTypes()
|
|||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
const initialData = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
|
const showSyncModal = ref(false)
|
||||||
const {
|
const syncLoading = ref(false)
|
||||||
isRestrictedMode,
|
const syncPreviewData = ref<SyncPreviewResult | null>(null)
|
||||||
isSubmitBlocked,
|
const pendingPayload = ref<Partial<ModelTypePayload> | null>(null)
|
||||||
restrictedModeMessage,
|
|
||||||
submitBlockMessage,
|
|
||||||
loadLinkedCount,
|
|
||||||
guardSubmitOrNotify,
|
|
||||||
} = useCategoryEditGuard({
|
|
||||||
endpoint: '/products',
|
|
||||||
filterKey: 'typeProduct',
|
|
||||||
labels: {
|
|
||||||
singular: 'produit',
|
|
||||||
plural: 'produits',
|
|
||||||
verifying: 'Vérification des produits liés en cours…',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const title = computed(() =>
|
const title = computed(() =>
|
||||||
initialData.value?.name ? `Modifier « ${initialData.value.name} »` : 'Modifier une catégorie de produit',
|
initialData.value?.name ? `Modifier « ${initialData.value.name} »` : 'Modifier une catégorie de produit',
|
||||||
@@ -124,7 +114,6 @@ const loadCategory = async () => {
|
|||||||
structure: (response.structure as ProductModelStructure | null) ?? undefined,
|
structure: (response.structure as ProductModelStructure | null) ?? undefined,
|
||||||
}
|
}
|
||||||
|
|
||||||
await loadLinkedCount(id)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
await navigateBackToList()
|
await navigateBackToList()
|
||||||
@@ -139,9 +128,6 @@ const handleCancel = () => {
|
|||||||
|
|
||||||
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
||||||
if (!canEdit.value) return
|
if (!canEdit.value) return
|
||||||
if (guardSubmitOrNotify()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const id = String(route.params.id)
|
const id = String(route.params.id)
|
||||||
saving.value = true
|
saving.value = true
|
||||||
try {
|
try {
|
||||||
@@ -149,10 +135,29 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
...payload,
|
...payload,
|
||||||
description: payload?.notes ?? null,
|
description: payload?.notes ?? null,
|
||||||
}
|
}
|
||||||
await updateModelType(id, enrichedPayload)
|
|
||||||
await loadProductTypes({ force: true })
|
// Get sync preview BEFORE saving
|
||||||
showSuccess('Catégorie de produit mise à jour avec succès.')
|
const preview = await syncPreview(id, enrichedPayload.structure || {})
|
||||||
await navigateBackToList()
|
|
||||||
|
const hasImpact = preview && (
|
||||||
|
Object.values(preview.additions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.deletions || {}).some(v => v > 0)
|
||||||
|
|| Object.values(preview.modifications || {}).some(v => v > 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (hasImpact) {
|
||||||
|
// Show modal for confirmation
|
||||||
|
pendingPayload.value = enrichedPayload
|
||||||
|
syncPreviewData.value = preview
|
||||||
|
showSyncModal.value = true
|
||||||
|
} else {
|
||||||
|
// No impact — save directly + sync
|
||||||
|
await updateModelType(id, enrichedPayload)
|
||||||
|
await syncExecute(id, { confirmDeletions: false, confirmTypeChanges: false })
|
||||||
|
await loadProductTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de produit mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(normalizeError(error))
|
showError(normalizeError(error))
|
||||||
} finally {
|
} finally {
|
||||||
@@ -160,6 +165,39 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleSyncConfirm = async () => {
|
||||||
|
if (!pendingPayload.value) return
|
||||||
|
const id = String(route.params.id)
|
||||||
|
|
||||||
|
syncLoading.value = true
|
||||||
|
try {
|
||||||
|
const hasDeletions = syncPreviewData.value && Object.values(syncPreviewData.value.deletions || {}).some(v => v > 0)
|
||||||
|
const hasModifications = syncPreviewData.value && Object.values(syncPreviewData.value.modifications || {}).some(v => v > 0)
|
||||||
|
|
||||||
|
await updateModelType(id, pendingPayload.value)
|
||||||
|
await syncExecute(id, {
|
||||||
|
confirmDeletions: !!hasDeletions,
|
||||||
|
confirmTypeChanges: !!hasModifications,
|
||||||
|
})
|
||||||
|
await loadProductTypes({ force: true })
|
||||||
|
showSuccess('Catégorie de produit mise à jour avec succès.')
|
||||||
|
await navigateBackToList()
|
||||||
|
} catch (error) {
|
||||||
|
showError(normalizeError(error))
|
||||||
|
} finally {
|
||||||
|
syncLoading.value = false
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSyncCancel = () => {
|
||||||
|
showSyncModal.value = false
|
||||||
|
pendingPayload.value = null
|
||||||
|
syncPreviewData.value = null
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadCategory()
|
loadCategory()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ const loadProductType = async () => {
|
|||||||
// Try using the expanded typeProduct from entity response first
|
// Try using the expanded typeProduct from entity response first
|
||||||
const embedded = product.value?.typeProduct
|
const embedded = product.value?.typeProduct
|
||||||
if (embedded && typeof embedded === 'object' && embedded.id) {
|
if (embedded && typeof embedded === 'object' && embedded.id) {
|
||||||
const embeddedStructure = embedded.structure ?? embedded.productSkeleton ?? null
|
const embeddedStructure = embedded.structure ?? null
|
||||||
if (embeddedStructure) {
|
if (embeddedStructure) {
|
||||||
productType.value = embedded
|
productType.value = embedded
|
||||||
structure.value = normalizeProductStructureForSave(embeddedStructure)
|
structure.value = normalizeProductStructureForSave(embeddedStructure)
|
||||||
@@ -406,7 +406,7 @@ const loadProductType = async () => {
|
|||||||
try {
|
try {
|
||||||
const type = await getModelType(product.value.typeProductId)
|
const type = await getModelType(product.value.typeProductId)
|
||||||
productType.value = type
|
productType.value = type
|
||||||
structure.value = normalizeProductStructureForSave(type?.structure ?? type?.productSkeleton ?? null)
|
structure.value = normalizeProductStructureForSave(type?.structure ?? null)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors du chargement du type de produit:', error)
|
console.error('Erreur lors du chargement du type de produit:', error)
|
||||||
productType.value = embedded ?? null
|
productType.value = embedded ?? null
|
||||||
|
|||||||
@@ -46,9 +46,6 @@ export interface ModelType extends BaseModelTypePayload {
|
|||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
category: ModelCategory;
|
category: ModelCategory;
|
||||||
structure: ModelTypeStructure;
|
structure: ModelTypeStructure;
|
||||||
componentSkeleton?: ComponentModelStructure | null;
|
|
||||||
pieceSkeleton?: PieceModelStructure | null;
|
|
||||||
productSkeleton?: ProductModelStructure | null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ModelTypeListParams {
|
export interface ModelTypeListParams {
|
||||||
@@ -86,42 +83,9 @@ const normalizeModelType = (item: any): ModelType => {
|
|||||||
if (!item || typeof item !== 'object') {
|
if (!item || typeof item !== 'object') {
|
||||||
return item as ModelType;
|
return item as ModelType;
|
||||||
}
|
}
|
||||||
if (!item.structure) {
|
|
||||||
if (item.category === 'COMPONENT' && item.componentSkeleton) {
|
|
||||||
item.structure = item.componentSkeleton;
|
|
||||||
} else if (item.category === 'PIECE' && item.pieceSkeleton) {
|
|
||||||
item.structure = item.pieceSkeleton;
|
|
||||||
} else if (item.category === 'PRODUCT' && item.productSkeleton) {
|
|
||||||
item.structure = item.productSkeleton;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return item as ModelType;
|
return item as ModelType;
|
||||||
};
|
};
|
||||||
|
|
||||||
const mapStructureToSkeleton = <T extends Record<string, any>>(payload: T): T => {
|
|
||||||
if (!payload || typeof payload !== 'object') {
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
if (!('structure' in payload)) {
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
const structure = (payload as any).structure;
|
|
||||||
if (!structure) {
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
const category = (payload as any).category;
|
|
||||||
const next = { ...payload } as Record<string, any>;
|
|
||||||
if (category === 'COMPONENT') {
|
|
||||||
next.componentSkeleton = structure;
|
|
||||||
} else if (category === 'PIECE') {
|
|
||||||
next.pieceSkeleton = structure;
|
|
||||||
} else if (category === 'PRODUCT') {
|
|
||||||
next.productSkeleton = structure;
|
|
||||||
}
|
|
||||||
delete next.structure;
|
|
||||||
return next as T;
|
|
||||||
};
|
|
||||||
|
|
||||||
export async function listModelTypes(params: ModelTypeListParams = {}, opts: { signal?: AbortSignal } = {}) {
|
export async function listModelTypes(params: ModelTypeListParams = {}, opts: { signal?: AbortSignal } = {}) {
|
||||||
const requestFetch = useRequestFetch();
|
const requestFetch = useRequestFetch();
|
||||||
const query: Record<string, string | number> = {};
|
const query: Record<string, string | number> = {};
|
||||||
@@ -178,28 +142,26 @@ export async function listModelTypes(params: ModelTypeListParams = {}, opts: { s
|
|||||||
|
|
||||||
export function createModelType(payload: ModelTypePayload, opts: { signal?: AbortSignal } = {}) {
|
export function createModelType(payload: ModelTypePayload, opts: { signal?: AbortSignal } = {}) {
|
||||||
const requestFetch = useRequestFetch();
|
const requestFetch = useRequestFetch();
|
||||||
const mappedPayload = mapStructureToSkeleton(payload);
|
|
||||||
return requestFetch<ModelType>(ENDPOINT, createOptions({
|
return requestFetch<ModelType>(ENDPOINT, createOptions({
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/ld+json',
|
'Content-Type': 'application/ld+json',
|
||||||
Accept: 'application/ld+json',
|
Accept: 'application/ld+json',
|
||||||
},
|
},
|
||||||
body: mappedPayload,
|
body: payload,
|
||||||
signal: opts.signal,
|
signal: opts.signal,
|
||||||
})).then(normalizeModelType);
|
})).then(normalizeModelType);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function updateModelType(id: string, payload: Partial<ModelTypePayload>, opts: { signal?: AbortSignal } = {}) {
|
export function updateModelType(id: string, payload: Partial<ModelTypePayload>, opts: { signal?: AbortSignal } = {}) {
|
||||||
const requestFetch = useRequestFetch();
|
const requestFetch = useRequestFetch();
|
||||||
const mappedPayload = mapStructureToSkeleton(payload);
|
|
||||||
return requestFetch<ModelType>(`${ENDPOINT}/${id}`, createOptions({
|
return requestFetch<ModelType>(`${ENDPOINT}/${id}`, createOptions({
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/merge-patch+json',
|
'Content-Type': 'application/merge-patch+json',
|
||||||
Accept: 'application/ld+json',
|
Accept: 'application/ld+json',
|
||||||
},
|
},
|
||||||
body: mappedPayload,
|
body: payload,
|
||||||
signal: opts.signal,
|
signal: opts.signal,
|
||||||
})).then(normalizeModelType);
|
})).then(normalizeModelType);
|
||||||
}
|
}
|
||||||
@@ -249,3 +211,45 @@ export function convertCategory(id: string, opts: { signal?: AbortSignal } = {})
|
|||||||
signal: opts.signal,
|
signal: opts.signal,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SyncPreviewResult {
|
||||||
|
modelTypeId: string;
|
||||||
|
category: string;
|
||||||
|
itemCount: number;
|
||||||
|
additions: Record<string, number>;
|
||||||
|
deletions: Record<string, number>;
|
||||||
|
modifications: Record<string, number>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SyncExecuteResult {
|
||||||
|
itemsUpdated: number;
|
||||||
|
additions: Record<string, number>;
|
||||||
|
deletions: Record<string, number>;
|
||||||
|
modifications: Record<string, number>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function syncPreview(id: string, structure: unknown, opts: { signal?: AbortSignal } = {}) {
|
||||||
|
const requestFetch = useRequestFetch();
|
||||||
|
return requestFetch<SyncPreviewResult>(`${ENDPOINT}/${id}/sync-preview`, createOptions({
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json',
|
||||||
|
},
|
||||||
|
body: { structure },
|
||||||
|
signal: opts.signal,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function syncExecute(id: string, confirmation: { confirmDeletions: boolean; confirmTypeChanges: boolean }, opts: { signal?: AbortSignal } = {}) {
|
||||||
|
const requestFetch = useRequestFetch();
|
||||||
|
return requestFetch<SyncExecuteResult>(`${ENDPOINT}/${id}/sync`, createOptions({
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json',
|
||||||
|
},
|
||||||
|
body: confirmation,
|
||||||
|
signal: opts.signal,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|||||||
@@ -175,6 +175,9 @@ export const normalizeStructureForSave = (input: any): any => {
|
|||||||
if (piece.reference) {
|
if (piece.reference) {
|
||||||
payload.reference = piece.reference
|
payload.reference = piece.reference
|
||||||
}
|
}
|
||||||
|
if ((piece as any).quantity !== undefined && (piece as any).quantity >= 1) {
|
||||||
|
payload.quantity = (piece as any).quantity
|
||||||
|
}
|
||||||
return payload
|
return payload
|
||||||
}) as any
|
}) as any
|
||||||
|
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ export const hydratePieces = (pieces: any[]): ComponentModelPiece[] => {
|
|||||||
reference: piece?.reference ?? '',
|
reference: piece?.reference ?? '',
|
||||||
familyCode: piece?.familyCode ?? piece?.typePiece?.code ?? '',
|
familyCode: piece?.familyCode ?? piece?.typePiece?.code ?? '',
|
||||||
role: piece?.role ?? '',
|
role: piece?.role ?? '',
|
||||||
|
...(piece?.quantity !== undefined && piece.quantity >= 1 ? { quantity: piece.quantity } : {}),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,6 +176,7 @@ export const mapComponentPieces = (pieces: any[]): ComponentModelPiece[] => {
|
|||||||
typePieceLabel: piece?.typePieceLabel ?? piece?.typePiece?.name ?? '',
|
typePieceLabel: piece?.typePieceLabel ?? piece?.typePiece?.name ?? '',
|
||||||
familyCode: piece?.familyCode ?? piece?.typePiece?.code ?? '',
|
familyCode: piece?.familyCode ?? piece?.typePiece?.code ?? '',
|
||||||
role: piece?.role ?? '',
|
role: piece?.role ?? '',
|
||||||
|
...(piece?.quantity !== undefined && piece.quantity >= 1 ? { quantity: piece.quantity } : {}),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -162,6 +162,8 @@ export const sanitizePieces = (pieces: any[]): ComponentModelPiece[] => {
|
|||||||
const rawRole = typeof piece?.role === 'string' ? piece.role.trim() : ''
|
const rawRole = typeof piece?.role === 'string' ? piece.role.trim() : ''
|
||||||
const role = rawRole.length > 0 ? rawRole : undefined
|
const role = rawRole.length > 0 ? rawRole : undefined
|
||||||
|
|
||||||
|
const quantity = typeof piece?.quantity === 'number' && piece.quantity >= 1 ? piece.quantity : undefined
|
||||||
|
|
||||||
if (!typePieceId && !typePieceLabel && !reference && !familyCode) {
|
if (!typePieceId && !typePieceLabel && !reference && !familyCode) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -182,6 +184,9 @@ export const sanitizePieces = (pieces: any[]): ComponentModelPiece[] => {
|
|||||||
if (typePieceLabel) {
|
if (typePieceLabel) {
|
||||||
result.typePieceLabel = typePieceLabel
|
result.typePieceLabel = typePieceLabel
|
||||||
}
|
}
|
||||||
|
if (quantity !== undefined) {
|
||||||
|
result.quantity = quantity
|
||||||
|
}
|
||||||
return result
|
return result
|
||||||
})
|
})
|
||||||
.filter((piece): piece is ComponentModelPiece => !!piece)
|
.filter((piece): piece is ComponentModelPiece => !!piece)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ export interface DefinitionOverridePayload {
|
|||||||
name?: string
|
name?: string
|
||||||
reference?: string
|
reference?: string
|
||||||
constructeurIds?: string[]
|
constructeurIds?: string[]
|
||||||
prix?: number
|
prix?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export const sanitizeDefinitionOverrides = (definition: any): DefinitionOverridePayload | null => {
|
export const sanitizeDefinitionOverrides = (definition: any): DefinitionOverridePayload | null => {
|
||||||
@@ -41,7 +41,7 @@ export const sanitizeDefinitionOverrides = (definition: any): DefinitionOverride
|
|||||||
if (definition.prix !== undefined && definition.prix !== null && definition.prix !== '') {
|
if (definition.prix !== undefined && definition.prix !== null && definition.prix !== '') {
|
||||||
const parsed = Number(definition.prix)
|
const parsed = Number(definition.prix)
|
||||||
if (!Number.isNaN(parsed)) {
|
if (!Number.isNaN(parsed)) {
|
||||||
payload.prix = parsed
|
payload.prix = String(parsed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ export interface ComponentModelPiece {
|
|||||||
reference?: string
|
reference?: string
|
||||||
familyCode?: string
|
familyCode?: string
|
||||||
role?: string
|
role?: string
|
||||||
|
quantity?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ComponentModelProduct {
|
export interface ComponentModelProduct {
|
||||||
@@ -156,6 +157,7 @@ const validatePiece = (
|
|||||||
const reference = ensureString(value.reference)
|
const reference = ensureString(value.reference)
|
||||||
const familyCode = ensureString(value.familyCode)
|
const familyCode = ensureString(value.familyCode)
|
||||||
const role = ensureString(value.role)
|
const role = ensureString(value.role)
|
||||||
|
const quantity = typeof value.quantity === 'number' && value.quantity >= 1 ? value.quantity : undefined
|
||||||
|
|
||||||
if (!typePieceId && !typePieceLabel && !reference && !familyCode) {
|
if (!typePieceId && !typePieceLabel && !reference && !familyCode) {
|
||||||
issues.push(`${path}: au moins un identifiant, une famille ou une référence de pièce est requis`)
|
issues.push(`${path}: au moins un identifiant, une famille ou une référence de pièce est requis`)
|
||||||
@@ -168,6 +170,7 @@ const validatePiece = (
|
|||||||
...(reference ? { reference } : {}),
|
...(reference ? { reference } : {}),
|
||||||
...(familyCode ? { familyCode } : {}),
|
...(familyCode ? { familyCode } : {}),
|
||||||
...(role ? { role } : {}),
|
...(role ? { role } : {}),
|
||||||
|
...(quantity ? { quantity } : {}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -225,7 +225,10 @@ export const buildCustomFieldInputs = (
|
|||||||
if (fieldName) mapByName.set(fieldName, entry)
|
if (fieldName) mapByName.set(fieldName, entry)
|
||||||
})
|
})
|
||||||
|
|
||||||
return definitions
|
const matchedIds = new Set<string>()
|
||||||
|
const matchedNames = new Set<string>()
|
||||||
|
|
||||||
|
const result = definitions
|
||||||
.map((definition) => {
|
.map((definition) => {
|
||||||
const definitionId = definition.customFieldId || definition.id || null
|
const definitionId = definition.customFieldId || definition.id || null
|
||||||
const matched = (definitionId ? mapById.get(definitionId) : null) || mapByName.get(definition.name)
|
const matched = (definitionId ? mapById.get(definitionId) : null) || mapByName.get(definition.name)
|
||||||
@@ -239,6 +242,11 @@ export const buildCustomFieldInputs = (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const matchedFieldId = matched.customField?.id || matched.customFieldId || null
|
||||||
|
if (matchedFieldId) matchedIds.add(matchedFieldId)
|
||||||
|
const matchedFieldName = matched.customField?.name || matched.name || null
|
||||||
|
if (matchedFieldName) matchedNames.add(matchedFieldName)
|
||||||
|
|
||||||
const resolvedValue = extractStoredCustomFieldValue(matched)
|
const resolvedValue = extractStoredCustomFieldValue(matched)
|
||||||
return {
|
return {
|
||||||
...definition,
|
...definition,
|
||||||
@@ -253,7 +261,36 @@ export const buildCustomFieldInputs = (
|
|||||||
),
|
),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.sort((a, b) => (a.orderIndex ?? 0) - (b.orderIndex ?? 0))
|
|
||||||
|
// Include values with embedded definitions that didn't match any structure definition
|
||||||
|
valueList.forEach((entry, index) => {
|
||||||
|
if (!entry || typeof entry !== 'object') return
|
||||||
|
const cf = entry.customField
|
||||||
|
if (!cf || typeof cf !== 'object') return
|
||||||
|
const fieldId = cf.id || entry.customFieldId || null
|
||||||
|
const fieldName = cf.name || entry.name || null
|
||||||
|
if (fieldId && matchedIds.has(fieldId)) return
|
||||||
|
if (fieldName && matchedNames.has(fieldName)) return
|
||||||
|
|
||||||
|
const name = resolveFieldName(cf)
|
||||||
|
if (!name) return
|
||||||
|
|
||||||
|
const type = resolveFieldType(cf)
|
||||||
|
const resolvedValue = extractStoredCustomFieldValue(entry)
|
||||||
|
result.push({
|
||||||
|
id: fieldId,
|
||||||
|
name,
|
||||||
|
type,
|
||||||
|
required: resolveRequiredFlag(cf),
|
||||||
|
options: resolveOptions(cf),
|
||||||
|
value: formatDefaultValue(type, resolvedValue),
|
||||||
|
customFieldId: fieldId,
|
||||||
|
customFieldValueId: entry.id ?? null,
|
||||||
|
orderIndex: typeof cf.orderIndex === 'number' ? cf.orderIndex : definitions.length + index,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return result.sort((a, b) => (a.orderIndex ?? 0) - (b.orderIndex ?? 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -196,34 +196,19 @@ export const getProductDisplay = (
|
|||||||
|
|
||||||
const structuralCandidates = [
|
const structuralCandidates = [
|
||||||
source.products,
|
source.products,
|
||||||
source.productSkeleton,
|
|
||||||
(source.definition as AnyRecord)?.products,
|
(source.definition as AnyRecord)?.products,
|
||||||
(source.definition as AnyRecord)?.productSkeleton,
|
|
||||||
((source.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
((source.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
||||||
((source.definition as AnyRecord)?.structure as AnyRecord)?.productSkeleton,
|
|
||||||
(source.structure as AnyRecord)?.products,
|
(source.structure as AnyRecord)?.products,
|
||||||
(source.structure as AnyRecord)?.productSkeleton,
|
|
||||||
(source.requirement as AnyRecord)?.products,
|
(source.requirement as AnyRecord)?.products,
|
||||||
(source.requirement as AnyRecord)?.productSkeleton,
|
|
||||||
((source.requirement as AnyRecord)?.structure as AnyRecord)?.products,
|
((source.requirement as AnyRecord)?.structure as AnyRecord)?.products,
|
||||||
((source.requirement as AnyRecord)?.structure as AnyRecord)?.productSkeleton,
|
|
||||||
((source.requirement as AnyRecord)?.componentSkeleton as AnyRecord)?.products,
|
|
||||||
(source.typeComposant as AnyRecord)?.products,
|
(source.typeComposant as AnyRecord)?.products,
|
||||||
(source.typeComposant as AnyRecord)?.productSkeleton,
|
|
||||||
((source.typeComposant as AnyRecord)?.structure as AnyRecord)?.products,
|
((source.typeComposant as AnyRecord)?.structure as AnyRecord)?.products,
|
||||||
((source.typeComposant as AnyRecord)?.structure as AnyRecord)?.productSkeleton,
|
|
||||||
(source.originalComposant as AnyRecord)?.products,
|
(source.originalComposant as AnyRecord)?.products,
|
||||||
(source.originalComposant as AnyRecord)?.productSkeleton,
|
|
||||||
((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.products,
|
((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.products,
|
||||||
((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.productSkeleton,
|
|
||||||
(((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
(((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
||||||
(((source.originalComposant as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.productSkeleton,
|
|
||||||
(source.originalComponent as AnyRecord)?.products,
|
(source.originalComponent as AnyRecord)?.products,
|
||||||
(source.originalComponent as AnyRecord)?.productSkeleton,
|
|
||||||
((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.products,
|
((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.products,
|
||||||
((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.productSkeleton,
|
|
||||||
(((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
(((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.products,
|
||||||
(((source.originalComponent as AnyRecord)?.definition as AnyRecord)?.structure as AnyRecord)?.productSkeleton,
|
|
||||||
]
|
]
|
||||||
|
|
||||||
const structuralProducts = structuralCandidates
|
const structuralProducts = structuralCandidates
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ export function sanitizePieceDefinition(definition: ComponentModelPiece) {
|
|||||||
typePieceLabel: definition.typePieceLabel ?? null,
|
typePieceLabel: definition.typePieceLabel ?? null,
|
||||||
reference: definition.reference ?? null,
|
reference: definition.reference ?? null,
|
||||||
familyCode: (definition as any).familyCode ?? null,
|
familyCode: (definition as any).familyCode ?? null,
|
||||||
|
quantity: typeof (definition as any).quantity === 'number' ? (definition as any).quantity : null,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ export type SelectionEntry = {
|
|||||||
path: string
|
path: string
|
||||||
requirementLabel: string
|
requirementLabel: string
|
||||||
resolvedName: string
|
resolvedName: string
|
||||||
|
quantity?: number
|
||||||
|
slotId?: string
|
||||||
|
_definition?: Record<string, any>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type StructureSelectionResult = {
|
export type StructureSelectionResult = {
|
||||||
@@ -59,6 +62,9 @@ export function collectStructureSelections(
|
|||||||
path: isNonEmptyString(entry?.path) ? entry.path : `${nodePath}:piece-${index + 1}`,
|
path: isNonEmptyString(entry?.path) ? entry.path : `${nodePath}:piece-${index + 1}`,
|
||||||
requirementLabel: resolvers.resolvePieceLabel(definition),
|
requirementLabel: resolvers.resolvePieceLabel(definition),
|
||||||
resolvedName: catalogPiece?.name || selectedId,
|
resolvedName: catalogPiece?.name || selectedId,
|
||||||
|
quantity: typeof definition?.quantity === 'number' ? definition.quantity : undefined,
|
||||||
|
slotId: isNonEmptyString(entry?.slotId) ? entry.slotId : undefined,
|
||||||
|
_definition: definition,
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -225,56 +225,6 @@ describe('category lock', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Restricted mode
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('restricted mode', () => {
|
|
||||||
it('shows restricted mode message', () => {
|
|
||||||
const wrapper = mountForm({
|
|
||||||
restrictedMode: true,
|
|
||||||
restrictedModeMessage: 'Mode restreint actif',
|
|
||||||
})
|
|
||||||
expect(wrapper.text()).toContain('Mode restreint actif')
|
|
||||||
expect(wrapper.find('.alert-info').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not show restricted mode message when not restricted', () => {
|
|
||||||
const wrapper = mountForm({
|
|
||||||
restrictedMode: false,
|
|
||||||
})
|
|
||||||
expect(wrapper.find('.alert-info').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disables name input in restricted mode', () => {
|
|
||||||
const wrapper = mountForm({ restrictedMode: true })
|
|
||||||
expect((getNameInput(wrapper).element as HTMLInputElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Submit disabled
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('submit disabled', () => {
|
|
||||||
it('disables submit button when disableSubmit is true', () => {
|
|
||||||
const wrapper = mountForm({ disableSubmit: true })
|
|
||||||
expect((getSubmitButton(wrapper).element as HTMLButtonElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows warning alert when disableSubmit is true', () => {
|
|
||||||
const wrapper = mountForm({
|
|
||||||
disableSubmit: true,
|
|
||||||
disableSubmitMessage: 'Cannot save now',
|
|
||||||
})
|
|
||||||
expect(wrapper.find('.alert-warning').exists()).toBe(true)
|
|
||||||
expect(wrapper.text()).toContain('Cannot save now')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not show warning when disableSubmit is false', () => {
|
|
||||||
const wrapper = mountForm({ disableSubmit: false })
|
|
||||||
expect(wrapper.find('.alert-warning').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Saving state
|
// Saving state
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -227,98 +227,6 @@ describe('required checkbox', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Restricted mode
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('restricted mode', () => {
|
|
||||||
it('allows editing name of pre-existing field', () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: {
|
|
||||||
customFields: [{ name: 'Locked Field', type: 'text', required: false, orderIndex: 0 }],
|
|
||||||
products: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const nameInput = wrapper.find('input[type="text"]')
|
|
||||||
expect((nameInput.element as HTMLInputElement).disabled).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disables type select for pre-existing field', () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: {
|
|
||||||
customFields: [{ name: 'Locked', type: 'text', required: false, orderIndex: 0 }],
|
|
||||||
products: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const selects = wrapper.findAll('select')
|
|
||||||
const typeSelect = selects[selects.length - 1]
|
|
||||||
expect((typeSelect.element as HTMLSelectElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disables required checkbox for pre-existing field', () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: {
|
|
||||||
customFields: [{ name: 'Locked', type: 'text', required: false, orderIndex: 0 }],
|
|
||||||
products: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const checkbox = wrapper.find('input[type="checkbox"]')
|
|
||||||
expect((checkbox.element as HTMLInputElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('hides delete button for pre-existing field', () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: {
|
|
||||||
customFields: [{ name: 'Locked', type: 'text', required: false, orderIndex: 0 }],
|
|
||||||
products: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
// btn-error should not exist for locked fields
|
|
||||||
const deleteBtn = wrapper.find('button.btn-error')
|
|
||||||
expect(deleteBtn.exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('allows full editing of newly added field', async () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: {
|
|
||||||
customFields: [],
|
|
||||||
products: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
await getAddFieldButton(wrapper).trigger('click')
|
|
||||||
await nextTick()
|
|
||||||
|
|
||||||
// New field should have an editable type select (not disabled)
|
|
||||||
const selects = wrapper.findAll('select')
|
|
||||||
const typeSelect = selects[selects.length - 1]
|
|
||||||
expect((typeSelect.element as HTMLSelectElement).disabled).toBe(false)
|
|
||||||
|
|
||||||
// Delete button should exist for new field
|
|
||||||
const deleteBtn = wrapper.find('button.btn-error')
|
|
||||||
expect(deleteBtn.exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('hides product add button in restricted mode', () => {
|
|
||||||
const wrapper = mountEditor({
|
|
||||||
restrictedMode: true,
|
|
||||||
modelValue: { customFields: [], products: [] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const addButtons = wrapper.findAll('button').filter(b => b.text().includes('Ajouter'))
|
|
||||||
// Only the "add field" button should be visible, not the product one
|
|
||||||
expect(addButtons.length).toBe(1)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Add product
|
// Add product
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -1,269 +0,0 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
||||||
|
|
||||||
import { useCategoryEditGuard } from '~/composables/useCategoryEditGuard'
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Mocks
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
const mockGet = vi.fn()
|
|
||||||
const mockShowInfo = vi.fn()
|
|
||||||
|
|
||||||
vi.mock('~/composables/useApi', () => ({
|
|
||||||
useApi: () => ({
|
|
||||||
get: mockGet,
|
|
||||||
post: vi.fn(),
|
|
||||||
patch: vi.fn(),
|
|
||||||
put: vi.fn(),
|
|
||||||
delete: vi.fn(),
|
|
||||||
apiCall: vi.fn(),
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock('~/composables/useToast', () => ({
|
|
||||||
useToast: () => ({
|
|
||||||
showInfo: mockShowInfo,
|
|
||||||
showSuccess: vi.fn(),
|
|
||||||
showError: vi.fn(),
|
|
||||||
showToast: vi.fn(),
|
|
||||||
toasts: { value: [] },
|
|
||||||
clearAll: vi.fn(),
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const GUARD_CONFIG = {
|
|
||||||
endpoint: '/composants',
|
|
||||||
filterKey: 'typeComposant',
|
|
||||||
labels: {
|
|
||||||
singular: 'composant',
|
|
||||||
plural: 'composants',
|
|
||||||
verifying: 'Vérification des composants liés en cours…',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks()
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Initial state
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('initial state', () => {
|
|
||||||
it('has linkedCount 0 and restrictedMode false', () => {
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
expect(guard.linkedCount.value).toBe(0)
|
|
||||||
expect(guard.isRestrictedMode.value).toBe(false)
|
|
||||||
expect(guard.isSubmitBlocked.value).toBe(false)
|
|
||||||
expect(guard.linkedLoading.value).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has empty messages when no linked items', () => {
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
expect(guard.restrictedModeMessage.value).toBe('')
|
|
||||||
expect(guard.submitBlockMessage.value).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// loadLinkedCount
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('loadLinkedCount', () => {
|
|
||||||
it('sets linkedCount from API totalItems', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 5, member: [] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(5)
|
|
||||||
expect(guard.isRestrictedMode.value).toBe(true)
|
|
||||||
expect(mockGet).toHaveBeenCalledWith(
|
|
||||||
expect.stringContaining('/composants?'),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets linkedCount 0 when API returns 0 items', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 0, member: [] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(0)
|
|
||||||
expect(guard.isRestrictedMode.value).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('extracts totalItems from hydra:totalItems format', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { 'hydra:totalItems': 3, 'hydra:member': [{}, {}, {}] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(3)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('falls back to member.length when no totalItems', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { member: [{}, {}] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(2)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('falls back to hydra:member.length', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { 'hydra:member': [{}] },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets linkedCount 0 on API failure', async () => {
|
|
||||||
mockGet.mockResolvedValue({ success: false })
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(0)
|
|
||||||
expect(guard.isRestrictedMode.value).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets linkedCount 0 on exception', async () => {
|
|
||||||
mockGet.mockRejectedValue(new Error('Network error'))
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedCount.value).toBe(0)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sends correct filter parameters', async () => {
|
|
||||||
mockGet.mockResolvedValue({ success: true, data: { totalItems: 0 } })
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('abc-123')
|
|
||||||
|
|
||||||
const callUrl = mockGet.mock.calls[0][0] as string
|
|
||||||
expect(callUrl).toContain('itemsPerPage=1')
|
|
||||||
expect(callUrl).toContain('typeComposant=%2Fapi%2Fmodel_types%2Fabc-123')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// restrictedModeMessage
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('restrictedModeMessage', () => {
|
|
||||||
it('shows singular message for 1 linked item', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 1 },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.restrictedModeMessage.value).toContain('1 composant')
|
|
||||||
expect(guard.restrictedModeMessage.value).toContain('Mode restreint')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows plural message for multiple linked items', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 5 },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.restrictedModeMessage.value).toContain('5 composants')
|
|
||||||
expect(guard.restrictedModeMessage.value).toContain('renommer les existants')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('uses custom labels from config', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 3 },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard({
|
|
||||||
endpoint: '/pieces',
|
|
||||||
filterKey: 'typePiece',
|
|
||||||
labels: { singular: 'pièce', plural: 'pièces', verifying: 'Vérification...' },
|
|
||||||
})
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.restrictedModeMessage.value).toContain('3 pièces')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// isSubmitBlocked & submitBlockMessage
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('submit blocking', () => {
|
|
||||||
it('blocks submit during loading', () => {
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
// Simulate loading state by starting a load without awaiting
|
|
||||||
mockGet.mockReturnValue(new Promise(() => {})) // Never resolves
|
|
||||||
guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.linkedLoading.value).toBe(true)
|
|
||||||
expect(guard.isSubmitBlocked.value).toBe(true)
|
|
||||||
expect(guard.submitBlockMessage.value).toBe(GUARD_CONFIG.labels.verifying)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('unblocks submit after loading completes', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 5 },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.isSubmitBlocked.value).toBe(false)
|
|
||||||
expect(guard.submitBlockMessage.value).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// guardSubmitOrNotify
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
describe('guardSubmitOrNotify', () => {
|
|
||||||
it('returns false when not blocked', async () => {
|
|
||||||
mockGet.mockResolvedValue({
|
|
||||||
success: true,
|
|
||||||
data: { totalItems: 0 },
|
|
||||||
})
|
|
||||||
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
await guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.guardSubmitOrNotify()).toBe(false)
|
|
||||||
expect(mockShowInfo).not.toHaveBeenCalled()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns true and shows info when blocked', () => {
|
|
||||||
const guard = useCategoryEditGuard(GUARD_CONFIG)
|
|
||||||
// Simulate loading
|
|
||||||
mockGet.mockReturnValue(new Promise(() => {}))
|
|
||||||
guard.loadLinkedCount('mt-1')
|
|
||||||
|
|
||||||
expect(guard.guardSubmitOrNotify()).toBe(true)
|
|
||||||
expect(mockShowInfo).toHaveBeenCalled()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -50,60 +50,55 @@ beforeEach(() => {
|
|||||||
// normalizeModelType (tested via getModelType which calls .then(normalizeModelType))
|
// normalizeModelType (tested via getModelType which calls .then(normalizeModelType))
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
describe('normalizeModelType (via getModelType)', () => {
|
describe('normalizeModelType (via getModelType)', () => {
|
||||||
it('maps componentSkeleton to structure for COMPONENT', async () => {
|
it('returns structure as-is for COMPONENT', async () => {
|
||||||
const skeleton = { customFields: [{ name: 'Weight' }] }
|
const structure = { customFields: [{ name: 'Weight' }] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType({
|
mockFetch.mockResolvedValue(fakeModelType({
|
||||||
category: 'COMPONENT',
|
category: 'COMPONENT',
|
||||||
structure: null,
|
structure: structure as any,
|
||||||
componentSkeleton: skeleton as any,
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const result = await getModelType('mt-1')
|
const result = await getModelType('mt-1')
|
||||||
expect(result.structure).toEqual(skeleton)
|
expect(result.structure).toEqual(structure)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('maps pieceSkeleton to structure for PIECE', async () => {
|
it('returns structure as-is for PIECE', async () => {
|
||||||
const skeleton = { customFields: [{ name: 'Size' }] }
|
const structure = { customFields: [{ name: 'Size' }] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType({
|
mockFetch.mockResolvedValue(fakeModelType({
|
||||||
category: 'PIECE',
|
category: 'PIECE',
|
||||||
structure: null,
|
structure: structure as any,
|
||||||
pieceSkeleton: skeleton as any,
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const result = await getModelType('mt-1')
|
const result = await getModelType('mt-1')
|
||||||
expect(result.structure).toEqual(skeleton)
|
expect(result.structure).toEqual(structure)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('maps productSkeleton to structure for PRODUCT', async () => {
|
it('returns structure as-is for PRODUCT', async () => {
|
||||||
const skeleton = { customFields: [{ name: 'Brand' }] }
|
const structure = { customFields: [{ name: 'Brand' }] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType({
|
mockFetch.mockResolvedValue(fakeModelType({
|
||||||
category: 'PRODUCT',
|
category: 'PRODUCT',
|
||||||
structure: null,
|
structure: structure as any,
|
||||||
productSkeleton: skeleton as any,
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const result = await getModelType('mt-1')
|
const result = await getModelType('mt-1')
|
||||||
expect(result.structure).toEqual(skeleton)
|
expect(result.structure).toEqual(structure)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('does not override existing structure', async () => {
|
it('preserves null structure', async () => {
|
||||||
const existing = { customFields: [{ name: 'Existing' }] }
|
|
||||||
mockFetch.mockResolvedValue(fakeModelType({
|
mockFetch.mockResolvedValue(fakeModelType({
|
||||||
category: 'COMPONENT',
|
category: 'COMPONENT',
|
||||||
structure: existing as any,
|
structure: null,
|
||||||
componentSkeleton: { customFields: [{ name: 'Skeleton' }] } as any,
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const result = await getModelType('mt-1')
|
const result = await getModelType('mt-1')
|
||||||
expect(result.structure).toEqual(existing)
|
expect(result.structure).toBeNull()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// createModelType — maps structure to skeleton
|
// createModelType — sends structure directly
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
describe('createModelType', () => {
|
describe('createModelType', () => {
|
||||||
it('sends POST with componentSkeleton for COMPONENT', async () => {
|
it('sends POST with structure for COMPONENT', async () => {
|
||||||
const structure = { customFields: [] }
|
const structure = { customFields: [] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType())
|
mockFetch.mockResolvedValue(fakeModelType())
|
||||||
|
|
||||||
@@ -120,11 +115,10 @@ describe('createModelType', () => {
|
|||||||
const [endpoint, options] = mockFetch.mock.calls[0]
|
const [endpoint, options] = mockFetch.mock.calls[0]
|
||||||
expect(endpoint).toBe('/model_types')
|
expect(endpoint).toBe('/model_types')
|
||||||
expect(options.method).toBe('POST')
|
expect(options.method).toBe('POST')
|
||||||
expect(options.body.componentSkeleton).toEqual(structure)
|
expect(options.body.structure).toEqual(structure)
|
||||||
expect(options.body.structure).toBeUndefined()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sends POST with pieceSkeleton for PIECE', async () => {
|
it('sends POST with structure for PIECE', async () => {
|
||||||
const structure = { customFields: [], products: [] }
|
const structure = { customFields: [], products: [] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType({ category: 'PIECE' }))
|
mockFetch.mockResolvedValue(fakeModelType({ category: 'PIECE' }))
|
||||||
|
|
||||||
@@ -136,11 +130,10 @@ describe('createModelType', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const [, options] = mockFetch.mock.calls[0]
|
const [, options] = mockFetch.mock.calls[0]
|
||||||
expect(options.body.pieceSkeleton).toEqual(structure)
|
expect(options.body.structure).toEqual(structure)
|
||||||
expect(options.body.structure).toBeUndefined()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sends POST with productSkeleton for PRODUCT', async () => {
|
it('sends POST with structure for PRODUCT', async () => {
|
||||||
const structure = { customFields: [] }
|
const structure = { customFields: [] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType({ category: 'PRODUCT' }))
|
mockFetch.mockResolvedValue(fakeModelType({ category: 'PRODUCT' }))
|
||||||
|
|
||||||
@@ -152,15 +145,15 @@ describe('createModelType', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const [, options] = mockFetch.mock.calls[0]
|
const [, options] = mockFetch.mock.calls[0]
|
||||||
expect(options.body.productSkeleton).toEqual(structure)
|
expect(options.body.structure).toEqual(structure)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// updateModelType — maps structure to skeleton
|
// updateModelType — sends structure directly
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
describe('updateModelType', () => {
|
describe('updateModelType', () => {
|
||||||
it('sends PATCH with correct endpoint and skeleton', async () => {
|
it('sends PATCH with correct endpoint and structure', async () => {
|
||||||
const structure = { customFields: [{ name: 'Updated' }] }
|
const structure = { customFields: [{ name: 'Updated' }] }
|
||||||
mockFetch.mockResolvedValue(fakeModelType())
|
mockFetch.mockResolvedValue(fakeModelType())
|
||||||
|
|
||||||
@@ -176,10 +169,10 @@ describe('updateModelType', () => {
|
|||||||
expect(endpoint).toBe('/model_types/mt-1')
|
expect(endpoint).toBe('/model_types/mt-1')
|
||||||
expect(options.method).toBe('PATCH')
|
expect(options.method).toBe('PATCH')
|
||||||
expect(options.headers['Content-Type']).toBe('application/merge-patch+json')
|
expect(options.headers['Content-Type']).toBe('application/merge-patch+json')
|
||||||
expect(options.body.componentSkeleton).toEqual(structure)
|
expect(options.body.structure).toEqual(structure)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sends payload without skeleton when no structure', async () => {
|
it('sends payload without structure when not provided', async () => {
|
||||||
mockFetch.mockResolvedValue(fakeModelType())
|
mockFetch.mockResolvedValue(fakeModelType())
|
||||||
|
|
||||||
await updateModelType('mt-1', {
|
await updateModelType('mt-1', {
|
||||||
@@ -189,7 +182,7 @@ describe('updateModelType', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const [, options] = mockFetch.mock.calls[0]
|
const [, options] = mockFetch.mock.calls[0]
|
||||||
expect(options.body.componentSkeleton).toBeUndefined()
|
expect(options.body.structure).toBeUndefined()
|
||||||
expect(options.body.name).toBe('Just Name')
|
expect(options.body.name).toBe('Just Name')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user