[release] v0.12.0-unstable20

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

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 = () => {
                         }}
                       />
 
-                      <Button
+<Button
                         variant="outlined"
                         onClick={() => {
                           formik.setFieldValue('Background', "");
@@ -330,6 +330,17 @@ const ConfigManagement = () => {
                       >
                         Reset Wallpaper
                       </Button>
+                      <Button
+                        variant="outlined"
+                        onClick={() => {
+                          formik.setFieldValue('PrimaryColor', "");
+                          SetPrimaryColor("");
+                          formik.setFieldValue('SecondaryColor', "");
+                          SetSecondaryColor("");
+                        }}
+                      >
+                        Reset Colors
+                      </Button>
                     </Stack>
                   </Grid>
                   
@@ -344,11 +355,11 @@ const ConfigManagement = () => {
                   <Grid item xs={12}>
                     <Stack spacing={1}>
                       <InputLabel style={{marginBottom: '10px'}} htmlFor="PrimaryColor">Primary Color</InputLabel>
-                      <TwitterPicker
+                      <SliderPicker
                         id="PrimaryColor"
                         color={formik.values.PrimaryColor}
                         onChange={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 = () => {
                   <Grid item xs={12}>
                     <Stack spacing={1}>
                       <InputLabel style={{marginBottom: '10px'}} htmlFor="SecondaryColor">Secondary Color</InputLabel>
-                      <TwitterPicker
+                      <SliderPicker
                         id="SecondaryColor"
                         color={formik.values.SecondaryColor}
                         onChange={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);
                         }}

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'

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}) =
                 >
                     <OrderTableHead headCells={headCells} order={order} orderBy={orderBy} setOrderBy={setOrderBy} setOrder={setOrder} />
                     <TableBody style={{height:'409px', overflow: 'auto'}}>
-                        {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}`;
 

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

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": {