M1 · 2/3 (Front) — Retirer le bloc contact principal des ecrans Client (#57)
Auto Tag Develop / tag (push) Successful in 10s
Auto Tag Develop / tag (push) Successful in 10s
## Objectif Retirer le bloc « contact principal » (Nom, Prénom, Téléphone, Téléphone 2, Email) des trois écrans Client — **création**, **consultation**, **modification** — ainsi que des types, mappeurs, validations et clés i18n associés. La saisie des contacts passe désormais exclusivement par l'onglet **Contacts** (`ClientContactBlock`, inchangé). Dépend du ticket **1/3 (back)** : l'API ne renvoie/n'accepte plus ces 5 champs sur `client`. Contexte : `docs/specs/M1-clients/refonte-contact/README.md`. ## Changements - **`pages/clients/new.vue`** : bloc principal réduit à Nom entreprise / Catégories / Relation / Triage. Suppression de `main.firstName/lastName/email`, `mainPhones`, `addMainPhone()`, `prefillFirstContact()`. `isMainValid` ne dépend plus que de `companyName` + ≥ 1 catégorie + relation valide. Payload POST et `ClientResponse` nettoyés. - **`pages/clients/[id]/edit.vue`** : mêmes champs retirés, `isMainValid` simplifié. - **`pages/clients/[id]/index.vue`** : affichage lecture seule des 5 champs retiré. - **`utils/clientEdit.ts`** : `MainFormDraft`, `mapMainDraft()`, `buildMainPayload()` débarrassés des 5 champs + `hasSecondaryPhone`. - **`utils/clientConsultation.ts`** : `ClientDetail` débarrassé des champs inline (`ContactRead` conservé). - **`i18n/locales/fr.json`** : clés `form.main.firstName/lastName/email/phonePrimary/phoneSecondary/addPhone` supprimées. `form.contact.*` conservé. - **Tests** : `clientEdit.spec.ts` ajusté (factory, `MAIN_KEYS`, assertions `mapMainDraft`, test téléphone secondaire obsolète retiré). ## Vérifications - `make nuxt-test` : suites `clientEdit` / `clientConsultation` / `clientFormRules` vertes. Les 2 échecs restants (`useClientReferentials.spec.ts`, libellé de site) sont **pré-existants** sur `develop` (confirmé par `git stash`), sans rapport avec ce ticket. - `eslint` sur les fichiers touchés : OK, aucun import/variable mort. - Zéro référence orpheline aux clés `form.main.*` supprimées ; JSON i18n valide. ## Reste à faire - Golden path navigateur (création → consultation → modification sans bloc inline) à valider manuellement. Reviewed-on: #57 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>
This commit was merged in pull request #57.
This commit is contained in:
@@ -133,14 +133,9 @@
|
|||||||
"duplicateCompany": "Un client portant ce nom de société existe déjà.",
|
"duplicateCompany": "Un client portant ce nom de société existe déjà.",
|
||||||
"main": {
|
"main": {
|
||||||
"companyName": "Nom du client (Entreprise)",
|
"companyName": "Nom du client (Entreprise)",
|
||||||
"firstName": "Prénom du contact principal",
|
|
||||||
"lastName": "Nom du contact principal",
|
|
||||||
"email": "Email",
|
|
||||||
"phonePrimary": "Téléphone",
|
|
||||||
"phoneSecondary": "Téléphone (2)",
|
|
||||||
"addPhone": "Ajouter un numéro",
|
|
||||||
"categories": "Catégorie",
|
"categories": "Catégorie",
|
||||||
"relation": "Distributeur / Courtier",
|
"relation": "Distributeur / Courtier",
|
||||||
|
"relationNone": "Aucun",
|
||||||
"relationDistributor": "Dépend du distributeur",
|
"relationDistributor": "Dépend du distributeur",
|
||||||
"relationBroker": "Dépend du courtier",
|
"relationBroker": "Dépend du courtier",
|
||||||
"distributorName": "Nom du distributeur",
|
"distributorName": "Nom du distributeur",
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ describe('useClientReferentials.loadCommon (resilience ERP-102)', () => {
|
|||||||
return Promise.reject(new Error('403 Forbidden'))
|
return Promise.reject(new Error('403 Forbidden'))
|
||||||
}
|
}
|
||||||
if (url === '/sites') {
|
if (url === '/sites') {
|
||||||
return Promise.resolve({ member: [{ '@id': '/api/sites/1', name: 'Chatellerault' }] })
|
return Promise.resolve({ member: [{ '@id': '/api/sites/1', name: 'Chatellerault', postalCode: '86100' }] })
|
||||||
}
|
}
|
||||||
return Promise.resolve({
|
return Promise.resolve({
|
||||||
member: [{ '@id': '/api/x/1', code: 'X', label: 'Libelle X' }],
|
member: [{ '@id': '/api/x/1', code: 'X', label: 'Libelle X' }],
|
||||||
@@ -40,7 +40,8 @@ describe('useClientReferentials.loadCommon (resilience ERP-102)', () => {
|
|||||||
await refs.loadCommon()
|
await refs.loadCommon()
|
||||||
|
|
||||||
// Resilience : les referentiels OK sont peuples malgre l'echec de /categories.
|
// Resilience : les referentiels OK sont peuples malgre l'echec de /categories.
|
||||||
expect(refs.sites.value).toEqual([{ value: '/api/sites/1', label: 'Chatellerault' }])
|
// Le libelle d'un site est son numero de departement (2 premiers chiffres du code postal).
|
||||||
|
expect(refs.sites.value).toEqual([{ value: '/api/sites/1', label: '86' }])
|
||||||
expect(refs.tvaModes.value).toEqual([{ value: '/api/x/1', label: 'Libelle X' }])
|
expect(refs.tvaModes.value).toEqual([{ value: '/api/x/1', label: 'Libelle X' }])
|
||||||
expect(refs.banks.value).toEqual([{ value: '/api/x/1', label: 'Libelle X' }])
|
expect(refs.banks.value).toEqual([{ value: '/api/x/1', label: 'Libelle X' }])
|
||||||
|
|
||||||
@@ -56,7 +57,7 @@ describe('useClientReferentials.loadCommon (resilience ERP-102)', () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (url === '/sites') {
|
if (url === '/sites') {
|
||||||
return Promise.resolve({ member: [{ '@id': '/api/sites/1', name: 'Chatellerault' }] })
|
return Promise.resolve({ member: [{ '@id': '/api/sites/1', name: 'Chatellerault', postalCode: '86100' }] })
|
||||||
}
|
}
|
||||||
return Promise.resolve({ member: [] })
|
return Promise.resolve({ member: [] })
|
||||||
})
|
})
|
||||||
@@ -67,6 +68,7 @@ describe('useClientReferentials.loadCommon (resilience ERP-102)', () => {
|
|||||||
expect(refs.categories.value).toEqual([
|
expect(refs.categories.value).toEqual([
|
||||||
{ value: '/api/categories/1', label: 'Secteur', code: 'SECTEUR' },
|
{ value: '/api/categories/1', label: 'Secteur', code: 'SECTEUR' },
|
||||||
])
|
])
|
||||||
expect(refs.sites.value).toEqual([{ value: '/api/sites/1', label: 'Chatellerault' }])
|
// Le libelle d'un site est son numero de departement (2 premiers chiffres du code postal).
|
||||||
|
expect(refs.sites.value).toEqual([{ value: '/api/sites/1', label: '86' }])
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -29,16 +29,6 @@
|
|||||||
:required="true"
|
:required="true"
|
||||||
:readonly="businessReadonly"
|
:readonly="businessReadonly"
|
||||||
/>
|
/>
|
||||||
<MalioInputText
|
|
||||||
v-model="main.lastName"
|
|
||||||
:label="t('commercial.clients.form.main.lastName')"
|
|
||||||
:readonly="businessReadonly"
|
|
||||||
/>
|
|
||||||
<MalioInputText
|
|
||||||
v-model="main.firstName"
|
|
||||||
:label="t('commercial.clients.form.main.firstName')"
|
|
||||||
:readonly="businessReadonly"
|
|
||||||
/>
|
|
||||||
<MalioSelectCheckbox
|
<MalioSelectCheckbox
|
||||||
:model-value="main.categoryIris"
|
:model-value="main.categoryIris"
|
||||||
:options="mainCategoryOptions"
|
:options="mainCategoryOptions"
|
||||||
@@ -47,34 +37,11 @@
|
|||||||
:disabled="businessReadonly"
|
:disabled="businessReadonly"
|
||||||
@update:model-value="(v: (string | number)[]) => main.categoryIris = v.map(String)"
|
@update:model-value="(v: (string | number)[]) => main.categoryIris = v.map(String)"
|
||||||
/>
|
/>
|
||||||
<MalioInputPhone
|
|
||||||
v-model="main.phonePrimary"
|
|
||||||
:label="t('commercial.clients.form.main.phonePrimary')"
|
|
||||||
:mask="PHONE_MASK"
|
|
||||||
:required="true"
|
|
||||||
:readonly="businessReadonly"
|
|
||||||
add-icon-name="mdi:plus"
|
|
||||||
:addable="!main.hasSecondaryPhone && !businessReadonly"
|
|
||||||
:add-button-label="t('commercial.clients.form.main.addPhone')"
|
|
||||||
@add="main.hasSecondaryPhone = true"
|
|
||||||
/>
|
|
||||||
<MalioInputPhone
|
|
||||||
v-if="main.hasSecondaryPhone"
|
|
||||||
v-model="main.phoneSecondary"
|
|
||||||
:label="t('commercial.clients.form.main.phoneSecondary')"
|
|
||||||
:mask="PHONE_MASK"
|
|
||||||
:readonly="businessReadonly"
|
|
||||||
/>
|
|
||||||
<MalioInputEmail
|
|
||||||
v-model="main.email"
|
|
||||||
:label="t('commercial.clients.form.main.email')"
|
|
||||||
:required="true"
|
|
||||||
:readonly="businessReadonly"
|
|
||||||
/>
|
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
:model-value="main.relationType"
|
:model-value="main.relationType"
|
||||||
:options="relationOptions"
|
:options="relationOptions"
|
||||||
:label="t('commercial.clients.form.main.relation')"
|
:label="t('commercial.clients.form.main.relation')"
|
||||||
|
:empty-option-label="t('commercial.clients.form.main.relationNone')"
|
||||||
:disabled="businessReadonly"
|
:disabled="businessReadonly"
|
||||||
@update:model-value="onRelationChange"
|
@update:model-value="onRelationChange"
|
||||||
/>
|
/>
|
||||||
@@ -424,7 +391,6 @@ import {
|
|||||||
import { extractApiErrorMessage } from '~/shared/utils/api'
|
import { extractApiErrorMessage } from '~/shared/utils/api'
|
||||||
|
|
||||||
// Masques de saisie (la normalisation finale reste serveur).
|
// Masques de saisie (la normalisation finale reste serveur).
|
||||||
const PHONE_MASK = '## ## ## ## ##'
|
|
||||||
const SIREN_MASK = '#########'
|
const SIREN_MASK = '#########'
|
||||||
const EMPLOYEES_MASK = '#######'
|
const EMPLOYEES_MASK = '#######'
|
||||||
|
|
||||||
@@ -620,9 +586,6 @@ const isMainValid = computed(() => {
|
|||||||
|| (main.relationType === 'distributeur' && filled(main.distributorIri))
|
|| (main.relationType === 'distributeur' && filled(main.distributorIri))
|
||||||
|| (main.relationType === 'courtier' && filled(main.brokerIri))
|
|| (main.relationType === 'courtier' && filled(main.brokerIri))
|
||||||
return filled(main.companyName)
|
return filled(main.companyName)
|
||||||
&& filled(main.email)
|
|
||||||
&& filled(main.phonePrimary)
|
|
||||||
&& (filled(main.firstName) || filled(main.lastName))
|
|
||||||
&& main.categoryIris.length >= 1
|
&& main.categoryIris.length >= 1
|
||||||
&& relationValid
|
&& relationValid
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -52,16 +52,6 @@
|
|||||||
:label="t('commercial.clients.form.main.companyName')"
|
:label="t('commercial.clients.form.main.companyName')"
|
||||||
readonly
|
readonly
|
||||||
/>
|
/>
|
||||||
<MalioInputText
|
|
||||||
:model-value="client.lastName"
|
|
||||||
:label="t('commercial.clients.form.main.lastName')"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<MalioInputText
|
|
||||||
:model-value="client.firstName"
|
|
||||||
:label="t('commercial.clients.form.main.firstName')"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<MalioSelectCheckbox
|
<MalioSelectCheckbox
|
||||||
:model-value="categoryIris"
|
:model-value="categoryIris"
|
||||||
:options="mainCategoryOptions"
|
:options="mainCategoryOptions"
|
||||||
@@ -69,26 +59,16 @@
|
|||||||
:display-tag="true"
|
:display-tag="true"
|
||||||
disabled
|
disabled
|
||||||
/>
|
/>
|
||||||
<MalioInputPhone
|
<!-- Relation toujours affichee (vide = « Aucun »), comme en edition. -->
|
||||||
v-for="(phone, index) in mainPhones"
|
|
||||||
:key="index"
|
|
||||||
:model-value="phone"
|
|
||||||
:label="index === 0 ? t('commercial.clients.form.main.phonePrimary') : t('commercial.clients.form.main.phoneSecondary')"
|
|
||||||
:mask="PHONE_MASK"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<MalioInputEmail
|
|
||||||
:model-value="client.email"
|
|
||||||
:label="t('commercial.clients.form.main.email')"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
v-if="relation.type"
|
|
||||||
:model-value="relation.type"
|
:model-value="relation.type"
|
||||||
:options="relationOptions"
|
:options="relationOptions"
|
||||||
:label="t('commercial.clients.form.main.relation')"
|
:label="t('commercial.clients.form.main.relation')"
|
||||||
|
:empty-option-label="t('commercial.clients.form.main.relationNone')"
|
||||||
disabled
|
disabled
|
||||||
/>
|
/>
|
||||||
|
<!-- Nom du distributeur/courtier : conditionnel (libelle type-dependant,
|
||||||
|
aucune valeur sans relation — meme comportement qu'en edition). -->
|
||||||
<MalioInputText
|
<MalioInputText
|
||||||
v-if="relation.type"
|
v-if="relation.type"
|
||||||
:model-value="relation.name"
|
:model-value="relation.name"
|
||||||
@@ -313,11 +293,9 @@ import {
|
|||||||
type ClientDetail,
|
type ClientDetail,
|
||||||
type SelectOption,
|
type SelectOption,
|
||||||
} from '~/modules/commercial/utils/clientConsultation'
|
} from '~/modules/commercial/utils/clientConsultation'
|
||||||
import { formatPhoneFR } from '~/shared/utils/phone'
|
|
||||||
import { emptyAddress, emptyContact, emptyRib } from '~/modules/commercial/types/clientForm'
|
import { emptyAddress, emptyContact, emptyRib } from '~/modules/commercial/types/clientForm'
|
||||||
|
|
||||||
// Masques d'affichage (purement visuels, la donnee reste celle du serveur).
|
// Masque d'affichage (purement visuel, la donnee reste celle du serveur).
|
||||||
const PHONE_MASK = '## ## ## ## ##'
|
|
||||||
const SIREN_MASK = '#########'
|
const SIREN_MASK = '#########'
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
@@ -350,13 +328,6 @@ const headerTitle = computed(() => client.value?.companyName ?? t('commercial.cl
|
|||||||
const relation = computed(() => (client.value ? relationOf(client.value) : { type: null, name: null }))
|
const relation = computed(() => (client.value ? relationOf(client.value) : { type: null, name: null }))
|
||||||
const categoryIris = computed(() => (client.value?.categories ?? []).map(c => c['@id']))
|
const categoryIris = computed(() => (client.value?.categories ?? []).map(c => c['@id']))
|
||||||
|
|
||||||
// Telephones du formulaire principal, formates XX XX XX XX XX (RG d'affichage).
|
|
||||||
const mainPhones = computed(() =>
|
|
||||||
[client.value?.phonePrimary, client.value?.phoneSecondary]
|
|
||||||
.filter((p): p is string => Boolean(p))
|
|
||||||
.map(formatPhoneFR),
|
|
||||||
)
|
|
||||||
|
|
||||||
const information = computed(() => ({
|
const information = computed(() => ({
|
||||||
description: client.value?.description ?? null,
|
description: client.value?.description ?? null,
|
||||||
competitors: client.value?.competitors ?? null,
|
competitors: client.value?.competitors ?? null,
|
||||||
|
|||||||
@@ -23,16 +23,6 @@
|
|||||||
:required="true"
|
:required="true"
|
||||||
:readonly="mainLocked"
|
:readonly="mainLocked"
|
||||||
/>
|
/>
|
||||||
<MalioInputText
|
|
||||||
v-model="main.lastName"
|
|
||||||
:label="t('commercial.clients.form.main.lastName')"
|
|
||||||
:readonly="mainLocked"
|
|
||||||
/>
|
|
||||||
<MalioInputText
|
|
||||||
v-model="main.firstName"
|
|
||||||
:label="t('commercial.clients.form.main.firstName')"
|
|
||||||
:readonly="mainLocked"
|
|
||||||
/>
|
|
||||||
<MalioSelectCheckbox
|
<MalioSelectCheckbox
|
||||||
:model-value="main.categoryIris"
|
:model-value="main.categoryIris"
|
||||||
:options="referentials.categories.value"
|
:options="referentials.categories.value"
|
||||||
@@ -41,30 +31,11 @@
|
|||||||
:disabled="mainLocked"
|
:disabled="mainLocked"
|
||||||
@update:model-value="(v: (string | number)[]) => main.categoryIris = v.map(String)"
|
@update:model-value="(v: (string | number)[]) => main.categoryIris = v.map(String)"
|
||||||
/>
|
/>
|
||||||
<!-- Telephones : 1 par defaut, le bouton « + » revele le 2e (max 2, RG-1.02). -->
|
|
||||||
<MalioInputPhone
|
|
||||||
v-for="(_, index) in mainPhones"
|
|
||||||
:key="index"
|
|
||||||
v-model="mainPhones[index]"
|
|
||||||
:label="t('commercial.clients.form.main.phonePrimary')"
|
|
||||||
:mask="PHONE_MASK"
|
|
||||||
:required="index === 0"
|
|
||||||
:readonly="mainLocked"
|
|
||||||
add-icon-name="mdi:plus"
|
|
||||||
:addable="mainPhones.length === 1 && !mainLocked"
|
|
||||||
:add-button-label="t('commercial.clients.form.main.addPhone')"
|
|
||||||
@add="addMainPhone"
|
|
||||||
/>
|
|
||||||
<MalioInputEmail
|
|
||||||
v-model="main.email"
|
|
||||||
:label="t('commercial.clients.form.main.email')"
|
|
||||||
:required="true"
|
|
||||||
:readonly="mainLocked"
|
|
||||||
/>
|
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
:model-value="main.relationType"
|
:model-value="main.relationType"
|
||||||
:options="relationOptions"
|
:options="relationOptions"
|
||||||
:label="t('commercial.clients.form.main.relation')"
|
:label="t('commercial.clients.form.main.relation')"
|
||||||
|
:empty-option-label="t('commercial.clients.form.main.relationNone')"
|
||||||
:disabled="mainLocked"
|
:disabled="mainLocked"
|
||||||
@update:model-value="onRelationChange"
|
@update:model-value="onRelationChange"
|
||||||
/>
|
/>
|
||||||
@@ -388,11 +359,9 @@ import {
|
|||||||
type ContactFormDraft,
|
type ContactFormDraft,
|
||||||
type RibFormDraft,
|
type RibFormDraft,
|
||||||
} from '~/modules/commercial/types/clientForm'
|
} from '~/modules/commercial/types/clientForm'
|
||||||
import { formatPhoneFR } from '~/shared/utils/phone'
|
|
||||||
import { extractApiErrorMessage } from '~/shared/utils/api'
|
import { extractApiErrorMessage } from '~/shared/utils/api'
|
||||||
|
|
||||||
// Masques de saisie (la normalisation finale reste serveur).
|
// Masques de saisie (la normalisation finale reste serveur).
|
||||||
const PHONE_MASK = '## ## ## ## ##'
|
|
||||||
const SIREN_MASK = '#########'
|
const SIREN_MASK = '#########'
|
||||||
// Masque « nombre » du champ Nombre de salaries : chiffres uniquement (max 7).
|
// Masque « nombre » du champ Nombre de salaries : chiffres uniquement (max 7).
|
||||||
const EMPLOYEES_MASK = '#######'
|
const EMPLOYEES_MASK = '#######'
|
||||||
@@ -444,9 +413,6 @@ const tabSubmitting = ref(false)
|
|||||||
// ── Formulaire principal ────────────────────────────────────────────────────
|
// ── Formulaire principal ────────────────────────────────────────────────────
|
||||||
const main = reactive({
|
const main = reactive({
|
||||||
companyName: null as string | null,
|
companyName: null as string | null,
|
||||||
firstName: null as string | null,
|
|
||||||
lastName: null as string | null,
|
|
||||||
email: null as string | null,
|
|
||||||
categoryIris: [] as string[],
|
categoryIris: [] as string[],
|
||||||
relationType: null as 'distributeur' | 'courtier' | null,
|
relationType: null as 'distributeur' | 'courtier' | null,
|
||||||
distributorIri: null as string | null,
|
distributorIri: null as string | null,
|
||||||
@@ -454,17 +420,6 @@ const main = reactive({
|
|||||||
triageService: false,
|
triageService: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
// Telephones du formulaire principal : 1 par defaut, 2 au maximum (RG-1.02).
|
|
||||||
// L'index 0 alimente phonePrimary, l'index 1 phoneSecondary au POST.
|
|
||||||
const mainPhones = ref<string[]>([''])
|
|
||||||
|
|
||||||
/** Revele le 2e numero (le bouton « + » disparait une fois a 2, RG-1.02). */
|
|
||||||
function addMainPhone(): void {
|
|
||||||
if (mainPhones.value.length === 1) {
|
|
||||||
mainPhones.value.push('')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pas d'option « Aucun » : le select est vide par defaut (relationType = null).
|
// Pas d'option « Aucun » : le select est vide par defaut (relationType = null).
|
||||||
const relationOptions = computed<RefOption[]>(() => [
|
const relationOptions = computed<RefOption[]>(() => [
|
||||||
{ value: 'distributeur', label: t('commercial.clients.form.main.relationDistributor') },
|
{ value: 'distributeur', label: t('commercial.clients.form.main.relationDistributor') },
|
||||||
@@ -472,10 +427,11 @@ const relationOptions = computed<RefOption[]>(() => [
|
|||||||
])
|
])
|
||||||
|
|
||||||
// Validation du formulaire principal (gate le bouton « Valider ») :
|
// Validation du formulaire principal (gate le bouton « Valider ») :
|
||||||
// - companyName / email / telephone principal / >= 1 categorie obligatoires ;
|
// - companyName / >= 1 categorie obligatoires ;
|
||||||
// - RG-1.01 : nom OU prenom du contact principal ;
|
// - relation Distributeur/Courtier optionnelle, mais le nom correspondant
|
||||||
// - relation Distributeur/Courtier obligatoire (un des deux), ET le nom
|
// devient requis si l'un des deux est choisi (spec fonctionnelle).
|
||||||
// correspondant obligatoire selon le choix (spec fonctionnelle).
|
// Les coordonnees de contact ne sont plus saisies ici : elles vivent dans
|
||||||
|
// l'onglet Contacts (RG-1.05/1.14 garantissent >= 1 contact valide).
|
||||||
const isMainValid = computed(() => {
|
const isMainValid = computed(() => {
|
||||||
const filled = (v: string | null | undefined) => v !== null && v !== undefined && v.trim() !== ''
|
const filled = (v: string | null | undefined) => v !== null && v !== undefined && v.trim() !== ''
|
||||||
// Relation Distributeur/Courtier OPTIONNELLE ; mais si « Depend du
|
// Relation Distributeur/Courtier OPTIONNELLE ; mais si « Depend du
|
||||||
@@ -485,9 +441,6 @@ const isMainValid = computed(() => {
|
|||||||
|| (main.relationType === 'distributeur' && filled(main.distributorIri))
|
|| (main.relationType === 'distributeur' && filled(main.distributorIri))
|
||||||
|| (main.relationType === 'courtier' && filled(main.brokerIri))
|
|| (main.relationType === 'courtier' && filled(main.brokerIri))
|
||||||
return filled(main.companyName)
|
return filled(main.companyName)
|
||||||
&& filled(main.email)
|
|
||||||
&& filled(mainPhones.value[0])
|
|
||||||
&& (filled(main.firstName) || filled(main.lastName))
|
|
||||||
&& main.categoryIris.length >= 1
|
&& main.categoryIris.length >= 1
|
||||||
&& relationValid
|
&& relationValid
|
||||||
})
|
})
|
||||||
@@ -512,11 +465,6 @@ async function submitMain(): Promise<void> {
|
|||||||
try {
|
try {
|
||||||
const payload: Record<string, unknown> = {
|
const payload: Record<string, unknown> = {
|
||||||
companyName: main.companyName,
|
companyName: main.companyName,
|
||||||
firstName: main.firstName || null,
|
|
||||||
lastName: main.lastName || null,
|
|
||||||
email: main.email,
|
|
||||||
phonePrimary: mainPhones.value[0] || null,
|
|
||||||
phoneSecondary: mainPhones.value[1] || null,
|
|
||||||
categories: main.categoryIris,
|
categories: main.categoryIris,
|
||||||
distributor: main.relationType === 'distributeur' ? main.distributorIri : null,
|
distributor: main.relationType === 'distributeur' ? main.distributorIri : null,
|
||||||
broker: main.relationType === 'courtier' ? main.brokerIri : null,
|
broker: main.relationType === 'courtier' ? main.brokerIri : null,
|
||||||
@@ -528,18 +476,8 @@ async function submitMain(): Promise<void> {
|
|||||||
})
|
})
|
||||||
|
|
||||||
clientId.value = created.id
|
clientId.value = created.id
|
||||||
// Reaffiche les valeurs normalisees renvoyees par le serveur.
|
// Reaffiche la valeur normalisee renvoyee par le serveur.
|
||||||
main.companyName = created.companyName ?? main.companyName
|
main.companyName = created.companyName ?? main.companyName
|
||||||
main.firstName = created.firstName ?? null
|
|
||||||
main.lastName = created.lastName ?? null
|
|
||||||
main.email = created.email ?? main.email
|
|
||||||
// Reaffiche les telephones normalises (reformates via formatPhoneFR).
|
|
||||||
const normalizedPhones = [formatPhoneFR(created.phonePrimary), formatPhoneFR(created.phoneSecondary)]
|
|
||||||
.filter(p => p !== '')
|
|
||||||
mainPhones.value = normalizedPhones.length > 0 ? normalizedPhones : ['']
|
|
||||||
|
|
||||||
// Pre-remplit le 1er contact a partir du formulaire principal (editable).
|
|
||||||
prefillFirstContact()
|
|
||||||
|
|
||||||
mainLocked.value = true
|
mainLocked.value = true
|
||||||
unlockedIndex.value = 0
|
unlockedIndex.value = 0
|
||||||
@@ -652,18 +590,10 @@ async function submitInformation(): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Onglet Contact ──────────────────────────────────────────────────────────
|
// ── Onglet Contact ──────────────────────────────────────────────────────────
|
||||||
|
// Au moins un bloc Contact vide au depart : c'est desormais le seul point de
|
||||||
|
// saisie des coordonnees (le bloc principal ne porte plus de contact inline).
|
||||||
const contacts = ref<ContactFormDraft[]>([emptyContact()])
|
const contacts = ref<ContactFormDraft[]>([emptyContact()])
|
||||||
|
|
||||||
/** Pre-remplit le 1er contact depuis le formulaire principal (apres creation). */
|
|
||||||
function prefillFirstContact(): void {
|
|
||||||
const first = contacts.value[0]
|
|
||||||
if (!first) return
|
|
||||||
first.lastName = main.lastName
|
|
||||||
first.firstName = main.firstName
|
|
||||||
first.email = main.email
|
|
||||||
first.phonePrimary = mainPhones.value[0] ?? null
|
|
||||||
}
|
|
||||||
|
|
||||||
// « + Nouveau contact » desactive tant que le dernier bloc n'a ni nom ni prenom.
|
// « + Nouveau contact » desactive tant que le dernier bloc n'a ni nom ni prenom.
|
||||||
const canAddContact = computed(() => {
|
const canAddContact = computed(() => {
|
||||||
const last = contacts.value[contacts.value.length - 1]
|
const last = contacts.value[contacts.value.length - 1]
|
||||||
@@ -945,11 +875,6 @@ function runConfirm(): void {
|
|||||||
interface ClientResponse {
|
interface ClientResponse {
|
||||||
id: number
|
id: number
|
||||||
companyName: string | null
|
companyName: string | null
|
||||||
firstName: string | null
|
|
||||||
lastName: string | null
|
|
||||||
email: string | null
|
|
||||||
phonePrimary: string | null
|
|
||||||
phoneSecondary: string | null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ContactResponse {
|
interface ContactResponse {
|
||||||
|
|||||||
@@ -22,12 +22,6 @@ import type { AddressFormDraft, ContactFormDraft, RibFormDraft } from '~/modules
|
|||||||
function mainDraft(overrides: Partial<MainFormDraft> = {}): MainFormDraft {
|
function mainDraft(overrides: Partial<MainFormDraft> = {}): MainFormDraft {
|
||||||
return {
|
return {
|
||||||
companyName: 'ACME',
|
companyName: 'ACME',
|
||||||
firstName: 'Jean',
|
|
||||||
lastName: 'Dupont',
|
|
||||||
email: 'jean@acme.fr',
|
|
||||||
phonePrimary: '05 49 11 22 33',
|
|
||||||
phoneSecondary: null,
|
|
||||||
hasSecondaryPhone: false,
|
|
||||||
categoryIris: ['/api/categories/1'],
|
categoryIris: ['/api/categories/1'],
|
||||||
relationType: null,
|
relationType: null,
|
||||||
distributorIri: null,
|
distributorIri: null,
|
||||||
@@ -64,9 +58,10 @@ function accountingDraft(overrides: Partial<AccountingFormDraft> = {}): Accounti
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Champs de chaque groupe de serialisation (miroir back ClientProcessor).
|
// Champs de chaque groupe de serialisation (miroir back ClientProcessor).
|
||||||
|
// Le contact inline (nom/prenom/telephones/email) ne fait plus partie du groupe
|
||||||
|
// main : les coordonnees vivent desormais sur la sous-ressource ClientContact.
|
||||||
const MAIN_KEYS = [
|
const MAIN_KEYS = [
|
||||||
'companyName', 'firstName', 'lastName', 'email', 'phonePrimary',
|
'companyName', 'categories', 'distributor', 'broker', 'triageService',
|
||||||
'phoneSecondary', 'categories', 'distributor', 'broker', 'triageService',
|
|
||||||
]
|
]
|
||||||
const INFORMATION_KEYS = [
|
const INFORMATION_KEYS = [
|
||||||
'description', 'competitors', 'foundedAt', 'employeesCount',
|
'description', 'competitors', 'foundedAt', 'employeesCount',
|
||||||
@@ -104,11 +99,6 @@ describe('buildMainPayload — scoping strict groupe client:write:main', () => {
|
|||||||
expect(payload.distributor).toBeNull()
|
expect(payload.distributor).toBeNull()
|
||||||
expect(payload.broker).toBeNull()
|
expect(payload.broker).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('telephone secondaire non revele : envoie null meme si une valeur traine', () => {
|
|
||||||
const payload = buildMainPayload(mainDraft({ hasSecondaryPhone: false, phoneSecondary: '06 00 00 00 00' }))
|
|
||||||
expect(payload.phoneSecondary).toBeNull()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('buildInformationPayload — scoping strict groupe client:write:information', () => {
|
describe('buildInformationPayload — scoping strict groupe client:write:information', () => {
|
||||||
@@ -168,19 +158,16 @@ describe('buildContactPayload / buildAddressPayload / buildRibPayload', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
describe('mapMainDraft — pre-remplissage bloc principal', () => {
|
describe('mapMainDraft — pre-remplissage bloc principal', () => {
|
||||||
it('formate les telephones, resout la relation et extrait les IRI', () => {
|
it('resout la relation et extrait les IRI (sans contact inline)', () => {
|
||||||
const client = {
|
const client = {
|
||||||
'@id': '/api/clients/1', id: 1,
|
'@id': '/api/clients/1', id: 1,
|
||||||
companyName: 'ACME', firstName: 'Jean', lastName: 'Dupont', email: 'jean@acme.fr',
|
companyName: 'ACME', triageService: true,
|
||||||
phonePrimary: '0549112233', phoneSecondary: '0600000000', triageService: true,
|
|
||||||
categories: [{ '@id': '/api/categories/1', code: 'SECTEUR' }],
|
categories: [{ '@id': '/api/categories/1', code: 'SECTEUR' }],
|
||||||
distributor: { '@id': '/api/clients/9', companyName: 'DISTRIB' },
|
distributor: { '@id': '/api/clients/9', companyName: 'DISTRIB' },
|
||||||
} as ClientDetail
|
} as ClientDetail
|
||||||
|
|
||||||
const draft = mapMainDraft(client)
|
const draft = mapMainDraft(client)
|
||||||
expect(draft.phonePrimary).toBe('05 49 11 22 33')
|
expect(draft.companyName).toBe('ACME')
|
||||||
expect(draft.phoneSecondary).toBe('06 00 00 00 00')
|
|
||||||
expect(draft.hasSecondaryPhone).toBe(true)
|
|
||||||
expect(draft.categoryIris).toEqual(['/api/categories/1'])
|
expect(draft.categoryIris).toEqual(['/api/categories/1'])
|
||||||
expect(draft.relationType).toBe('distributeur')
|
expect(draft.relationType).toBe('distributeur')
|
||||||
expect(draft.distributorIri).toBe('/api/clients/9')
|
expect(draft.distributorIri).toBe('/api/clients/9')
|
||||||
@@ -191,7 +178,6 @@ describe('mapMainDraft — pre-remplissage bloc principal', () => {
|
|||||||
it('gere les cles omises (skip_null_values) sans planter', () => {
|
it('gere les cles omises (skip_null_values) sans planter', () => {
|
||||||
const draft = mapMainDraft({ '@id': '/api/clients/2', id: 2 } as ClientDetail)
|
const draft = mapMainDraft({ '@id': '/api/clients/2', id: 2 } as ClientDetail)
|
||||||
expect(draft.companyName).toBeNull()
|
expect(draft.companyName).toBeNull()
|
||||||
expect(draft.hasSecondaryPhone).toBe(false)
|
|
||||||
expect(draft.categoryIris).toEqual([])
|
expect(draft.categoryIris).toEqual([])
|
||||||
expect(draft.relationType).toBeNull()
|
expect(draft.relationType).toBeNull()
|
||||||
expect(draft.triageService).toBe(false)
|
expect(draft.triageService).toBe(false)
|
||||||
|
|||||||
@@ -93,11 +93,6 @@ export interface RelatedClientRead extends HydraRef {
|
|||||||
export interface ClientDetail extends HydraRef {
|
export interface ClientDetail extends HydraRef {
|
||||||
id: number
|
id: number
|
||||||
companyName?: string | null
|
companyName?: string | null
|
||||||
firstName?: string | null
|
|
||||||
lastName?: string | null
|
|
||||||
phonePrimary?: string | null
|
|
||||||
phoneSecondary?: string | null
|
|
||||||
email?: string | null
|
|
||||||
triageService?: boolean
|
triageService?: boolean
|
||||||
isArchived?: boolean
|
isArchived?: boolean
|
||||||
categories?: CategoryRead[]
|
categories?: CategoryRead[]
|
||||||
|
|||||||
@@ -24,23 +24,16 @@ import {
|
|||||||
type ClientDetail,
|
type ClientDetail,
|
||||||
} from '~/modules/commercial/utils/clientConsultation'
|
} from '~/modules/commercial/utils/clientConsultation'
|
||||||
import type { AddressFormDraft, ContactFormDraft, RibFormDraft } from '~/modules/commercial/types/clientForm'
|
import type { AddressFormDraft, ContactFormDraft, RibFormDraft } from '~/modules/commercial/types/clientForm'
|
||||||
import { formatPhoneFR } from '~/shared/utils/phone'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Etat « plat » du bloc principal (groupe client:write:main). Distinct des
|
* Etat « plat » du bloc principal (groupe client:write:main). Distinct des
|
||||||
* brouillons Contact : ces champs vivent sur le Client lui-meme (companyName,
|
* brouillons Contact : ces champs vivent sur le Client lui-meme (companyName,
|
||||||
* contact principal, telephones, email, categories, relation, triage), pas sur
|
* categories, relation, triage), pas sur une sous-ressource ClientContact. Les
|
||||||
* une sous-ressource ClientContact.
|
* coordonnees de contact (nom, prenom, telephones, email) ne sont plus portees
|
||||||
|
* par le Client : elles vivent exclusivement dans l'onglet Contacts.
|
||||||
*/
|
*/
|
||||||
export interface MainFormDraft {
|
export interface MainFormDraft {
|
||||||
companyName: string | null
|
companyName: string | null
|
||||||
firstName: string | null
|
|
||||||
lastName: string | null
|
|
||||||
email: string | null
|
|
||||||
phonePrimary: string | null
|
|
||||||
phoneSecondary: string | null
|
|
||||||
/** UI : le 2e numero a ete revele (ou existait deja au chargement). */
|
|
||||||
hasSecondaryPhone: boolean
|
|
||||||
/** IRI des categories rattachees (M2M). */
|
/** IRI des categories rattachees (M2M). */
|
||||||
categoryIris: string[]
|
categoryIris: string[]
|
||||||
relationType: 'distributeur' | 'courtier' | null
|
relationType: 'distributeur' | 'courtier' | null
|
||||||
@@ -96,22 +89,15 @@ export interface TabEditability {
|
|||||||
// ── Pre-remplissage (GET detail -> brouillons) ──────────────────────────────
|
// ── Pre-remplissage (GET detail -> brouillons) ──────────────────────────────
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mappe le detail client vers le brouillon du bloc principal. Les telephones
|
* Mappe le detail client vers le brouillon du bloc principal. La relation
|
||||||
* sont reformates XX XX XX XX XX (RG d'affichage). La relation Distributeur/
|
* Distributeur/Courtier est resolue par exclusivite (RG-1.03) et son IRI extrait
|
||||||
* Courtier est resolue par exclusivite (RG-1.03) et son IRI extrait de l'embed.
|
* de l'embed.
|
||||||
*/
|
*/
|
||||||
export function mapMainDraft(client: ClientDetail): MainFormDraft {
|
export function mapMainDraft(client: ClientDetail): MainFormDraft {
|
||||||
const relation = relationOf(client)
|
const relation = relationOf(client)
|
||||||
const phoneSecondary = client.phoneSecondary ?? null
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
companyName: client.companyName ?? null,
|
companyName: client.companyName ?? null,
|
||||||
firstName: client.firstName ?? null,
|
|
||||||
lastName: client.lastName ?? null,
|
|
||||||
email: client.email ?? null,
|
|
||||||
phonePrimary: client.phonePrimary ? formatPhoneFR(client.phonePrimary) : null,
|
|
||||||
phoneSecondary: phoneSecondary ? formatPhoneFR(phoneSecondary) : null,
|
|
||||||
hasSecondaryPhone: phoneSecondary !== null && phoneSecondary !== '',
|
|
||||||
categoryIris: (client.categories ?? []).map(c => c['@id']),
|
categoryIris: (client.categories ?? []).map(c => c['@id']),
|
||||||
relationType: relation.type,
|
relationType: relation.type,
|
||||||
distributorIri: iriOf(client.distributor),
|
distributorIri: iriOf(client.distributor),
|
||||||
@@ -157,11 +143,6 @@ export function mapAccountingFormDraft(client: ClientDetail): AccountingFormDraf
|
|||||||
export function buildMainPayload(main: MainFormDraft): Record<string, unknown> {
|
export function buildMainPayload(main: MainFormDraft): Record<string, unknown> {
|
||||||
return {
|
return {
|
||||||
companyName: main.companyName,
|
companyName: main.companyName,
|
||||||
firstName: main.firstName || null,
|
|
||||||
lastName: main.lastName || null,
|
|
||||||
email: main.email,
|
|
||||||
phonePrimary: main.phonePrimary || null,
|
|
||||||
phoneSecondary: main.hasSecondaryPhone ? (main.phoneSecondary || null) : null,
|
|
||||||
categories: main.categoryIris,
|
categories: main.categoryIris,
|
||||||
distributor: main.relationType === 'distributeur' ? main.distributorIri : null,
|
distributor: main.relationType === 'distributeur' ? main.distributorIri : null,
|
||||||
broker: main.relationType === 'courtier' ? main.brokerIri : null,
|
broker: main.relationType === 'courtier' ? main.brokerIri : null,
|
||||||
|
|||||||
Reference in New Issue
Block a user