From 8d0d4a40e6a650a0923b7583bee48f2113742ac7 Mon Sep 17 00:00:00 2001 From: BNWEIN Date: Thu, 23 Feb 2023 15:14:43 +0000 Subject: [PATCH 1/2] Update AddUser.js Removed adconnectsettings.dirSyncConfigured as this information is no longer being returned by the latest graph call being made (https://graph.microsoft.com/beta/organization) @KelvinTegelaar please review to make sure this didnt break anything else, but i do not think it should. --- src/views/identity/administration/AddUser.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/views/identity/administration/AddUser.js b/src/views/identity/administration/AddUser.js index ced12ede0f62..30a0aea33332 100644 --- a/src/views/identity/administration/AddUser.js +++ b/src/views/identity/administration/AddUser.js @@ -133,15 +133,13 @@ const AddUser = () => { {adcError && Unable to determine Azure AD Connect Settings} - {!adcIsFetching && - adconnectsettings.dirSyncEnabled && - adconnectsettings.dirSyncConfigured && ( - - Warning! {adconnectsettings.dirSyncEnabled} This tenant currently has Active - Directory Sync Enabled and Configured. This usually means users should be - created in Active Directory - - )} + {!adcIsFetching && adconnectsettings.dirSyncEnabled && ( + + Warning! {adconnectsettings.dirSyncEnabled} This tenant currently has Active + Directory Sync Enabled. This usually means users should be created in Active + Directory + + )}
Date: Thu, 23 Feb 2023 17:18:45 +0000 Subject: [PATCH 2/2] Update AutopilotAddDevice.js Fixed issue with case sensitive CSV headers --- src/views/endpoint/autopilot/AutopilotAddDevice.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/views/endpoint/autopilot/AutopilotAddDevice.js b/src/views/endpoint/autopilot/AutopilotAddDevice.js index 37c63f10f14c..80e28426fdef 100644 --- 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)