@optimiser/common 1.0.403 → 1.0.405

package/dist/lib/utility.d.ts

@@ -260,10 +260,11 @@ declare function CreateBanquetingVATSettingsData(msp_d: AnyObjectInterface, db:
 declare function CheckReportFolderAccess(report: AnyObjectInterface, db: Db, msp_d: AnyObjectInterface, folderActiveStatus?: boolean): Promise<boolean>;
 /**
  * TODO: Return On behalf String in Calendar Invitation mails
- * @param fromUser  From User Name
+ * @param {string} fromUser  From User Name
+ * @param {boolean} isIgnoreTemplate boolean flag pass true to get only fromUser
  * @returns string
  */
-declare function GetMailFromString(fromUser: string): string;
+declare function GetMailFromString(fromUser: string, isIgnoreTemplate?: boolean): string;
 /**
  * TODO: Return On behalf String in Calendar Invitation mails
  * @param fromUser  From User Name

package/dist/lib/utility.js

@@ -821,8 +821,9 @@ function DeleteFieldInOtherCollection(objectName, objectIDs, db, params, comMast
                                                 _c);
                                         }
                                         else {
-                                            /*On deletion of Pipeline or Event, Removing Pipeline/Event Id and LookupData from Activity*/
-                                            if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
+                                            /*On deletion set Lookupdata & Value to null instead of marking it as IsActive False in LookupData - QPC-9876*/
+                                            //if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
+                                            if (obj.Fields.ResetToNullOnDelete == true) {
                                                 query.set = (_d = {},
                                                     _d[obj.Fields.Name] = null,
                                                     _d[alias] = null,
@@ -943,8 +944,9 @@ function DeleteFieldInOtherCollection(objectName, objectIDs, db, params, comMast
                                                 _c);
                                         }
                                         else {
-                                            /*On deletion of Pipeline or Event, Removing Pipeline/Event Id and LookupData from Activity*/
-                                            if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
+                                            /*On deletion set Lookupdata & Value to null instead of marking it as IsActive False in LookupData - QPC-9876*/
+                                            //if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
+                                            if (obj.Fields.ResetToNullOnDelete == true) {
                                                 query.set = (_d = {},
                                                     _d[obj.Fields.Name] = null,
                                                     _d[alias] = null,
@@ -5491,11 +5493,13 @@ function CheckReportFolderAccess(report, db, msp_d, folderActiveStatus) {
 exports.CheckReportFolderAccess = CheckReportFolderAccess;
 /**
  * TODO: Return On behalf String in Calendar Invitation mails
- * @param fromUser  From User Name
+ * @param {string} fromUser  From User Name
+ * @param {boolean} isIgnoreTemplate boolean flag pass true to get only fromUser
  * @returns string
  */
-function GetMailFromString(fromUser) {
-    return "Optimiser (on behalf of ".concat(fromUser, ")");
+function GetMailFromString(fromUser, isIgnoreTemplate) {
+    if (isIgnoreTemplate === void 0) { isIgnoreTemplate = false; }
+    return isIgnoreTemplate ? fromUser : "Optimiser (on behalf of ".concat(fromUser, ")");
 }
 exports.GetMailFromString = GetMailFromString;
 /**

package/package.json

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