@icure/form 3.0.39 → 3.0.42

package/icure/form-values-container.js

@@ -7,18 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { CodeStub, DecryptedContact, DecryptedService, DecryptedSubContact } from '@icure/cardinal-sdk';
+import { CodeStub, DecryptedContact, DecryptedService, DecryptedSubContact, ServiceLink } from '@icure/cardinal-sdk';
 import { sortedBy } from '../utils/no-lodash';
-import { CodeStubWithId } from './model';
 import { areCodesEqual, codeStubToCode, contentToPrimitiveType, isContentEqual, primitiveTypeToContent } from './icure-utils';
 import { parsePrimitive } from '../utils/primitive';
 import { anyDateToDate, dateToFuzzyDate } from '../utils/dates';
+import { v4 as uuidv4 } from 'uuid';
 import { normalizeCodes } from '../utils/code-utils';
-let bfvcIdGen = 0;
-let cfvcIdGen = 0;
-function notify(l, fvc, modifiedFields = [], context = undefined, id = undefined, recurse = false) {
-    console.log(`${id !== null && id !== void 0 ? id : 'cc'}: Notifying listener with context [>>> ${fvc['_id']}] -> ${context} <- ${modifiedFields.length ? `and modified fields ${modifiedFields.map((f) => f.label).join(', ')}` : ''}`);
-    l(fvc, modifiedFields, recurse);
+function notify(l, fvc) {
+    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:
@@ -43,21 +40,6 @@ export class BridgedFormValuesContainer {
     toString() {
         return `Bridged(${this.contactFormValuesContainer.rootForm.formTemplateId}[${this.contactFormValuesContainer.rootForm.id}]) - ${this._id}`;
     }
-    options() {
-        return {
-            responsible: this.responsible,
-            contactFormValuesContainer: this.contactFormValuesContainer,
-            interpreter: this.interpreter,
-            contact: this.contact,
-            initialValuesProvider: this.initialValuesProvider,
-            dependentValuesProvider: this.dependentValuesProvider,
-            validatorsProvider: this.validatorsProvider,
-            language: this.language,
-            changeListeners: this.changeListeners,
-            interpreterContext: this.interpreterContext,
-            currentComputations: this.currentComputations,
-        };
-    }
     /**
      * Creates an instance of BridgedFormValuesContainer.
      * @param responsible The id of the data owner responsible for the creation of the values
@@ -70,83 +52,36 @@ export class BridgedFormValuesContainer {
      * @param language The language in which the values are displayed
      * @param changeListeners The listeners that will be notified when the values change
      * @param interpreterContext A map with keys that are the names of the variables and values that are the functions that return the values of the variables
-     * @param currentComputations A list of ongoing computations that should be observed and not recomputed when the form is created.
-     * @param modifiedFields A list of fields that have been modified and should be considered when computing the initial values
-     * @param stackLevel The stack level at which the BridgedFormValuesContainer is created, used to limit recursion induced by default values computations
-     * @param context A string that describes the context in which the BridgedFormValuesContainer is created, used for debugging purposes
      */
-    constructor({ responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider, dependentValuesProvider, validatorsProvider, language, changeListeners, interpreterContext, currentComputations, modifiedFields, stackLevel = 0, context, }) {
-        this._id = `B-${(bfvcIdGen++).toString()}`;
-        this.initialValuesProvider = () => [];
-        this.dependentValuesProvider = () => [];
-        this.validatorsProvider = () => [];
-        this.language = 'en';
-        this.changeListeners = [];
-        this.interpreterContext = {};
-        this.currentComputations = {};
-        console.log(`${this._id}: Creating BridgedFormValuesContainer because ${context !== null && context !== void 0 ? context : 'no context provided'}`);
-        //Before start to broadcast changes, we need to fill in the contactFormValuesContainer with the dependent values
-        this.contactFormValuesContainer = contactFormValuesContainer;
+    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = [], interpreterContext = {}) {
         this.responsible = responsible;
         this.interpreter = interpreter;
-        this.initialValuesProvider = initialValuesProvider !== null && initialValuesProvider !== void 0 ? initialValuesProvider : (() => []);
-        this.dependentValuesProvider = dependentValuesProvider !== null && dependentValuesProvider !== void 0 ? dependentValuesProvider : (() => []);
-        this.validatorsProvider = validatorsProvider !== null && validatorsProvider !== void 0 ? validatorsProvider : (() => []);
-        this.language = language !== null && language !== void 0 ? language : 'en';
-        this.changeListeners = changeListeners !== null && changeListeners !== void 0 ? changeListeners : [];
-        this.interpreterContext = interpreterContext !== null && interpreterContext !== void 0 ? interpreterContext : {};
-        this.contact = contact !== null && contact !== void 0 ? contact : contactFormValuesContainer.currentContact;
-        const isFormValueContainerObsolete = { current: false };
-        this.mutateAndNotify = (newContactFormValuesContainer_1, modifiedFields_1, ...args_1) => __awaiter(this, [newContactFormValuesContainer_1, modifiedFields_1, ...args_1], void 0, function* (newContactFormValuesContainer, modifiedFields, recurse = false) {
+        this.initialValuesProvider = initialValuesProvider;
+        this.dependentValuesProvider = dependentValuesProvider;
+        this.validatorsProvider = validatorsProvider;
+        this.language = language;
+        this.changeListeners = changeListeners;
+        this.interpreterContext = interpreterContext;
+        this._id = uuidv4();
+        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) => __awaiter(this, void 0, void 0, function* () {
             newContactFormValuesContainer.unregisterChangeListener(this.mutateAndNotify);
-            const modifiedLabels = modifiedFields.map((f) => f.label);
-            const newBridgedFormValueContainer = new BridgedFormValuesContainer(Object.assign(Object.assign({}, this.options()), { contactFormValuesContainer: newContactFormValuesContainer, contact: this.contact === this.contactFormValuesContainer.currentContact ? newContactFormValuesContainer.currentContact : this.contact, currentComputations: Object.entries(this.currentComputations).reduce((acc, [label, { metadata, revisionsFilter, computation, status }]) => {
-                    return modifiedLabels.includes(label)
-                        ? Object.assign(Object.assign({}, acc), { [label]: { metadata, revisionsFilter, computation, status: 'resolved' } }) : Object.assign(Object.assign({}, acc), { [label]: { metadata, revisionsFilter, computation, status } });
-                }, {}), modifiedFields: modifiedFields, context: 'ContactFormValuesContainer change', stackLevel: recurse ? stackLevel + 1 : stackLevel }));
-            isFormValueContainerObsolete.current = true;
-            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer, modifiedFields, 'ContactFormValuesContainer change', this._id));
+            const newBridgedFormValueContainer = yield 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.interpreterContext).init();
+            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer));
             return newBridgedFormValueContainer;
         });
         this.contactFormValuesContainer.registerChangeListener(this.mutateAndNotify);
-        this.currentComputations =
-            (modifiedFields && !modifiedFields.length) || stackLevel > 1000
-                ? currentComputations !== null && currentComputations !== void 0 ? currentComputations : {}
-                : this.computeDependentValues(this.computeInitialValues(Object.fromEntries(Object.entries(currentComputations !== null && currentComputations !== void 0 ? currentComputations : {}).filter(([, c]) => c.status === 'pending')), modifiedFields), modifiedFields);
-        //console.log(`bFVC with uuid ${this.uuid} has the following initial computations`, Object.keys(this.currentComputations).join(', '))
-        Object.entries(this.currentComputations).forEach(([label, { metadata, revisionsFilter, computation: computationPromise, status }]) => {
-            computationPromise
-                .then((computationResult) => {
-                var _a;
-                if (isFormValueContainerObsolete.current) {
-                    return;
-                }
-                //console.log(`Computed value for ${label} in ${this.uuid} with computation`, computation)
-                const newValue = this.convertRawValue(computationResult);
-                const currentValue = this.getValues(revisionsFilter);
-                if (newValue !== undefined || currentValue != 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['*'];
-                    }
-                    console.log(`${this._id}: setValue for ${label}`);
-                    if (this.setValue(label, lng, newValue, Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata, undefined, true)) {
-                        console.log(`${this._id}: Obsolete because of update`);
-                    }
-                    else {
-                        if (status === 'pending' && !isFormValueContainerObsolete.current) {
-                            isFormValueContainerObsolete.current = true;
-                            console.log(`${this._id}: Obsolete because of prune`);
-                            const newBridgedFormValueContainer = new BridgedFormValuesContainer(Object.assign(Object.assign({}, this.options()), { currentComputations: Object.entries(this.currentComputations).reduce((acc, [cLabel, c]) => (cLabel !== label ? Object.assign(Object.assign({}, acc), { [cLabel]: c }) : Object.assign(Object.assign({}, acc), { [cLabel]: Object.assign(Object.assign({}, c), { status: 'resolved' }) })), {}), modifiedFields: [], context: 'Prune computed value' }));
-                            this.changeListeners.forEach((l) => notify(l, newBridgedFormValueContainer, [], 'Prune computed value', this._id));
-                        }
-                    }
-                }
-            })
-                .catch(console.error); // Ignore errors in computations, they will be logged in the console
+        this.contact = contact !== null && contact !== void 0 ? contact : contactFormValuesContainer.currentContact;
+    }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.contactFormValuesContainer.mustBeInitialised()) {
+                yield this.computeInitialValues();
+            }
+            yield this.computeDependentValues();
+            return this;
         });
     }
     getLabel() {
@@ -164,6 +99,13 @@ export class BridgedFormValuesContainer {
     unregisterChangeListener(listener) {
         this.changeListeners = this.changeListeners.filter((l) => l !== listener);
     }
+    getDefaultValue(label) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const formula = (_a = this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).find(({ metadata }) => metadata.label === label)) === null || _a === void 0 ? void 0 : _a.formula;
+            return formula ? this.convertRawValue(yield this.compute(formula)) : undefined;
+        });
+    }
     getValues(revisionsFilter) {
         return Object.entries(this.contactFormValuesContainer.getValues((id, history) => revisionsFilter(id, history
             .filter(({ modified }) => !this.contact.created || !modified || modified <= this.contact.created)
@@ -247,46 +189,92 @@ export class BridgedFormValuesContainer {
         }
         return undefined;
     }
-    computeInitialValues(currentComputations, modifiedFields) {
-        return this.contactFormValuesContainer.rootForm.formTemplateId
-            ? this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId, modifiedFields).reduce((acc, { metadata, revisionsFilter, formula }) => {
-                if (currentComputations[metadata.label] === undefined) {
-                    const currentValue = this.getValues(revisionsFilter);
-                    return !currentValue || !Object.keys(currentValue).length
-                        ? Object.assign(Object.assign({}, acc), { [metadata.label]: { metadata, revisionsFilter, computation: this.compute(formula), status: 'pending' } }) : acc;
-                }
-                else {
-                    return acc;
-                }
-            }, currentComputations)
-            : currentComputations;
+    //This method mutates the BridgedFormValuesContainer but can only be called from the constructor
+    computeInitialValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+                yield Promise.all(this.initialValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).map((_a) => __awaiter(this, [_a], void 0, function* ({ metadata, revisionsFilter, formula }) {
+                    var _b;
+                    try {
+                        const currentValue = this.getValues(revisionsFilter);
+                        if (!currentValue || !Object.keys(currentValue).length) {
+                            const newValue = this.convertRawValue((yield this.compute(formula)));
+                            if (newValue !== undefined) {
+                                const lng = (_b = this.language) !== null && _b !== void 0 ? _b : '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);
+                    }
+                })));
+            }
+        });
     }
-    computeDependentValues(currentComputations, modifiedFields) {
-        return this.contactFormValuesContainer.rootForm.formTemplateId
-            ? this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId, modifiedFields).reduce((acc, { metadata, revisionsFilter, formula }) => {
-                return currentComputations[metadata.label] === undefined
-                    ? Object.assign(Object.assign({}, acc), { [metadata.label]: { metadata, revisionsFilter, computation: this.compute(formula), status: 'pending' } }) : acc;
-            }, currentComputations)
-            : currentComputations;
+    //This method mutates the BridgedFormValuesContainer but can only be called from the constructor
+    computeDependentValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+                yield Promise.all(this.dependentValuesProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).map((_a) => __awaiter(this, [_a], void 0, function* ({ metadata, revisionsFilter, formula }) {
+                    var _b;
+                    try {
+                        const currentValue = this.getValues(revisionsFilter);
+                        const newValue = this.convertRawValue((yield this.compute(formula)));
+                        if (newValue !== undefined || currentValue != undefined) {
+                            const lng = (_b = this.language) !== null && _b !== void 0 ? _b : 'en';
+                            if (newValue && !newValue.content[lng] && newValue.content['*']) {
+                                newValue.content[lng] = newValue.content['*'];
+                            }
+                            if (newValue) {
+                                delete newValue.content['*'];
+                            }
+                            const interceptor = (fvc) => {
+                                const currentContact = this.contactFormValuesContainer.currentContact;
+                                this.contactFormValuesContainer = fvc;
+                                if (this.contact === currentContact) {
+                                    this.contact = fvc.currentContact;
+                                }
+                            };
+                            setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, Object.keys(currentValue !== null && currentValue !== void 0 ? currentValue : {})[0], metadata, interceptor);
+                        }
+                    }
+                    catch (e) {
+                        console.log(`Error while computing formula : ${formula}`, e);
+                    }
+                })));
+            }
+        });
     }
-    setValue(label, language, fv, id, metadata, _, recurse = false) {
-        console.log(`${this._id}: setValue on ${this.contactFormValuesContainer._id}`);
-        return setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata, recurse);
+    setValue(label, language, fv, id, metadata) {
+        setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata);
     }
     setMetadata(meta, id) {
         var _a;
-        return this.contactFormValuesContainer.setMetadata({
+        this.contactFormValuesContainer.setMetadata({
             label: meta.label,
             responsible: meta.owner,
             valueDate: meta.valueDate,
-            tags: (_a = meta.tags) === null || _a === void 0 ? void 0 : _a.map((x) => new CodeStubWithId(x)),
+            tags: (_a = meta.tags) === null || _a === void 0 ? void 0 : _a.map((x) => new CodeStub(x)),
         }, id);
     }
     delete(serviceId) {
         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] : []); });
+        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] : []); });
     }
     compute(formula, sandbox) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -311,7 +299,6 @@ export class BridgedFormValuesContainer {
                     .join(', ');
             };
             const log = console.log;
-            // noinspection JSUnusedGlobalSymbols
             const native = {
                 parseInt: parseInt,
                 parseFloat: parseFloat,
@@ -350,8 +337,8 @@ export class BridgedFormValuesContainer {
                 Promise,
             };
             const proxy = new Proxy({}, {
-                has: (_target, key) => { var _a; return !!native[key] || key === 'self' || !!this.interpreterContext[key] || Object.keys((_a = this.getVersionedValuesForKey(key)) !== null && _a !== void 0 ? _a : {}).length > 0; },
-                get: (_target, key) => {
+                has: (target, key) => { var _a; return !!native[key] || key === 'self' || !!this.interpreterContext[key] || Object.keys((_a = this.getVersionedValuesForKey(key)) !== null && _a !== void 0 ? _a : {}).length > 0; },
+                get: (target, key) => {
                     if (key === 'undefined') {
                         return undefined;
                     }
@@ -365,24 +352,9 @@ export class BridgedFormValuesContainer {
             return (_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, sandbox !== null && sandbox !== void 0 ? sandbox : proxy);
         });
     }
-    isFieldBeingComputed(label) {
-        var _a;
-        return ((_a = this.currentComputations[label]) === null || _a === void 0 ? void 0 : _a.status) === 'pending';
-    }
     getChildren() {
         return __awaiter(this, void 0, void 0, function* () {
-            const children = yield Promise.all((yield this.contactFormValuesContainer.getChildren()).map((fvc) => new BridgedFormValuesContainer({
-                responsible: this.responsible,
-                contactFormValuesContainer: fvc,
-                interpreter: this.interpreter,
-                contact: this.contact,
-                initialValuesProvider: this.initialValuesProvider,
-                dependentValuesProvider: this.dependentValuesProvider,
-                validatorsProvider: this.validatorsProvider,
-                language: this.language,
-                interpreterContext: this.interpreterContext,
-                context: 'New child form',
-            })));
+            const children = yield Promise.all((yield this.contactFormValuesContainer.getChildren()).map((fvc) => new BridgedFormValuesContainer(this.responsible, fvc, this.interpreter, this.contact, this.initialValuesProvider, this.dependentValuesProvider, this.validatorsProvider, this.language, [], this.interpreterContext).init()));
             console.log(`${children.length} children found in ${this.contactFormValuesContainer.rootForm.formTemplateId} initialised with `, this.initialValuesProvider);
             return children;
         });
@@ -400,7 +372,7 @@ export class BridgedFormValuesContainer {
                             }
                         }
                         catch (e) {
-                            console.warn(`Error while computing validation : ${validation}`, e);
+                            console.log(`Error while computing validation : ${validation}`, e);
                         }
                         return res;
                     }), resPromise);
@@ -438,6 +410,9 @@ export class ContactFormValuesContainer {
     toString() {
         return `Contact(${this.rootForm.formTemplateId}[${this.rootForm.id}]) - ${this._id}`;
     }
+    mustBeInitialised() {
+        return !this._initialised;
+    }
     /**
      * Returns a contact that combines the content of the contact in this form with the content of all contents stored in the children
      */
@@ -457,9 +432,10 @@ export class ContactFormValuesContainer {
     allForms() {
         return [this.rootForm].concat(this.children.flatMap((c) => c.allForms()));
     }
-    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, formRecycler, changeListeners = []) {
-        //console.log(`Creating contact FVC (${rootForm.formTemplateId}) with ${children.length} children [${this._id}]`)
-        this._id = `C-${(cfvcIdGen++).toString()}`;
+    constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, formRecycler, changeListeners = [], initialised = true) {
+        this._id = uuidv4();
+        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');
         }
@@ -471,9 +447,10 @@ export class ContactFormValuesContainer {
         this.formFactory = formFactory;
         this.formRecycler = formRecycler;
         this.changeListeners = changeListeners;
+        this._initialised = initialised;
         this.indexedServices = [this.currentContact].concat(this.contactsHistory).reduce((acc, ctc) => {
             var _a, _b, _c;
-            return ((_c = (_b = (_a = ctc.services) === null || _a === void 0 ? void 0 : _a.filter((s) => { var _a; return (_a = ctc.subContacts) === null || _a === void 0 ? void 0 : _a.some((sc) => { var _a; return sc.formId === this.rootForm.id && ((_a = sc.services) === null || _a === void 0 ? void 0 : _a.some((sss) => sss.serviceId === s.id)); }); })) === null || _b === void 0 ? void 0 : _b.reduce((acc, s) => {
+            const services = (_c = (_b = (_a = ctc.services) === null || _a === void 0 ? void 0 : _a.filter((s) => { var _a; return (_a = ctc.subContacts) === null || _a === void 0 ? void 0 : _a.some((sc) => { var _a; return sc.formId === this.rootForm.id && ((_a = sc.services) === null || _a === void 0 ? void 0 : _a.some((sss) => sss.serviceId === s.id)); }); })) === null || _b === void 0 ? void 0 : _b.reduce((acc, s) => {
                 var _a, _b;
                 return s.id
                     ? Object.assign(Object.assign({}, acc), { [s.id]: ((_a = acc[s.id]) !== null && _a !== void 0 ? _a : (acc[s.id] = [])).concat({
@@ -481,7 +458,8 @@ export class ContactFormValuesContainer {
                             modified: ctc.created,
                             value: s,
                         }) }) : acc;
-            }, acc)) !== null && _c !== void 0 ? _c : acc);
+            }, acc)) !== null && _c !== void 0 ? _c : acc;
+            return services;
         }, {});
         this.synchronise();
     }
@@ -499,7 +477,7 @@ export class ContactFormValuesContainer {
                 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.formRecycler);
-                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer, [], `Child ${childFormValueContainer.rootForm.formTemplateId} changed`, this._id));
+                this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
             },
         ];
     }
@@ -509,7 +487,7 @@ export 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, formRecycler); })))
-                : [], formFactory, formRecycler, changeListeners);
+                : [], formFactory, formRecycler, changeListeners, false);
             contactFormValuesContainer.children.forEach((childFVC) => contactFormValuesContainer.registerChildFormValuesContainer(childFVC));
             return contactFormValuesContainer;
         });
@@ -538,6 +516,9 @@ export class ContactFormValuesContainer {
             throw new Error('Validation not supported at contact level');
         });
     }
+    getDefaultValue() {
+        return Promise.resolve(undefined);
+    }
     getValues(revisionsFilter) {
         return Object.entries(this.getServicesInHistory(revisionsFilter)).reduce((acc, [id, history]) => history.length
             ? Object.assign(Object.assign({}, acc), { [id]: [...history].sort((a, b) => ((b === null || b === void 0 ? void 0 : b.modified) || +new Date()) - ((a === null || a === void 0 ? void 0 : a.modified) || +new Date())) }) : acc, {});
@@ -560,7 +541,7 @@ export class ContactFormValuesContainer {
                                 label: (_c = s.label) !== null && _c !== void 0 ? _c : s.id,
                                 responsible: s.responsible,
                                 valueDate: s.valueDate,
-                                tags: normalizeCodes(s.tags),
+                                tags: s.tags,
                             },
                         }) }) : acc;
             }, acc)) !== null && _b !== void 0 ? _b : acc;
@@ -581,24 +562,20 @@ export class ContactFormValuesContainer {
             meta.valueDate && (newService.valueDate = meta.valueDate);
             meta.codes && (newService.codes = normalizeCodes(meta.codes));
             meta.tags && (newService.tags = 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.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer, [meta], `Metadata change for service ${service.id}`, this._id));
-            return true;
-        }
-        else {
-            return false;
+            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, new DecryptedContact(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.formRecycler, this.changeListeners);
+            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
     }
-    setValue(label, language, value, id, metadata, changeListenersOverrider, recurse = false) {
+    setValue(label, language, value, id, metadata, changeListenersOverrider) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         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 = (value === null || value === void 0 ? void 0 : value.codes) ? normalizeCodes(value.codes) : [];
         if (!isContentEqual((_d = service.content) === null || _d === void 0 ? void 0 : _d[language], newContent) || (newCodes && !areCodesEqual(newCodes, (_e = service.codes) !== null && _e !== void 0 ? _e : []))) {
-            //console.log('Setting value of service', service.id, 'with', value, 'and metadata', metadata)
             const newService = new DecryptedService(Object.assign(Object.assign({}, service), { modified: Date.now() }));
             const newContents = newContent
                 ? Object.assign(Object.assign({}, (service.content || {})), { [language]: newContent }) : Object.assign({}, (service.content || {}));
@@ -607,11 +584,11 @@ export class ContactFormValuesContainer {
             }
             let newCurrentContact;
             if (!Object.entries(newContents).filter(([, cnt]) => cnt !== undefined).length) {
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_f = this.currentContact.subContacts) !== null && _f !== void 0 ? _f : []).some((sc) => sc.formId === this.rootForm.id)
+                newCurrentContact = new DecryptedContact(Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_f = this.currentContact.subContacts) !== null && _f !== void 0 ? _f : []).some((sc) => sc.formId === this.rootForm.id)
                         ? ((_g = this.currentContact.subContacts) !== null && _g !== void 0 ? _g : []).map((sc) => {
                             var _a;
                             if (sc.formId === this.rootForm.id) {
-                                return Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([{ serviceId: service.id }]) });
+                                return new DecryptedSubContact(Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([new ServiceLink({ serviceId: service.id })]) }));
                             }
                             else {
                                 return sc;
@@ -619,10 +596,10 @@ export class ContactFormValuesContainer {
                         })
                         : ((_h = this.currentContact.subContacts) !== null && _h !== void 0 ? _h : []).concat(new DecryptedSubContact({
                             formId: this.rootForm.id,
-                            services: [{ serviceId: service.id }],
+                            services: [new ServiceLink({ serviceId: service.id })],
                         })), services: ((_j = this.currentContact.services) !== null && _j !== void 0 ? _j : []).some((s) => s.id === service.id)
                         ? ((_k = this.currentContact.services) !== null && _k !== void 0 ? _k : []).filter((s) => s.id !== service.id)
-                        : [...((_l = this.currentContact.services) !== null && _l !== void 0 ? _l : [])] });
+                        : [...((_l = this.currentContact.services) !== null && _l !== void 0 ? _l : [])] }));
             }
             else {
                 newService.content = newContents;
@@ -633,11 +610,11 @@ export class ContactFormValuesContainer {
                     newService.tags = metadata.tags ? normalizeCodes(metadata.tags) : newService.tags;
                     newService.label = (_p = metadata.label) !== null && _p !== void 0 ? _p : newService.label;
                 }
-                newCurrentContact = Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_q = this.currentContact.subContacts) !== null && _q !== void 0 ? _q : []).some((sc) => sc.formId === this.rootForm.id)
+                newCurrentContact = new DecryptedContact(Object.assign(Object.assign({}, this.currentContact), { subContacts: ((_q = this.currentContact.subContacts) !== null && _q !== void 0 ? _q : []).some((sc) => sc.formId === this.rootForm.id)
                         ? ((_r = this.currentContact.subContacts) !== null && _r !== void 0 ? _r : []).map((sc) => {
                             var _a;
                             if (sc.formId === this.rootForm.id) {
-                                return Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([{ serviceId: service.id }]) });
+                                return new DecryptedSubContact(Object.assign(Object.assign({}, sc), { services: ((_a = sc.services) !== null && _a !== void 0 ? _a : []).filter((s) => s.serviceId !== service.id).concat([new ServiceLink({ serviceId: service.id })]) }));
                             }
                             else {
                                 return sc;
@@ -645,38 +622,23 @@ export class ContactFormValuesContainer {
                         })
                         : ((_s = this.currentContact.subContacts) !== null && _s !== void 0 ? _s : []).concat(new DecryptedSubContact({
                             formId: this.rootForm.id,
-                            services: [{ serviceId: service.id }],
+                            services: [new ServiceLink({ serviceId: service.id })],
                         })), services: ((_t = this.currentContact.services) !== null && _t !== void 0 ? _t : []).some((s) => s.id === service.id)
                         ? ((_u = this.currentContact.services) !== null && _u !== void 0 ? _u : []).map((s) => (s.id === service.id ? newService : s))
-                        : [...((_v = this.currentContact.services) !== null && _v !== void 0 ? _v : []), newService] });
+                        : [...((_v = this.currentContact.services) !== null && _v !== void 0 ? _v : []), newService] }));
             }
             const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, newCurrentContact, this.contactsHistory.map((c) => (c === this.currentContact ? newCurrentContact : c)), this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
-            changeListenersOverrider
-                ? changeListenersOverrider(newFormValuesContainer)
-                : this.changeListeners.forEach((l) => {
-                    var _a;
-                    return notify(l, newFormValuesContainer, [
-                        {
-                            valueDate: newService.valueDate,
-                            tags: normalizeCodes(newService.tags),
-                            label: (_a = newService.label) !== null && _a !== void 0 ? _a : label,
-                        },
-                    ], `Set value of service ${service.id}}`, this._id, recurse);
-                });
-            return true;
-        }
-        else {
-            return false;
+            changeListenersOverrider ? changeListenersOverrider(newFormValuesContainer) : this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
     }
     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
+            const newFormValuesContainer = new ContactFormValuesContainer(this.rootForm, new DecryptedContact(Object.assign(Object.assign({}, this.currentContact), { services: (_a = this.currentContact.services) === null || _a === void 0 ? void 0 : _a.map((s) => s.id === serviceId
                     ? new DecryptedService(Object.assign(Object.assign({}, service), { endOfLife: Date.now() }))
-                    : s) }), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer, [], `Delete service ${serviceId}`, this._id));
+                    : s) })), this.contactsHistory, this.serviceFactory, this.children, this.formFactory, this.formRecycler, this.changeListeners);
+            this.changeListeners.forEach((l) => notify(l, newFormValuesContainer));
         }
     }
     compute() {
@@ -684,9 +646,6 @@ export class ContactFormValuesContainer {
             throw new Error('Compute not supported at contact level');
         });
     }
-    isFieldBeingComputed() {
-        return false;
-    }
     /** returns all services in history that match a selector
      *
      * @private
@@ -706,7 +665,7 @@ export class ContactFormValuesContainer {
                         owner: s.responsible,
                         valueDate: s.valueDate,
                         codes: s.codes,
-                        tags: normalizeCodes(s.tags),
+                        tags: s.tags,
                     },
                 });
             }));
@@ -720,10 +679,10 @@ export class ContactFormValuesContainer {
             if (!parentId)
                 return;
             const newForm = yield this.formFactory(parentId, anchorId, templateId, label);
-            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory, this.formRecycler, []);
+            const childFVC = new ContactFormValuesContainer(newForm, this.currentContact, this.contactsHistory, this.serviceFactory, [], this.formFactory, this.formRecycler, [], false);
             const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, this.currentContact, this.contactsHistory, this.serviceFactory, [...this.children, childFVC], this.formFactory, this.formRecycler, this.changeListeners);
             newContactFormValuesContainer.registerChildFormValuesContainer(childFVC);
-            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer, [], `Add child form ${newForm.formTemplateId} to contact form ${this.rootForm.formTemplateId}`, this._id));
+            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
         });
     }
     getServiceInCurrentContact(id) {
@@ -734,14 +693,14 @@ export 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.rootForm.id !== container.rootForm.id), this.formFactory, this.formRecycler, this.changeListeners);
-            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer, [], `Remove child form ${container.rootForm.formTemplateId} from contact form ${this.rootForm.formTemplateId}`, this._id));
+            this.changeListeners.forEach((l) => notify(l, newContactFormValuesContainer));
         });
     }
 }
-const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata, recurse = false) => {
+const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, metadata, changeListenersOverrider) => {
     var _a, _b, _c, _d;
     const value = fv === null || fv === void 0 ? void 0 : fv.content[language];
-    return cfvc.setValue(label, language, new DecryptedService({
+    cfvc.setValue(label, language, new DecryptedService({
         id: id,
         codes: (_b = (_a = fv === null || fv === void 0 ? void 0 : fv.codes) === null || _a === void 0 ? void 0 : _a.map((x) => new CodeStub(x))) !== null && _b !== void 0 ? _b : [],
         content: value
@@ -754,8 +713,8 @@ const setValueOnContactFormValuesContainer = (cfvc, label, language, fv, id, met
             label: (_c = metadata === null || metadata === void 0 ? void 0 : metadata.label) !== null && _c !== void 0 ? _c : label,
             responsible: metadata === null || metadata === void 0 ? void 0 : metadata.owner,
             valueDate: metadata === null || metadata === void 0 ? void 0 : metadata.valueDate,
-            tags: normalizeCodes((_d = metadata === null || metadata === void 0 ? void 0 : metadata.tags) === null || _d === void 0 ? void 0 : _d.map((x) => new CodeStub(x))),
+            tags: (_d = metadata === null || metadata === void 0 ? void 0 : metadata.tags) === null || _d === void 0 ? void 0 : _d.map((x) => new CodeStub(x)),
         }
-        : undefined, undefined, recurse);
+        : undefined, changeListenersOverrider);
 };
 //# sourceMappingURL=form-values-container.js.map