feat(metadata): add possibility to fill af form from query params #3781
+79
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VincentCauchois
added
enhancement
frontend
javascript
VincentCauchois
force-pushed
the
feat/add-set-from-query-params-for-af-form
branch
9 times, most recently
from
0e2666a to
454b302
Compare
VincentCauchois
force-pushed
the
feat/add-set-from-query-params-for-af-form
branch
from
454b302 to
ed4f489
Compare
VincentCauchois
commented
Nov 6, 2025
Comment on lines
111
to
165
| combineLatest([ | ||
| this.acquisition_framework.asObservable().pipe( | ||
| tap(() => this.reset()), | ||
| tap(() => { | ||
| this.additionalFieldsForm = []; | ||
| }), | ||
| switchMap((af) => | ||
| af !== null ? this.acquisition_framework.asObservable() : this.initialValues | ||
| ), | ||
| map((value) => { | ||
| if (value.cor_af_actor) { | ||
| if (this.actorFormS.nbMainContact(value.cor_af_actor) == 0) { | ||
| value.cor_af_actor.push({ | ||
| id_nomenclature_actor_role: this.actorFormS.getIDRoleTypeByCdNomenclature('1'), | ||
| }); | ||
| } | ||
| value.cor_af_actor.forEach((actor) => { | ||
| this.addActor(this.actors, actor); | ||
| }); | ||
| } | ||
| if (value.bibliographical_references) { | ||
| value.bibliographical_references.forEach((e) => { | ||
| this.addBibliographicalReferences(); | ||
| }); | ||
| } | ||
| return value; | ||
| }), | ||
| // Get additional fields from acquisition framework | ||
| switchMap((acquisition_framework) => { | ||
| let additionnalFieldsObservable: Observable<any>; | ||
| additionnalFieldsObservable = this.getAdditionalFields(['METADATA_CADRE_ACQUISITION']); | ||
| return forkJoin([of(acquisition_framework), additionnalFieldsObservable]); | ||
| }), | ||
| map(([acquisition_framework, additional_data]) => { | ||
| additional_data.forEach((field) => { | ||
| // Set value of field | ||
| if (acquisition_framework.additional_data[field.attribut_name] !== undefined) { | ||
| field.value = acquisition_framework.additional_data[field.attribut_name]; | ||
| } | ||
| }); | ||
|
|
||
| return [acquisition_framework, additional_data]; | ||
| }), | ||
| // Set the additional fields form | ||
| tap(([acquisition_framework, additional_data]) => { | ||
| this.additionalFieldsForm = additional_data; | ||
| }), | ||
| // Map to return acquisition framework data only | ||
| map(([acquisition_framework, additional_data]) => acquisition_framework) | ||
| ) | ||
| .subscribe((value: any) => this.form.patchValue(value)); | ||
| ), | ||
| this.queryParamsSource, | ||
| ]).subscribe(([value, params]) => { | ||
| setTimeout(() => this.form.patchValue(value), 0); | ||
| this.setFromParams(params); | ||
| }); |
There was a problem hiding this comment.
Pas idéal, il faudrait faire en sorte que this.form.patchValue(value) ne s'exécute que quand c'est nécessaire, et notamment pas quand il s'agit d'une émission de this.queryParamsSource seulement.
VincentCauchois
commented
Nov 6, 2025
Comment on lines
112
to
157
| this.acquisition_framework.asObservable().pipe( | ||
| tap(() => this.reset()), | ||
| tap(() => { | ||
| this.additionalFieldsForm = []; | ||
| }), | ||
| switchMap((af) => | ||
| af !== null ? this.acquisition_framework.asObservable() : this.initialValues | ||
| ), | ||
| map((value) => { | ||
| if (value.cor_af_actor) { | ||
| if (this.actorFormS.nbMainContact(value.cor_af_actor) == 0) { | ||
| value.cor_af_actor.push({ | ||
| id_nomenclature_actor_role: this.actorFormS.getIDRoleTypeByCdNomenclature('1'), | ||
| }); | ||
| } | ||
| value.cor_af_actor.forEach((actor) => { | ||
| this.addActor(this.actors, actor); | ||
| }); | ||
| } | ||
| if (value.bibliographical_references) { | ||
| value.bibliographical_references.forEach((e) => { | ||
| this.addBibliographicalReferences(); | ||
| }); | ||
| } | ||
| return value; | ||
| }), | ||
| // Get additional fields from acquisition framework | ||
| switchMap((acquisition_framework) => { | ||
| let additionnalFieldsObservable: Observable<any>; | ||
| additionnalFieldsObservable = this.getAdditionalFields(['METADATA_CADRE_ACQUISITION']); | ||
| return forkJoin([of(acquisition_framework), additionnalFieldsObservable]); | ||
| }), | ||
| map(([acquisition_framework, additional_data]) => { | ||
| additional_data.forEach((field) => { | ||
| // Set value of field | ||
| if (acquisition_framework.additional_data[field.attribut_name] !== undefined) { | ||
| field.value = acquisition_framework.additional_data[field.attribut_name]; | ||
| } | ||
| }); | ||
|
|
||
| return [acquisition_framework, additional_data]; | ||
| }), | ||
| // Set the additional fields form | ||
| tap(([acquisition_framework, additional_data]) => { | ||
| this.additionalFieldsForm = additional_data; | ||
| }), | ||
| // Map to return acquisition framework data only | ||
| map(([acquisition_framework, additional_data]) => acquisition_framework) | ||
| ) |
There was a problem hiding this comment.
Voulu factoriser cette 1ʳᵉ observable longue dans une variable const afSource = [...], mais le lint ES vient ensuite me casser la définition de cette observable en ajoutant un ; non désiré à un endroit.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
feat/additional-fields-for-metadata- // PR #3744 - plutôt quedeveloppour pouvoir tester le pré-remplissage de champs additionnel