@alfresco/adf-process-services-cloud 9.2.0-35244306307 → 9.2.0-35271819200

package/fesm2022/adf-process-services-cloud.mjs

@@ -8238,6 +8238,14 @@ const resolveRichTextExpressions = (value, resolve, options = {}) => {
     });
     return resolvedValue;
 };
+const hasResolvableRichTextExpressions = (value, hasExpressions) => {
+    let resolvable = false;
+    resolveRichTextExpressions(value, (content) => {
+        resolvable = resolvable || hasExpressions(content);
+        return content;
+    });
+    return resolvable;
+};
 
 /*!
  * @license
@@ -8256,6 +8264,7 @@ const resolveRichTextExpressions = (value, resolve, options = {}) => {
  * limitations under the License.
  */
 const isSubmissionRow = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const isExpressionTemplate = (authoredValue, expressions) => hasResolvableRichTextExpressions(authoredValue, (content) => expressions.hasExpressions(content));
 const getExpressionEvaluationEnabled$ = (settings) => isObservable(settings)
     ? settings.pipe(map((value) => value?.enableExpressionEvaluation ?? false))
     : of(settings?.enableExpressionEvaluation ?? false);
@@ -8266,7 +8275,10 @@ const materializeSubmissionValues = (form, options, expressions) => {
     }
     for (const field of form.getFormFields([FormFieldTypes.DISPLAY_RICH_TEXT])) {
         const { authoredValue, parent } = field;
-        if (authoredValue === undefined || parent?.isTemplate) {
+        if (parent?.isTemplate) {
+            continue;
+        }
+        if (!isExpressionTemplate(authoredValue, expressions)) {
             continue;
         }
         const materializedValue = resolveRichTextExpressions(authoredValue, (content) => expressions.resolveExpressions(form, content, true), {
@@ -15367,8 +15379,10 @@ const RICH_TEXT_PARSER_TOKEN = new InjectionToken('RichTextParserService', {
 class DisplayRichTextWidgetComponent extends BaseDisplayTextWidgetComponent {
     constructor() {
         super(...arguments);
+        this.parsedHTML = null;
         this.richTextParserService = inject(RICH_TEXT_PARSER_TOKEN);
         this.sanitizer = inject(DomSanitizer);
+        this.expressions = inject(FormExpressionService);
     }
     ngOnInit() {
         this.parseAndSanitize();
@@ -15381,43 +15395,31 @@ class DisplayRichTextWidgetComponent extends BaseDisplayTextWidgetComponent {
         this.fieldChangedSubscription?.unsubscribe();
     }
     storeOriginalValue() {
-        if (this.field) {
-            const authoredValue = this.field.authoredValue;
-            if (authoredValue !== undefined) {
-                this.originalFieldValue = JSON.stringify(authoredValue);
-            }
-        }
+        this.originalFieldValue = this.getAuthoredExpressionTemplate();
     }
     evaluateExpressions() {
-        if (!this.field) {
-            return;
-        }
-        const authoredValue = this.field.authoredValue;
-        if (authoredValue !== undefined) {
-            this.applyExpressionsToBlocks(authoredValue);
-        }
+        this.renderAuthoredExpressionTemplate();
     }
     reevaluateExpressions() {
+        this.renderAuthoredExpressionTemplate();
+    }
+    getAuthoredExpressionTemplate() {
+        const authoredValue = this.field?.authoredValue ?? null;
+        const isExpressionTemplate = hasResolvableRichTextExpressions(authoredValue, (content) => this.expressions.hasExpressions(content));
+        return isExpressionTemplate ? JSON.stringify(authoredValue) : undefined;
+    }
+    renderAuthoredExpressionTemplate() {
         if (!this.field || !this.originalFieldValue) {
             return;
         }
-        const value = JSON.parse(this.originalFieldValue);
-        this.applyExpressionsToBlocks(value);
-    }
-    applyExpressionsToBlocks(value) {
-        this.field.value = resolveRichTextExpressions(value, (content) => this.resolveExpressions(content, true));
+        this.field.value = resolveRichTextExpressions(JSON.parse(this.originalFieldValue), (content) => this.resolveExpressions(content, true));
     }
     parseAndSanitize() {
-        this.parsedHTML = this.richTextParserService.parse(this.field.value);
-        if (this.parsedHTML instanceof Error) {
-            throw this.parsedHTML;
-        }
-        else {
-            this.sanitizeHtmlContent();
+        const parsedValue = this.richTextParserService.parse(this.field.value);
+        if (parsedValue instanceof Error) {
+            throw parsedValue;
         }
-    }
-    sanitizeHtmlContent() {
-        this.parsedHTML = this.sanitizer.sanitize(SecurityContext.HTML, this.parsedHTML);
+        this.parsedHTML = this.sanitizer.sanitize(SecurityContext.HTML, parsedValue);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.31", ngImport: i0, type: DisplayRichTextWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.31", type: DisplayRichTextWidgetComponent, isStandalone: true, selector: "display-rich-text", host: { listeners: { "click": "event($event)", "blur": "event($event)", "change": "event($event)", "focus": "event($event)", "focusin": "event($event)", "focusout": "event($event)", "input": "event($event)", "invalid": "event($event)", "select": "event($event)" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"adf-display-rich-text-widget\">\n    <div class=\"adf-display-rich-text-widget-parsed-html\" [innerHTML]=\"parsedHTML\"></div>\n</div>\n", styles: [".adf-display-rich-text-widget pre{min-height:100px;white-space:pre;word-wrap:normal;overflow-x:auto;resize:vertical;width:100%}\n"], encapsulation: i0.ViewEncapsulation.None }); }