From 8652edc139e044d6db5224671a468dc262ba80d6 Mon Sep 17 00:00:00 2001
From: lana-k <skochetova89@gmail.com>
Date: Thu, 21 Jan 2021 13:25:29 +0100
Subject: [PATCH] refactor reading predefined queries

---
 src/storedQueries.js    |  7 +++++++
 src/views/MainView.vue  | 30 +-----------------------------
 src/views/MyQueries.vue |  9 ++++++++-
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/storedQueries.js b/src/storedQueries.js
index 7fde521..65e0c9f 100644
--- a/src/storedQueries.js
+++ b/src/storedQueries.js
@@ -113,5 +113,12 @@ export default {
       document.body.append(uploader)
     }
     uploader.click()
+  },
+
+  readPredefinedQueries () {
+    return fetch('./queries.json')
+      .then(resp => {
+        return resp.json()
+      })
   }
 }
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index 804a8b8..6508856 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -13,35 +13,7 @@ import '@/assets/styles/scrollbars.css'
 
 export default {
   name: 'MainView',
-  components: { MainMenu },
-  created () {
-    this.readPredefinedQueries()
-      .then(queries => {
-        this.$store.commit('updatePredefinedQueries', queries)
-      })
-      .catch(console.error)
-  },
-  methods: {
-    readPredefinedQueries () {
-      return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest()
-        xhr.open('GET', './queries.json')
-        xhr.onload = () => {
-          if (xhr.readyState === 4) {
-            if (xhr.status === 200) {
-              resolve(JSON.parse(xhr.responseText || '[]'))
-            } else {
-              reject(xhr.statusText)
-            }
-          }
-        }
-        xhr.onerror = () => {
-          reject(xhr.statusText)
-        }
-        xhr.send()
-      })
-    }
-  }
+  components: { MainMenu }
 }
 </script>
 <style scoped>
diff --git a/src/views/MyQueries.vue b/src/views/MyQueries.vue
index bfba81d..5e7ba32 100644
--- a/src/views/MyQueries.vue
+++ b/src/views/MyQueries.vue
@@ -214,7 +214,14 @@ export default {
     }
   },
   created () {
-    this.queries = storedQueries.getStoredQueries()
+    storedQueries.readPredefinedQueries()
+      .then(queries => {
+        this.$store.commit('updatePredefinedQueries', queries)
+      })
+      .catch(console.error)
+      .finally(() => {
+        this.queries = storedQueries.getStoredQueries()
+      })
   },
   mounted () {
     this.resizeObserver = new ResizeObserver(this.calcMaxTableHeight)