@icure/form 2.0.10 → 2.1.0

package/icure/form-values-container.js

@@ -18,7 +18,6 @@ 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.
@@ -47,16 +46,17 @@ class BridgedFormValuesContainer {
     /**
      * Creates an instance of BridgedFormValuesContainer.
      * @param responsible The id of the data owner responsible for the creation of the values
-     * @param contact The displayed contact (may be in the past). === to currentContact if the contact is the contact of the day
      * @param contactFormValuesContainer The wrapped ContactFormValuesContainer
      * @param interpreter A function that can interpret formulas
+     * @param contact The displayed contact (may be in the past). === to currentContact if the contact is the contact of the day
+     * @param initialValuesProvider A lambda that provides the initial values of the form
      * @param dependentValuesProvider A function that provides the dependent values (computed on the basis of other values) for a given anchorId and templateId
      * @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
+     * @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
      */
-    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = []) {
+    constructor(responsible, contactFormValuesContainer, interpreter, contact, initialValuesProvider = () => [], dependentValuesProvider = () => [], validatorsProvider = () => [], language = 'en', changeListeners = [], interpreterContext = {}) {
         this.responsible = responsible;
         this.interpreter = interpreter;
         this.initialValuesProvider = initialValuesProvider;
@@ -64,22 +64,28 @@ class BridgedFormValuesContainer {
         this.validatorsProvider = validatorsProvider;
         this.language = language;
         this.changeListeners = changeListeners;
+        this.interpreterContext = interpreterContext;
         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) => {
+        this.mutateAndNotify = (newContactFormValuesContainer) => __awaiter(this, void 0, void 0, function* () {
             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);
+            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.contact = contact !== null && contact !== void 0 ? contact : contactFormValuesContainer.currentContact;
-        if (this.contactFormValuesContainer.mustBeInitialised()) {
-            this.computeInitialValues();
-        }
-        this.computeDependentValues();
+    }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.contactFormValuesContainer.mustBeInitialised()) {
+                yield this.computeInitialValues();
+            }
+            yield this.computeDependentValues();
+            return this;
+        });
     }
     getLabel() {
         return this.contactFormValuesContainer.getLabel();
@@ -96,6 +102,13 @@ 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)
@@ -144,70 +157,109 @@ class BridgedFormValuesContainer {
                 },
             })) })), {});
     }
+    convertRawValue(rawValue) {
+        var _a, _b;
+        if (rawValue && typeof rawValue === 'object' && 'content' in rawValue) {
+            return rawValue;
+        }
+        if (Array.isArray(rawValue)) {
+            return rawValue.reduce((acc, it, idx) => {
+                var _a, _b, _c, _d, _e;
+                const fv = this.convertRawValue(it);
+                if (fv === undefined) {
+                    return acc;
+                }
+                acc.codes = [...((_a = fv.codes) !== null && _a !== void 0 ? _a : []), ...((_b = acc.codes) !== null && _b !== void 0 ? _b : [])];
+                acc.content['*'] = ((_c = fv.content['*']) === null || _c === void 0 ? void 0 : _c.value)
+                    ? Object.assign(Object.assign({}, acc.content['*']), { [(_e = ((_d = fv.codes) !== null && _d !== void 0 ? _d : [])[0].id) !== null && _e !== void 0 ? _e : idx.toString()]: fv.content['*'].value }) : acc.content['*'];
+                return acc;
+            }, { content: { '*': { type: 'compound', value: {} } } });
+        }
+        if (typeof rawValue === 'number') {
+            return { content: { '*': { type: 'number', value: rawValue } } };
+        }
+        if (typeof rawValue === 'string') {
+            return { content: { '*': { type: 'string', value: rawValue } } };
+        }
+        if (typeof rawValue === 'boolean') {
+            return { content: { '*': { type: 'boolean', value: rawValue } } };
+        }
+        if (rawValue instanceof Date) {
+            return { content: { '*': { type: 'timestamp', value: (0, dates_1.dateToFuzzyDate)(rawValue) } } };
+        }
+        if (rawValue && typeof rawValue === 'object' && 'unit' in rawValue && 'value' in rawValue && typeof rawValue.value === 'number') {
+            return { content: { '*': { type: 'measure', value: rawValue.value, unit: (_b = (_a = rawValue.unit) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '' } } };
+        }
+        return undefined;
+    }
     //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';
+        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);
+                    }
+                })));
+            }
+        });
+    }
+    //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['*'];
                             }
-                            setValueOnContactFormValuesContainer(this.contactFormValuesContainer, metadata.label, lng, newValue, undefined, metadata, (fvc) => {
+                            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);
-                }
-            });
-        }
-    }
-    //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, revisionsFilter, formula }) => {
-                var _a;
-                try {
-                    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';
-                        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);
                     }
-                }
-                catch (e) {
-                    console.log(`Error while computing formula : ${formula}`, e);
-                }
-            });
-        }
+                })));
+            }
+        });
     }
     setValue(label, language, fv, id, metadata) {
         setValueOnContactFormValuesContainer(this.contactFormValuesContainer, label, language, fv, id, metadata);
@@ -227,76 +279,111 @@ class BridgedFormValuesContainer {
         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) {
-        var _a;
-        // noinspection JSUnusedGlobalSymbols
-        const parseContent = (content) => {
-            var _a, _b;
-            if (!content) {
-                return undefined;
-            }
-            const primitive = (_b = (_a = content[this.language]) !== null && _a !== void 0 ? _a : content['*']) !== null && _b !== void 0 ? _b : content[Object.keys(content)[0]];
-            return primitive && (0, primitive_1.parsePrimitive)(primitive);
-        };
-        const log = console.log;
-        const native = {
-            parseInt: parseInt,
-            parseFloat: parseFloat,
-            Date: Date,
-            Math: Math,
-            Number: Number,
-            String: String,
-            Boolean: Boolean,
-            Array: Array,
-            Object: Object,
-            parseContent,
-            validate: {
-                notBlank: (self, label) => {
-                    var _a, _b, _c;
-                    const value = parseContent((_b = (_a = self[label]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.content);
-                    return !!((_c = value === null || value === void 0 ? void 0 : value.trim()) === null || _c === void 0 ? void 0 : _c.length);
-                },
-            },
-            log,
-        };
-        const proxy = new Proxy({}, {
-            has: (target, key) => { var _a; return !!native[key] || key === 'self' || Object.keys((_a = this.getVersionedValuesForKey(key)) !== null && _a !== void 0 ? _a : {}).length > 0; },
-            get: (target, key) => {
-                if (key === 'undefined') {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            // noinspection JSUnusedGlobalSymbols
+            const parseContent = (content, toString = false) => {
+                var _a, _b;
+                if (!content) {
                     return undefined;
                 }
-                const nativeValue = native[key];
-                if (!!nativeValue) {
-                    return nativeValue;
+                const primitive = (_b = (_a = content[this.language]) !== null && _a !== void 0 ? _a : content['*']) !== null && _b !== void 0 ? _b : content[Object.keys(content)[0]];
+                return primitive && (0, primitive_1.parsePrimitive)(primitive, toString);
+            };
+            const text = (item) => {
+                if (!item) {
+                    return undefined;
                 }
-                return key === 'self' ? proxy : Object.values(this.getVersionedValuesForKey(key)).map((v) => { var _a; return (_a = v[0]) === null || _a === void 0 ? void 0 : _a.value; });
-            },
+                const items = Array.isArray(item) ? item : [item];
+                return items
+                    .map((it) => { var _a; return (_a = parseContent(it.content, true)) === null || _a === void 0 ? void 0 : _a.toString(); })
+                    .filter((it) => !!it)
+                    .join(', ');
+            };
+            const log = console.log;
+            const native = {
+                parseInt: parseInt,
+                parseFloat: parseFloat,
+                Date: Date,
+                Math: Math,
+                Number: Number,
+                String: String,
+                Boolean: Boolean,
+                Array: Array,
+                Object: Object,
+                hasOption: (it, option) => { var _a; return it && ((_a = it.codes) === null || _a === void 0 ? void 0 : _a.some((c) => { var _a, _b; return c.id === option || ((_b = (_a = c.id) === null || _a === void 0 ? void 0 : _a.split('|')) === null || _b === void 0 ? void 0 : _b[1]) === option; })); },
+                score: (it) => {
+                    var _a;
+                    return it
+                        ? ((_a = it.codes) !== null && _a !== void 0 ? _a : []).reduce((acc, c) => {
+                            var _a, _b, _c;
+                            try {
+                                return acc + parseInt((_c = (_b = (_a = c.id) === null || _a === void 0 ? void 0 : _a.split('|')) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : '0');
+                            }
+                            catch (e) {
+                                return acc;
+                            }
+                        }, 0)
+                        : 0;
+                },
+                parseContent,
+                validate: {
+                    notBlank: (self, label) => {
+                        var _a, _b, _c;
+                        const value = parseContent((_b = (_a = self[label]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.content);
+                        return !!((_c = value === null || value === void 0 ? void 0 : value.trim()) === null || _c === void 0 ? void 0 : _c.length);
+                    },
+                },
+                text,
+                log,
+                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) => {
+                    if (key === 'undefined') {
+                        return undefined;
+                    }
+                    const nativeValue = native[key];
+                    if (!!nativeValue) {
+                        return nativeValue;
+                    }
+                    return key === 'self' ? proxy : this.interpreterContext[key] ? this.interpreterContext[key]() : Object.values(this.getVersionedValuesForKey(key)).map((v) => { var _a; return (_a = v[0]) === null || _a === void 0 ? void 0 : _a.value; });
+                },
+            });
+            return (_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, sandbox !== null && sandbox !== void 0 ? sandbox : proxy);
         });
-        return (_a = this.interpreter) === null || _a === void 0 ? void 0 : _a.call(this, formula, sandbox !== null && sandbox !== void 0 ? sandbox : proxy);
     }
     getChildren() {
-        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;
+        return __awaiter(this, void 0, void 0, function* () {
+            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;
+        });
     }
     getValidationErrors() {
-        if (this.contactFormValuesContainer.rootForm.formTemplateId) {
-            return this.validatorsProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).flatMap(({ metadata, validators }) => validators
-                .map(({ validation, message }) => {
-                try {
-                    return this.compute(validation) ? undefined : [metadata, message];
-                }
-                catch (e) {
-                    console.log(`Error while computing validation : ${validation}`, e);
-                    return undefined;
-                }
-            })
-                .filter((x) => !!x));
-        }
-        else {
-            return [];
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.contactFormValuesContainer.rootForm.formTemplateId) {
+                // noinspection ES6MissingAwait
+                return yield this.validatorsProvider(this.contactFormValuesContainer.rootForm.descr, this.contactFormValuesContainer.rootForm.formTemplateId).reduce((resPromise_1, _a) => __awaiter(this, [resPromise_1, _a], void 0, function* (resPromise, { metadata, validators }) {
+                    return yield validators.reduce((resPromise_2, _a) => __awaiter(this, [resPromise_2, _a], void 0, function* (resPromise, { validation, message }) {
+                        const res = yield resPromise;
+                        try {
+                            if (!(yield this.compute(validation))) {
+                                res.push([metadata, message]);
+                            }
+                        }
+                        catch (e) {
+                            console.log(`Error while computing validation : ${validation}`, e);
+                        }
+                        return res;
+                    }), resPromise);
+                }), Promise.resolve([]));
+            }
+            else {
+                return [];
+            }
+        });
     }
     addChild(anchorId, templateId, label) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -362,6 +449,19 @@ class ContactFormValuesContainer {
         this.formRecycler = formRecycler;
         this.changeListeners = changeListeners;
         this._initialised = initialised;
+        this.indexedServices = [this.currentContact].concat(this.contactsHistory).reduce((acc, ctc) => {
+            var _a, _b, _c;
+            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({
+                            revision: (_b = ctc.rev) !== null && _b !== void 0 ? _b : null,
+                            modified: ctc.created,
+                            value: s,
+                        }) }) : acc;
+            }, acc)) !== null && _c !== void 0 ? _c : acc;
+            return services;
+        }, {});
         this.synchronise();
     }
     synchronise() {
@@ -408,10 +508,17 @@ class ContactFormValuesContainer {
         this.changeListeners = this.changeListeners.filter((l) => l !== listener);
     }
     getChildren() {
-        return this.children;
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.children;
+        });
     }
     getValidationErrors() {
-        throw new Error('Validation not supported at contact level');
+        return __awaiter(this, void 0, void 0, function* () {
+            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
@@ -530,7 +637,9 @@ class ContactFormValuesContainer {
         }
     }
     compute() {
-        throw new Error('Compute not supported at contact level');
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Compute not supported at contact level');
+        });
     }
     /** returns all services in history that match a selector
      *
@@ -538,20 +647,8 @@ class ContactFormValuesContainer {
      * @param revisionsFilter
      */
     getServicesInHistory(revisionsFilter) {
-        const indexedServices = [this.currentContact].concat(this.contactsHistory).reduce((acc, ctc) => {
-            var _a, _b, _c;
-            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({
-                            revision: (_b = ctc.rev) !== null && _b !== void 0 ? _b : null,
-                            modified: ctc.created,
-                            value: s,
-                        }) }) : acc;
-            }, acc)) !== null && _c !== void 0 ? _c : acc;
-            return services;
-        }, {}); //index services in history by id
-        return Object.entries(indexedServices)
+        //index services in history by id
+        return Object.entries(this.indexedServices)
             .map(([id, history]) => {
             const keptRevisions = revisionsFilter(id, history.map(({ revision, modified, value: s }) => {
                 var _a, _b;