From fff19e390a5fc9f948720f2a33e1e2370a3cc4ad Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 10 Aug 2020 18:56:52 +0000
Subject: [PATCH]

---
 ayanova/src/components/gz-data-table.vue |  2 +-
 ayanova/src/views/adm-global-logo.vue    | 45 ++++++++++++------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 86d980de..1997ef61 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -737,7 +737,7 @@ function buildRecords(listData, columndefinitions) {
             column.i != 0
           ) {
             //yes so provide the ot (openable type) info needed for the grid to make this openable
-           // console.log("Openable type:", column);
+            // console.log("Openable type:", column);
             switch (column.v) {
               //Not openable types
               case 18: //DataListView
diff --git a/ayanova/src/views/adm-global-logo.vue b/ayanova/src/views/adm-global-logo.vue
index 3df4ab48..51ee4b1c 100644
--- a/ayanova/src/views/adm-global-logo.vue
+++ b/ayanova/src/views/adm-global-logo.vue
@@ -7,10 +7,7 @@
         <v-row>
           <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
           <v-col cols="12">
-            <img :src="test()" />
-          </v-col>
-          <v-col cols="12">
-            <img :src="imageUrl('small')" />
+            <img class="grey lighten-2" :src="smallUrl" />
             <v-file-input
               v-model="uploadSmall"
               accept="image/*"
@@ -22,7 +19,7 @@
             }}</v-btn>
           </v-col>
           <v-col cols="12" class="mt-10">
-            <img class="mt-10 grey lighten-2" :src="imageUrl('medium')" />
+            <img class="mt-10 grey lighten-2" :src="mediumUrl" />
             <v-file-input
               v-model="uploadMedium"
               accept="image/*"
@@ -34,7 +31,7 @@
             }}</v-btn>
           </v-col>
           <v-col cols="12" class="mt-10">
-            <img class="mt-10 grey lighten-2" :src="imageUrl('large')" />
+            <img class="mt-10 grey lighten-2" :src="largeUrl" />
             <v-file-input
               v-model="uploadLarge"
               accept="image/*"
@@ -73,6 +70,9 @@ export default {
       //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
       //modify the menu as necessary
       generateMenu(vm);
+      vm.smallUrl = `${window.$gz.api.logoUrl("small")}?x=${Date.now()}`;
+      vm.mediumUrl = `${window.$gz.api.logoUrl("medium")}?x=${Date.now()}`;
+      vm.largeUrl = `${window.$gz.api.logoUrl("large")}?x=${Date.now()}`;
 
       vm.formState.loading = false;
     } catch (err) {
@@ -85,6 +85,9 @@ export default {
       uploadSmall: null,
       uploadMedium: null,
       uploadLarge: null,
+      mediumUrl: null,
+      largeUrl: null,
+      smallUrl: null,
       formState: {
         ready: false,
         dirty: false,
@@ -99,9 +102,6 @@ export default {
     };
   },
   methods: {
-    test() {
-      return "https://www.ayanova.com/images/AyaNovaIcon32.png";
-    },
     imageUrl(size) {
       return window.$gz.api.logoUrl(size);
     },
@@ -122,25 +122,24 @@ export default {
         default:
           return;
       }
-      //   let fileData = [];
-      //   for (let i = 0; i < vm.uploadFiles.length; i++) {
-      //     let f = vm.uploadFiles[i];
-      //     fileData.push({ name: f.name, lastModified: f.lastModified });
-      //   }
-      //   let at = {
-      //     ayaId: vm.ayaId,
-      //     ayaType: vm.ayaType,
-      //     files: vm.uploadFiles,
-      //     fileData: JSON.stringify(fileData), //note this is required for an array or it will come to the server as a string [object,object]
-      //     notes: vm.notes ? vm.notes : ""
-      //   };
       try {
         let res = await window.$gz.api.uploadLogo(fileData, size);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
-          //   vm.uploadFiles = [];
-          //   vm.updateDisplayList(res.data);
+          switch (size) {
+            case "small":
+              vm.smallUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
+              break;
+            case "medium":
+              vm.mediumUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
+              break;
+            case "large":
+              vm.largeUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
+              break;
+            default:
+              return;
+          }
         }
       } catch (error) {
         window.$gz.errorHandler.handleFormError(error);