fix: errors with mergin resource options

SoftwareBrothers · Aug 7, 2020 · 65be2a6 · 65be2a6
1 parent 72514b3
commit 65be2a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/example-app/src/companies/company.admin.js b/example-app/src/companies/company.admin.js
@@ -4,6 +4,7 @@ const passwordFeature = require('../features/password/password.feature')
 
 /** @type {AdminBro.ResourceOptions} */
 const options = {
+  listProperties: ['companyName', 'email', 'address'],
   properties: {
     profilePhotoLocation: {
       isVisible: false,

diff --git a/src/backend/utils/build-feature.ts b/src/backend/utils/build-feature.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import uniq from 'lodash/uniq'
+import merge from 'lodash/merge'
 import { FeatureType } from '../../admin-bro-options.interface'
 import { ResourceOptions } from '../decorators/resource-options.interface'
 import Action, { ActionResponse } from '../actions/action.interface'
@@ -59,15 +60,17 @@ const mergeResourceOptions = (
 
   ['listProperties', 'showProperties', 'editProperties', 'filterProperties'].forEach((propName) => {
     if (newOptions[propName]) {
-      options[propName] = uniq([...(oldOptions[propName] || []), newOptions[propName]])
+      const mergedOptions = [
+        ...(oldOptions && oldOptions[propName] ? oldOptions[propName] : []),
+        ...(newOptions && newOptions[propName] ? newOptions[propName] : []),
+      ]
+
+      options[propName] = uniq(mergedOptions)
     }
   })
 
   if (oldOptions.properties || newOptions.properties) {
-    options.properties = {
-      ...oldOptions.properties,
-      ...newOptions.properties,
-    }
+    options.properties = merge({}, oldOptions.properties, newOptions.properties)
   }
 
   if (oldOptions.actions || newOptions.actions) {