@annalib/anna-core 31.0.1 → 31.0.2

package/fesm2022/annalib-anna-core.mjs

@@ -1769,6 +1769,8 @@ class AnnaFilterService {
             "userMG",
             "udValue",
             "odValue",
+            "buyerBookedValue",
+            "trafficBookedValue",
         ]);
         this.isFilterSortActive = {};
         this.resetFilterSortActiveStatus = true;
@@ -2165,7 +2167,7 @@ class AnnaFilterService {
                 // eslint-disable-next-line no-param-reassign
                 key = key.split(this.SPLITED_CHECKBOX_FILTER_KEY)[0];
             }
-            if (key !== keyToSkip && originalData.length > 0 && Object.keys(originalData[0]).includes(key)) {
+            if (key !== keyToSkip && originalData.length > 0 && this.nestedKeyExists(originalData[0], key)) {
                 if (this.sliderSet.has(key)) {
                     filteredData = filteredData.filter((obj) => obj[key] >= value.min && obj[key] <= value.max);
                 }
@@ -2208,12 +2210,23 @@ class AnnaFilterService {
                     filteredData = filteredData.filter((obj) => this.returnDataForStartAndEndTimeRange(obj, value, key));
                 }
                 else if (value.length > 0) {
-                    filteredData = filteredData.filter((u) => filterSplitedValues ? value.find((val) => u[key].includes(val)) : value.includes(u[key]));
+                    filteredData = filteredData.filter((u) => filterSplitedValues ? value.find((val) => u[key].includes(val)) : value.includes(this.getValueFromObject(u, key)));
                 }
             }
         });
         return filteredData;
     }
+    getValueFromObject(obj, key) {
+        return key.split(".").reduce((res, currentKey) => res && res[currentKey], obj);
+    }
+    nestedKeyExists(obj, key) {
+        return (key.split(".").reduce((acc, currentKey) => {
+            if (acc && currentKey in acc) {
+                return acc[currentKey];
+            }
+            return undefined;
+        }, obj) !== undefined);
+    }
     returnOrdersInTheRange(order, range, key) {
         const isDateBetweenTheSelectedRange = dayjs(order[key]).isBetween(range.minSelectedDate, range.maxSelectedDate);
         const isDateSameAsTheMinSelectedDate = dayjs(order[key]).isSame(range.minSelectedDate);
@@ -4911,34 +4924,6 @@ class AnnaNonEditableGenericTableComponent {
             this.bindValueFuncCalled = false;
         }
     }
-    checkIfUniqueValuePresentForTheHeader(header, enabledHeaders) {
-        header.filterSortObjectKeys.forEach((item) => {
-            const dataToCheck = this.annaFilterService.getFilterOptionsData(this.tableData, this.clonedTableData, item);
-            if (item === "period") {
-                const uniqStartDate = uniq(dataToCheck.map((u) => u.startDate));
-                const uniqEndDate = uniq(dataToCheck.map((u) => u.endDate));
-                if (uniqStartDate.length > 1 || uniqEndDate.length > 1 || this.isTooltipActive([item])) {
-                    enabledHeaders.push(item);
-                }
-            }
-            else {
-                const values = dataToCheck.map((u) => u[item]);
-                // if last applied filter is this header, push it alos as enabledHeader
-                let activeAndLastlyAppliedHeader = false;
-                if (this.annaFilterService.appliedFiltersArray.length > 0 &&
-                    this.annaFilterService.appliedFiltersArray[this.annaFilterService.appliedFiltersArray.length - 1] === item) {
-                    activeAndLastlyAppliedHeader = true;
-                }
-                if (header.filter === "CHECKBOX" && (uniq(values).length > 1 || activeAndLastlyAppliedHeader)) {
-                    enabledHeaders.push(item);
-                }
-                else if (header.filter !== "CHECKBOX" &&
-                    (uniq(values).filter((n) => n != null && n !== "-").length > 1 || activeAndLastlyAppliedHeader)) {
-                    enabledHeaders.push(item);
-                }
-            }
-        });
-    }
     openTooltip(tooltip, header, columnHeader) {
         this.closeTooltip();
         this.tooltip = tooltip;
@@ -4951,39 +4936,6 @@ class AnnaNonEditableGenericTableComponent {
             columnHeader?.splitDelimiter?.[index]);
         });
     }
-    disableEnableEachColumnTooltipIcon() {
-        this.tableHeaders.forEach((header) => {
-            header.headerInfo.forEach((item) => {
-                if (item.showTooltipIcon) {
-                    let values = [];
-                    item.disableTooltipIcon = true;
-                    item.filterSortObjectKeys.forEach((key) => {
-                        const latestFilters = this.annaFilterService.appliedFiltersArray;
-                        if (latestFilters.length > 0 &&
-                            item.disableTooltipIcon &&
-                            latestFilters[latestFilters.length - 1] === key) {
-                            item.disableTooltipIcon = false;
-                        }
-                        if (item.disableTooltipIcon) {
-                            if (key === "period") {
-                                const uniqStartDate = uniq(this.tableData.map((u) => u.startDate));
-                                const uniqEndDate = uniq(this.tableData.map((u) => u.endDate));
-                                item.disableTooltipIcon = !(uniqStartDate.length > 1 || uniqEndDate.length > 1);
-                            }
-                            else {
-                                values = this.tableData.map((u) => u[key]);
-                                if ((item.filter === "CHECKBOX" && uniq(values).length > 1) ||
-                                    (item.filter !== "CHECKBOX" &&
-                                        uniq(values).filter((n) => n != null && n !== "-").length > 1)) {
-                                    item.disableTooltipIcon = false;
-                                }
-                            }
-                        }
-                    });
-                }
-            });
-        });
-    }
     dataRowClicked(rowData) {
         this.rowClicked.emit(rowData);
     }