@optimiser/common 1.0.448 → 1.0.450

package/dist/lib/helper.js

@@ -409,7 +409,7 @@ var GetDateRangeFromOperatorValue = function (operator, fiscalMonth, fiscalFrom)
     var getFiscalMonthIndex = moment_1.default.monthsShort().findIndex(function (month) { return month === fiscalMonth; });
     // GET FISCAL MONTH INDEX
     // if (operator.includes("Fiscal")) {
-    if (operator.toLowerCase().includes("fiscal") || ["Year to Date", "year-to-date"].includes(operator)) {
+    if (operator.toLowerCase().includes("fiscal") || ["Year to Date", "year-to-date", "Year to Date Last Year", "year-to-date-last-year"].includes(operator)) {
         if (fiscalFrom === "End") {
             fiscalMonth = momentObj.clone().month(fiscalMonth).add(1, "months").format('MMM'); // Modify FiscalMonth in FiscalFrom - End
         }
@@ -684,6 +684,31 @@ var GetDateRangeFromOperatorValue = function (operator, fiscalMonth, fiscalFrom)
                 }
             }
             break;
+        case "Year to Date Last Year":
+        case "year-to-date-last-year":
+            endDate = momentObj.clone().subtract(1, "years").format(requiredDateFormat);
+            if (fiscalFrom === "Start") {
+                if (getFiscalMonthIndex == 0 || getFiscalMonthIndex && getFiscalMonthIndex <= momentObj.clone().month()) {
+                    startDate = (0, moment_1.default)(startDate, currentDateFormat).clone().month(fiscalMonth).subtract(12, "months").startOf('month').format(requiredDateFormat);
+                }
+                else {
+                    startDate = (0, moment_1.default)(startDate, currentDateFormat).clone().month(fiscalMonth).subtract(24, "months").startOf('month').format(requiredDateFormat);
+                }
+            }
+            else {
+                if (getFiscalMonthIndex == 0 || getFiscalMonthIndex && getFiscalMonthIndex < momentObj.clone().month() || getFiscalMonthIndex == 11) {
+                    startDate = (0, moment_1.default)(startDate, currentDateFormat).clone().month(fiscalMonth).subtract(12, "months").startOf('month').format(requiredDateFormat);
+                }
+                else {
+                    startDate = (0, moment_1.default)(startDate, currentDateFormat).clone().month(fiscalMonth).subtract(24, "months").startOf('month').format(requiredDateFormat);
+                }
+            }
+            break;
+        case "This Month Last Year":
+        case "this-month-last-year":
+            startDate = momentObj.clone().subtract(12, "months").startOf('month').format(requiredDateFormat);
+            endDate = momentObj.clone().subtract(12, "months").endOf('month').format(requiredDateFormat);
+            break;
         default:
             break;
     }

package/dist/lib/utility.js

@@ -80,6 +80,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -5035,18 +5044,21 @@ function IsAnotherObjectField(pageData, fieldName) {
     return false;
 }
 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
+        allowedTags: __spreadArray(__spreadArray([], (sanitize_html_1.default.defaults.allowedTags || []), true), [
+            'img' //allow img tag qpc-13026
+        ], false),
+        allowedAttributes: {
+            img: ['src', 'alt', 'title', 'width', 'height'],
+            a: ['href', 'name', 'target']
+        },
+        allowedSchemes: ['http', 'https', 'data'], // allow base64 images if needed
     };
-    // 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);
         if (uiDataType === 'texteditor') {
-            return sanitizedHtmlContent; //Return without replace code fixed QPC-11110 script data save
+            return sanitizedHtmlContent;
         }
         return sanitizedHtmlContent
             .replace(/&amp;/g, '&')
@@ -5055,7 +5067,7 @@ var CustomSanitizeHtml = function (dirtyHtml, uiDataType) {
     }
     catch (error) {
         console.error('Sanitization failed:', error);
-        return ''; // Return empty string or handle error as needed
+        return '';
     }
 };
 /*

package/package.json

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