Fixes #1032: ensure when no initial preferences set, that values are …

…correctly emptied and removed, before validating on export.
qcif · Jul 14, 2020 · e8bfd6c · e8bfd6c
1 parent 1630828
commit e8bfd6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/main/preferences.js b/src/main/preferences.js
@@ -3,7 +3,7 @@ import { ipcMain as ipc } from 'electron'
 
 ipc.on('getPreference', (event, arg) => {
   const preference = settings.get(arg)
-  event.returnValue = preference || ''
+  event.returnValue = preference || []
 })
 
 ipc.on('setPreference', (event, name, stringified) => {

diff --git a/src/renderer/frictionlessDataPackage.js b/src/renderer/frictionlessDataPackage.js
@@ -78,6 +78,7 @@ function addPackageProperties (descriptor) {
   let packageProperties = _.cloneDeep(hotStore.state.packageProperties)
   _.merge(descriptor, packageProperties)
   removeEmptiesFromDescriptor(descriptor)
+  removeEmpty(descriptor, 'contributors')
   updateCustomsForProperties(descriptor, 'package')
 }
 
@@ -273,10 +274,12 @@ function addPath (descriptor, tabId) {
 function updateCustomsForProperties (descriptor, customType) {
   let customs = _.get(descriptor, 'customs', [])
   _.unset(descriptor, 'customs')
-  do {
-    const custom = customs.pop()
-    if (!_.isEmpty(_.get(custom, 'name', '')) && !_.isEmpty(_.get(custom, 'value', '')) && _.includes(_.get(custom, 'types', []), customType)) {
-      _.set(descriptor, custom.name, custom.value)
-    }
-  } while (!_.isEmpty(customs))
+  if (!_.isEmpty(customs)) {
+    do {
+      const custom = customs.pop()
+      if (!_.isEmpty(_.get(custom, 'name', '')) && !_.isEmpty(_.get(custom, 'value', '')) && _.includes(_.get(custom, 'types', []), customType)) {
+        _.set(descriptor, custom.name, custom.value)
+      }
+    } while (!_.isEmpty(customs))
+  }
 }