From bd5b62b1071d6424f82477dca2f0d374f709a596 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 Mar 2021 19:42:24 +0200
Subject: changed importexport into a service instead of component for
 simplicity

---
 src/services/export_import/export_import.js | 57 +++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/services/export_import/export_import.js

(limited to 'src/services/export_import')

diff --git a/src/services/export_import/export_import.js b/src/services/export_import/export_import.js
new file mode 100644
index 00000000..0bf9eadc
--- /dev/null
+++ b/src/services/export_import/export_import.js
@@ -0,0 +1,57 @@
+export const newExporter = ({
+  filename = 'data',
+  getExportedObject
+}) => ({
+  exportData () {
+    const stringified = JSON.stringify(getExportedObject(), null, 2) // Pretty-print and indent with 2 spaces
+
+    // Create an invisible link with a data url and simulate a click
+    const e = document.createElement('a')
+    e.setAttribute('download', `${filename}.json`)
+    e.setAttribute('href', 'data:application/json;base64,' + window.btoa(stringified))
+    e.style.display = 'none'
+
+    document.body.appendChild(e)
+    e.click()
+    document.body.removeChild(e)
+  }
+})
+
+export const newImporter = ({
+  onImport,
+  onImportFailure,
+  validator = () => true
+}) => ({
+  importData () {
+    const filePicker = document.createElement('input')
+    filePicker.setAttribute('type', 'file')
+    filePicker.setAttribute('accept', '.json')
+    console.log(1)
+
+    filePicker.addEventListener('change', event => {
+      if (event.target.files[0]) {
+        // eslint-disable-next-line no-undef
+        const reader = new FileReader()
+        reader.onload = ({ target }) => {
+          try {
+            const parsed = JSON.parse(target.result)
+            const validationResult = validator(parsed)
+            if (validationResult === true) {
+              onImport(parsed)
+            } else {
+              onImportFailure({ validationResult })
+            }
+          } catch (error) {
+            onImportFailure({ error })
+          }
+        }
+        console.log(2)
+        reader.readAsText(event.target.files[0])
+      }
+    })
+
+    document.body.appendChild(filePicker)
+    filePicker.click()
+    document.body.removeChild(filePicker)
+  }
+})
-- 
cgit v1.2.3-70-g09d2


From 3d95ea6acbd47cabee519b2450647512ac2d5b46 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 Mar 2021 21:56:20 +0200
Subject: cleanup + fix

---
 src/components/settings_modal/settings_modal.js | 1 -
 src/modules/config.js                           | 4 ++--
 src/services/export_import/export_import.js     | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/services/export_import')

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 7010e4aa..04043483 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -116,7 +116,6 @@ const SettingsModal = {
       if (data) { this.$store.dispatch('loadSettings', data) }
     },
     restore () {
-      console.log(this.dataImporter)
       this.dataImporter.importData()
     },
     backup () {
diff --git a/src/modules/config.js b/src/modules/config.js
index 352adf20..b0fc98f5 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -111,7 +111,7 @@ const config = {
   },
   actions: {
     loadSettings ({ dispatch }, data) {
-      const knownKeys = new Set(Object.keys(this.state.config))
+      const knownKeys = new Set(Object.keys(defaultState))
       const presentKeys = new Set(Object.keys(data))
       const intersection = new Set()
       for (let elem of presentKeys) {
@@ -120,7 +120,7 @@ const config = {
         }
       }
 
-      Object.keys(intersection).forEach(
+      intersection.forEach(
         name => dispatch('setOption', { name, value: data[name] })
       )
     },
diff --git a/src/services/export_import/export_import.js b/src/services/export_import/export_import.js
index 0bf9eadc..ac67cf9c 100644
--- a/src/services/export_import/export_import.js
+++ b/src/services/export_import/export_import.js
@@ -26,7 +26,6 @@ export const newImporter = ({
     const filePicker = document.createElement('input')
     filePicker.setAttribute('type', 'file')
     filePicker.setAttribute('accept', '.json')
-    console.log(1)
 
     filePicker.addEventListener('change', event => {
       if (event.target.files[0]) {
@@ -45,7 +44,6 @@ export const newImporter = ({
             onImportFailure({ error })
           }
         }
-        console.log(2)
         reader.readAsText(event.target.files[0])
       }
     })
-- 
cgit v1.2.3-70-g09d2