@hmcts/ccd-case-ui-toolkit 7.4.2-broken-access → 7.4.2-exui-5220-rc1

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -14787,7 +14787,7 @@ class CaseFileViewFieldComponent {
     }
     setMediaViewerFile(document) {
         const documentDetails = {
-            document_binary_url: this.withLegacyDocumentAccessContext(this.documentManagementService.getDocumentBinaryUrl(document)),
+            document_binary_url: document.document_binary_url,
             document_filename: document.document_filename,
             content_type: document.content_type
         };
@@ -14802,19 +14802,6 @@ class CaseFileViewFieldComponent {
         const mediaViewerInfo = this.documentManagementService.getMediaViewerInfo(documentDetails);
         this.currentDocument = JSON.parse(mediaViewerInfo);
     }
-    withLegacyDocumentAccessContext(documentBinaryUrl) {
-        if (!documentBinaryUrl || !this.caseId) {
-            return documentBinaryUrl;
-        }
-        const [path, query = ''] = documentBinaryUrl.split('?');
-        if (!/^\/documents\/[^/]+\/binary\/?$/.test(path)) {
-            return documentBinaryUrl;
-        }
-        // XUI validates legacy document access against the case before proxying the binary request.
-        const searchParams = new URLSearchParams(query);
-        searchParams.set('caseId', this.caseId);
-        return `${path}?${searchParams.toString()}`;
-    }
     moveDocument(data) {
         const cid = this.route.snapshot.paramMap.get(CaseFileViewFieldComponent.PARAM_CASE_ID);
         const loadingToken = this.loadingService.register();
@@ -27417,8 +27404,12 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
+        if (hasMeaningfulContent) {
+            this.preserveDocmosisBlankParagraphs(documentElement);
+        }
         const sanitisedValue = sanitiseRichTextDocument(documentElement);
-        return this.hasMeaningfulRichTextContent(documentElement)
+        return hasMeaningfulContent
             ? this.normalisePlainTextValue(sanitisedValue)
             : '';
     }
@@ -27438,11 +27429,22 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
+        if (hasMeaningfulContent) {
+            this.preserveDocmosisBlankParagraphs(documentElement);
+        }
         const sanitisedValue = sanitiseRichTextDocument(documentElement);
-        return this.hasMeaningfulRichTextContent(documentElement)
+        return hasMeaningfulContent
             ? this.normalisePlainTextValue(sanitisedValue)
             : '';
     }
+    /**
+     * Gives intentionally blank paragraphs content so Docmosis preserves them as blank lines.
+    * This runs only when the document has meaningful content, so a completely empty field remains empty.
+    */
+    preserveDocmosisBlankParagraphs(documentElement) {
+        this.replaceBlankParagraphContent(documentElement, '\u00a0');
+    }
     hasMeaningfulRichTextContent(documentElement) {
         const visibleText = (documentElement.body.textContent || '')
             .replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
@@ -27563,7 +27565,8 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
                 emitEvent: false,
                 emitModelToViewChange: false
             });
-            if (normalisedValue || this.editorHasMeaningfulRichTextContent()) {
+            if ((normalisedValue || this.editorHasMeaningfulRichTextContent())
+                && !this.differsOnlyByDocmosisBlankParagraphs(value, normalisedValue)) {
                 this.editor.setContent(normalisedValue || '');
             }
         }
@@ -27571,6 +27574,34 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             this.isNormalisingValue = false;
         }
     }
+    differsOnlyByDocmosisBlankParagraphs(value, normalisedValue) {
+        if (!value || !normalisedValue) {
+            return false;
+        }
+        const originalDocument = new DOMParser().parseFromString(value, 'text/html');
+        const normalisedDocument = new DOMParser().parseFromString(normalisedValue, 'text/html');
+        this.clearBlankParagraphs(originalDocument);
+        this.clearBlankParagraphs(normalisedDocument);
+        return originalDocument.body.innerHTML === normalisedDocument.body.innerHTML;
+    }
+    /**
+     * Canonicalises visually blank paragraphs to <p></p> before comparing two HTML values.
+    * This lets the editor avoid reloading when only the Docmosis blank-line representation changed.
+    */
+    clearBlankParagraphs(documentElement) {
+        this.replaceBlankParagraphContent(documentElement, '');
+    }
+    replaceBlankParagraphContent(documentElement, replacement) {
+        const paragraphs = Array.prototype.slice.call(documentElement.body.querySelectorAll('p'));
+        paragraphs.forEach((paragraph) => {
+            // Ignore standard whitespace (\s), non-breaking spaces (U+00A0), zero-width characters
+            // (U+200B–U+200D), and the byte-order mark (U+FEFF) when checking for visible text.
+            const visibleText = (paragraph.textContent || '').replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
+            if (!visibleText && !paragraph.querySelector('hr')) {
+                paragraph.textContent = replacement;
+            }
+        });
+    }
     editorHasMeaningfulRichTextContent() {
         const documentNode = this.editor.view.state.doc;
         const visibleText = documentNode.textContent.replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
@@ -35635,18 +35666,19 @@ class ReadFieldsFilterPipe {
         const collectionItemValue = ReadFieldsFilterPipe.getCollectionItemValue(complexField);
         if (Object.keys(collectionItemValue).length > 0) {
             return {
-                checkConditionalShowAgainst: Object.assign(collectionItemValue, currentValues),
+                checkConditionalShowAgainst: { ...collectionItemValue, ...currentValues },
                 formGroupAvailable: false
             };
         }
         return {
-            checkConditionalShowAgainst: Object.assign(checkConditionalShowAgainst, currentValues),
+            checkConditionalShowAgainst: { ...checkConditionalShowAgainst, ...currentValues },
             formGroupAvailable: false
         };
     }
     static resolveFallbackConditionalShowContext(checkConditionalShowAgainst, currentValues) {
         return {
-            checkConditionalShowAgainst: Object.assign(checkConditionalShowAgainst, currentValues),
+            // Contexts are local to this render; never copy sibling values into shared form data.
+            checkConditionalShowAgainst: { ...checkConditionalShowAgainst, ...currentValues },
             formGroupAvailable: false
         };
     }
@@ -35659,6 +35691,11 @@ class ReadFieldsFilterPipe {
             return { checkConditionalShowAgainst, formGroupAvailable };
         }
         if (idPrefix !== '') {
+            // A collection item already supplies its own condition values. Do not rely on
+            // its collection's name having been flattened into the root by another render.
+            if (complexField.parent?.field_type?.type === 'Collection') {
+                return { checkConditionalShowAgainst: currentValues, formGroupAvailable: false };
+            }
             return ReadFieldsFilterPipe.resolvePrefixedConditionalShowContext(checkConditionalShowAgainst, currentValues, idPrefix);
         }
         if (path === 'parent_value' && ReadFieldsFilterPipe.findAncestorOfType(complexField, 'Collection')) {