@optimiser/common 1.0.399 → 1.0.401

package/dist/lib/utility.js

@@ -4760,14 +4760,27 @@ function IsAnotherObjectField(pageData, fieldName) {
     }
     return false;
 }
-var CustomSanitizeHtml = function (dirtyHtml) {
-    var sanitizeHtmlContent = (0, sanitize_html_1.default)(dirtyHtml, {
-        allowedTags: sanitize_html_1.default.defaults.allowedTags,
-        allowedAttributes: {
-            '*': ['class'], // Allow 'class' attribute on all tags
-        } // QPC-9587 sanitized html allowed class attribute
-    });
-    return sanitizeHtmlContent.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+var CustomSanitizeHtml = function (dirtyHtml, uiDataType) {
+    // Define default sanitization options
+    var defaultOptions = {
+        allowedTags: sanitize_html_1.default.defaults.allowedTags || false, // Use an empty array if defaults are unavailable
+        allowedAttributes: false
+    };
+    // Determine sanitization options based on uiDataType
+    var sanitizeOptions = (uiDataType === 'texteditor') ? defaultOptions : {};
+    try {
+        // Sanitize the HTML content
+        var sanitizedHtmlContent = (0, sanitize_html_1.default)(dirtyHtml, sanitizeOptions);
+        // Replace HTML entities with their characters (use caution)
+        return sanitizedHtmlContent
+            .replace(/&amp;/g, '&')
+            .replace(/&lt;/g, '<')
+            .replace(/&gt;/g, '>');
+    }
+    catch (error) {
+        console.error('Sanitization failed:', error);
+        return ''; // Return empty string or handle error as needed
+    }
 };
 /*
 * Created by:  Nirbhay as on 01-09-22
@@ -4839,7 +4852,7 @@ function ValidateUserInput(options) {
                                     if (!field) return [3 /*break*/, 58];
                                     //sanitizing Html and added IgnoreSanitizeHtml condition so that it can be ignored for certain fields
                                     if (!field.IgnoreSanitizeHtml && IsStringValue(fieldData)) {
-                                        inputFields[fieldName] = CustomSanitizeHtml(fieldData);
+                                        inputFields[fieldName] = CustomSanitizeHtml(fieldData, field.UIDataType);
                                         fieldData = inputFields[fieldName];
                                     }
                                     if (field.DisableValidateUserInput) {
@@ -5336,7 +5349,8 @@ function CheckConditionalField(field, record, action) {
                     break;
                 case "show-enabled-mandatory":
                 case "show-enabled-nonmandatory":
-                    if (fieldData) {
+                    // Add this condition to exclude fields with UIDataType "location" for search address, as discussed with Shahzaib Sir.
+                    if (fieldData && field.Schema.UIDataType !== "location") {
                         msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
                     }
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.399",
+  "version": "1.0.401",
   "description": "",
   "main": "dist/index.js",
   "scripts": {