@cnamts/synapse 0.0.11-alpha → 0.0.13-alpha

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

@@ -30,6 +30,8 @@ const meta = {
 			description: 'Permet d\'utiliser uniquement les indicatifs que vous renseignez dans la props customIndicatifs',
 		},
 		isValidatedOnBlur: { control: 'boolean' },
+		displayAsterisk: { control: 'boolean' },
+		disableErrorHandling: { control: 'boolean' },
 	},
 } satisfies Meta<typeof PhoneField>
 
@@ -192,6 +194,74 @@ export const Required: Story = {
 	},
 }
 
+/**
+ * Story avec champ requis et astérisque.
+ */
+export const RequiredWithAsterisk: Story = {
+	args: {
+		...Default.args,
+		required: true,
+		displayAsterisk: true,
+	},
+	parameters: {
+		docs: {
+			description: {
+				story: 'Version du champ téléphone requis avec un astérisque visuel.',
+			},
+		},
+		sourceCode: [
+			{
+				name: 'Template',
+				code: `
+<template>
+  <PhoneField
+    v-model="phoneNumber"
+    required
+    display-asterisk
+  />
+</template>
+        `,
+			},
+			{
+				name: 'Script',
+				code: `
+<script setup lang="ts">
+import { ref } from 'vue'
+import PhoneField from '@cnamts/synapse'
+
+const phoneNumber = ref('')
+</script>
+        `,
+			},
+		],
+	},
+	render: (args) => {
+		return {
+			components: { PhoneField },
+			setup() {
+				return { args }
+			},
+			template: `
+				<div class="pa-4">
+					<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"
+						:display-asterisk="args.displayAsterisk"
+					/>
+				</div>
+			`,
+		}
+	},
+}
+
 export const CustomIndicatifs: Story = {
 	parameters: {
 		sourceCode: [
@@ -827,3 +897,103 @@ export const DisplayModels: Story = {
 		}
 	},
 }
+
+/**
+ * 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,
+	},
+	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"
+					/>
+					<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"
+						/>
+					</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 = {
@@ -32,6 +31,8 @@
 		customIndicatifs: { type: Array as PropType<Indicatif[]>, default: () => [] },
 		useCustomIndicatifsOnly: { type: Boolean, default: false },
 		isValidatedOnBlur: { type: Boolean, default: true },
+		displayAsterisk: { type: Boolean, default: false },
+		disableErrorHandling: { type: Boolean, default: false },
 	})
 
 	const emit = defineEmits(['update:modelValue', 'update:selectedDialCode', 'change'])
@@ -41,7 +42,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 {
@@ -94,25 +94,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,
@@ -121,6 +170,7 @@
 		hasError,
 		phoneNumber,
 		mergedDialCodes,
+		validation,
 	})
 </script>
 
@@ -133,6 +183,9 @@
 			:label="locales.indicatifLabel"
 			:outlined="outlinedIndicatif"
 			:required="props.countryCodeRequired"
+			:display-asterisk="props.displayAsterisk"
+			:disable-error-handling="props.disableErrorHandling"
+			:return-object="true"
 			class="custom-select"
 			text-key="displayText"
 			value-key="code"
@@ -144,9 +197,18 @@
 			: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'"
-			class="phone-field"
+			:display-asterisk="props.displayAsterisk"
+			:class="{
+				'phone-field': true,
+				'error-field': hasError,
+				'warning-field': hasWarning,
+				'success-field': hasSuccess
+			}"
 			color="primary"
 			@blur="validateInputOnBlur"
 			@input="handlePhoneInput"
@@ -158,9 +220,6 @@
 				>
 					{{ mdiPhone }}
 				</VIcon>
-				<VIcon v-if="hasError">
-					{{ mdiInformation }}
-				</VIcon>
 			</template>
 		</SyTextField>
 	</div>

package/src/components/PhoneField/indicatifs.ts

@@ -1,5 +1,5 @@
 export const indicatifs = [
-	{ code: '+1', country: 'USA/Canada', abbreviation: 'US/CA', phoneLength: 10, mask: '###-###-####' },
+	{ code: '+1', country: 'USA/Canada', abbreviation: 'US/CA', phoneLength: 10, mask: '### ### ####' },
 	{ code: '+7', country: 'Russia/Kazakhstan', abbreviation: 'RU/KZ', phoneLength: 10, mask: '### ### ## ##' },
 	{ code: '+20', country: 'Egypt', abbreviation: 'EG', phoneLength: 9, mask: '### ### ####' },
 	{ code: '+27', country: 'South Africa', abbreviation: 'ZA', phoneLength: 9, mask: '### ### ####' },

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/RatingPicker/RatingPicker.stories.ts

@@ -141,7 +141,7 @@ export const Default: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingEmotion = ref(-1)
 </script>
@@ -192,7 +192,7 @@ export const TwoEmotions: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingEmotion = ref(-1)
 </script>
@@ -241,7 +241,7 @@ export const Numbers: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingNumber = ref(-1)
 </script>
@@ -290,7 +290,7 @@ export const Stars: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingStar = ref(-1)
 </script>
@@ -341,7 +341,7 @@ export const ReadOnly: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingEmotion = ref(-1)
 </script>
@@ -392,7 +392,7 @@ export const HideAlert: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import RatingPicker from '@cnamts/synapse'
+import { RatingPicker } from '@cnamts/synapse'
 
 const ratingEmotion = ref(-1)
 </script>
@@ -488,7 +488,7 @@ export const DefaultSlot: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import {RatingPicker, SySelect} from '@cnamts/synapse'
+import { RatingPicker, SySelect } from '@cnamts/synapse'
 import { VBtn, VSpacer } from 'vuetify/components'
 
 const ratingEmotion = ref(-1)

package/src/components/SearchListField/SearchListField.stories.ts

@@ -88,7 +88,7 @@ export const Default: Story = {
 				code: `
 <script setup lang="ts">
 import { ref } from 'vue'
-import SearchListField from '@cnamts/synapse'
+import { SearchListField } from '@cnamts/synapse'
 
 const modelValue = ref('')
 

package/src/components/UploadWorkflow/Accessibilite.mdx

@@ -0,0 +1,14 @@
+import { Meta, Story } from '@storybook/addon-docs';
+import * as AccessStories from './Accessibilite.stories.ts';
+
+<Meta of={AccessStories} />
+
+Accessibilité
+=============
+<Story of={AccessStories.Legende} />
+<br />
+
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+<Story of={AccessStories.AccessibilitePanel} />
+<br />