@optimiser/common 1.0.449 → 1.0.451

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

@@ -5046,13 +5046,26 @@ function IsAnotherObjectField(pageData, fieldName) {
 var CustomSanitizeHtml = function (dirtyHtml, uiDataType) {
     var defaultOptions = {
         allowedTags: __spreadArray(__spreadArray([], (sanitize_html_1.default.defaults.allowedTags || []), true), [
-            'img' //allow img tag qpc-13026
+            'img',
+            'span'
         ], false),
         allowedAttributes: {
+            '*': ['class', 'style'], // allow class & style on all tags
             img: ['src', 'alt', 'title', 'width', 'height'],
             a: ['href', 'name', 'target']
         },
-        allowedSchemes: ['http', 'https', 'data'], // allow base64 images if needed
+        allowedSchemes: ['http', 'https', 'data'],
+        allowedStyles: {
+            '*': {
+                // Allow only safe CSS properties
+                'color': [/^.*$/],
+                'background-color': [/^.*$/],
+                'text-align': [/^left$/, /^right$/, /^center$/, /^justify$/],
+                'font-size': [/^\d+(?:px|em|rem|%)$/],
+                'width': [/^\d+(?:px|%)$/],
+                'height': [/^\d+(?:px|%)$/]
+            }
+        }
     };
     var sanitizeOptions = (uiDataType === 'texteditor') ? defaultOptions : {};
     try {

package/package.json

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