From b5f4ce08ea0921d4375f99cd4451611f6e417241 Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Mon, 30 Oct 2023 22:24:54 +0000 Subject: [PATCH] [release] v0.12.0-unstable20 --- changelog.md | 1 + client/src/pages/config/users/configman.jsx | 23 ++++++++++++++----- .../src/pages/dashboard/components/plot.jsx | 4 ++-- .../src/pages/dashboard/components/table.jsx | 21 ++++++++++------- .../src/pages/dashboard/components/utils.jsx | 2 ++ package.json | 2 +- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/changelog.md b/changelog.md index 9652904..923e800 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,7 @@ - New metrics gathering system - Integrated a new docker-less mode of functioning for networking - Added Button to force reset HTTPS cert in settings + - New color slider with reset buttons ## Version 0.11.3 - Fix missing even subscriber on export diff --git a/client/src/pages/config/users/configman.jsx b/client/src/pages/config/users/configman.jsx index 4b9db37..97e9e27 100644 --- a/client/src/pages/config/users/configman.jsx +++ b/client/src/pages/config/users/configman.jsx @@ -25,7 +25,7 @@ import CountrySelect from '../../../components/countrySelect'; import { DnsChallengeComp } from '../../../utils/dns-challenge-comp'; import UploadButtons from '../../../components/fileUpload'; -import { TwitterPicker +import { SliderPicker } from 'react-color'; import { LoadingButton } from '@mui/lab'; @@ -322,7 +322,7 @@ const ConfigManagement = () => { }} /> - + @@ -344,11 +355,11 @@ const ConfigManagement = () => { Primary Color - { - let colorRGB = `rgb(${color.rgb.r}, ${color.rgb.g}, ${color.rgb.b}, ${color.rgb.a})` + let colorRGB = `rgba(${color.rgb.r}, ${color.rgb.g}, ${color.rgb.b}, ${color.rgb.a})` formik.setFieldValue('PrimaryColor', colorRGB); SetPrimaryColor(colorRGB); }} @@ -382,11 +393,11 @@ const ConfigManagement = () => { Secondary Color - { - let colorRGB = `rgb(${color.rgb.r}, ${color.rgb.g}, ${color.rgb.b}, ${color.rgb.a})` + let colorRGB = `rgba(${color.rgb.r}, ${color.rgb.g}, ${color.rgb.b}, ${color.rgb.a})` formik.setFieldValue('SecondaryColor', colorRGB); SetSecondaryColor(colorRGB); }} diff --git a/client/src/pages/dashboard/components/plot.jsx b/client/src/pages/dashboard/components/plot.jsx index 2371709..1e19412 100644 --- a/client/src/pages/dashboard/components/plot.jsx +++ b/client/src/pages/dashboard/components/plot.jsx @@ -89,10 +89,10 @@ const PlotComponent = ({ title, slot, data, SimpleDesign, withSelector, xAxis, z }) }); }); - + setOptions((prevState) => ({ ...prevState, - colors: [theme.palette.primary.main, theme.palette.secondary.main], + colors: [theme.palette.primary.main.replace('rgb', 'rgba'), theme.palette.secondary.main.replace('rgb', 'rgba')], xaxis: { categories: slot === 'hourly' diff --git a/client/src/pages/dashboard/components/table.jsx b/client/src/pages/dashboard/components/table.jsx index c250df3..51d2b1f 100644 --- a/client/src/pages/dashboard/components/table.jsx +++ b/client/src/pages/dashboard/components/table.jsx @@ -136,7 +136,7 @@ const TableComponent = ({ title, data, displayMax, render, xAxis, slot, zoom}) = data.forEach((item) => { let k = item.Key.split('.') let v = item.Values.length ? item.Values[item.Values.length - 1].Value : 0; - if (slot === 'hourly' || slot === 'daily') { + let avgIndex = 0; v = xAxis .filter((date, index) => { @@ -146,12 +146,16 @@ const TableComponent = ({ title, data, displayMax, render, xAxis, slot, zoom}) = return true; }) .map((date) => { - let key = slot === 'hourly' ? "hour_" : "day_"; - let k = key + toUTC(date, slot === 'hourly'); - if (k in item.ValuesAggl) { - return item.ValuesAggl[k].Value; + if (slot === 'hourly' || slot === 'daily') { + let key = slot === 'hourly' ? "hour_" : "day_"; + let k = key + toUTC(date, slot === 'hourly'); + if (k in item.ValuesAggl) { + return item.ValuesAggl[k].Value; + } else { + return 0; + } } else { - return 0; + return item.Values[date] ? item.Values[date].Value : 0; } }) .reduce((a, b) => { @@ -169,10 +173,11 @@ const TableComponent = ({ title, data, displayMax, render, xAxis, slot, zoom}) = return b; } }, 0); + if (item.AggloType == "avg") { v = v / avgIndex; } - } + let name = k[k.length - 1]; let cat = k[k.length - 2]; @@ -260,7 +265,7 @@ const TableComponent = ({ title, data, displayMax, render, xAxis, slot, zoom}) = > - {stableSort(rows, getComparator(order, orderBy)).map((row, index) => { + {stableSort(rows, getComparator(order, "__" + orderBy)).map((row, index) => { const isItemSelected = false // isSelected(row.trackingNo); const labelId = `enhanced-table-checkbox-${index}`; diff --git a/client/src/pages/dashboard/components/utils.jsx b/client/src/pages/dashboard/components/utils.jsx index 1fea307..63a8955 100644 --- a/client/src/pages/dashboard/components/utils.jsx +++ b/client/src/pages/dashboard/components/utils.jsx @@ -1,5 +1,7 @@ export const simplifyNumber = (num) => { if(!num) return 0; + + num = Math.round(num * 100) / 100; if (Math.abs(num) >= 1e12) { return (num / 1e12).toFixed(1) + 'T'; // Convert to Millions diff --git a/package.json b/package.json index 69a95aa..f398c29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.12.0-unstable19", + "version": "0.12.0-unstable20", "description": "", "main": "test-server.js", "bugs": {