fix(ui): properly parse date parameters from url and pass on the endp…

…oints (#6200)
kestra-io · Nov 29, 2024 · a5328b2 · a5328b2
1 parent 6fa7eeb
commit a5328b2
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/ui/src/components/dashboard/Dashboard.vue b/ui/src/components/dashboard/Dashboard.vue
@@ -23,7 +23,8 @@
                         'scope',
                         'relative_date',
                         'absolute_date',
-                    ]"
+                    ]
+            "
             :refresh="{
                 shown: true,
                 callback: custom.shown ? refreshCustom : fetchAll,
@@ -229,7 +230,7 @@
     import {useStore} from "vuex";
     import {useI18n} from "vue-i18n";
 
-    // import moment from "moment";
+    import moment from "moment";
 
     import {apiUrl} from "override/utils/route";
     import State from "../../utils/state";
@@ -499,6 +500,20 @@
         //     route.query.endDate = moment().toISOString(true);
         // }
 
+        route.query.startDate = route.query.timeRange
+            ? moment()
+                .subtract(
+                    moment.duration(route.query.timeRange).as("milliseconds"),
+                )
+                .toISOString(true)
+            : route.query.startDate ||
+                moment()
+                    .subtract(moment.duration("PT720H").as("milliseconds"))
+                    .toISOString(true);
+        route.query.endDate = route.query.timeRange
+            ? moment().toISOString(true)
+            : route.query.endDate || moment().toISOString(true);
+
         try {
             await Promise.any([
                 fetchNumbers(),
@@ -525,15 +540,15 @@
             router.replace({query: {...route.query, flowId: props.flowID}});
         }
 
-        // if (!route.query.namespace && props.restoreURL) {
-        //     router.replace({query: {...route.query, namespace: defaultNamespace}});
-        //     filters.value.namespace = route.query.namespace || defaultNamespace;
-        // }
-        // else {
-        //     filters.value.namespace = null
-        // }
+    // if (!route.query.namespace && props.restoreURL) {
+    //     router.replace({query: {...route.query, namespace: defaultNamespace}});
+    //     filters.value.namespace = route.query.namespace || defaultNamespace;
+    // }
+    // else {
+    //     filters.value.namespace = null
+    // }
 
-        // updateParams(route.query);
+    // updateParams(route.query);
     });
 
     watch(