logitude-dashboard-library 3.1.74 → 3.1.76

package/dist/Utils/DateHelper.d.ts

@@ -1,7 +1,4 @@
 import { ReactWidgetPM } from "../types/widget";
 declare const getLabelFormatByDateGroupType: (label: string, widget: ReactWidgetPM, isSecondGrouping?: boolean) => any;
-declare const getDateRangesByCode: (code: string | null) => {
-    fromDate: any;
-    toDate: any;
-};
+declare const getDateRangesByCode: (code: string | null, _fromDate: string | null, _toDate: string | null) => any;
 export { getLabelFormatByDateGroupType, getDateRangesByCode };

package/dist/index.js

@@ -580,7 +580,7 @@ var getLast30DaysDates = function getLast30DaysDates(format) {
   return dateValues;
 };
 
-var getDateRangesByCode = function getDateRangesByCode(code) {
+var getDateRangesByCode = function getDateRangesByCode(code, _fromDate, _toDate) {
   var result = {
     fromDate: null,
     toDate: null
@@ -654,6 +654,11 @@ var getDateRangesByCode = function getDateRangesByCode(code) {
       result.toDate = getPreviousMonthToDateDates()[1];
       break;
 
+    case "Custom_Range":
+      result.fromDate = _fromDate;
+      result.toDate = _toDate;
+      break;
+
     case "Today":
       result.fromDate = getTodayDates()[0];
       result.toDate = getTodayDates()[1];
@@ -829,8 +834,8 @@ var KpiChart = function KpiChart(props) {
       var isKPISettingsActivated = !isNullOrUndefinedOrEmpty(kpiSettings.PeriodFieldId);
 
       if (isKPISettingsActivated) {
-        var PeriodDateFilterDates = getDateRangesByCode(kpiSettings.PeriodDateFilter.DateTimeValueCode);
-        var ComparePeriodDateFilterDates = kpiSettings.ComparisonPeriodType == 'Manually' ? getDateRangesByCode(kpiSettings.ComparePeriodDateFilter.DateTimeValueCode) : getDateRangesByCode(null);
+        var PeriodDateFilterDates = getDateRangesByCode(kpiSettings.PeriodDateFilter.DateTimeValueCode, null, null);
+        var ComparePeriodDateFilterDates = kpiSettings.ComparisonPeriodType == 'Manually' ? getDateRangesByCode(kpiSettings.ComparePeriodDateFilter.DateTimeValueCode, kpiSettings.ComparePeriodDateFilter.FieldValue, kpiSettings.ComparePeriodDateFilter.FieldValue2) : getDateRangesByCode(null, null, null);
         kpiSettings.PeriodDateFilter.FieldValue = PeriodDateFilterDates.fromDate;
         kpiSettings.PeriodDateFilter.FieldValue2 = PeriodDateFilterDates.toDate;
         kpiSettings.ComparePeriodDateFilter.FieldValue = ComparePeriodDateFilterDates.fromDate;
@@ -1163,6 +1168,10 @@ var TableChart = function TableChart(props) {
       objectTableName = _useState9[0],
       setObjectTableName = _useState9[1];
 
+  var _useState10 = React.useState(null),
+      triggerId = _useState10[0],
+      setTriggerId = _useState10[1];
+
   React.useEffect(function () {
     var _props$customChartPro;
 
@@ -1177,8 +1186,33 @@ var TableChart = function TableChart(props) {
 
       if ((updatedWidget === null || updatedWidget === void 0 ? void 0 : updatedWidget.key) != ((_widgetRefData$curren = widgetRefData.current) === null || _widgetRefData$curren === void 0 ? void 0 : _widgetRefData$curren.key)) return;
       setWidget(_extends({}, updatedWidget));
+      setTriggerId(uuid.v4());
     });
   }, []);
+  React.useEffect(function () {
+    if (triggerId != null) {
+      ReOrderColumns(widget === null || widget === void 0 ? void 0 : widget.Columns);
+    }
+  }, [triggerId]);
+
+  var ReOrderColumns = function ReOrderColumns(updatedWidgetColumns) {
+    if (updatedWidgetColumns == null || updatedWidgetColumns == undefined || typeof updatedWidgetColumns == 'string' && (updatedWidgetColumns === null || updatedWidgetColumns === void 0 ? void 0 : updatedWidgetColumns.length) == 0) {
+      return;
+    }
+
+    var updatedWidgetColumnsData = JSON.parse(updatedWidgetColumns);
+    var _updatedTableColumns = [];
+    updatedWidgetColumnsData.forEach(function (c) {
+      var col = tableColumns.find(function (f) {
+        return f.Id == c.Id;
+      });
+
+      if (col) {
+        _updatedTableColumns.push(col);
+      }
+    });
+    setTableColumns([].concat(_updatedTableColumns));
+  };
 
   var getObjectTableName = function getObjectTableName(widget) {
     var dashboardAnalyticsService = new DashboardAnalyticsService();