Update import data structure.

Remove obsolete and redundant budget.budget structure Move budget to settings object.
Delwin444 · Sep 5, 2021 · 322a8ba · 322a8ba
1 parent ed0d41a
commit 322a8ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/components/calculator/Export.vue b/src/components/calculator/Export.vue
@@ -13,9 +13,9 @@ export default {
       const exportData = {
         positions: this.$store.getters['positions/valid'],
         groups: this.$store.state.groups.items,
-        budget: this.$store.state.controls.budget.budget,
         settings: {
-          enableAnimations: this.$store.state.controls.enableAnimations
+          enableAnimations: this.$store.state.controls.enableAnimations,
+          budget: this.$store.state.controls.budget
         }
       }
       const dataStr = 'data:text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(exportData))

diff --git a/src/components/calculator/Import.vue b/src/components/calculator/Import.vue
@@ -18,8 +18,7 @@ export default {
       const requiredImportDataKeys = [
         'groups',
         'positions',
-        'settings',
-        'budget'
+        'settings'
       ]
       pseudoImportNode.type = 'file'
       pseudoImportNode.accept = '.json'
@@ -56,7 +55,7 @@ export default {
           self.$store.commit('groups/update', importData.groups)
           self.$store.commit('positions/update', importData.positions)
           self.$store.commit('controls/updateEnableAnimations', importData.settings.enableAnimations)
-          self.$store.commit('controls/updateBudget', importData.budget)
+          self.$store.commit('controls/updateBudget', importData.settings.budget)
         })
 
         fileReader.readAsText(file)