ayanova/src/views/ops-metrics.vue

@@ -17,7 +17,11 @@
 </template>
 
 <script>
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //https://medium.com/javascript-in-plain-english/exploring-chart-js-e3ba70b07aa4
+import relativeDatefilterCalculator from "../api/relative-date-filter-calculator.js";
 const FORM_KEY = "ops-metrics";
 export default {
   created() {
@@ -39,17 +43,6 @@ export default {
   data() {
     return {
       obj: {},
-      xxcpuChartData: {
-        labels: [],
-        datasets: [
-          {
-            label: "CPU %",
-            borderColor: "indigo",
-            fill: false,
-            data: []
-          }
-        ]
-      },
       chartOptions: {
         responsive: true,
         maintainAspectRatio: false,
@@ -62,6 +55,9 @@ export default {
           ]
         }
       },
+      selectLists: {
+        dateFilterTokens: []
+      },
       formState: {
         ready: false,
         loading: true,
@@ -162,16 +158,8 @@ export default {
     getDataFromApi() {
       let vm = this;
 
-      /*
+      let filterDates = relativeDatefilterCalculator.tokenToDates("*pastyear*");//TODO: FROM UI
-Date range keys for this:
+      TODO: ADD last 7 days last 6 hours to relative date filter calculator
-case "*pastyear*":
-"*last6months*"
-"*past30days*"
-"*past7days*" <-Need to add to relativeDatefilter
-"*past24hours*"
-DEFAULT: "*past6hours*" <-Need to add to relativeDatefilter
-
-*/
 
       vm.formState.loading = true;
       //##########################################################################################################################################
@@ -294,6 +282,7 @@ function initForm(vm) {
     (async function() {
       try {
         await fetchTranslatedText(vm);
+        await populateSelectionLists(vm);
       } catch (err) {
         reject(err);
       }
@@ -326,7 +315,14 @@ function populateSelectionLists(vm) {
 // Ensures UI translated text is available
 //
 function fetchTranslatedText(vm) {
-  let tKeysRequired = ["HelpAboutAyaNova"];
+  let tKeysRequired = [
+    "DateRangePast6Hours",
+    "DateRangePast24Hours",
+    "DateRangePast7Days",
+    "DateRangePast30Days",
+    "DateRangeInTheLastSixMonths",
+    "DateRangePastYear"
+  ];
 
   return window.$gz.translation.fetch(tKeysRequired);
 }