From 6ceb83276f7d32dc605fda0e6c4c618065a5b3ff Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 1 Sep 2022 13:02:46 -0700
Subject: [PATCH] Fixed issue with duplicate properties

---
 ui/src/app/admin/component/ConfigurationForm.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/admin/component/ConfigurationForm.js b/ui/src/app/admin/component/ConfigurationForm.js
index cc13aa791..a97b1051e 100644
--- a/ui/src/app/admin/component/ConfigurationForm.js
+++ b/ui/src/app/admin/component/ConfigurationForm.js
@@ -12,6 +12,7 @@ import { useProperties } from '../hoc/PropertiesProvider';
 import Form from 'react-bootstrap/Form';
 import FloatingLabel from 'react-bootstrap/FloatingLabel';
 import { useTranslator } from '../../i18n/hooks';
+import { includes } from 'lodash';
 
 export function ConfigurationForm({ configuration = {}, loading, onSave, onCancel }) {
 
@@ -27,20 +28,23 @@ export function ConfigurationForm({ configuration = {}, loading, onSave, onCance
     });
 
     const properties = useProperties();
+    const selected = watch('properties');
 
     const addProperties = (props) => {
 
         const parsed = props.reduce((coll, prop, idx) => {
             if (prop.isCategory) {
-                console.log(properties.filter(p => p.category === prop.category))
-
                 return [...coll, ...properties.filter(p => p.category === prop.category)];
             } else {
                 return [...coll, prop];
             }
         }, []);
 
-        append(parsed);
+        const names = selected.map(p => p.propertyName);
+
+        const filtered = parsed.filter(p => includes(names, p.propertyName) ? false : true);
+
+        append(filtered);
     };
 
     const saveConfig = (formValues) => {