@icure/form 2.1.4 → 2.1.7

package/components/icure-form/renderer/index.d.ts

@@ -1,11 +1,11 @@
 import { TemplateResult } from 'lit';
-import { FormValuesContainer, Suggestion } from '../../../generic';
-import { FieldMetadata, FieldValue, Form } from '../../model';
+import { FormValuesContainer, Suggestion, Version } from '../../../generic';
+import { Field, FieldMetadata, FieldValue, Form } from '../../model';
 export interface RendererProps {
     language?: string;
     labelPosition?: 'top' | 'left' | 'right' | 'bottom' | 'float';
     defaultOwner?: string;
 }
-export type Renderer = (form: Form, props: RendererProps, formsValueContainer?: FormValuesContainer<FieldValue, FieldMetadata>, translationProvider?: (language: string, text: string) => string, ownersProvider?: (terms: string[], ids?: string[], specialties?: string[]) => Promise<Suggestion[]>, optionsProvider?: (language: string, codifications: string[], terms?: string[]) => Promise<Suggestion[]>, actionListener?: (event: string, payload: unknown) => void, languages?: {
+export type Renderer = (form: Form, props: RendererProps, formsValueContainer?: FormValuesContainer<FieldValue, FieldMetadata>, translationProvider?: (language: string, text: string) => string, revisionsFilter?: (field: Field, id: string, history: Version<FieldMetadata>[]) => string[], ownersProvider?: (terms: string[], ids?: string[], specialties?: string[]) => Promise<Suggestion[]>, optionsProvider?: (language: string, codifications: string[], terms?: string[]) => Promise<Suggestion[]>, actionListener?: (event: string, payload: unknown) => void, languages?: {
     [iso: string]: string;
 }, readonly?: boolean, displayMetadata?: boolean, sectionWrapper?: (index: number, section: () => TemplateResult) => TemplateResult) => Promise<TemplateResult>;

package/components/icure-form/renderer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../tmp/components/icure-form/renderer/index.ts"],"names":[],"mappings":"","sourcesContent":["import { TemplateResult } from 'lit'\nimport { FormValuesContainer, Suggestion } from '../../../generic'\nimport { FieldMetadata, FieldValue, Form } from '../../model'\n\nexport interface RendererProps {\n\tlanguage?: string\n\tlabelPosition?: 'top' | 'left' | 'right' | 'bottom' | 'float'\n\tdefaultOwner?: string\n}\n\nexport type Renderer = (\n\tform: Form,\n\tprops: RendererProps,\n\tformsValueContainer?: FormValuesContainer<FieldValue, FieldMetadata>,\n\ttranslationProvider?: (language: string, text: string) => string,\n\townersProvider?: (terms: string[], ids?: string[], specialties?: string[]) => Promise<Suggestion[]>,\n\toptionsProvider?: (language: string, codifications: string[], terms?: string[]) => Promise<Suggestion[]>,\n\tactionListener?: (event: string, payload: unknown) => void,\n\tlanguages?: { [iso: string]: string },\n\treadonly?: boolean,\n\tdisplayMetadata?: boolean,\n\tsectionWrapper?: (index: number, section: () => TemplateResult) => TemplateResult,\n) => Promise<TemplateResult>\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../tmp/components/icure-form/renderer/index.ts"],"names":[],"mappings":"","sourcesContent":["import { TemplateResult } from 'lit'\nimport { FormValuesContainer, Suggestion, Version } from '../../../generic'\nimport { Field, FieldMetadata, FieldValue, Form } from '../../model'\n\nexport interface RendererProps {\n\tlanguage?: string\n\tlabelPosition?: 'top' | 'left' | 'right' | 'bottom' | 'float'\n\tdefaultOwner?: string\n}\n\nexport type Renderer = (\n\tform: Form,\n\tprops: RendererProps,\n\tformsValueContainer?: FormValuesContainer<FieldValue, FieldMetadata>,\n\ttranslationProvider?: (language: string, text: string) => string,\n\trevisionsFilter?: (field: Field, id: string, history: Version<FieldMetadata>[]) => string[],\n\townersProvider?: (terms: string[], ids?: string[], specialties?: string[]) => Promise<Suggestion[]>,\n\toptionsProvider?: (language: string, codifications: string[], terms?: string[]) => Promise<Suggestion[]>,\n\tactionListener?: (event: string, payload: unknown) => void,\n\tlanguages?: { [iso: string]: string },\n\treadonly?: boolean,\n\tdisplayMetadata?: boolean,\n\tsectionWrapper?: (index: number, section: () => TemplateResult) => TemplateResult,\n) => Promise<TemplateResult>\n"]}

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

@@ -155,6 +155,7 @@ export declare class ContactFormValuesContainer implements FormValuesContainer<S
     private getServicesInHistory;
     addChild(anchorId: string, templateId: string, label: string): Promise<void>;
     private getServiceInCurrentContact;
+    private static collectFormIds;
     removeChild(container: ContactFormValuesContainer): Promise<void>;
 }
 export {};

package/icure/form-values-container.js

@@ -489,12 +489,19 @@ class ContactFormValuesContainer {
      * Returns a contact that combines the content of the contact in this form with the content of all contents stored in the children
      */
     coordinatedContact() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const childrenContacts = this.children.map((c) => c.coordinatedContact());
-        const thisKeptServiceIds = ((_a = this.currentContact.subContacts) !== null && _a !== void 0 ? _a : []).filter((sc) => sc.formId === this.rootForm.id).flatMap((sc) => { var _a; return ((_a = sc.services) !== null && _a !== void 0 ? _a : []).map((s) => s.serviceId); });
-        return Object.assign(Object.assign({}, this.currentContact), { services: childrenContacts.reduce((acc, c) => { var _a; return acc.concat((_a = c.services) !== null && _a !== void 0 ? _a : []); }, []).concat(((_b = this.currentContact.services) !== null && _b !== void 0 ? _b : []).filter((s) => thisKeptServiceIds.includes(s.id))), subContacts: childrenContacts
+        const thisKeptServiceIds = new Set(((_a = this.currentContact.subContacts) !== null && _a !== void 0 ? _a : []).filter((sc) => sc.formId === this.rootForm.id).flatMap((sc) => { var _a; return ((_a = sc.services) !== null && _a !== void 0 ? _a : []).map((s) => s.serviceId); }));
+        const thisFormServices = ((_b = this.currentContact.services) !== null && _b !== void 0 ? _b : []).filter((s) => thisKeptServiceIds.has(s.id));
+        // Include endOfLife services not linked to any subcontact (from deleted subforms)
+        const allSubContactServiceIds = new Set(((_c = this.currentContact.subContacts) !== null && _c !== void 0 ? _c : []).flatMap((sc) => { var _a; return ((_a = sc.services) !== null && _a !== void 0 ? _a : []).map((s) => s.serviceId); }));
+        const endOfLifeServices = ((_d = this.currentContact.services) !== null && _d !== void 0 ? _d : []).filter((s) => s.endOfLife && s.id && !allSubContactServiceIds.has(s.id));
+        return Object.assign(Object.assign({}, this.currentContact), { services: childrenContacts
+                .reduce((acc, c) => { var _a; return acc.concat((_a = c.services) !== null && _a !== void 0 ? _a : []); }, [])
+                .concat(thisFormServices)
+                .concat(endOfLifeServices), subContacts: childrenContacts
                 .reduce((acc, c) => { var _a; return acc.concat((_a = c.subContacts) !== null && _a !== void 0 ? _a : []); }, [])
-                .concat(((_c = this.currentContact.subContacts) !== null && _c !== void 0 ? _c : []).filter((s) => s.formId === this.rootForm.id)) });
+                .concat(((_e = this.currentContact.subContacts) !== null && _e !== void 0 ? _e : []).filter((s) => s.formId === this.rootForm.id)) });
     }
     /**
      * Returns a contact that combines the content of the contact in this form with the content of all contents stored in the children
@@ -503,7 +510,7 @@ class ContactFormValuesContainer {
         return [this.rootForm].concat(this.children.flatMap((c) => c.allForms()));
     }
     constructor(rootForm, currentContact, contactsHistory, serviceFactory, children, formFactory, formRecycler, changeListeners = [], anchorId, initialised = true) {
-        var _a;
+        var _a, _b;
         this._id = '';
         this._initialised = false;
         this.rootForm = rootForm;
@@ -521,9 +528,16 @@ class ContactFormValuesContainer {
         this.formRecycler = formRecycler;
         this.changeListeners = changeListeners;
         this._initialised = initialised;
+        // Collect IDs of services that have been marked with endOfLife in the most recent contact
+        const endOfLifeServiceIds = new Set();
+        const mostRecentContact = this.currentContact;
+        for (const s of (_b = mostRecentContact.services) !== null && _b !== void 0 ? _b : []) {
+            if (s.id && s.endOfLife)
+                endOfLifeServiceIds.add(s.id);
+        }
         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) => {
+            return ((_c = (_b = (_a = ctc.services) === null || _a === void 0 ? void 0 : _a.filter((s) => { var _a; return !endOfLifeServiceIds.has(s.id) && ((_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({
@@ -785,9 +799,77 @@ class ContactFormValuesContainer {
         const service = (_a = (this.currentContact.services || [])) === null || _a === void 0 ? void 0 : _a.find((s) => s.id === id);
         return service !== null && service !== void 0 ? service : undefined;
     }
+    static collectFormIds(container) {
+        const ids = new Set();
+        if (container.rootForm.id)
+            ids.add(container.rootForm.id);
+        for (const child of container.children) {
+            for (const id of ContactFormValuesContainer.collectFormIds(child)) {
+                ids.add(id);
+            }
+        }
+        return ids;
+    }
     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.anchorId, true);
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            // Collect all form IDs in the subtree being removed (child + its descendants)
+            const removedFormIds = ContactFormValuesContainer.collectFormIds(container);
+            // Collect service IDs linked to any removed form across current contact and history
+            const allContacts = [this.currentContact, ...this.contactsHistory];
+            const childServiceIds = new Set();
+            for (const ctc of allContacts) {
+                for (const sc of (_a = ctc.subContacts) !== null && _a !== void 0 ? _a : []) {
+                    if (sc.formId && removedFormIds.has(sc.formId)) {
+                        for (const sRef of (_b = sc.services) !== null && _b !== void 0 ? _b : []) {
+                            if (sRef.serviceId)
+                                childServiceIds.add(sRef.serviceId);
+                        }
+                    }
+                }
+            }
+            // Build the updated current contact:
+            // - Services that exist in history must be marked with endOfLife (not removed)
+            // - Services that only exist in the current contact can be simply removed
+            // - Remove subContact entries for all removed forms
+            const now = Date.now();
+            // Determine which child services exist in history
+            const childServiceIdsInHistory = new Set();
+            for (const ctc of this.contactsHistory) {
+                for (const sc of (_c = ctc.subContacts) !== null && _c !== void 0 ? _c : []) {
+                    if (sc.formId && removedFormIds.has(sc.formId)) {
+                        for (const sRef of (_d = sc.services) !== null && _d !== void 0 ? _d : []) {
+                            if (sRef.serviceId && childServiceIds.has(sRef.serviceId))
+                                childServiceIdsInHistory.add(sRef.serviceId);
+                        }
+                    }
+                }
+            }
+            const existingServiceIds = new Set(((_e = this.currentContact.services) !== null && _e !== void 0 ? _e : []).map((s) => s.id));
+            // Services in current contact: mark with endOfLife if in history, remove otherwise
+            const updatedServices = ((_f = this.currentContact.services) !== null && _f !== void 0 ? _f : [])
+                .filter((s) => !(s.id && childServiceIds.has(s.id) && !childServiceIdsInHistory.has(s.id)))
+                .map((s) => (s.id && childServiceIdsInHistory.has(s.id) ? new api_1.Service({ id: s.id, created: s.created, modified: now, endOfLife: now }) : s));
+            // Services only in history (not in current contact): add with endOfLife
+            for (const serviceId of childServiceIdsInHistory) {
+                if (!existingServiceIds.has(serviceId)) {
+                    for (const ctc of this.contactsHistory) {
+                        const historyService = (_g = ctc.services) === null || _g === void 0 ? void 0 : _g.find((s) => s.id === serviceId);
+                        if (historyService) {
+                            updatedServices.push(new api_1.Service({ id: historyService.id, created: historyService.created, modified: now, endOfLife: now }));
+                            break;
+                        }
+                    }
+                }
+            }
+            // Remove subContact entries for all removed forms
+            const updatedSubContacts = ((_h = this.currentContact.subContacts) !== null && _h !== void 0 ? _h : []).filter((sc) => !sc.formId || !removedFormIds.has(sc.formId));
+            const updatedContact = Object.assign(Object.assign({}, this.currentContact), { services: updatedServices, subContacts: updatedSubContacts });
+            // Recycle all removed forms
+            for (const formId of removedFormIds) {
+                yield this.formRecycler(formId);
+            }
+            const newContactFormValuesContainer = new ContactFormValuesContainer(this.rootForm, updatedContact, this.contactsHistory, this.serviceFactory, this.children.filter((c) => c.rootForm.id !== container.rootForm.id), this.formFactory, this.formRecycler, this.changeListeners, this.anchorId, true);
             this.changeListeners.forEach((l) => { var _a; return notify(l, newContactFormValuesContainer, [`subForms_${(_a = container.anchorId) !== null && _a !== void 0 ? _a : 'all'}`]); });
         });
     }