Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: afficher le NIR dans les informations personnelles #1943

Merged
merged 5 commits into from
Aug 9, 2023
Merged

feat: afficher le NIR dans les informations personnelles #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
559fc95
feat: afficher le NIR dans les informations personnelles
HadrienMP Aug 3, 2023
b0db2dd
fix: permissions pro
HadrienMP Aug 8, 2023
c970790
fix: validation du NIR
HadrienMP Aug 8, 2023
79f5ee3
fix: inverse les champs nir et date de naissance
HadrienMP Aug 8, 2023
ef0c480
fix: améliore les permissions
HadrienMP Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"@babel/core": "7.21.4",
"@babel/preset-env": "7.21.4",
"@babel/preset-typescript": "7.21.4",
"@faker-js/faker": "^8.0.2",
"@graphql-codegen/cli": "3.2.2",
"@graphql-codegen/typed-document-node": "3.0.2",
"@graphql-codegen/typescript": "3.0.2",
Expand All @@ -70,6 +71,7 @@
"@tailwindcss/typography": "^0.5.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/svelte": "^3.0.3",
"@testing-library/user-event": "^14.4.3",
"@types/cookie": "^0.5.0",
"@types/jsonwebtoken": "9.0.1",
"@types/nodemailer": "^6.4.4",
Expand Down
5 changes: 5 additions & 0 deletions app/src/lib/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export const pluck = function pluck<T>(
return result;
};

export function trimToNull(arg0: string): string {
const trimmed = arg0.trim();
return trimmed === '' ? null : trimmed;
}

export function filterFalsyProps(obj: Record<string, unknown>): Record<string, unknown> {
const result = {};
for (const [k, v] of Object.entries(obj)) {
Expand Down
36 changes: 23 additions & 13 deletions app/src/lib/ui/ProBeneficiaryUpdate/ProBeneficiaryUpdateFields.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
export type Field =
| 'firstname'
| 'lastname'
| 'nir'
| 'dateOfBirth'
| 'rightRsa'
| 'rightAre'
Expand All @@ -16,14 +17,9 @@
import { Checkbox, Radio } from '../forms';

export let disabledFields: Field[];
// We can by default edit any field

function isFieldDisabled(fieldName: Field) {
return disabledFields.includes(fieldName);
}

function titleForField(fieldName: Field) {
return isFieldDisabled(fieldName)
return disabledFields.includes(fieldName)
? 'Ce champ n‘est pas modifiable. Si toutefois vous devez y apporter une modification, merci de nous contacter par chat.'
: '';
}
Expand All @@ -34,7 +30,7 @@
placeholder="Jean-Baptiste"
name="firstname"
required
disabled={isFieldDisabled('firstname')}
disabled={disabledFields.includes('firstname')}
title={titleForField('firstname')}
/>

Expand All @@ -43,7 +39,7 @@
placeholder="Poquelin"
name="lastname"
required
disabled={isFieldDisabled('lastname')}
disabled={disabledFields.includes('lastname')}
title={titleForField('lastname')}
/>

Expand All @@ -55,10 +51,20 @@
inputHint="Format JJ/MM/AAAA"
name="dateOfBirth"
required
disabled={isFieldDisabled('dateOfBirth')}
disabled={disabledFields.includes('dateOfBirth')}
title={titleForField('dateOfBirth')}
/>

<Input
inputLabel="NIR"
placeholder="1234567890123"
type="text"
pattern={'[0-9]{13}'}
name="nir"
disabled={disabledFields.includes('nir')}
title={titleForField('nir')}
/>

<Input inputLabel="Courriel" placeholder="jb@poquelin.fr" name="email" />
<Input inputLabel="Téléphone" placeholder="0123456789" name="mobileNumber" class="max-w-max" />
<Input inputLabel="Adresse" placeholder="55-57 rue du Faubourg Saint-Honoré" name="address1" />
Expand All @@ -78,19 +84,23 @@
legend="Revenu de solidarité active (RSA)"
name="rightRsa"
options={rsaRightKeys.options}
disabled={isFieldDisabled('rightRsa')}
disabled={disabledFields.includes('rightRsa')}
/>
</div>

<div class="fr-fieldset">
<legend class="fr-fieldset__legend--regular fr-fieldset__legend">Autres aides</legend>
<div class="fr-fieldset__element">
<Checkbox name="rightAre" label="ARE" disabled={isFieldDisabled('rightAre')} />
<Checkbox name="rightAre" label="ARE" disabled={disabledFields.includes('rightAre')} />
</div>
<div class="fr-fieldset__element">
<Checkbox name="rightAss" label="ASS" disabled={isFieldDisabled('rightAss')} />
<Checkbox name="rightAss" label="ASS" disabled={disabledFields.includes('rightAss')} />
</div>
<div class="fr-fieldset__element">
<Checkbox name="rightBonus" label="Prime d'activité" disabled={isFieldDisabled('rightBonus')} />
<Checkbox
name="rightBonus"
label="Prime d'activité"
disabled={disabledFields.includes('rightBonus')}
/>
</div>
</div>
13 changes: 13 additions & 0 deletions app/src/lib/ui/ProBeneficiaryUpdate/beneficiary.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
nullifyEmptyString,
validateCodePostal,
validateDateInput,
validateNir,
validatePhoneNumber,
} from '$lib/validation';
import * as yup from 'yup';
Expand All @@ -17,6 +18,17 @@ const beneficiaryAccountSchemaObject = {
.test('is-date-valid', 'Le format de la date est incorrect', validateDateInput)
.required(),

nir: yup
.string()
.trim()
.test(
'is-nir-valid',
'Le NIR doit être composé de 13 chiffres',
(value) => !value || validateNir(value)
)
.transform(nullifyEmptyString)
.nullable(),

mobileNumber: yup
.string()
.trim()
Expand Down Expand Up @@ -58,6 +70,7 @@ export const beneficiaryAccountPartialSchema = yup.object().shape({
firstname: beneficiaryAccountSchemaObject.firstname.optional(),
lastname: beneficiaryAccountSchemaObject.lastname.optional(),
dateOfBirth: beneficiaryAccountSchemaObject.dateOfBirth.optional(),
nir: beneficiaryAccountSchemaObject.nir.optional(),
});

export type BeneficiaryAccountInput = yup.InferType<typeof beneficiaryAccountSchema>;
Expand Down
119 changes: 22 additions & 97 deletions app/src/lib/ui/ProNotebookPersonalInfo/ProNotebookPersonalInfoUpdate.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,28 @@
<script lang="ts">
import {
type Beneficiary,
UpdateBeneficiaryPersonalInfoDocument,
} from '$lib/graphql/_gen/typed-document-nodes';
import { UpdateBeneficiaryPersonalInfoDocument } from '$lib/graphql/_gen/typed-document-nodes';
import { accountData, openComponent } from '$lib/stores';
import { mutation, operationStore } from '@urql/svelte';
import { Button } from '$lib/ui/base';
import {
type BeneficiaryAccountInput,
beneficiaryAccountPartialSchema,
beneficiaryAccountSchema,
} from '$lib/ui/ProBeneficiaryUpdate/beneficiary.schema';
import Form from '$lib/ui/forms/Form.svelte';
import ProBeneficiaryUpdateFields from '$lib/ui/ProBeneficiaryUpdate/ProBeneficiaryUpdateFields.svelte';
import type { Field } from '$lib/ui/ProBeneficiaryUpdate/ProBeneficiaryUpdateFields.svelte';
import Input from '$lib/ui/forms/Input.svelte';
import type { BeneficiaryAccountInput } from '$lib/ui/ProBeneficiaryUpdate/beneficiary.schema';
import { trackEvent } from '$lib/tracking/matomo';

import { RoleEnum } from '$lib/graphql/_gen/typed-document-nodes';

export let beneficiary: Pick<
Beneficiary,
| 'id'
| 'firstname'
| 'lastname'
| 'dateOfBirth'
| 'mobileNumber'
| 'email'
| 'address1'
| 'address2'
| 'postalCode'
| 'city'
| 'peNumber'
| 'cafNumber'
| 'rightRsa'
| 'rightAre'
| 'rightAss'
| 'rightBonus'
>;
import ProNotebookPersonalInfoUpdateView, {
type FormBeneficiary,
} from './ProNotebookPersonalInfoUpdateView.svelte';

export let beneficiary: FormBeneficiary;
export let canEditDetailedInfo = false;

const update = mutation(operationStore(UpdateBeneficiaryPersonalInfoDocument));

const initialValues = {
firstname: beneficiary.firstname,
lastname: beneficiary.lastname,
dateOfBirth: beneficiary.dateOfBirth,
mobileNumber: beneficiary.mobileNumber,
email: beneficiary.email,
address1: beneficiary.address1,
address2: beneficiary.address2,
postalCode: beneficiary.postalCode,
city: beneficiary.city,
peNumber: beneficiary.peNumber,
cafNumber: beneficiary.cafNumber,
rightRsa: beneficiary.rightRsa,
rightAre: beneficiary.rightAre,
rightAss: beneficiary.rightAss,
rightBonus: beneficiary.rightBonus,
};

const isPartialUpdate = $accountData.type !== RoleEnum.Manager;

const validationSchema = isPartialUpdate
? beneficiaryAccountPartialSchema
: beneficiaryAccountSchema;

const partialUpdateDisabledFields: Field[] = isPartialUpdate
? ['firstname', 'lastname', 'dateOfBirth']
: [];

const disabledFields: Field[] = partialUpdateDisabledFields.concat(
canEditDetailedInfo ? [] : ['rightRsa', 'rightAre', 'rightAss', 'rightBonus']
);

async function updateBeneficiary(values: BeneficiaryAccountInput) {
const onSubmit = async (isPartialUpdate: boolean, values: BeneficiaryAccountInput) => {
const partialUpdatePayload = isPartialUpdate
? { ...values, firstname: undefined, lastname: undefined, dateOfBirth: undefined }
? {
...values,
firstname: undefined,
lastname: undefined,
dateOfBirth: undefined,
nir: undefined,
}
: { ...values };

const payload = canEditDetailedInfo
Expand All @@ -99,33 +44,13 @@
payload,
});
openComponent.close();
}

function onCancel() {
openComponent.close();
}
};
</script>

<section>
<h1>Informations personnelles</h1>
<Form {initialValues} {validationSchema} onSubmit={updateBeneficiary}>
<ProBeneficiaryUpdateFields {disabledFields} />
<Input
name="peNumber"
placeholder={'123456789A'}
class="pt-6"
inputLabel={'Identifiant Pôle emploi'}
disabled={!canEditDetailedInfo}
/>
<Input
name="cafNumber"
placeholder={'123456789A'}
inputLabel={'Identifiant CAF/MSA'}
disabled={!canEditDetailedInfo}
/>
<div class="flex flex-row gap-6 pt-4 pb-12">
<Button type="submit">Enregistrer</Button>
<Button outline on:click={onCancel}>Annuler</Button>
</div>
</Form>
</section>
<ProNotebookPersonalInfoUpdateView
{beneficiary}
role={$accountData.type}
{onSubmit}
onCancel={openComponent.close}
{canEditDetailedInfo}
/>
Loading
Loading