@cnamts/synapse 0.0.12-alpha → 0.0.14-alpha

package/src/components/PhoneField/PhoneField.stories.ts

@@ -31,6 +31,8 @@ const meta = {
 		},
 		isValidatedOnBlur: { control: 'boolean' },
 		displayAsterisk: { control: 'boolean' },
+		disableErrorHandling: { control: 'boolean' },
+		disabled: { control: 'boolean' },
 	},
 } satisfies Meta<typeof PhoneField>
 
@@ -88,6 +90,9 @@ export const Default: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: true,
+		bgColor: undefined,
+		readOnly: false,
+		disabled: false,
 	},
 	render: (args) => {
 		return {
@@ -108,6 +113,9 @@ export const Default: Story = {
 					:customIndicatifs="args.customIndicatifs"
 					:useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
 					:isValidatedOnBlur="args.isValidatedOnBlur"
+					:bg-color="args.bgColor"
+					:readOnly="args.readOnly"
+					:disabled="args.disabled"
 				/>
 				</div>
 				<br><br><br><br><br>
@@ -166,6 +174,9 @@ export const Required: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: true,
+		bgColor: undefined,
+		readOnly: false,
+		disabled: false,
 	},
 	render: (args) => {
 		return {
@@ -186,6 +197,9 @@ export const Required: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+     :bg-color="args.bgColor"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
     />
 				</div>
    `,
@@ -201,6 +215,7 @@ export const RequiredWithAsterisk: Story = {
 		...Default.args,
 		required: true,
 		displayAsterisk: true,
+		bgColor: undefined,
 	},
 	parameters: {
 		docs: {
@@ -254,6 +269,9 @@ const phoneNumber = ref('')
 						:useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
 						:isValidatedOnBlur="args.isValidatedOnBlur"
 						:display-asterisk="args.displayAsterisk"
+						:readOnly="args.readOnly"
+						:disabled="args.disabled"
+						:bg-color="args.bgColor"
 					/>
 				</div>
 			`,
@@ -321,6 +339,9 @@ export const CustomIndicatifs: Story = {
 		],
 		useCustomIndicatifsOnly: true,
 		isValidatedOnBlur: true,
+		bgColor: undefined,
+		readOnly: false,
+		disabled: false,
 	},
 	render: (args) => {
 		return {
@@ -341,6 +362,9 @@ export const CustomIndicatifs: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -398,6 +422,9 @@ export const NotValidatedOnBlur: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -418,6 +445,9 @@ export const NotValidatedOnBlur: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -475,6 +505,9 @@ export const DisplayFormatCode: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -495,6 +528,9 @@ export const DisplayFormatCode: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -552,6 +588,9 @@ export const DisplayFormatCodeAbbreviation: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -572,6 +611,9 @@ export const DisplayFormatCodeAbbreviation: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -629,6 +671,9 @@ export const DisplayFormatCodeCountry: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -649,6 +694,9 @@ export const DisplayFormatCodeCountry: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -706,6 +754,9 @@ export const DisplayFormatCountry: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -726,6 +777,9 @@ export const DisplayFormatCountry: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 				</div>
    `,
@@ -783,6 +837,9 @@ export const DisplayFormatAbbreviation: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -803,6 +860,9 @@ export const DisplayFormatAbbreviation: Story = {
      :customIndicatifs="args.customIndicatifs"
      :useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
      :isValidatedOnBlur="args.isValidatedOnBlur"
+	 :readOnly="args.readOnly"
+	 :disabled="args.disabled"
+     :bg-color="args.bgColor"
     />
 							</div>
    `,
@@ -866,6 +926,8 @@ export const DisplayModels: Story = {
 		customIndicatifs: [],
 		useCustomIndicatifsOnly: false,
 		isValidatedOnBlur: false,
+		readOnly: false,
+		bgColor: undefined,
 	},
 	render: (args) => {
 		return {
@@ -890,9 +952,121 @@ export const DisplayModels: Story = {
 						:customIndicatifs="args.customIndicatifs"
 						:useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
 						:isValidatedOnBlur="args.isValidatedOnBlur"
+						:readOnly="args.readOnly"
+						:disabled="args.disabled"
+						:bg-color="args.bgColor"
 					/>
 				</div>
 			`,
 		}
 	},
 }
+
+/**
+ * Story qui montre le comportement du composant lorsque la gestion des erreurs est désactivée.
+ * Aucun message d'erreur ne sera affiché, même si le champ est requis et vide.
+ */
+export const DisabledErrorHandling: Story = {
+	parameters: {
+		sourceCode: [
+			{
+				name: 'Template',
+				code: `
+				<template>
+					<PhoneField
+						v-model="modelValue"
+						:required="required"
+						:withCountryCode="withCountryCode"
+						:countryCodeRequired="countryCodeRequired"
+						:displayFormat="displayFormat"
+						:isValidatedOnBlur="isValidatedOnBlur"
+						:disableErrorHandling="disableErrorHandling"
+					/>
+				</template>
+				`,
+			},
+			{
+				name: 'Script',
+				code: `
+				<script setup lang="ts">
+					import { PhoneField } from '@cnamts/synapse'
+					
+					const modelValue = ref('')
+					const required = ref(true)
+					const withCountryCode = ref(true)
+					const countryCodeRequired = ref(true)
+					const displayFormat = ref('code')
+					const isValidatedOnBlur = ref(true)
+					const disableErrorHandling = ref(true)
+				</script>
+				`,
+			},
+		],
+	},
+	args: {
+		modelValue: '',
+		required: true,
+		outlined: true,
+		outlinedIndicatif: true,
+		withCountryCode: true,
+		countryCodeRequired: true,
+		displayFormat: 'code',
+		customIndicatifs: [],
+		useCustomIndicatifsOnly: false,
+		isValidatedOnBlur: true,
+		disableErrorHandling: true,
+		readOnly: false,
+		disabled: false,
+		bgColor: undefined,
+	},
+	render: (args) => {
+		return {
+			components: { PhoneField },
+			setup() {
+				return { args }
+			},
+			template: `
+				<div class="pa-4">
+					<h3>Gestion des erreurs désactivée</h3>
+					<p>Ce champ est requis mais n'affichera pas d'erreur même s'il est vide.</p>
+					<PhoneField
+						v-model="args.modelValue"
+						:required="args.required"
+						:outlined="args.outlined"
+						:outlinedIndicatif="args.outlinedIndicatif"
+						:withCountryCode="args.withCountryCode"
+						:countryCodeRequired="args.countryCodeRequired"
+						:displayFormat="args.displayFormat"
+						:customIndicatifs="args.customIndicatifs"
+						:useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
+						:isValidatedOnBlur="args.isValidatedOnBlur"
+						:disableErrorHandling="args.disableErrorHandling"
+						:readOnly="args.readOnly"
+						:disabled="args.disabled"
+						:bg-color="args.bgColor"
+					/>
+					<div class="mt-6">
+						<h3>Comparaison avec gestion des erreurs activée</h3>
+						<p>Ce champ est requis et affichera une erreur s'il est vide.</p>
+						<PhoneField
+							v-model="args.modelValue"
+							:required="args.required"
+							:outlined="args.outlined"
+							:outlinedIndicatif="args.outlinedIndicatif"
+							:withCountryCode="args.withCountryCode"
+							:countryCodeRequired="args.countryCodeRequired"
+							:displayFormat="args.displayFormat"
+							:customIndicatifs="args.customIndicatifs"
+							:useCustomIndicatifsOnly="args.useCustomIndicatifsOnly"
+							:isValidatedOnBlur="args.isValidatedOnBlur"
+							:disableErrorHandling="false"
+							:readOnly="args.readOnly"
+							:disabled="args.disabled"
+							:bg-color="args.bgColor"
+						/>
+					</div>
+				</div>
+			`,
+		}
+	},
+}

package/src/components/PhoneField/PhoneField.vue

@@ -1,14 +1,13 @@
 <script lang="ts" setup>
 	import { computed, ref, watch } from 'vue'
 	import type { PropType } from 'vue'
-	import { required as RequiredRule } from '@/utils/rules/required'
-	import { exactLength } from '@/utils/rules/exactLength'
-	import { mdiPhone, mdiInformation } from '@mdi/js'
+	import { mdiPhone } from '@mdi/js'
 	import { indicatifs } from './indicatifs'
 	import { vMaska } from 'maska/vue'
 	import { locales } from './locales'
 	import SySelect from '@/components/Customs/SySelect/SySelect.vue'
 	import SyTextField from '@/components/Customs/SyTextField/SyTextField.vue'
+	import { useValidation, type ValidationRule } from '@/composables/validation/useValidation'
 
 	type DisplayFormat = 'code' | 'code-abbreviation' | 'code-country' | 'country' | 'abbreviation'
 	type Indicatif = {
@@ -33,6 +32,10 @@
 		useCustomIndicatifsOnly: { type: Boolean, default: false },
 		isValidatedOnBlur: { type: Boolean, default: true },
 		displayAsterisk: { type: Boolean, default: false },
+		disableErrorHandling: { type: Boolean, default: false },
+		bgColor: { type: String, default: undefined },
+		readOnly: { type: Boolean, default: false },
+		disabled: { type: Boolean, default: false },
 	})
 
 	const emit = defineEmits(['update:modelValue', 'update:selectedDialCode', 'change'])
@@ -42,7 +45,6 @@
 	const dialCode = ref<string | Record<string, any>>(props.dialCodeModel || '')
 	const counter = ref(10)
 	const phoneMask = ref('## ## ## ## ##')
-	const hasError = ref(false)
 	const onBlur = ref(false)
 
 	function formatPhoneNumber(value: string): string {
@@ -95,25 +97,74 @@
 		return format[props.displayFormat] || ind.code
 	}
 
-	const validationRules = computed(() => {
-		const rules = [exactLength(counter.value, true)]
+	const validationRules = computed<ValidationRule[]>(() => {
+		const rules = [{
+			type: 'exactLength',
+			options: {
+				length: counter.value,
+				ignoreSpace: true, // Ignorer les espaces dans la validation
+				message: `Le numéro de téléphone doit contenir ${counter.value} chiffres.`,
+				fieldIdentifier: locales.label,
+			},
+		}]
 		if (props.required) {
-			rules.unshift(RequiredRule)
+			rules.unshift({
+				type: 'required',
+				options: {
+					length: counter.value,
+					ignoreSpace: true, // Ignorer les espaces dans la validation
+					message: `Le champ ${locales.label} est requis.`,
+					fieldIdentifier: locales.label,
+				},
+			})
 		}
 		return rules
 	})
 
+	// Initialisation du composable de validation
+	const validation = useValidation({
+		customRules: validationRules.value,
+		showSuccessMessages: true,
+		fieldIdentifier: locales.label,
+		disableErrorHandling: props.disableErrorHandling,
+	})
+
+	// Computed pour l'affichage des états
+	const hasError = computed(() => validation.hasError.value)
+	const hasWarning = computed(() => validation.hasWarning.value)
+	const hasSuccess = computed(() => validation.hasSuccess.value)
+
+	const errors = computed(() => validation.errors.value)
+	const warnings = computed(() => validation.warnings.value)
+	const successes = computed(() => validation.successes.value)
+
 	function validateInputOnBlur() {
 		if (!props.isValidatedOnBlur) return
 
-		hasError.value = false
-		const requiredValidation = !props.required || RequiredRule(phoneNumber.value) === true
-		const lengthValidation = exactLength(counter.value, true)(phoneNumber.value) === true
-
-		hasError.value = !(requiredValidation && lengthValidation)
 		onBlur.value = true
+		// On nettoie la valeur des espaces avant de la valider
+		const cleanedValue = phoneNumber.value.replace(/\s/g, '')
+		validation.validateField(cleanedValue, validationRules.value)
 	}
 
+	// Mise à jour de la validation lorsque le numéro de téléphone change
+	watch(phoneNumber, (newValue) => {
+		if (!props.isValidatedOnBlur || onBlur.value) {
+			// On nettoie la valeur des espaces avant de la valider
+			const cleanedValue = newValue.replace(/\s/g, '')
+			validation.validateField(cleanedValue, validationRules.value)
+		}
+	})
+
+	// Mise à jour de la validation lorsque les règles changent
+	watch(validationRules, () => {
+		if (onBlur.value) {
+			// On nettoie la valeur des espaces avant de la valider
+			const cleanedValue = phoneNumber.value.replace(/\s/g, '')
+			validation.validateField(cleanedValue, validationRules.value)
+		}
+	})
+
 	defineExpose({
 		computedValue,
 		dialCode,
@@ -122,6 +173,7 @@
 		hasError,
 		phoneNumber,
 		mergedDialCodes,
+		validation,
 	})
 </script>
 
@@ -135,6 +187,11 @@
 			:outlined="outlinedIndicatif"
 			:required="props.countryCodeRequired"
 			:display-asterisk="props.displayAsterisk"
+			:disable-error-handling="props.disableErrorHandling"
+			:return-object="true"
+			:bg-color="props.bgColor"
+			:read-only="props.readOnly"
+			:disabled="props.disabled"
 			class="custom-select"
 			text-key="displayText"
 			value-key="code"
@@ -146,10 +203,20 @@
 			:counter-value="(value: string) => value.replace(/\s/g, '').length"
 			:label="locales.label"
 			:required="props.required"
-			:rules="validationRules"
+			:error="hasError"
+			:error-messages="errors"
+			:warning-messages="warnings"
+			:success-messages="successes"
 			:variant="outlined ? 'outlined' : 'underlined'"
 			:display-asterisk="props.displayAsterisk"
-			class="phone-field"
+			:bg-color="props.bgColor"
+			:disabled="props.disabled"
+			:class="{
+				'phone-field': true,
+				'error-field': hasError,
+				'warning-field': hasWarning,
+				'success-field': hasSuccess
+			}"
 			color="primary"
 			@blur="validateInputOnBlur"
 			@input="handlePhoneInput"
@@ -161,9 +228,6 @@
 				>
 					{{ mdiPhone }}
 				</VIcon>
-				<VIcon v-if="hasError">
-					{{ mdiInformation }}
-				</VIcon>
 			</template>
 		</SyTextField>
 	</div>

package/src/components/PhoneField/tests/PhoneField.spec.ts

@@ -161,4 +161,44 @@ describe('PhoneField', () => {
 		const textField = wrapper.findComponent({ name: 'VTextField' })
 		expect(textField.props('variant')).toBe('underlined')
 	})
+
+	it('passes dialCode object to SyTextField when dialCode is set', async () => {
+		const wrapper = mount(PhoneField, {
+			global: {
+				plugins: [vuetify],
+			},
+			props: {
+				withCountryCode: true,
+				dialCodeModel: { code: '+33', abbreviation: 'FR', country: 'France', phoneLength: 10, mask: '## ## ## ## ##' },
+			},
+		})
+
+		// Vérifier que le dialCode est bien un objet
+		expect(typeof wrapper.vm.dialCode).toBe('object')
+
+		// Trouver le composant SyTextField
+		const textField = wrapper.findComponent({ name: 'SyTextField' })
+		expect(textField.exists()).toBe(true)
+
+		// Vérifier que les propriétés du SyTextField sont correctement définies en fonction du dialCode
+		expect(wrapper.vm.phoneMask).toBe('## ## ## ## ##')
+		expect(wrapper.vm.counter).toBe(10)
+
+		// Vérifier que le SyTextField reçoit les bonnes propriétés
+		expect(textField.props('counter')).toBe(10)
+
+		// Vérifier que le SySelect est présent et reçoit l'objet dialCode
+		const select = wrapper.findComponent({ name: 'SySelect' })
+		expect(select.exists()).toBe(true)
+		expect(select.props('returnObject')).toBe(true)
+
+		// Vérifier que l'objet dialCode est correctement passé au SySelect via v-model
+		expect(wrapper.vm.dialCode).toEqual({
+			code: '+33',
+			abbreviation: 'FR',
+			country: 'France',
+			phoneLength: 10,
+			mask: '## ## ## ## ##',
+		})
+	})
 })

package/src/components/RangeField/RangeSlider/tests/__snapshots__/rangeSlider.spec.ts.snap

@@ -1,27 +1,90 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`RangeField component > should render the component 1`] = `
-"<div data-v-cfbfc2ef="" class="wrapper">
-  <div data-v-cfbfc2ef="" class="track"><button data-v-cfbfc2ef="" class="thumb-min" style="left: 25%;" role="slider" aria-valuenow="25" tabindex="0" aria-valuemin="0" aria-valuemax="75" aria-orientation="horizontal" aria-label="Minimum" title="Minimum">
-      <div data-v-24e1b71f="" data-v-cfbfc2ef="" class="tooltip-wrapper">
-        <div data-v-24e1b71f="" class="tooltip" style="transform: translateX(calc(-50% + 0px)); transition: transform 0.1s;">25</div>
-      </div><span data-v-cfbfc2ef="" class="inner-thumb"></span>
-    </button><button data-v-cfbfc2ef="" role="slider" class="thumb-max" style="left: 75%;" aria-valuenow="75" tabindex="0" aria-valuemin="25" aria-valuemax="100" aria-orientation="horizontal" aria-label="Maximum" title="Maximum">
-      <div data-v-24e1b71f="" data-v-cfbfc2ef="" class="tooltip-wrapper">
-        <div data-v-24e1b71f="" class="tooltip" style="transform: translateX(calc(-50% + 0px)); transition: transform 0.1s;">75</div>
-      </div><span data-v-cfbfc2ef="" class="inner-thumb"></span>
+<div class="wrapper">
+  <div class="track">
+    <button
+      aria-label="Minimum"
+      aria-orientation="horizontal"
+      aria-valuemax="75"
+      aria-valuemin="0"
+      aria-valuenow="25"
+      class="thumb-min"
+      role="slider"
+      style="left: 25%;"
+      tabindex="0"
+      title="Minimum"
+    >
+      <div class="tooltip-wrapper">
+        <div
+          class="tooltip"
+          style="transform: translateX(calc(-50% + 0px)); transition: transform 0.1s;"
+        >
+          25
+        </div>
+      </div>
+      <span class="inner-thumb"></span>
+    </button>
+    <button
+      aria-label="Maximum"
+      aria-orientation="horizontal"
+      aria-valuemax="100"
+      aria-valuemin="25"
+      aria-valuenow="75"
+      class="thumb-max"
+      role="slider"
+      style="left: 75%;"
+      tabindex="0"
+      title="Maximum"
+    >
+      <div class="tooltip-wrapper">
+        <div
+          class="tooltip"
+          style="transform: translateX(calc(-50% + 0px)); transition: transform 0.1s;"
+        >
+          75
+        </div>
+      </div>
+      <span class="inner-thumb"></span>
     </button>
-    <div data-v-cfbfc2ef="" class="fake-thumb thumb-min" aria-hidden="true" style="left: 25%;">
-      <div data-v-24e1b71f="" data-v-cfbfc2ef="" class="tooltip-wrapper">
-        <div data-v-24e1b71f="" class="tooltip" style="transform: translateX(calc(-50% + 0px));">25</div>
+    <div
+      aria-hidden="true"
+      class="
+        fake-thumb
+        thumb-min
+      "
+      style="left: 25%;"
+    >
+      <div class="tooltip-wrapper">
+        <div
+          class="tooltip"
+          style="transform: translateX(calc(-50% + 0px));"
+        >
+          25
+        </div>
       </div>
     </div>
-    <div data-v-cfbfc2ef="" class="fake-thumb thumb-max" aria-hidden="true" style="left: 75%;">
-      <div data-v-24e1b71f="" data-v-cfbfc2ef="" class="tooltip-wrapper">
-        <div data-v-24e1b71f="" class="tooltip" style="transform: translateX(calc(-50% + 0px));">75</div>
+    <div
+      aria-hidden="true"
+      class="
+        fake-thumb
+        thumb-max
+      "
+      style="left: 75%;"
+    >
+      <div class="tooltip-wrapper">
+        <div
+          class="tooltip"
+          style="transform: translateX(calc(-50% + 0px));"
+        >
+          75
+        </div>
       </div>
     </div>
-    <div data-v-cfbfc2ef="" class="filled-track" style="left: 25%; width: 50%;"></div>
+    <div
+      class="filled-track"
+      style="left: 25%; width: 50%;"
+    ></div>
   </div>
-</div>"
+</div>
 `;