@optimiser/common 1.0.324 → 1.0.325

package/dist/lib/utility.js

@@ -4568,12 +4568,13 @@ function IsAnotherObjectField(pageData, fieldName) {
 */
 function ValidateUserInput(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var inputFields, pageData, documentID, db, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _a, pageFields_1, pageField, state_2, countryData, err_3;
+        var inputFields, fieldsJsonData, pageData, documentID, db, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _a, pageFields_1, pageField, state_2, countryData, err_3;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     _b.trys.push([0, 7, , 8]);
                     inputFields = options.userInput;
+                    fieldsJsonData = bson_1.EJSON.parse(JSON.stringify(inputFields));
                     pageData = options.pageData;
                     documentID = options.objectID;
                     db = options.db;
@@ -4604,7 +4605,7 @@ function ValidateUserInput(options) {
                         }
                     }
                     _loop_19 = function (pageField) {
-                        var fieldName, fieldData, field, searchQuery, result, _a, minValue, maxValue, filter, searchObj, result, searchObj, totalRecord, _b, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _i, fieldData_1, obj, searchObj, totalRecord, searchObj, result, _c, fieldData_2, obj;
+                        var fieldName, fieldData, field, searchQuery, result, fld, _a, minValue, maxValue, filter, searchObj, result, searchObj, totalRecord, _b, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _i, fieldData_1, obj, searchObj, totalRecord, searchObj, result, _c, fieldData_2, obj;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -4652,6 +4653,14 @@ function ValidateUserInput(options) {
                                     }
                                     _d.label = 2;
                                 case 2:
+                                    // Added by Shahzaib to check conditional field criteria
+                                    if (field.IsConditionalField) {
+                                        fld = JSON.parse(JSON.stringify(pageField));
+                                        fld.Schema = field;
+                                        msg = CheckConditionalField(fld, fieldsJsonData, action);
+                                        if (msg != "")
+                                            return [2 /*return*/, "break"];
+                                    }
                                     if (!inputField.includes(fieldName)) return [3 /*break*/, 54];
                                     if (!(fieldData || fieldData === 0 || fieldData === false)) return [3 /*break*/, 54];
                                     _a = field.UIDataType;
@@ -5036,6 +5045,48 @@ function ValidateUserInput(options) {
     });
 }
 exports.ValidateUserInput = ValidateUserInput;
+/**
+ * TODO: Check conditional field criteria with user inputs
+ *
+ * @param {object} field Contains shcema
+ * @param {object} record contains user inputs
+ * @param {string} action shows add or update
+ * @return message in string
+ */
+function CheckConditionalField(field, record, action) {
+    var msg = '';
+    var fieldData = record[field.Name];
+    if (field.Schema.ConditionalAction == 'enabled' && field.IsRequired == true) {
+        if (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add")) {
+            msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is required!';
+        }
+    }
+    else if (record != undefined && eval(field.Schema.ConditionalExpression) == true) {
+        switch (field.Schema.ConditionalAction) {
+            case "mandatory":
+            case "enabled-mandatory":
+            case "show-enabled-mandatory":
+            case "show-disabled-mandatory":
+                if (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add")) {
+                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is conditionally required!';
+                }
+                break;
+        }
+    }
+    else {
+        switch (field.Schema.ConditionalAction) {
+            case "show-disabled-mandatory":
+            case "show-disabled-nonmandatory":
+            case "show-enabled-mandatory":
+            case "show-enabled-nonmandatory":
+                if (fieldData) {
+                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
+                }
+                break;
+        }
+    }
+    return msg;
+}
 /**
  * TODO: Create lookup of fields of list schema for Vat Setting data
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.324",
+  "version": "1.0.325",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -43,6 +43,7 @@
   "devDependencies": {
     "@types/aws-sdk": "^2.7.0",
     "@types/bson": "^4.0.2",
+    "@types/exceljs": "^1.3.0",
     "@types/express": "^4.17.8",
     "@types/ioredis": "^4.17.4",
     "@types/moment": "^2.13.0",