logitude-dashboard-library 1.3.87 → 1.3.90

package/dist/assets/styles/dl-dashboard.scss

@@ -294,11 +294,13 @@ $dark-grey: #717585;
     box-sizing: border-box;
     position: relative;
     height: 100%;
+
     header {
         display: flex;
         justify-content: space-between;
         align-items: center;
         position: unset;
+
         i {
             font-size: 18px;
             // color: colors.$red;
@@ -454,4 +456,4 @@ $dark-grey: #717585;
 .db-fc-container {
     width: 100%;
     height: 100%;
-}
+}

package/dist/features/Dashboard/ChartsComponents/FusionChartObjectBuilder.d.ts

@@ -1,4 +1,4 @@
 import { ChartObject } from "fusioncharts";
 import { SeriesMeasure } from "../../../types/SeriesMeasure";
 import { FusionChartProps } from "./FusionChart";
-export declare function BuildFusionChartObject(seriesMeasures: SeriesMeasure[], props: FusionChartProps, id: string): ChartObject;
+export declare function BuildFusionChartObject(seriesMeasures: SeriesMeasure[], props: FusionChartProps): ChartObject;

package/dist/index.js

@@ -203,51 +203,51 @@ var DashboardAnalyticsService = /*#__PURE__*/function () {
 
 var KpiChart = function KpiChart(props) {
   var _useState = React.useState(false),
-      isView = _useState[0],
-      setisView = _useState[1];
+      dataLoaded = _useState[0],
+      setDataLoaded = _useState[1];
 
-  var _useState2 = React.useState(false),
-      viewError = _useState2[0],
-      setViewError = _useState2[1];
+  var _useState2 = React.useState(),
+      error = _useState2[0],
+      setError = _useState2[1];
 
-  var isLoadingDrow = React.useRef(true);
   var widget = React.useRef();
   var widgetRef = React.useRef();
-  var isDataLoaded = React.useRef(false);
   var hasDataError = React.useRef(false);
 
-  var _useState3 = React.useState(''),
-      error = _useState3[0],
-      setEror = _useState3[1];
+  var _useState3 = React.useState(),
+      data = _useState3[0],
+      setData = _useState3[1];
 
   var _useState4 = React.useState(),
-      data = _useState4[0],
-      setData = _useState4[1];
-
-  var _useState5 = React.useState(),
-      title = _useState5[0],
-      setTitle = _useState5[1];
+      title = _useState4[0],
+      setTitle = _useState4[1];
 
   React.useEffect(function () {
+    widget.current = props.customChartProps.widget;
+    onRefresh();
+  }, []);
+
+  var onRefresh = function onRefresh() {
     var _props$customChartPro;
 
-    setTimeout(function () {
-      isLoadingDrow.current = false;
-      updateView();
-    }, 500);
-    widget.current = props.customChartProps.widget;
     (_props$customChartPro = props.customChartProps.dataBinding) === null || _props$customChartPro === void 0 ? void 0 : _props$customChartPro.onEditWidget.subscribe(function (e) {
       var _widget$current;
 
       if (e.key == ((_widget$current = widget.current) === null || _widget$current === void 0 ? void 0 : _widget$current.key)) {
+        setDataLoaded(false);
         Tools.Map(e, widget.current);
-        RefreshData();
+        setTimeout(function () {
+          RefreshData();
+        }, 500);
       }
     });
-  }, []);
+  };
+
   React.useEffect(function () {
     widgetRef.current = props.customChartProps.widgetRef;
-    RefreshData();
+    setTimeout(function () {
+      RefreshData();
+    }, 500);
   }, []);
   React.useEffect(function () {
     widgetRef.current = props.customChartProps.widgetRef;
@@ -264,32 +264,16 @@ var KpiChart = function KpiChart(props) {
     postWidget.onChange = undefined;
     dashboardAnalyticsService.getKpiData(postWidget).then(function (result) {
       setData(result.data);
-      isDataLoaded.current = true;
-      hasDataError.current = false;
-      updateView();
+      setDataLoaded(true);
     }, function (error) {
       var _error$response, _error$response$data, _error$response2, _error$response2$data;
 
       console.log('error', error);
-      if (error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && (_error$response$data = _error$response.data) !== null && _error$response$data !== void 0 && _error$response$data.ErrorMessage) setEror(error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.ErrorMessage);else setEror(error.message);
-      isDataLoaded.current = true;
-      hasDataError.current = true;
-      updateView();
+      if (error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && (_error$response$data = _error$response.data) !== null && _error$response$data !== void 0 && _error$response$data.ErrorMessage) setError(error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.ErrorMessage);else setError(error.message);
+      setDataLoaded(true);
     });
   };
 
-  var updateView = function updateView() {
-    if (isDataLoaded.current && !isLoadingDrow.current && !hasDataError.current) {
-      setisView(true);
-      setViewError(false);
-    }
-
-    if (isDataLoaded.current && !isLoadingDrow.current && hasDataError.current) {
-      setisView(false);
-      setViewError(true);
-    }
-  };
-
   var kpiClick = function kpiClick() {
     var _props$customChartPro4, _props$customChartPro5, _props$customChartPro6, _props$customChartPro7, _props$customChartPro8;
 
@@ -301,7 +285,7 @@ var KpiChart = function KpiChart(props) {
     });
   };
 
-  return !isView && !viewError ? React__default.createElement("div", {
+  return !dataLoaded ? React__default.createElement("div", {
     className: 'dl-full-hight dl-flex-content-center spinner-custome'
   }, React__default.createElement(progressspinner.ProgressSpinner, {
     style: {
@@ -310,7 +294,7 @@ var KpiChart = function KpiChart(props) {
     },
     strokeWidth: "4",
     animationDuration: "2s"
-  })) : isView ? React__default.createElement("div", {
+  })) : !error ? React__default.createElement("div", {
     className: "kpIcontainer",
     onClick: kpiClick
   }, React__default.createElement("div", {
@@ -349,7 +333,7 @@ var CustomChart = function CustomChart(props) {
   }, project());
 };
 
-function BuildFusionChartObject(seriesMeasures, props, id) {
+function BuildFusionChartObject(seriesMeasures, props) {
   var _props$widget;
 
   handelNullLabels(seriesMeasures);
@@ -401,7 +385,7 @@ function getPieObject(seriesMeasures, chart) {
   return chart;
 }
 
-function getDefaultChartobject(seriesMeasures, props, id) {
+function getDefaultChartobject(seriesMeasures, props) {
   var chart = {};
   chart.type = "column2d";
   chart.width = "100%";
@@ -412,21 +396,20 @@ function getDefaultChartobject(seriesMeasures, props, id) {
 }
 
 function buildChartDataSource(chart, props, seriesMeasures) {
-  var _props$widget2, _props$widget3, _props$widget4;
+  var _props$widget2, _props$widget3, _props$widget4, _props$widget5;
 
   if (!seriesMeasures || !seriesMeasures[0]) return;
   var chartinfo = {
-    caption: (_props$widget2 = props.widget) === null || _props$widget2 === void 0 ? void 0 : _props$widget2.Title,
     theme: "fusion",
     scrollHeight: "5",
     scrollWidth: "5",
     scrollPadding: "8",
     flatScrollBars: "1",
     enableSlicing: "0",
-    showLegend: "0"
+    showLegend: ((_props$widget2 = props.widget) === null || _props$widget2 === void 0 ? void 0 : _props$widget2.TypeCode) == "bar" || ((_props$widget3 = props.widget) === null || _props$widget3 === void 0 ? void 0 : _props$widget3.TypeCode) == "line" ? "1" : "0"
   };
 
-  if (((_props$widget3 = props.widget) === null || _props$widget3 === void 0 ? void 0 : _props$widget3.TypeCode) == "bar" || ((_props$widget4 = props.widget) === null || _props$widget4 === void 0 ? void 0 : _props$widget4.TypeCode) == "line") {
+  if (((_props$widget4 = props.widget) === null || _props$widget4 === void 0 ? void 0 : _props$widget4.TypeCode) == "bar" || ((_props$widget5 = props.widget) === null || _props$widget5 === void 0 ? void 0 : _props$widget5.TypeCode) == "line") {
     chart.dataSource = {
       chart: chartinfo,
       categories: buildCategories(seriesMeasures),
@@ -459,7 +442,6 @@ function buildDataSource(values) {
 
 function buildDataSet(seriesMeasures) {
   var dataSet = [];
-  var position = 1;
   seriesMeasures.forEach(function (seriesMeasure) {
     var datas = seriesMeasure.SeriesMeasureVulues.map(function (e) {
       return {
@@ -472,9 +454,8 @@ function buildDataSet(seriesMeasures) {
     });
     dataSet.push({
       data: datas,
-      seriesname: "series-" + position
+      seriesname: seriesMeasure.Name
     });
-    position++;
   });
   return dataSet;
 }
@@ -496,66 +477,52 @@ ReactFC.fcRoot(FusionCharts, Charts, FusionTheme);
 
 var FusionChart = function FusionChart(props) {
   var _useState = React.useState(false),
-      isView = _useState[0],
-      setisView = _useState[1];
+      dataLoaded = _useState[0],
+      setDataLoaded = _useState[1];
 
-  var _useState2 = React.useState(false),
-      viewError = _useState2[0],
-      setViewError = _useState2[1];
+  var _useState2 = React.useState(),
+      error = _useState2[0],
+      setError = _useState2[1];
 
-  var isLoadingDrow = React.useRef(true);
   var widget = React.useRef();
   var widgetRef = React.useRef();
-  var isDataLoaded = React.useRef(false);
-  var hasDataError = React.useRef(false);
 
-  var _useState3 = React.useState(''),
-      error = _useState3[0],
-      setError = _useState3[1];
+  var _useState3 = React.useState({}),
+      args = _useState3[0],
+      setArgs = _useState3[1];
 
   var _useState4 = React.useState({}),
-      args = _useState4[0],
-      setArgs = _useState4[1];
-
-  var _useState5 = React.useState({}),
-      fChart = _useState5[0],
-      setFchart = _useState5[1];
+      fChart = _useState4[0],
+      setFchart = _useState4[1];
 
   var entered = React.useRef(false);
   var id = (Math.random() + 1).toString(36).substring(7);
   React.useEffect(function () {
+    widget.current = props.widget;
+    onRefresh();
+  }, []);
+
+  var onRefresh = function onRefresh() {
     var _props$dataBinding;
 
-    setTimeout(function () {
-      isLoadingDrow.current = false;
-      updateView();
-    }, 500);
-    widget.current = props.widget;
     (_props$dataBinding = props.dataBinding) === null || _props$dataBinding === void 0 ? void 0 : _props$dataBinding.onEditWidget.subscribe(function (e) {
       var _widget$current;
 
       if (e.key == ((_widget$current = widget.current) === null || _widget$current === void 0 ? void 0 : _widget$current.key)) {
+        setDataLoaded(false);
         Tools.Map(e, widget.current);
-        RefreshData();
+        setTimeout(function () {
+          RefreshData();
+        }, 500);
       }
     });
-  }, []);
-
-  var updateView = function updateView() {
-    if (isDataLoaded.current && !isLoadingDrow.current && !hasDataError.current) {
-      setisView(true);
-      setViewError(false);
-    }
-
-    if (isDataLoaded.current && !isLoadingDrow.current && hasDataError.current) {
-      setisView(false);
-      setViewError(true);
-    }
   };
 
   React.useEffect(function () {
     widgetRef.current = props.widgetRef;
-    RefreshData();
+    setTimeout(function () {
+      RefreshData();
+    }, 500);
   }, []);
   React.useEffect(function () {
     widgetRef.current = props.widgetRef;
@@ -568,19 +535,15 @@ var FusionChart = function FusionChart(props) {
 
     postWidget.onChange = undefined;
     dashboardAnalyticsService.getData(postWidget).then(function (result) {
-      updateView();
       var chart = BuildFusionChartObject(result.data, props);
       setArgs(chart);
-      isDataLoaded.current = true;
-      hasDataError.current = false;
+      setDataLoaded(true);
     }, function (error) {
       var _error$response, _error$response$data, _error$response2, _error$response2$data;
 
       console.log('error', error);
       if (error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && (_error$response$data = _error$response.data) !== null && _error$response$data !== void 0 && _error$response$data.ErrorMessage) setError(error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.ErrorMessage);else setError(error.message);
-      isDataLoaded.current = true;
-      hasDataError.current = true;
-      updateView();
+      setDataLoaded(true);
     });
   };
 
@@ -611,7 +574,7 @@ var FusionChart = function FusionChart(props) {
   }),
       ref = _useResizeObserver.ref;
 
-  return !isView && !viewError ? React__default.createElement("div", {
+  return !dataLoaded ? React__default.createElement("div", {
     className: 'dl-full-hight dl-flex-content-center spinner-custome'
   }, React__default.createElement(progressspinner.ProgressSpinner, {
     style: {
@@ -620,9 +583,10 @@ var FusionChart = function FusionChart(props) {
     },
     strokeWidth: "4",
     animationDuration: "2s"
-  })) : isView ? React__default.createElement("div", {
+  })) : !error ? React__default.createElement("div", {
     className: 'db-fc-container',
-    ref: ref
+    ref: ref,
+    id: id
   }, React__default.createElement(ReactFC, Object.assign({}, args, {
     "fcEvent-dataplotClick": dataplotClick,
     onRender: renderComplete
@@ -639,7 +603,7 @@ var FusionChart = function FusionChart(props) {
 };
 
 var WidgetCard = function WidgetCard(props, state) {
-  var _props$widget2;
+  var _props$widget, _props$widget2, _props$widget4;
 
   var moreBtnToggle = React.useRef(null);
 
@@ -652,12 +616,15 @@ var WidgetCard = function WidgetCard(props, state) {
 
   return React__default.createElement("div", {
     className: "panel",
-    key: props.el.i
+    key: props.el.i,
+    style: {
+      cursor: props.isInEditMode ? 'move' : 'default'
+    }
   }, React__default.createElement("header", {
     style: {
       paddingLeft: "5px"
     }
-  }, React__default.createElement("h1", null), props.isInEditMode ? React__default.createElement(button.Button, {
+  }, React__default.createElement("h1", null, (props === null || props === void 0 ? void 0 : (_props$widget = props.widget) === null || _props$widget === void 0 ? void 0 : _props$widget.TypeCode) == "kpi" ? null : (_props$widget2 = props.widget) === null || _props$widget2 === void 0 ? void 0 : _props$widget2.Title), props.isInEditMode ? React__default.createElement(button.Button, {
     icon: "pi pi-ellipsis-v",
     className: "p-button-lg p-button-rounded p-button-text",
     onClick: function onClick(e) {
@@ -674,13 +641,13 @@ var WidgetCard = function WidgetCard(props, state) {
     onClick: editWidget
   }, " Edit "), React__default.createElement("div", {
     onClick: function onClick() {
-      var _props$widget;
+      var _props$widget3;
 
-      return props.deleteBtnClicked((_props$widget = props.widget) === null || _props$widget === void 0 ? void 0 : _props$widget.key);
+      return props.deleteBtnClicked((_props$widget3 = props.widget) === null || _props$widget3 === void 0 ? void 0 : _props$widget3.key);
     }
   }, "Remove")))), React__default.createElement("div", {
     className: "dl-dashboard-widget"
-  }, (props === null || props === void 0 ? void 0 : (_props$widget2 = props.widget) === null || _props$widget2 === void 0 ? void 0 : _props$widget2.TypeCode) == "kpi" ? React__default.createElement(CustomChart, {
+  }, (props === null || props === void 0 ? void 0 : (_props$widget4 = props.widget) === null || _props$widget4 === void 0 ? void 0 : _props$widget4.TypeCode) == "kpi" ? React__default.createElement(CustomChart, {
     dataBinding: props.dataBinding,
     widget: props.widget,
     widgetRef: props.widgetRef,