@hmcts/ccd-case-ui-toolkit 7.2.58 → 7.2.59-markdown-add-validation

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

@@ -8,7 +8,7 @@ import * as i1$1 from '@angular/router';
 import { RouterModule, NavigationStart, NavigationEnd } from '@angular/router';
 import * as i4 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Validators, ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { BehaviorSubject, throwError, Subject, EMPTY, Observable, of, combineLatest, timer, forkJoin, fromEvent, Subscription } from 'rxjs';
+import { BehaviorSubject, throwError, Subject, EMPTY, Observable, skip, of, combineLatest, timer, forkJoin, fromEvent, Subscription } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
 import { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, take, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, first, takeUntil, filter } from 'rxjs/operators';
@@ -5093,10 +5093,15 @@ class FormValidatorsService {
         return validator;
     }
     static markDownPatternValidator() {
-        const pattern = /(\[[^\]]{0,500}\]\([^)]{0,500}\)|!\[[^\]]{0,500}\]\([^)]{0,500}\)|<img[^>]{0,500}>|<a[^>]{0,500}>.*?<\/a>)/;
+        // Matches: [text](url), ![alt](url), <img ...>, <a ...>...</a>
+        const inlineMarkdownPattern = /(?:!?\[[^\]]{0,500}\]\([^)]{0,500}\)|<(?:img\b[^>]{0,500}>|a\b[^>]{0,500}>[\s\S]*?<\/a>))/i;
+        // Matches: [text][id], ![alt][id], and the collapsed form [text][]
+        const referenceBoxPattern = /(!)?\[((?:[^[\]\\]|\\.){0,500})\]\s*\[([^\]]{0,100})\]/;
+        // Matches: autolinks such as <http://example.com>
+        const autolinkPattern = /<(?:[A-Za-z][A-Za-z0-9+.-]*:[^ <>\n]*|[A-Za-z0-9.!#$%&'*+/=?^_`{|}~-]+@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+)>/;
         return (control) => {
             const value = control?.value?.toString().trim();
-            return (value && pattern.test(value)) ? { markDownPattern: {} } : null;
+            return (value && (inlineMarkdownPattern.test(value) || referenceBoxPattern.test(value) || this.matchesReferenceUrlDef(value) || autolinkPattern.test(value) || this.hasMultiBracket(value))) ? { markDownPattern: {} } : null;
         };
     }
     // TODO: Strip this out as it's only here for the moment because
@@ -5114,6 +5119,74 @@ class FormValidatorsService {
         }
         return control;
     }
+    // Check for multi-bracket markdown links and validate destination URL
+    static hasMultiBracket(value) {
+        // Sonar-friendly detector: opening-run + text + first closing ']'
+        const openingTextClosePattern = /\[{1,10}[^[\]\n]{1,60}\]/;
+        // Can add an additional RegEx for additional URL validation rules if needed here
+        let scanIndex = 0;
+        const totalLength = value.length;
+        while (scanIndex < totalLength) {
+            const seg = this.findOpeningTextClose(value, scanIndex, openingTextClosePattern);
+            if (!seg) {
+                return false; // no candidate -> no match
+            }
+            const runs = this.extendClosingRunAndRequireParen(value, seg.absStart, seg.afterFirstClose);
+            // if there is more than one opening '[' and there is at least a matching number of closing ']'
+            if (runs && runs.openingRunCount > 1 && runs.openingRunCount === runs.closingRunCount) {
+                // If there were additional validation rules, they would be applied here
+                return true;
+            }
+            // Advance to avoid stalling on overlaps
+            scanIndex = seg.absStart + 1;
+        }
+        return false;
+    }
+    // Find opening '[' run, text, and first closing ']'
+    static findOpeningTextClose(source, fromIndex, pattern) {
+        const slice = source.slice(fromIndex);
+        const match = pattern.exec(slice);
+        if (!match) {
+            return null;
+        }
+        const absStart = fromIndex + match.index;
+        const afterFirstClose = absStart + match[0].length; // index just after the first ']'
+        return { absStart, afterFirstClose };
+    }
+    // Count opening '[' run, extend the ']' run, and require '(' right after the full ']' run
+    static extendClosingRunAndRequireParen(source, absStart, afterFirstClose) {
+        const n = source.length;
+        // Count opening '[' run (e.g., '[[[')
+        let openingRunCount = 0;
+        for (let i = absStart; i < n && source[i] === '['; i++) {
+            openingRunCount++;
+        }
+        // Extend closing ']' run forward from the first one
+        let closingRunCount = 1;
+        let afterClosingRun = afterFirstClose;
+        while (afterClosingRun < n && source[afterClosingRun] === ']') {
+            closingRunCount++;
+            afterClosingRun++;
+        }
+        return { openingRunCount, closingRunCount, afterOpenParen: afterClosingRun + 1 };
+    }
+    static isValidReferenceUrlTitleTail(tail) {
+        const possibleTitle = tail.trim();
+        // Accept exactly one of: "title", 'title', (title) — bounded and single-line.
+        if (!possibleTitle || /^"[^"\r\n]{0,300}"$/.test(possibleTitle) || /^'[^'\r\n]{0,300}'$/.test(possibleTitle) || /^\([^)\r\n]{0,300}\)$/.test(possibleTitle)) {
+            return true;
+        }
+        return false;
+    }
+    static matchesReferenceUrlDef(line) {
+        // Single-line, pragmatic CommonMark-style reference definition e.g. [text]: http://example.com
+        const baseReferenceUrlPattern = /^[ \t]{0,3}\[([^\]]{1,100})\]:[ \t]*<?([^\s>]{1,2048})>?[ \t]*([^ \t\r\n].*)?$/m;
+        const mainRegEx = baseReferenceUrlPattern.exec(line);
+        if (!mainRegEx)
+            return false;
+        const tail = mainRegEx[3] ?? "";
+        return this.isValidReferenceUrlTitleTail(tail);
+    }
     static ɵfac = function FormValidatorsService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FormValidatorsService)(); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: FormValidatorsService, factory: FormValidatorsService.ɵfac });
 }
@@ -6533,11 +6606,8 @@ class LabelSubstitutorDirective {
         this.initialHintText = this.caseField.hint_text;
         this.caseField.originalLabel = this.caseField.label;
         this.formGroup = this.formGroup || new FormGroup({});
-        this.languageSubscription = this.rpxTranslationService.language$.subscribe(() => {
-            // timeout is required to prevent race conditions with translation pipe
-            setTimeout(() => {
-                this.onLanguageChange();
-            }, 100);
+        this.languageSubscription = this.rpxTranslationService.language$.pipe(skip(1)).subscribe(() => {
+            this.onLanguageChange();
         });
         this.applySubstitutions();
     }
@@ -7346,7 +7416,6 @@ class DocumentManagementService {
     isDocumentSecureModeEnabled() {
         const documentSecureModeCaseTypeExclusions = this.appConfig.getCdamExclusionList()?.split(',');
         const isDocumentOnExclusionList = documentSecureModeCaseTypeExclusions?.includes(this.caseTypeId);
-        this.appConfig.logMessage(`isDocumentOnExclusionList: ${isDocumentOnExclusionList}`);
         if (!isDocumentOnExclusionList) {
             return true;
         }
@@ -15252,6 +15321,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     jurisdictionId;
     caseTypeId;
     caseTypeExclusions;
+    caseId;
     // Should the file upload use CDAM
     fileSecureModeOn = false;
     constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
@@ -15272,6 +15342,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             if (caseDetails) {
                 this.caseTypeId = caseDetails?.case_type?.id;
                 this.jurisdictionId = caseDetails?.case_type?.jurisdiction?.id;
+                this.caseId = caseDetails?.case_id;
             }
             if (jurisdiction) {
                 this.jurisdictionId = jurisdiction.id;
@@ -15290,12 +15361,8 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             }
             // use the documentManagement service to check if the document upload should use CDAM
             if (this.documentManagement.isDocumentSecureModeEnabled()) {
-                this.appConfig.logMessage(`CDAM is enabled for case with case ref:: ${caseDetails?.case_id}`);
                 this.fileSecureModeOn = true;
             }
-            else {
-                this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${caseDetails?.case_id}`);
-            }
             this.dialogConfig = initDialog();
             let document = this.caseField.value || { document_url: null, document_binary_url: null, document_filename: null };
             document = this.fileSecureModeOn && !document.document_hash ? { ...document, document_hash: null } : document;
@@ -15529,6 +15596,13 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         return documentUpload;
     }
     handleDocumentUploadResult(result) {
+        // use the documentManagement service to check if the document upload should use CDAM
+        if (this.documentManagement.isDocumentSecureModeEnabled()) {
+            this.appConfig.logMessage(`CDAM is enabled for case with case ref:: ${this.caseId}`);
+        }
+        else {
+            this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${this.caseId}`);
+        }
         if (!this.uploadedDocument) {
             if (this.fileSecureModeOn) {
                 this.createDocumentForm({ document_url: null, document_binary_url: null, document_filename: null, document_hash: null });