fixed, childProfilesRfIds & removed unsed props

Telecominfraproject · Dec 1, 2020 · 1998829 · 1998829
1 parent 933aef3
commit 1998829
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/containers/AddProfile/index.js b/src/containers/AddProfile/index.js
@@ -79,7 +79,7 @@ const AddProfile = ({
         }
 
         if (profileType === 'equipment_ap') {
-          if (values.rfProfileId === null) {
+          if (!values.rfProfileId) {
             notification.error({
               message: 'Error',
               description: 'A Rf Profile is required.',

diff --git a/src/containers/ProfileDetails/components/AccessPoint/index.js b/src/containers/ProfileDetails/components/AccessPoint/index.js
@@ -29,6 +29,7 @@ const AccessPointForm = ({
   const [syslog, setSyslog] = useState(details?.syslogRelay?.enabled);
 
   const [selectedChildProfiles, setSelectdChildProfiles] = useState(childProfileIds);
+  const [previousRfId, setPreviousRfId] = useState(childProfiles.filter(i => i.profileType === 'rf')[0]?.id);
 
   const handleOnChangeSsid = selectedItem => {
     form.setFieldsValue({
@@ -45,12 +46,13 @@ const AccessPointForm = ({
   };
 
   const handleOnChangeRf = selectedItem => {
-    const newChildProfileList = childProfiles.filter(i => i.profileType !== 'rf').map(o => o.id);
+    const newChildProfileList = selectedChildProfiles.filter(i => i !== previousRfId);
 
     form.setFieldsValue({
       childProfileIds: [...newChildProfileList, selectedItem],
     });
     setSelectdChildProfiles([...newChildProfileList, selectedItem]);
+    setPreviousRfId(selectedItem);
   };
 
   useEffect(() => {
@@ -76,7 +78,7 @@ const AccessPointForm = ({
       },
       syntheticClientEnabled: details?.syntheticClientEnabled ? 'true' : 'false',
       equipmentDiscovery: details?.equipmentDiscovery ? 'true' : 'false',
-      rfProfileId: childProfiles.filter(i => i.profileType === 'rf')[0]?.name || null,
+      rfProfileId: previousRfId,
       childProfileIds,
     });
   }, [form, details, childProfileIds]);

diff --git a/src/containers/ProfileDetails/index.js b/src/containers/ProfileDetails/index.js
@@ -88,14 +88,14 @@ const ProfileDetails = ({
           formattedData = Object.assign(formattedData, formatSsidProfileForm(values));
         }
         if (profileType === 'equipment_ap') {        
-          if (values.rfProfileId === null) {
+          if (!values.rfProfileId) {
             notification.error({
               message: 'Error',
               description: 'A Rf Profile is required.',
             });
               return;
           }
-          formattedData = Object.assign(formattedData, formatApProfileForm(values, rfProfiles));
+          formattedData = Object.assign(formattedData, formatApProfileForm(values));
         }
         if (profileType === 'radius') {
           if (values.services.length === 0) {