sf-i-events 1.0.875 → 1.0.876

package/dev/index.html

@@ -738,7 +738,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"
@@ -765,8 +765,8 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  </sf-i-events>
+  <!-- <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"
@@ -793,7 +793,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <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" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="viewer" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2025">
 
         <div slot="uploader">

package/package.json

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

package/sf-i-events.js

@@ -2604,7 +2604,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             if (event.reporters != null && remarks.length > 0) {
                 html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
             }
-            console.log('returning divstarthtml', html);
+            // console.log('returning divstarthtml', html);
             return html;
         };
         this.renderCalendarRowDivItemDivEnd = () => {
@@ -15023,7 +15023,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div id="locations-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingLocationsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingLocationsListContainer, mappedSerializedEntities, mappedLocations, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingLocationsListContainer, mappedSerializedEntities, mappedLocations, ["shortid", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingCompliances = (mappedStatutes, mappedCompliances) => {
             //console.log('mappedcompliances', mappedCompliances);
@@ -15138,7 +15138,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div id="entities-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingEntitiesContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingEntitiesListContainer, mappedSerializedCountries, mappedEntities, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
+            this.renderTaggingTable(this._SfOnboardingEntitiesListContainer, mappedSerializedCountries, mappedEntities, ["shortid", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
         };
         this.renderOnboardingCountries = (mappedCountries, mappedCompliances, countriesJobs) => {
             var html = '';
@@ -15159,7 +15159,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             //   }
             // }
             // mappedCountries.data.mappings.mappings = arr2;
-            this.renderTaggingTable(this._SfOnboardingCountriesListContainer, mappedCompliances, mappedCountries, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingCountriesListContainer, mappedCompliances, mappedCountries, ["shortid", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingStatutes = (mappedStatutes) => {
             var initCursor = "";
@@ -16146,9 +16146,18 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
                 this.filterEventsInWindow(query, ctx, eventContainer);
             });
-            (_b = container.querySelector('#chart-control-cancel')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', () => {
-                container.innerHTML = '';
-                container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+            (_b = container.querySelector('#chart-control-cancel')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', (e) => {
+                var _a, _b, _c, _f, _g, _h, _j;
+                let targetDiv = e.target;
+                let containerDiv = (_a = targetDiv.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+                if (containerDiv != null) {
+                    containerDiv.innerHTML = '';
+                    (_f = (_c = (_b = containerDiv.parentElement) === null || _b === void 0 ? void 0 : _b.parentElement) === null || _c === void 0 ? void 0 : _c.querySelector('#chart-control-settings')) === null || _f === void 0 ? void 0 : _f.setAttribute('part', 'calendar-tab-button-not-selected');
+                    (_j = (_h = (_g = containerDiv.parentElement) === null || _g === void 0 ? void 0 : _g.parentElement) === null || _h === void 0 ? void 0 : _h.querySelector('#chart-control-summary')) === null || _j === void 0 ? void 0 : _j.setAttribute('part', 'calendar-tab-button-not-selected');
+                    // containerDiv.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+                }
+                // container.innerHTML = '';
+                // container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
             });
         };
         this.renderChartSettingsSettings = (container, selectedTab = 1) => {
@@ -16259,13 +16268,34 @@ let SfIEvents = class SfIEvents extends LitElement {
       `;
             }
             container.innerHTML = html;
-            (_a = container.querySelector('#chart-control-cancel')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
-                container.innerHTML = '';
-                container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+            (_a = container.querySelector('#chart-control-cancel')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', (e) => {
+                var _a, _b, _c, _f, _g, _h, _j;
+                let targetDiv = e.target;
+                let containerDiv = (_a = targetDiv.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+                console.log('containerDiv', containerDiv);
+                if (containerDiv != null) {
+                    containerDiv.innerHTML = '';
+                    (_f = (_c = (_b = containerDiv.parentElement) === null || _b === void 0 ? void 0 : _b.parentElement) === null || _c === void 0 ? void 0 : _c.querySelector('#chart-control-settings')) === null || _f === void 0 ? void 0 : _f.setAttribute('part', 'calendar-tab-button-not-selected');
+                    (_j = (_h = (_g = containerDiv.parentElement) === null || _g === void 0 ? void 0 : _g.parentElement) === null || _h === void 0 ? void 0 : _h.querySelector('#chart-control-summary')) === null || _j === void 0 ? void 0 : _j.setAttribute('part', 'calendar-tab-button-not-selected');
+                    // containerDiv.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+                }
             });
             (_b = container.querySelector('#button-download-stats')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', async () => {
-                if (selectedTab === -1)
-                    await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
+                if (selectedTab === -1) {
+                    if (this.selectedFeatures.indexOf('compliances') >= 0) {
+                        await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
+                    }
+                    else if (this.selectedFeatures.indexOf('notices') >= 0) {
+                        await this.fetchAndRenderNotices(this.sdate, this.edate, "", "no");
+                    }
+                    else if (this.selectedFeatures.indexOf('contracts') >= 0) {
+                        await this.fetchAndRenderContracts(this.sdate, this.edate, "", "no");
+                    }
+                    else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+                        await this.fetchAndRenderLicenses(this.sdate, this.edate, "", "no");
+                    }
+                    // await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
+                }
                 const radioCsv = container.querySelector('#radio-csv');
                 const radioImage = container.querySelector('#radio-image');
                 const radioStats = container.querySelector('#radio-stats');
@@ -16433,7 +16463,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             });
         };
         this.renderChartSettings = (container, selectedTab = -1, selectedSummary = -1, ctx) => {
-            var _a, _b;
+            var _a, _b, _c;
             console.log('rendering chart settings', selectedSummary);
             var html = '';
             html += '<div class="d-flex justify-end align-start">';
@@ -16456,14 +16486,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '<button class="tab-button" id="chart-control-summary" part="calendar-tab-button-not-selected" class="mr-10"><span class="material-icons">summarize</span></button>';
             }
             html += '</div>';
-            container.querySelector('#chart-settings-controls').innerHTML = html;
-            (_a = container.querySelector('#chart-settings-controls').querySelector('#chart-control-settings')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
-                this.renderChartSettings(container, 1, selectedSummary, ctx);
-            });
-            (_b = container.querySelector('#chart-settings-controls').querySelector('#chart-control-summary')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', () => {
-                console.log('summary clicked');
-                this.renderChartSummary();
-            });
+            if (container.querySelector('#chart-settings-controls') != null) {
+                container.querySelector('#chart-settings-controls').innerHTML = html;
+                (_a = container.querySelector('#chart-settings-controls').querySelector('#chart-control-settings')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
+                    this.renderChartSettings(container, 1, selectedSummary, ctx);
+                });
+                (_b = container.querySelector('#chart-settings-controls').querySelector('#chart-control-summary')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', () => {
+                    console.log('summary clicked');
+                    this.renderChartSummary();
+                });
+            }
             // (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-filters')?.addEventListener('click', () => {
             //   this.renderChartSettings(container, 0, ctx);
             // });
@@ -16477,7 +16509,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 // radioCompleteness.click();
                 this.renderChartSettingsSettings(container.querySelector('#chart-settings'), selectedSummary);
             }
-            container.querySelector('#chart-settings').addEventListener('canceled', () => {
+            (_c = container.querySelector('#chart-settings')) === null || _c === void 0 ? void 0 : _c.addEventListener('canceled', () => {
                 //console.log('canceled');
                 if (this.getCurrentTab() == this.TAB_STREAM) {
                     this.renderChartSettings(container, -1, -1, ctx);

package/src/sf-i-events.ts

@@ -4804,7 +4804,7 @@ export class SfIEvents extends LitElement {
     if (event.reporters != null && remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
     }
-    console.log('returning divstarthtml', html);
+    // console.log('returning divstarthtml', html);
     return html;
 
   }
@@ -19800,7 +19800,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingLocationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingLocationsListContainer as HTMLDivElement), mappedSerializedEntities, mappedLocations, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingLocationsListContainer as HTMLDivElement), mappedSerializedEntities, mappedLocations, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -19961,7 +19961,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingEntitiesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingEntitiesListContainer as HTMLDivElement), mappedSerializedCountries, mappedEntities, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
+    this.renderTaggingTable((this._SfOnboardingEntitiesListContainer as HTMLDivElement), mappedSerializedCountries, mappedEntities, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
 
   }
 
@@ -19993,7 +19993,7 @@ export class SfIEvents extends LitElement {
 
     // mappedCountries.data.mappings.mappings = arr2;
 
-    this.renderTaggingTable((this._SfOnboardingCountriesListContainer as HTMLDivElement), mappedCompliances, mappedCountries, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingCountriesListContainer as HTMLDivElement), mappedCompliances, mappedCountries, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -21271,10 +21271,19 @@ export class SfIEvents extends LitElement {
 
     });
 
-    container.querySelector('#chart-control-cancel')?.addEventListener('click', () => {
+    container.querySelector('#chart-control-cancel')?.addEventListener('click', (e) => {
 
-      container.innerHTML = '';
-      container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+      let targetDiv = e.target as HTMLDivElement;
+      let containerDiv = targetDiv.parentElement?.parentElement as HTMLDivElement;
+      if(containerDiv != null){
+        containerDiv.innerHTML = '';
+        containerDiv.parentElement?.parentElement?.querySelector('#chart-control-settings')?.setAttribute('part', 'calendar-tab-button-not-selected');
+        containerDiv.parentElement?.parentElement?.querySelector('#chart-control-summary')?.setAttribute('part', 'calendar-tab-button-not-selected');
+        // containerDiv.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+      }
+
+      // container.innerHTML = '';
+      // container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
 
     });
 
@@ -21389,16 +21398,32 @@ export class SfIEvents extends LitElement {
 
     container.innerHTML = html;
 
-    container.querySelector('#chart-control-cancel')?.addEventListener('click', () => {
-
-      container.innerHTML = '';
-      container.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+    container.querySelector('#chart-control-cancel')?.addEventListener('click', (e) => {
 
+      let targetDiv = e.target as HTMLDivElement;
+      let containerDiv = targetDiv.parentElement?.parentElement as HTMLDivElement;
+      console.log('containerDiv', containerDiv);
+      if(containerDiv != null){
+        containerDiv.innerHTML = '';
+        containerDiv.parentElement?.parentElement?.querySelector('#chart-control-settings')?.setAttribute('part', 'calendar-tab-button-not-selected');
+        containerDiv.parentElement?.parentElement?.querySelector('#chart-control-summary')?.setAttribute('part', 'calendar-tab-button-not-selected');
+        // containerDiv.dispatchEvent(new CustomEvent('canceled', { bubbles: true }));
+      }
     });
 
     container.querySelector('#button-download-stats')?.addEventListener('click', async () => {
-      if (selectedTab === -1)
-        await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
+      if (selectedTab === -1){
+        if (this.selectedFeatures.indexOf('compliances') >= 0) {
+          await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no")
+        } else if (this.selectedFeatures.indexOf('notices') >= 0) {
+          await this.fetchAndRenderNotices(this.sdate, this.edate, "", "no");
+        } else if (this.selectedFeatures.indexOf('contracts') >= 0) {
+          await this.fetchAndRenderContracts(this.sdate, this.edate, "", "no");
+        } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+          await this.fetchAndRenderLicenses(this.sdate, this.edate, "", "no");
+        } 
+        // await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
+      }
       const radioCsv = (container.querySelector('#radio-csv') as HTMLInputElement);
       const radioImage = (container.querySelector('#radio-image') as HTMLInputElement);
       const radioStats = (container.querySelector('#radio-stats') as HTMLInputElement);
@@ -21622,18 +21647,20 @@ export class SfIEvents extends LitElement {
     }
     html += '</div>';
 
-    (container.querySelector('#chart-settings-controls') as HTMLDivElement).innerHTML = html;
+    if((container.querySelector('#chart-settings-controls') as HTMLDivElement) != null){
+      (container.querySelector('#chart-settings-controls') as HTMLDivElement).innerHTML = html;
 
-    (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-settings')?.addEventListener('click', () => {
+      (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-settings')?.addEventListener('click', () => {
 
-      this.renderChartSettings(container, 1, selectedSummary, ctx);
+        this.renderChartSettings(container, 1, selectedSummary, ctx);
 
-    });
-    (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-summary')?.addEventListener('click', () => {
-      console.log('summary clicked');
-      this.renderChartSummary();
+      });
+      (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-summary')?.addEventListener('click', () => {
+        console.log('summary clicked');
+        this.renderChartSummary();
 
-    });
+      });
+    }
 
     // (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-filters')?.addEventListener('click', () => {
 
@@ -21654,7 +21681,7 @@ export class SfIEvents extends LitElement {
       this.renderChartSettingsSettings((container.querySelector('#chart-settings') as HTMLDivElement), selectedSummary);
     }
 
-    (container.querySelector('#chart-settings') as HTMLDivElement).addEventListener('canceled', () => {
+    (container.querySelector('#chart-settings') as HTMLDivElement)?.addEventListener('canceled', () => {
       //console.log('canceled');
       if (this.getCurrentTab() == this.TAB_STREAM) {
         this.renderChartSettings(container, -1, -1, ctx);