sf-i-events 1.0.943 → 1.0.945

package/dev/index.html

@@ -850,7 +850,7 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
@@ -879,7 +879,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <sf-i-events projectid="5a05b884-d7ed-4f63-b623-4d305ea2cfd6" projectname="Standard Radiators Private Limited"
     mode="onboarding"
     locations="{&quot;India&quot;:{&quot;Punjab&quot;:[&quot;Punjab Warehouse&quot;],&quot;Gujarat&quot;:[&quot;RO &amp; Unit I&quot;,&quot;Unit II&quot;]}}"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.943",
+  "version": "1.0.945",
   "description": "Superflows Navigation Component",
   "main": "sf-i-events.js",
   "module": "sf-i-events.js",

package/sf-i-events.js

@@ -4981,12 +4981,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                             if (indexNext < titleArr.length - 1) {
                                 if (Util.isVisible(titleArr[indexNext + 1])) {
                                     nextString = titleArr[indexNext + 1].id;
+                                    console.log('prev nextString', nextString);
                                     let nextIdArr = nextString.split("-");
+                                    console.log('prev nextArr', nextIdArr);
                                     if (((_b = nextIdArr[7]) !== null && _b !== void 0 ? _b : "") == "reportedlocations") {
                                         nextString = "";
+                                        console.log('prev nextString2', nextString);
                                         indexNext++;
                                     }
                                     else {
+                                        console.log('prev nextString3', nextString);
                                         flagNext = false;
                                     }
                                 }
@@ -4999,7 +5003,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             }
                         }
                         // this.renderEventDetail(this.events[mmdd][j], mmdd + "/" + yyyy, null);
-                        this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, null, eventsContainer);
+                        this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, null, eventsContainer, prevString, nextString);
                     }
                 });
             }
@@ -13177,10 +13181,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 reportingReporting.configjson = reportingSchemaJson;
                 if (reportingSchemaValues != "")
                     reportingReporting.prepopulateValJson = reportingSchemaValues;
-                reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view";
-                reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true";
-                // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
-                // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+                // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+                // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+                reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view";
+                reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true";
                 reportingReporting.flow = "reporting";
                 setTimeout(() => {
                     reportingReporting.loadMode();
@@ -13266,8 +13270,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                         reportformatvalues = reportingReporting.selectedValues();
                     }
                     let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues));
-                    console.log('reportformatvalues', reportformatvalues, comparedObj);
-                    // await this.sendSuggestions(listEvent.id, comparedObj);
+                    console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues), comparedObj);
+                    if (Object.keys(comparedObj).length > 0) {
+                        await this.sendSuggestions(listEvent.id, comparedObj);
+                    }
                     // return;
                     var clickEvent = new MouseEvent("click", {
                         "view": window,
@@ -22027,7 +22033,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.sendSuggestions = async (eventid, eventdelta) => {
-            let url = "https://" + this.apiId + "/sendsuggestions";
+            let url = "https://" + this.apiIdRCMResources + "/sendsuggestions";
             const body = {
                 "projectid": this.projectId,
                 "objectid": eventid,

package/src/sf-i-events.ts

@@ -7424,11 +7424,15 @@ export class SfIEvents extends LitElement {
             if (indexNext < titleArr.length - 1) {
               if (Util.isVisible((titleArr[indexNext + 1] as HTMLButtonElement))) {
                 nextString = (titleArr[indexNext + 1] as HTMLButtonElement).id;
+                console.log('prev nextString', nextString)
                 let nextIdArr = nextString.split("-")
+                console.log('prev nextArr', nextIdArr)
                 if ((nextIdArr[7] ?? "") == "reportedlocations") {
                   nextString = "";
+                  console.log('prev nextString2', nextString)
                   indexNext++;
                 } else {
+                  console.log('prev nextString3', nextString)
                   flagNext = false;
                 }
               } else {
@@ -7440,7 +7444,7 @@ export class SfIEvents extends LitElement {
           }
 
           // this.renderEventDetail(this.events[mmdd][j], mmdd + "/" + yyyy, null);
-          this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, null, eventsContainer);
+          this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, null, eventsContainer, prevString, nextString);
         }
       })
 
@@ -17018,10 +17022,10 @@ export class SfIEvents extends LitElement {
     if (reportingSchemaJson != "" && reportingReporting != null) {
       reportingReporting.configjson = reportingSchemaJson;
       if (reportingSchemaValues != "") reportingReporting.prepopulateValJson = reportingSchemaValues
-      reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
-      reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
-      // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
-      // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+      // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+      // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+      reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+      reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
       reportingReporting.flow = "reporting"
       setTimeout(() => {
         reportingReporting.loadMode();
@@ -17116,8 +17120,10 @@ export class SfIEvents extends LitElement {
           reportformatvalues = reportingReporting!.selectedValues()
         }
         let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues))
-        console.log('reportformatvalues', reportformatvalues, comparedObj)
-        // await this.sendSuggestions(listEvent.id, comparedObj);
+        console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues),comparedObj)
+        if(Object.keys(comparedObj).length > 0){
+          await this.sendSuggestions(listEvent.id, comparedObj);
+        }
         // return;
         var clickEvent = new MouseEvent("click", {
           "view": window,
@@ -27858,7 +27864,7 @@ export class SfIEvents extends LitElement {
   }
 
   sendSuggestions = async (eventid: string, eventdelta:any) => {
-    let url = "https://" + this.apiId + "/sendsuggestions";
+    let url = "https://" + this.apiIdRCMResources + "/sendsuggestions";
 
     const body = {
       "projectid": this.projectId,

package/src/util.ts

@@ -583,11 +583,18 @@ function isJSONParsable(str: unknown): boolean {
 function isVisible(el: HTMLElement): boolean {
   const style = window.getComputedStyle(el);
   const rect = el.getBoundingClientRect();
-  console.log('previous style', style.display, rect, el.id);
+  console.log('previous style', style.display, rect, el.id, (
+    rect.height > 0 &&
+    rect.width > 0
+  ) && (
+      style.display !== "none" &&
+      style.visibility !== "hidden" &&
+      style.opacity !== "0"
+    ));
 
   return (
     rect.height > 0 &&
-    rect.width >= 0
+    rect.width > 0
   ) && (
       style.display !== "none" &&
       style.visibility !== "hidden" &&
@@ -598,16 +605,24 @@ function isVisible(el: HTMLElement): boolean {
 function compareObjects(obj1: any, obj2: any): any {
   if (obj1 === obj2) return {};
 
-  // If both are arrays
+  // Case: both are arrays
   if (Array.isArray(obj1) && Array.isArray(obj2)) {
+    // One empty, one not → full diff
+    if (obj1.length === 0 && obj2.length > 0) {
+      return obj2;
+    }
+    if (obj2.length === 0 && obj1.length > 0) {
+      return obj1;
+    }
+
     const maxLength = Math.max(obj1.length, obj2.length);
-    const result: any[] = [];
+    const result = [];
 
     for (let i = 0; i < maxLength; i++) {
       if (i >= obj1.length) {
         result[i] = obj2[i]; // new item
       } else if (i >= obj2.length) {
-        result[i] = undefined; // removed item
+        result[i] = obj1[i]; // removed item
       } else {
         const diff = compareObjects(obj1[i], obj2[i]);
         if (Object.keys(diff).length > 0) {
@@ -618,7 +633,8 @@ function compareObjects(obj1: any, obj2: any): any {
 
     return result.filter(v => v !== undefined).length > 0 ? result : {};
   }
-  // If both are objects
+
+  // Case: both are objects
   if (
     typeof obj1 === "object" &&
     obj1 !== null &&
@@ -626,15 +642,15 @@ function compareObjects(obj1: any, obj2: any): any {
     obj2 !== null
   ) {
     const keys = new Set([...Object.keys(obj1), ...Object.keys(obj2)]);
-    const diff: Record<string, any> = {};
+    const diff: any = {};
 
     for (const key of keys) {
       if (!(key in obj1)) {
-        diff[key] = [null, (obj2 as any)[key]];
+        diff[key] = obj2[key];
       } else if (!(key in obj2)) {
-        diff[key] = [(obj1 as any)[key], null];
+        diff[key] = obj1[key];
       } else {
-        const valueDiff = compareObjects((obj1 as any)[key], (obj2 as any)[key]);
+        const valueDiff = compareObjects(obj1[key], obj2[key]);
         if (
           typeof valueDiff === "object" &&
           valueDiff !== null &&
@@ -651,8 +667,8 @@ function compareObjects(obj1: any, obj2: any): any {
     return Object.keys(diff).length > 0 ? diff : {};
   }
 
-  // Primitive comparison
-  return obj1 !== obj2 ? [obj1, obj2] : [];
+  // Case: primitives
+  return obj1 !== obj2 ? [obj1, obj2] : {};
 }
 const exportFunctions = {
   callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, getProjectConfigHome, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible, compareObjects

package/util.js

@@ -495,17 +495,27 @@ function isJSONParsable(str) {
 function isVisible(el) {
     const style = window.getComputedStyle(el);
     const rect = el.getBoundingClientRect();
-    console.log('previous style', style.display, rect, el.id);
+    console.log('previous style', style.display, rect, el.id, (rect.height > 0 &&
+        rect.width > 0) && (style.display !== "none" &&
+        style.visibility !== "hidden" &&
+        style.opacity !== "0"));
     return (rect.height > 0 &&
-        rect.width >= 0) && (style.display !== "none" &&
+        rect.width > 0) && (style.display !== "none" &&
         style.visibility !== "hidden" &&
         style.opacity !== "0");
 }
 function compareObjects(obj1, obj2) {
     if (obj1 === obj2)
         return {};
-    // If both are arrays
+    // Case: both are arrays
     if (Array.isArray(obj1) && Array.isArray(obj2)) {
+        // One empty, one not → full diff
+        if (obj1.length === 0 && obj2.length > 0) {
+            return obj2;
+        }
+        if (obj2.length === 0 && obj1.length > 0) {
+            return obj1;
+        }
         const maxLength = Math.max(obj1.length, obj2.length);
         const result = [];
         for (let i = 0; i < maxLength; i++) {
@@ -513,7 +523,7 @@ function compareObjects(obj1, obj2) {
                 result[i] = obj2[i]; // new item
             }
             else if (i >= obj2.length) {
-                result[i] = undefined; // removed item
+                result[i] = obj1[i]; // removed item
             }
             else {
                 const diff = compareObjects(obj1[i], obj2[i]);
@@ -524,7 +534,7 @@ function compareObjects(obj1, obj2) {
         }
         return result.filter(v => v !== undefined).length > 0 ? result : {};
     }
-    // If both are objects
+    // Case: both are objects
     if (typeof obj1 === "object" &&
         obj1 !== null &&
         typeof obj2 === "object" &&
@@ -533,10 +543,10 @@ function compareObjects(obj1, obj2) {
         const diff = {};
         for (const key of keys) {
             if (!(key in obj1)) {
-                diff[key] = [null, obj2[key]];
+                diff[key] = obj2[key];
             }
             else if (!(key in obj2)) {
-                diff[key] = [obj1[key], null];
+                diff[key] = obj1[key];
             }
             else {
                 const valueDiff = compareObjects(obj1[key], obj2[key]);
@@ -552,8 +562,8 @@ function compareObjects(obj1, obj2) {
         }
         return Object.keys(diff).length > 0 ? diff : {};
     }
-    // Primitive comparison
-    return obj1 !== obj2 ? [obj1, obj2] : [];
+    // Case: primitives
+    return obj1 !== obj2 ? [obj1, obj2] : {};
 }
 const exportFunctions = {
     callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, getProjectConfigHome, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible, compareObjects