Commit 02bfc0718241ad461519ea4f170e7f7243a6facb
Committed by
GitHub
Merge pull request #3218 from vvlladd28/bug/road-map
[3.0] Change get index date for map widget
Showing
1 changed file
with
4 additions
and
3 deletions
@@ -249,10 +249,11 @@ export function parseData(input: DatasourceData[]): FormattedData[] { | @@ -249,10 +249,11 @@ export function parseData(input: DatasourceData[]): FormattedData[] { | ||
249 | deviceType: null | 249 | deviceType: null |
250 | }; | 250 | }; |
251 | entityArray.filter(el => el.data.length).forEach(el => { | 251 | entityArray.filter(el => el.data.length).forEach(el => { |
252 | - obj[el?.dataKey?.label] = el?.data[0][0] ? el?.data[0][1] : null; | ||
253 | - obj[el?.dataKey?.label + '|ts'] = el?.data[0][0] || null; | 252 | + const indexDate = el?.data?.length ? el.data.length - 1 : 0; |
253 | + obj[el?.dataKey?.label] = el?.data[indexDate][0] ? el?.data[indexDate][1] : null; | ||
254 | + obj[el?.dataKey?.label + '|ts'] = el?.data[indexDate][0] || null; | ||
254 | if (el?.dataKey?.label === 'type') { | 255 | if (el?.dataKey?.label === 'type') { |
255 | - obj.deviceType = el?.data[0][1]; | 256 | + obj.deviceType = el?.data[indexDate][1]; |
256 | } | 257 | } |
257 | }); | 258 | }); |
258 | return obj; | 259 | return obj; |