@icure/form 1.1.26 → 2.0.2

package/icure/form-values-container.d.ts

@@ -1,5 +1,5 @@
 import { Contact, Form as ICureForm, Service } from '@icure/api';
-import { FormValuesContainer, FormValuesContainerMutation, ID, Version, VersionedData } from '../generic';
+import { FormValuesContainer, Version, VersionedData } from '../generic';
 import { ServiceMetadata } from './model';
 import { FieldMetadata, FieldValue, Validator } from '../components/model';
 /** This class is a bridge between the ICure API and the generic FormValuesContainer interface.
@@ -24,14 +24,16 @@ import { FieldMetadata, FieldValue, Validator } from '../components/model';
 export declare class BridgedFormValuesContainer implements FormValuesContainer<FieldValue, FieldMetadata> {
     private responsible;
     private interpreter?;
+    private initialValuesProvider;
     private dependentValuesProvider;
     private validatorsProvider;
     private language;
     private changeListeners;
     private contact;
     private contactFormValuesContainer;
-    private _children;
-    get children(): BridgedFormValuesContainer[];
+    private _id;
+    private mutateAndNotify;
+    toString(): string;
     /**
      * Creates an instance of BridgedFormValuesContainer.
      * @param responsible The id of the data owner responsible for the creation of the values
@@ -42,12 +44,18 @@ export declare class BridgedFormValuesContainer implements FormValuesContainer<F
      * @param validatorsProvider A function that provides the validators for a given anchorId and templateId
      * @param language The language in which the values are displayed
      * @param changeListeners The listeners that will be notified when the values change
+     * @param initialValuesProvider A lambda that provides the initial values of the form
      */
     constructor(responsible: string, contactFormValuesContainer: ContactFormValuesContainer, interpreter?: (<T, S extends {
         [key: string]: unknown;
         [key: symbol]: unknown;
-    }>(formula: string, sandbox: S) => T | undefined) | undefined, contact?: Contact, dependentValuesProvider?: (anchorId: string | undefined, templateId: string) => {
+    }>(formula: string, sandbox: S) => T | undefined) | undefined, contact?: Contact, initialValuesProvider?: (anchorId?: string, templateId?: string) => {
+        metadata: FieldMetadata;
+        revisionsFilter: (id: string, history: Version<FieldMetadata>[]) => (string | null)[];
+        formula: string;
+    }[], dependentValuesProvider?: (anchorId: string | undefined, templateId: string | undefined) => {
         metadata: FieldMetadata;
+        revisionsFilter: (id: string, history: Version<FieldMetadata>[]) => (string | null)[];
         formula: string;
     }[], validatorsProvider?: (anchorId: string | undefined, templateId: string) => {
         metadata: FieldMetadata;
@@ -60,19 +68,20 @@ export declare class BridgedFormValuesContainer implements FormValuesContainer<F
     unregisterChangeListener(listener: (newValue: BridgedFormValuesContainer) => void): void;
     getValues(revisionsFilter: (id: string, history: Version<FieldMetadata>[]) => (string | null)[]): VersionedData<FieldValue>;
     getMetadata(id: string, revisions: (string | null)[]): VersionedData<FieldMetadata>;
-    private mutateAndNotify;
+    private computeInitialValues;
     private computeDependentValues;
-    setValue(label: string, language: string, fv?: FieldValue, id?: string, metadata?: FieldMetadata): FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, ID>;
-    setMetadata(meta: FieldMetadata, id?: string | undefined): FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, ID>;
-    delete(serviceId: string): FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, void>;
+    setValue(label: string, language: string, fv?: FieldValue, id?: string, metadata?: FieldMetadata): void;
+    setMetadata(meta: FieldMetadata, id?: string | undefined): void;
+    delete(serviceId: string): void;
     private getVersionedValuesForKey;
     compute<T, S extends {
         [key: string | symbol]: unknown;
     }>(formula: string, sandbox?: S): T | undefined;
     getChildren(): FormValuesContainer<FieldValue, FieldMetadata>[];
     getValidationErrors(): [FieldMetadata, string][];
-    addChild(anchorId: string, templateId: string, label: string): Promise<FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, BridgedFormValuesContainer>>;
-    removeChild(container: BridgedFormValuesContainer): Promise<FormValuesContainerMutation<FieldValue, FieldMetadata, BridgedFormValuesContainer, void>>;
+    addChild(anchorId: string, templateId: string, label: string): Promise<void>;
+    removeChild(container: BridgedFormValuesContainer): Promise<void>;
+    synchronise(): this;
 }
 /**
  * This class is a form values container that uses a hierarchy of forms as a data source. The actual values are extracted from the services of the contacts.
@@ -90,8 +99,13 @@ export declare class ContactFormValuesContainer implements FormValuesContainer<S
     serviceFactory: (label: string, serviceId?: string) => Service;
     formFactory: (anchorId: string, formTemplateId: string, label: string) => Promise<ICureForm>;
     changeListeners: ((newValue: ContactFormValuesContainer) => void)[];
-    constructor(rootForm: ICureForm, currentContact: Contact, contactsHistory: Contact[], serviceFactory: (label: string, serviceId?: string) => Service, children: ContactFormValuesContainer[], formFactory: (anchorId: string, formTemplateId: string, label: string) => Promise<ICureForm>, changeListeners?: ((newValue: ContactFormValuesContainer) => void)[]);
-    registerChildFormValuesContainer(childFVC: ContactFormValuesContainer): void;
+    private _id;
+    private _initialised;
+    toString(): string;
+    mustBeInitialised(): boolean;
+    constructor(rootForm: ICureForm, currentContact: Contact, contactsHistory: Contact[], serviceFactory: (label: string, serviceId?: string) => Service, children: ContactFormValuesContainer[], formFactory: (anchorId: string, formTemplateId: string, label: string) => Promise<ICureForm>, changeListeners?: ((newValue: ContactFormValuesContainer) => void)[], initialised?: boolean);
+    synchronise(): this;
+    registerChildFormValuesContainer(childFormValueContainer: ContactFormValuesContainer): void;
     static fromFormsHierarchy(rootForm: ICureForm, currentContact: Contact, contactsHistory: Contact[], serviceFactory: (label: string, serviceId?: string) => Service, formChildrenProvider: (parentId: string) => Promise<ICureForm[]>, formFactory: (anchorId: string, formTemplateId: string, label: string) => Promise<ICureForm>, changeListeners?: ((newValue: ContactFormValuesContainer) => void)[]): Promise<ContactFormValuesContainer>;
     getLabel(): string;
     getFormId(): string | undefined;
@@ -101,9 +115,9 @@ export declare class ContactFormValuesContainer implements FormValuesContainer<S
     getValidationErrors(): [FieldMetadata, string][];
     getValues(revisionsFilter: (id: string, history: Version<ServiceMetadata>[]) => (string | null)[]): VersionedData<Service>;
     getMetadata(id: string, revisions: (string | null)[]): VersionedData<ServiceMetadata>;
-    setMetadata(meta: ServiceMetadata, id?: string): FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, ID>;
-    setValue(label: string, language: string, value?: Service, id?: string, metadata?: ServiceMetadata): FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, ID>;
-    delete(serviceId: string): FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, void>;
+    setMetadata(meta: ServiceMetadata, id?: string): void;
+    setValue(label: string, language: string, value?: Service, id?: string, metadata?: ServiceMetadata, changeListenersOverrider?: (fvc: ContactFormValuesContainer) => void): void;
+    delete(serviceId: string): void;
     compute<T>(): T | undefined;
     /** returns all services in history that match a selector
      *
@@ -111,7 +125,7 @@ export declare class ContactFormValuesContainer implements FormValuesContainer<S
      * @param revisionsFilter
      */
     private getServicesInHistory;
-    addChild(anchorId: string, templateId: string, label: string): Promise<FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, ContactFormValuesContainer>>;
+    addChild(anchorId: string, templateId: string, label: string): Promise<void>;
     private getServiceInCurrentContact;
-    removeChild(container: ContactFormValuesContainer): Promise<FormValuesContainerMutation<Service, ServiceMetadata, ContactFormValuesContainer, void>>;
+    removeChild(container: ContactFormValuesContainer): Promise<void>;
 }

package/icure/form-values-container.js

@@ -15,6 +15,12 @@ const no_lodash_1 = require("../utils/no-lodash");
 const icure_utils_1 = require("./icure-utils");
 const primitive_1 = require("../utils/primitive");
 const dates_1 = require("../utils/dates");
+const uuid_1 = require("uuid");
+const code_utils_1 = require("../utils/code-utils");
+function notify(l, fvc) {
+    //console.log('Notifying', l, fvc.toString())
+    l(fvc);
+}
 /** This class is a bridge between the ICure API and the generic FormValuesContainer interface.
  * It wraps around a ContactFormValuesContainer and provides a series of services:
  * - It computes dependent values when the form is created
@@ -35,11 +41,8 @@ const dates_1 = require("../utils/dates");
  * This class is fairly generic and can be used as an inspiration or subclassed for other bridges
  */
 class BridgedFormValuesContainer {
-    get children() {
-        var _a;
-        return ((_a = this._children) !== null && _a !== void 0 ? _a : (this._children = this.contactFormValuesContainer
-            .getChildren()
-            .map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners))));
+    toString() {
+        return `Bridged(${this.contactFormValuesContainer.rootForm.formTemplateId}[${this.contactFormValuesContainer.rootForm.id}]) - ${this._id}`;
     }
     /**
      * Creates an instance of BridgedFormValuesContainer.
@@ -51,17 +54,31 @@ class BridgedFormValuesContainer {
      * @param validatorsProvider A function that provides the validators for a given anchorId and templateId
      * @param language The language in which the values are displayed
      * @param changeListeners The listeners that will be notified when the values change
+     * @param initialValuesProvider A lambda that provides the initial values of the form
      */
-    constructor(responsible, contactFormValuesContainer, interpreter, contact, dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = []) {
+    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = []) {
         this.responsible = responsible;
         this.interpreter = interpreter;
+        this.initialValuesProvider = initialValuesProvider;
         this.dependentValuesProvider = dependentValuesProvider;
         this.validatorsProvider = validatorsProvider;
         this.language = language;
         this.changeListeners = changeListeners;
+        this._id = (0, uuid_1.v4)();
+        console.log(`Creating bridge FVC (${contactFormValuesContainer.rootForm.formTemplateId}) with ${contactFormValuesContainer.children.length} children [${this._id}]`);
         //Before start to broadcast changes, we need to fill in the contactFormValuesContainer with the dependent values
         this.contactFormValuesContainer = contactFormValuesContainer;
+        this.mutateAndNotify = (newContactFormValuesContainer) => {
+            newContactFormValuesContainer.unregisterChangeListener(this.mutateAndNotify);
+            const newBridgedFormValueContainer = new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners);
+            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer));
+            return newBridgedFormValueContainer;
+        };
+        this.contactFormValuesContainer.registerChangeListener(this.mutateAndNotify);
         this.contact = contact !== null && contact !== void 0 ? contact : contactFormValuesContainer.currentContact;
+        if (this.contactFormValuesContainer.mustBeInitialised()) {
+            this.computeInitialValues();
+        }
         this.computeDependentValues();
     }
     getLabel() {
@@ -127,18 +144,46 @@ class BridgedFormValuesContainer {
                 },
             })) })), {});
     }
-    mutateAndNotify(newContactFormValuesContainer) {
-        const newBridgedFormValueContainer = new BridgedFormValuesContainer(this.responsible, newContactFormValuesContainer, this.interpreter, this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, this.dependentValuesProvider, this.validatorsProvider, this.language, this.changeListeners);
-        this.changeListeners.forEach((l) => l(newBridgedFormValueContainer));
-        return newBridgedFormValueContainer;
+    //This method mutates the BridgedFormValuesContainer but can only be called from the constructor
+    computeInitialValues() {
+        if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+            this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).forEach(({ metadata, revisionsFilter, formula }) => {
+                var _a;
+                try {
+                    const currentValue = this.getValues(revisionsFilter);
+                    if (!currentValue || !Object.keys(currentValue).length) {
+                        const newValue = this.compute(formula);
+                        if (newValue !== undefined) {
+                            const lng = (_a = this.language) !== null && _a !== void 0 ? _a : 'en';
+                            if (newValue && !newValue.content[lng] && newValue.content['*']) {
+                                newValue.content[lng] = newValue.content['*'];
+                            }
+                            if (newValue) {
+                                delete newValue.content['*'];
+                            }
+                            setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, undefined, metadata, (fvc) => {
+                                const currentContact = this.contactFormValuesContainer.currentContact;
+                                this.contactFormValuesContainer = fvc;
+                                if (this.contact === currentContact) {
+                                    this.contact = fvc.currentContact;
+                                }
+                            });
+                        }
+                    }
+                }
+                catch (e) {
+                    console.log(`Error while computing formula : ${formula}`, e);
+                }
+            });
+        }
     }
     //This method mutates the BridgedFormValuesContainer but can only be called from the constructor
     computeDependentValues() {
         if (this.contactFormValuesContainer.rootForm.formTemplateId) {
-            this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).forEach(({ metadata, formula }) => {
+            this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).forEach(({ metadata, revisionsFilter, formula }) => {
                 var _a;
                 try {
-                    const currentValue = this.getVersionedValuesForKey(metadata.label);
+                    const currentValue = this.getValues(revisionsFilter);
                     const newValue = this.compute(formula);
                     if (newValue !== undefined || currentValue != undefined) {
                         const lng = (_a = this.language) !== null && _a !== void 0 ? _a : 'en';
@@ -148,11 +193,13 @@ class BridgedFormValuesContainer {
                         if (newValue) {
                             delete newValue.content['*'];
                         }
-                        const currentContact = this.contactFormValuesContainer.currentContact;
-                        this.contactFormValuesContainer = setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata).formValuesContainer;
-                        if (this.contact === currentContact) {
-                            this.contact = this.contactFormValuesContainer.currentContact;
-                        }
+                        setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata, (fvc) => {
+                            const currentContact = this.contactFormValuesContainer.currentContact;
+                            this.contactFormValuesContainer = fvc;
+                            if (this.contact === currentContact) {
+                                this.contact = fvc.currentContact;
+                            }
+                        });
                     }
                 }
                 catch (e) {
@@ -162,21 +209,18 @@ class BridgedFormValuesContainer {
         }
     }
     setValue(label, language, fv, id, metadata) {
-        const mutation = setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata);
-        return { result: mutation.result, formValuesContainer: this.mutateAndNotify(mutation.formValuesContainer) };
+        setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata);
     }
     setMetadata(meta, id) {
-        const mutation = this.contactFormValuesContainer.setMetadata({
+        this.contactFormValuesContainer.setMetadata({
             label: meta.label,
             responsible: meta.owner,
             valueDate: meta.valueDate,
             tags: meta.tags,
         }, id);
-        return { result: mutation.result, formValuesContainer: this.mutateAndNotify(mutation.formValuesContainer) };
     }
     delete(serviceId) {
-        const mutation = this.contactFormValuesContainer.delete(serviceId);
-        return { result: undefined, formValuesContainer: this.mutateAndNotify(mutation.formValuesContainer) };
+        this.contactFormValuesContainer.delete(serviceId);
     }
     getVersionedValuesForKey(key) {
         return this.getValues((id, history) => { var _a, _b, _c; return (((_b = (_a = history === null || history === void 0 ? void 0 : history[0]) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.label) && key === history[0].value.label ? [(_c = history === null || history === void 0 ? void 0 : history[0]) === null || _c === void 0 ? void 0 : _c.revision] : []); });
@@ -229,7 +273,11 @@ class BridgedFormValuesContainer {
         return (_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, sandbox !== null && sandbox !== void 0 ? sandbox : proxy);
     }
     getChildren() {
-        return this.contactFormValuesContainer.getChildren().map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact));
+        const children = this.contactFormValuesContainer
+            .getChildren()
+            .map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, []));
+        console.log(`${children.length} children found in ${this.contactFormValuesContainer.rootForm.formTemplateId} initialised with `, this.initialValuesProvider);
+        return children;
     }
     getValidationErrors() {
         if (this.contactFormValuesContainer.rootForm.formTemplateId) {
@@ -251,21 +299,18 @@ class BridgedFormValuesContainer {
     }
     addChild(anchorId, templateId, label) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mutation = yield this.contactFormValuesContainer.addChild(anchorId, templateId, label);
-            const newBridgedFormValueContainer = this.mutateAndNotify(mutation.formValuesContainer);
-            const newChild = newBridgedFormValueContainer.children.find((c) => c.contactFormValuesContainer === mutation.result);
-            if (!newChild) {
-                throw new Error('Illegal state, the new child must be found');
-            }
-            return { result: newChild, formValuesContainer: newBridgedFormValueContainer };
+            yield this.contactFormValuesContainer.addChild(anchorId, templateId, label);
         });
     }
     removeChild(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mutation = yield this.contactFormValuesContainer.removeChild(container.contactFormValuesContainer);
-            return { result: undefined, formValuesContainer: this.mutateAndNotify(mutation.formValuesContainer) };
+            yield this.contactFormValuesContainer.removeChild(container.contactFormValuesContainer);
         });
     }
+    synchronise() {
+        this.contactFormValuesContainer.synchronise();
+        return this;
+    }
 }
 exports.BridgedFormValuesContainer = BridgedFormValuesContainer;
 /**
@@ -277,7 +322,16 @@ exports.BridgedFormValuesContainer = BridgedFormValuesContainer;
  * The `serviceFactory` and `formFactory` are used to create new services and add sub-forms.
  */
 class ContactFormValuesContainer {
-    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, changeListeners = []) {
+    toString() {
+        return `Contact(${this.rootForm.formTemplateId}[${this.rootForm.id}]) - ${this._id}`;
+    }
+    mustBeInitialised() {
+        return !this._initialised;
+    }
+    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, changeListeners = [], initialised = true) {
+        this._id = (0, uuid_1.v4)();
+        this._initialised = false;
+        console.log(`Creating contact FVC (${rootForm.formTemplateId}) with ${children.length} children [${this._id}]`);
         if (contactsHistory.includes(currentContact)) {
             throw new Error('Illegal argument, the history must not contain the currentContact');
         }
@@ -288,12 +342,26 @@ class ContactFormValuesContainer {
         this.serviceFactory = serviceFactory;
         this.formFactory = formFactory;
         this.changeListeners = changeListeners;
+        this._initialised = initialised;
+        this.synchronise();
     }
-    registerChildFormValuesContainer(childFVC) {
-        childFVC.registerChangeListener((newValue) => {
-            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.map((c) => (c === childFVC ? newValue : c)), this.formFactory, this.changeListeners);
-            this.changeListeners.forEach((l) => l(newContactFormValuesContainer));
+    synchronise() {
+        this.children.forEach((childFVC) => {
+            this.registerChildFormValuesContainer(childFVC.synchronise());
         });
+        return this;
+    }
+    //Make sure that when a child is changed, a new version of this is created with the updated child
+    registerChildFormValuesContainer(childFormValueContainer) {
+        childFormValueContainer.changeListeners = [
+            (newValue) => {
+                console.log(`Child ${newValue._id} ${childFormValueContainer.rootForm.formTemplateId} changed, updating parent ${this._id} ${this.rootForm.formTemplateId}`);
+                const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.map((c) => {
+                    return c.rootForm.id === childFormValueContainer.rootForm.id ? newValue : c;
+                }), this.formFactory);
+                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
+            },
+        ];
     }
     static fromFormsHierarchy(rootForm_1, currentContact_1, contactsHistory_1, serviceFactory_1, formChildrenProvider_1, formFactory_1) {
         return __awaiter(this, arguments, void 0, function* (rootForm, currentContact, contactsHistory, serviceFactory, formChildrenProvider, formFactory, changeListeners = []) {
@@ -301,7 +369,7 @@ class ContactFormValuesContainer {
                 ? yield Promise.all((yield formChildrenProvider(rootForm.id)).map((f) => __awaiter(this, void 0, void 0, function* () { 
                 // eslint-disable-next-line max-len
                 return yield ContactFormValuesContainer.fromFormsHierarchy(f, currentContact, contactsHistory, serviceFactory, formChildrenProvider, formFactory); })))
-                : [], formFactory, changeListeners);
+                : [], formFactory, changeListeners, false);
             contactFormValuesContainer.children.forEach((childFVC) => contactFormValuesContainer.registerChildFormValuesContainer(childFVC));
             return contactFormValuesContainer;
         });
@@ -367,24 +435,22 @@ class ContactFormValuesContainer {
             const newService = new api_1.Service(Object.assign(Object.assign({}, service), { modified: Date.now() }));
             meta.responsible && (newService.responsible = meta.responsible);
             meta.valueDate && (newService.valueDate = meta.valueDate);
-            meta.codes && (newService.codes = meta.codes);
-            meta.tags && (newService.tags = meta.tags);
+            meta.codes && (newService.codes = (0, code_utils_1.normalizeCodes)(meta.codes));
+            meta.tags && (newService.tags = (0, code_utils_1.normalizeCodes)(meta.tags));
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => (s.id === service.id ? newService : s)) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.changeListeners);
-            this.changeListeners.forEach((l) => l(newFormValuesContainer));
-            return { result: service.id, formValuesContainer: newFormValuesContainer };
+            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
-        return { result: service.id, formValuesContainer: this };
     }
-    setValue(label, language, value, id, metadata) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    setValue(label, language, value, id, metadata, changeListenersOverrider) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const service = (id && ((_b = (_a = this.getServicesInHistory((sid, history) => (sid === id ? history.map((x) => x.revision) : []))[id]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value)) || this.serviceFactory(label, id);
         if (!service.id) {
             throw new Error('Service id must be defined');
         }
         console.log('Setting value of service', service.id, 'with', value, 'and metadata', metadata);
         const newContent = (_c = value === null || value === void 0 ? void 0 : value.content) === null || _c === void 0 ? void 0 : _c[language];
-        const newCodes = (_d = value === null || value === void 0 ? void 0 : value.codes) !== null && _d !== void 0 ? _d : [];
-        if (!(0, icure_utils_1.isContentEqual)((_e = service.content) === null || _e === void 0 ? void 0 : _e[language], newContent) || (newCodes && !(0, icure_utils_1.areCodesEqual)(newCodes, (_f = service.codes) !== null && _f !== void 0 ? _f : []))) {
+        const newCodes = (value === null || value === void 0 ? void 0 : value.codes) ? (0, code_utils_1.normalizeCodes)(value.codes) : [];
+        if (!(0, icure_utils_1.isContentEqual)((_d = service.content) === null || _d === void 0 ? void 0 : _d[language], newContent) || (newCodes && !(0, icure_utils_1.areCodesEqual)(newCodes, (_e = service.codes) !== null && _e !== void 0 ? _e : []))) {
             const newService = new api_1.Service(Object.assign(Object.assign({}, service), { modified: Date.now() }));
             const newContents = newContent ? Object.assign(Object.assign({}, (service.content || {})), { [language]: newContent }) : Object.assign({}, (service.content || {}));
             if (!newContent) {
@@ -392,38 +458,34 @@ class ContactFormValuesContainer {
             }
             let newCurrentContact;
             if (!Object.entries(newContents).filter(([, cnt]) => cnt !== undefined).length) {
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_g = this.currentContact.services) !== null && _g !== void 0 ? _g : []).some((s) => s.id === service.id)
-                        ? ((_h = this.currentContact.services) !== null && _h !== void 0 ? _h : []).filter((s) => s.id !== service.id)
-                        : [...((_j = this.currentContact.services) !== null && _j !== void 0 ? _j : [])] });
+                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_f = this.currentContact.services) !== null && _f !== void 0 ? _f : []).some((s) => s.id === service.id)
+                        ? ((_g = this.currentContact.services) !== null && _g !== void 0 ? _g : []).filter((s) => s.id !== service.id)
+                        : [...((_h = this.currentContact.services) !== null && _h !== void 0 ? _h : [])] });
             }
             else {
                 newService.content = newContents;
                 newService.codes = newCodes;
                 if (metadata) {
-                    newService.responsible = (_k = metadata.responsible) !== null && _k !== void 0 ? _k : newService.responsible;
-                    newService.valueDate = (_l = metadata.valueDate) !== null && _l !== void 0 ? _l : newService.valueDate;
-                    newService.tags = (_m = metadata.tags) !== null && _m !== void 0 ? _m : newService.tags;
-                    newService.label = (_o = metadata.label) !== null && _o !== void 0 ? _o : newService.label;
+                    newService.responsible = (_j = metadata.responsible) !== null && _j !== void 0 ? _j : newService.responsible;
+                    newService.valueDate = (_k = metadata.valueDate) !== null && _k !== void 0 ? _k : newService.valueDate;
+                    newService.tags = metadata.tags ? (0, code_utils_1.normalizeCodes)(metadata.tags) : newService.tags;
+                    newService.label = (_l = metadata.label) !== null && _l !== void 0 ? _l : newService.label;
                 }
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_p = this.currentContact.services) !== null && _p !== void 0 ? _p : []).some((s) => s.id === service.id)
-                        ? ((_q = this.currentContact.services) !== null && _q !== void 0 ? _q : []).map((s) => (s.id === service.id ? newService : s))
-                        : [...((_r = this.currentContact.services) !== null && _r !== void 0 ? _r : []), newService] });
+                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { services: ((_m = this.currentContact.services) !== null && _m !== void 0 ? _m : []).some((s) => s.id === service.id)
+                        ? ((_o = this.currentContact.services) !== null && _o !== void 0 ? _o : []).map((s) => (s.id === service.id ? newService : s))
+                        : [...((_p = this.currentContact.services) !== null && _p !== void 0 ? _p : []), newService] });
             }
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, newCurrentContact, this.contactsHistory.map((c) => (c === this.currentContact ? newCurrentContact : c)), this.serviceFactory, this.children, this.formFactory, this.changeListeners);
-            this.changeListeners.forEach((l) => l(newFormValuesContainer));
-            return { result: service.id, formValuesContainer: newFormValuesContainer };
+            changeListenersOverrider ? changeListenersOverrider(newFormValuesContainer) : this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
-        return { result: service.id, formValuesContainer: this };
     }
     delete(serviceId) {
         var _a;
         const service = this.getServiceInCurrentContact(serviceId);
         if (service) {
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => (s.id === serviceId ? new api_1.Service(Object.assign(Object.assign({}, service), { endOfLife: Date.now() })) : s)) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.changeListeners);
-            this.changeListeners.forEach((l) => l(newFormValuesContainer));
-            return { result: undefined, formValuesContainer: newFormValuesContainer };
+            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
-        return { result: undefined, formValuesContainer: this };
     }
     compute() {
         throw new Error('Compute not supported at contact level');
@@ -463,11 +525,10 @@ class ContactFormValuesContainer {
     addChild(anchorId, templateId, label) {
         return __awaiter(this, void 0, void 0, function* () {
             const newForm = yield this.formFactory(anchorId, templateId, label);
-            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory);
-            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, [...this.children, childFVC], this.formFactory);
+            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory, [], false);
+            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, [...this.children, childFVC], this.formFactory, this.changeListeners);
             newContactFormValuesContainer.registerChildFormValuesContainer(childFVC);
-            this.changeListeners.forEach((l) => l(newContactFormValuesContainer));
-            return { result: childFVC, formValuesContainer: newContactFormValuesContainer };
+            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
         });
     }
     getServiceInCurrentContact(id) {
@@ -477,17 +538,16 @@ class ContactFormValuesContainer {
     }
     removeChild(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.filter((c) => c !== container), this.formFactory);
-            this.changeListeners.forEach((l) => l(newContactFormValuesContainer));
-            return { result: undefined, formValuesContainer: newContactFormValuesContainer };
+            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, this.children.filter((c) => c.rootForm.id !== container.rootForm.id), this.formFactory, this.changeListeners);
+            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
         });
     }
 }
 exports.ContactFormValuesContainer = ContactFormValuesContainer;
-const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata) => {
+const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata, changeListenersOverrider) => {
     var _a, _b;
     const value = fv === null || fv === void 0 ? void 0 : fv.content[language];
-    const mutation = cfvc.setValue(label, language, {
+    cfvc.setValue(label, language, {
         id: id,
         codes: (_a = fv === null || fv === void 0 ? void 0 : fv.codes) !== null && _a !== void 0 ? _a : [],
         content: value
@@ -502,7 +562,6 @@ const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, met
             valueDate: metadata === null || metadata === void 0 ? void 0 : metadata.valueDate,
             tags: metadata === null || metadata === void 0 ? void 0 : metadata.tags,
         }
-        : undefined);
-    return mutation;
+        : undefined, changeListenersOverrider);
 };
 //# sourceMappingURL=form-values-container.js.map