fix: redefine dates logic

GluuFederation · Mar 4, 2022 · fc882ec · fc882ec
1 parent 45bf399
commit fc882ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/admin-ui/app/routes/Dashboards/DashboardPage.js b/admin-ui/app/routes/Dashboards/DashboardPage.js
@@ -98,8 +98,8 @@ function DashboardPage({ statData, permissions, clients, loading, dispatch }) {
 
   function generateDateRange(start, end) {
     var result = []
-    while (start.isBefore(end)) {
-      result.push(start.format('YYYY-MM-01'))
+    while (end > start || start.format('M') === end.format('M')) {
+      result.push(start.format('YYYY-MM') + '-01')
       start.add(1, 'month')
     }
     return result

diff --git a/admin-ui/plugins/admin/components/MAU/MauGraph.js b/admin-ui/plugins/admin/components/MAU/MauGraph.js
@@ -62,8 +62,6 @@ function MauGraph({ statData, permissions, clients, loading, dispatch }) {
     if (stat && stat.length >= 1) {
       let flattendStat = stat.map((entry) => entry['month'])
       let aRange = generateDateRange(moment(startDate), moment(endDate))
-      console.log(moment(startDate).format())
-      console.log(moment(endDate).format())
       for (const ele of aRange) {
         const currentMonth = getYearMonth(new Date(ele))
         if (flattendStat.indexOf(parseInt(currentMonth, 10)) === -1) {
@@ -99,8 +97,9 @@ function MauGraph({ statData, permissions, clients, loading, dispatch }) {
 
   function generateDateRange(start, end) {
     var result = []
-    while (start.isBefore(end)) {
-      result.push(start.format('YYYY-MM-01'))
+
+    while (end > start || start.format('M') === end.format('M')) {
+      result.push(start.format('YYYY-MM') + '-01')
       start.add(1, 'month')
     }
     return result