Prechádzať zdrojové kódy

Synced Date Range options

They were inconsistent between the Allocation and Cloud Costs, made them
the same and chose defaults that are generally useful in th OpenCost UI

Signed-off-by: Matt Ray <github@mattray.dev>
Matt Ray 2 rokov pred
rodič
commit
bcc05ba386
2 zmenil súbory, kde vykonal 7 pridanie a 13 odobranie
  1. 4 6
      ui/src/Reports.js
  2. 3 7
      ui/src/cloudCost/tokens.js

+ 4 - 6
ui/src/Reports.js

@@ -36,14 +36,12 @@ import { currencyCodes } from "./constants/currencyCodes";
 const windowOptions = [
 const windowOptions = [
   { name: "Today", value: "today" },
   { name: "Today", value: "today" },
   { name: "Yesterday", value: "yesterday" },
   { name: "Yesterday", value: "yesterday" },
+  { name: "Last 24h", value: "24h" },
+  { name: "Last 48h", value: "48h" },
   { name: "Week-to-date", value: "week" },
   { name: "Week-to-date", value: "week" },
-  { name: "Month-to-date", value: "month" },
   { name: "Last week", value: "lastweek" },
   { name: "Last week", value: "lastweek" },
-  { name: "Last month", value: "lastmonth" },
-  { name: "Last 7 days", value: "6d" },
-  { name: "Last 30 days", value: "29d" },
-  { name: "Last 60 days", value: "59d" },
-  { name: "Last 90 days", value: "89d" },
+  { name: "Last 7 days", value: "7d" },
+  { name: "Last 14 days", value: "14d" },
 ];
 ];
 
 
 const aggregationOptions = [
 const aggregationOptions = [

+ 3 - 7
ui/src/cloudCost/tokens.js

@@ -1,16 +1,12 @@
 const windowOptions = [
 const windowOptions = [
   { name: "Today", value: "today" },
   { name: "Today", value: "today" },
   { name: "Yesterday", value: "yesterday" },
   { name: "Yesterday", value: "yesterday" },
-  { name: "Week-to-date", value: "week" },
-  // { name: "Month-to-date", value: "month" },
-  { name: "Last week", value: "lastweek" },
-  // { name: "Last month", value: "lastmonth" },
   { name: "Last 24h", value: "24h" },
   { name: "Last 24h", value: "24h" },
   { name: "Last 48h", value: "48h" },
   { name: "Last 48h", value: "48h" },
+  { name: "Week-to-date", value: "week" },
+  { name: "Last week", value: "lastweek" },
   { name: "Last 7 days", value: "7d" },
   { name: "Last 7 days", value: "7d" },
-  // { name: "Last 30 days", value: "30d" },
-  // { name: "Last 60 days", value: "60d" },
-  // { name: "Last 90 days", value: "90d" },
+  { name: "Last 14 days", value: "14d" },
 ];
 ];
 
 
 const aggregationOptions = [
 const aggregationOptions = [