From c4aa695f2884e01814a2a12a8d9d9425741f9177 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 23 May 2020 21:23:51 +0000
Subject: [PATCH]

---
 ayanova/src/views/ops-log.vue | 101 +++++++++++++++-------------------
 1 file changed, 44 insertions(+), 57 deletions(-)

diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index 6471ad9b..4d9ec513 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -1,13 +1,24 @@
 <template>
   <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
+    <v-col cols="12">
+      <v-select
+        v-model="selectedLog"
+        :items="selectLists.serverLogs"
+        item-text="logname"
+        item-value="logname"
+        :label="$ay.t('Log')"
+        @input="logSelected"
+      >
+      </v-select>
+    </v-col>
     <v-col cols="12">
       <p class="title">{{ $ay.t("Log") }}</p>
 
       <v-btn @click="getDataFromApi" class="mt-1 mb-n6">
         <v-icon>fa-sync</v-icon>
       </v-btn>
-       <v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>
+      <v-textarea v-model="log" full-width readonly auto-grow></v-textarea>
     </v-col>
   </v-row>
 </template>
@@ -26,7 +37,7 @@ export default {
       .then(() => {
         vm.formState.ready = true;
         window.$gz.eventBus.$on("menu-click", clickHandler);
-        vm.getDataFromApi();
+        // vm.getDataFromApi();
         vm.formState.loading = false;
       })
       .catch(err => {
@@ -36,19 +47,18 @@ export default {
   },
   data() {
     return {
-      obj: [],
-      rawObj: [],
+      log: [],
+      selectedLog: null,
+      selectLists: {
+        serverLogs: []
+      },
       formState: {
         ready: false,
         loading: true,
         errorBoxMessage: null,
         appError: null,
         serverError: {}
-      },
-      //cache display format stuff
-      timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
-      languageName: window.$gz.locale.getBrowserLanguages(),
-      hour12: window.$gz.locale.getHour12()
+      }
     };
   },
   beforeDestroy() {
@@ -69,10 +79,16 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
+    logSelected: function() {
+      this.getDataFromApi();
+    },
     getDataFromApi() {
       let vm = this;
+      if (!vm.selectedLog) {
+        return;
+      }
       vm.formState.loading = true;
-      let url = "job-operations/logs/all-jobs";
+      let url = "log-file/" + vm.selectedLog;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       window.$gz.api
         .get(url)
@@ -91,29 +107,9 @@ export default {
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             if (res.data) {
-              vm.rawObj = res.data;
-              let ret = [];
-              for (let i = 0; i < res.data.length; i++) {
-                let o = res.data[i];
-                ret.push({
-                  id: i,
-                  created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-                    o.created,
-                    this.timeZoneName,
-                    this.languageName,
-                    this.hour12
-                  ),
-                  status: o.statusText,
-                  jobId:
-                    o.jobId == "00000000-0000-0000-0000-000000000000"
-                      ? ""
-                      : o.jobId
-                });
-              }
-              vm.obj = ret;
+              vm.log = res.data;
             } else {
-              vm.rawObj = [];
-              vm.obj = [];
+              vm.log = null;
             }
 
             window.$gz.form.setFormState({
@@ -132,25 +128,6 @@ export default {
           });
           window.$gz.errorHandler.handleFormError(error, vm);
         });
-    },
-    testJob() {
-      let vm = this;
-      vm.formState.loading = true;
-      let url = "job-operations/test-job";
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .upsert(url, {})
-        .then(res => {
-          vm.formState.loading = false;
-          if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          }
-        })
-        .catch(function handleSubmitError(error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
-        });
     }
   }
 };
@@ -190,12 +167,7 @@ function clickHandler(menuItem) {
     switch (m.key) {
       case "copylog":
         //put the log info on the clipboard:
-        window.$gz.util.copyToClipboard(
-          "SERVER JOBS LOG\n" + JSON.stringify(m.vm.rawObj, null, 1)
-        );
-        break;
-      case "TEST_JOB":
-        m.vm.testJob();
+        window.$gz.util.copyToClipboard("SERVER LOG\n" + m.vm.log);
         break;
       default:
         window.$gz.eventBus.$emit(
@@ -214,6 +186,7 @@ function initForm(vm) {
     (async function() {
       try {
         await fetchTranslatedText(vm);
+        await populateSelectionLists(vm);
       } catch (err) {
         reject(err);
       }
@@ -231,4 +204,18 @@ function fetchTranslatedText(vm) {
 
   return window.$gz.translation.fetch(tKeysRequired);
 }
+
+//////////////////////
+//
+//
+function populateSelectionLists(vm) {
+  return window.$gz.api.get("log-file").then(res => {
+    if (res.error) {
+      window.$gz.errorHandler.handleFormError(res.error, vm);
+    } else {
+      debugger;
+      vm.selectLists.serverLogs = res.data;
+    }
+  });
+}
 </script>