@optimiser/common 1.0.268 → 1.0.271

package/dist/lib/utility.d.ts

@@ -38,7 +38,7 @@ declare function BuildLookupFieldProjection(field: AnyObjectInterface, group: An
 declare function FilterConditions(condition: AnyObjectInterface, match: AnyObjectInterface, fields: AnyObjectInterface): void;
 declare function GirdHeaderFilters(filters: AnyObjectInterface, fields: AnyObjectInterface): {
     $and: AnyObjectInterface[];
-};
+} | undefined;
 declare function FieldsGridHeaderFilters(filters: AnyObjectInterface, fields: AnyObjectInterface): {
     $and: AnyObjectInterface[];
     lookupConditions: {

package/dist/lib/utility.js

@@ -564,9 +564,7 @@ function SyncChildObjectData(pageData, objectID, db) {
                     _a.sent();
                     SyncFieldInSameCollectionByObjectID(group.ChildObject, childID, db);
                     _a.label = 5;
-                case 5:
-                    SyncFieldInOtherCollection(syncFields, db);
-                    return [3 /*break*/, 14];
+                case 5: return [3 /*break*/, 14];
                 case 6:
                     childFieldsObj = {};
                     _loop_6 = function (i_4) {
@@ -662,15 +660,15 @@ function SyncParentObjectData(pageData, objectID, db) {
             switch (_a.label) {
                 case 0:
                     objectName = pageData.ObjectName;
-                    if (!pageData.ParentObject) return [3 /*break*/, 5];
+                    if (!pageData.ParentObject) return [3 /*break*/, 4];
                     parent_1 = pageData.ParentObject;
                     return [4 /*yield*/, db.collection(objectName).findOne({ '_id': objectID })];
                 case 1:
                     data = _a.sent();
-                    if (!(data && data._id)) return [3 /*break*/, 5];
-                    if (!(parent_1 && data.IsDefaultRecord)) return [3 /*break*/, 5];
+                    if (!(data && data._id)) return [3 /*break*/, 4];
+                    if (!(parent_1 && data.IsDefaultRecord)) return [3 /*break*/, 4];
                     parentID = data[parent_1.ObjectField];
-                    if (!parentID) return [3 /*break*/, 5];
+                    if (!parentID) return [3 /*break*/, 4];
                     return [4 /*yield*/, db.collection(parent_1.ObjectName).findOne({ '_id': parentID })];
                 case 2:
                     parentData = _a.sent();
@@ -705,10 +703,7 @@ function SyncParentObjectData(pageData, objectID, db) {
                 case 3:
                     _a.sent();
                     _a.label = 4;
-                case 4:
-                    SyncFieldInOtherCollection(syncFields, db);
-                    _a.label = 5;
-                case 5: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -1806,7 +1801,9 @@ function BuildGridFieldProjection(project, field, group) {
             project[alias] = 1;
             if (field.Schema.LookupObject) {
                 for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                    searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
+                    //searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
+                    // added by Mohan, make int to string and concat  
+                    searchConcatArry.push({ "$ifNull": [{ $toString: '$' + alias + '.' + field.Schema.LookupFields[i] }, ""] });
                     if (i < field.Schema.LookupFields.length - 1) {
                         searchConcatArry.push(" ");
                     }
@@ -2179,60 +2176,65 @@ function FilterConditions(condition, match, fields) {
 }
 exports.FilterConditions = FilterConditions;
 function GirdHeaderFilters(filters, fields) {
-    var sets = [];
-    var _loop_14 = function (i) {
-        var obj = filters[i];
-        var field = fields.find(function (x) { return x.UniqueID == obj.Name; });
-        if (field) {
-            var matchValue = null;
-            var fldName = field.UniqueID;
-            //added by nirbhay on 25.04.22 to add dropdown in any type of fields for filter
-            if (field.Schema.SearchType == 'dropdown') {
-                matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
-            }
-            else if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
-                fldName += '_SearchValue';
-                matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
-            }
-            else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
-                if (field.Schema.LookupObject) {
-                    matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+    try {
+        var sets = [];
+        var _loop_14 = function (i) {
+            var obj = filters[i];
+            var field = fields.find(function (x) { return x.UniqueID == obj.Name; });
+            if (field) {
+                var matchValue = null;
+                var fldName = field.UniqueID;
+                //added by nirbhay on 25.04.22 to add dropdown in any type of fields for filter
+                if (field.Schema.SearchType == 'dropdown') {
+                    matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
                 }
-                else {
-                    matchValue = { '$in': obj.Value };
+                else if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
+                    fldName += '_SearchValue';
+                    matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
                 }
-            }
-            else if (["date", "datetime"].includes(field.Schema.UIDataType))
-                matchValue = { '$gte': moment_1.default(obj.Value.From).startOf('day').toDate(), '$lte': moment_1.default(obj.Value.To).endOf('day').toDate() };
-            // else if (field.Schema.UIDataType == 'time')
-            //     matchValue = (obj.Value == 'true');
-            else if (field.Schema.UIDataType == 'checkbox') {
-                if (obj.Value == 'true')
-                    matchValue = true;
+                else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
+                    if (field.Schema.LookupObject) {
+                        matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+                    }
+                    else {
+                        matchValue = { '$in': obj.Value };
+                    }
+                }
+                else if (["date", "datetime"].includes(field.Schema.UIDataType))
+                    matchValue = { '$gte': moment_1.default(obj.Value.From).startOf('day').toDate(), '$lte': moment_1.default(obj.Value.To).endOf('day').toDate() };
+                // else if (field.Schema.UIDataType == 'time')
+                //     matchValue = (obj.Value == 'true');
+                else if (field.Schema.UIDataType == 'checkbox') {
+                    if (obj.Value == 'true')
+                        matchValue = true;
+                    else
+                        matchValue = { $ne: true };
+                }
+                else if (field.Schema.UIDataType == 'int')
+                    matchValue = { '$eq': parseInt(obj.Value) };
+                else if (["decimal", "percent"].includes(field.Schema.UIDataType))
+                    matchValue = { '$eq': mongodb_1.Decimal128.fromString(obj.Value) };
+                else if (field.Schema.UIDataType == 'objectid')
+                    matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+                else if (field.Schema.IsEqualAndCaseInsensitiveSearch === true)
+                    matchValue = new RegExp('^' + obj.Value + '$', 'i');
+                else if (field.Schema.IsEqualSearch === true)
+                    matchValue = { '$eq': obj.Value };
                 else
-                    matchValue = { $ne: true };
+                    matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
+                var fieldMatch = {};
+                fieldMatch[fldName] = matchValue;
+                sets.push(fieldMatch);
             }
-            else if (field.Schema.UIDataType == 'int')
-                matchValue = { '$eq': parseInt(obj.Value) };
-            else if (["decimal", "percent"].includes(field.Schema.UIDataType))
-                matchValue = { '$eq': mongodb_1.Decimal128.fromString(obj.Value) };
-            else if (field.Schema.UIDataType == 'objectid')
-                matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
-            else if (field.Schema.IsEqualAndCaseInsensitiveSearch === true)
-                matchValue = new RegExp('^' + obj.Value + '$', 'i');
-            else if (field.Schema.IsEqualSearch === true)
-                matchValue = { '$eq': obj.Value };
-            else
-                matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
-            var fieldMatch = {};
-            fieldMatch[fldName] = matchValue;
-            sets.push(fieldMatch);
+        };
+        for (var i = 0; i < filters.length; i++) {
+            _loop_14(i);
         }
-    };
-    for (var i = 0; i < filters.length; i++) {
-        _loop_14(i);
+        return { '$and': sets };
+    }
+    catch (error) {
+        console.error("Internal Error in GirdHeaderFilters : " + error);
     }
-    return { '$and': sets };
 }
 exports.GirdHeaderFilters = GirdHeaderFilters;
 function FieldsGridHeaderFilters(filters, fields) {

package/package.json

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