Merge pull request #1390 from BNWEIN/dev

Update AddUser.js
KelvinTegelaar · Feb 27, 2023 · 24e5374 · 24e5374
2 parents 4ae883a + b09f0c4
commit 24e5374
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/views/endpoint/autopilot/AutopilotAddDevice.js b/src/views/endpoint/autopilot/AutopilotAddDevice.js
@@ -76,13 +76,17 @@ const AddAPDevice = () => {
 
   const handleOnDrop = (data) => {
     const importdata = data.map((item) => {
+      const normalizedData = {}
+      Object.keys(item.data).forEach((key) => {
+        normalizedData[key.toLowerCase()] = item.data[key]
+      })
       return {
         //Device serial number,Windows product ID,Hardware hash,Manufacturer name,Device Model
-        SerialNumber: item.data['Device serial number'],
-        productKey: item.data['Windows product ID'],
-        hardwareHash: item.data['Hardware hash'],
-        oemManufacturerName: item.data['Manufacturer name'],
-        modelName: item.data['Device Model'],
+        SerialNumber: normalizedData['device serial number'],
+        productKey: normalizedData['windows product id'],
+        hardwareHash: normalizedData['hardware hash'],
+        oemManufacturerName: normalizedData['manufacturer name'],
+        modelName: normalizedData['device model'],
       }
     })
     setAutopilotdata(importdata)

diff --git a/src/views/identity/administration/AddUser.js b/src/views/identity/administration/AddUser.js
@@ -133,15 +133,13 @@ const AddUser = () => {
             </CCardHeader>
             <CCardBody>
               {adcError && <span>Unable to determine Azure AD Connect Settings</span>}
-              {!adcIsFetching &&
-                adconnectsettings.dirSyncEnabled &&
-                adconnectsettings.dirSyncConfigured && (
-                  <CCallout color="warning">
-                    Warning! {adconnectsettings.dirSyncEnabled} This tenant currently has Active
-                    Directory Sync Enabled and Configured. This usually means users should be
-                    created in Active Directory
-                  </CCallout>
-                )}
+              {!adcIsFetching && adconnectsettings.dirSyncEnabled && (
+                <CCallout color="warning">
+                  Warning! {adconnectsettings.dirSyncEnabled} This tenant currently has Active
+                  Directory Sync Enabled. This usually means users should be created in Active
+                  Directory
+                </CCallout>
+              )}
               <Form
                 initialValues={{ ...initialState }}
                 onSubmit={onSubmit}