Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extension Mapping #2635

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Extension Mapping #2635

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c0e474
Cleanup comments, add refresh
JohnDuprey Jul 3, 2024
f3c00e3
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jul 5, 2024
018b0d0
Fix automapping
JohnDuprey Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 9 additions & 45 deletions src/views/cipp/ExtensionMappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
setMappingValue({})
})
}
/*const onNinjaOrgsSubmit = () => {
const originalFormat = ninjaMappingsArray.reduce((acc, item) => {
acc[item.Tenant?.customerId] = { label: item.ninjaName, value: item.ninjaId }
return acc
}, {})

setNinjaOrgsExtensionconfig({
path: 'api/ExecExtensionMapping?AddMapping=NinjaOrgs',
values: { mappings: originalFormat },
}).then(() => {
listNinjaOrgsBackend({ path: 'api/ExecExtensionMapping?List=NinjaOrgs' })
setMappingValue({})
})
}*/

const onOrgsAutomap = async (values) => {
if (autoMapSyncApi) {
Expand All @@ -66,16 +52,17 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
})
}

const newMappings = listMappingBackendResult.data?.Tenants.map((tenant) => {
var newMappings = []
listMappingBackendResult.data?.Tenants.map((tenant) => {
const company = listMappingBackendResult.data?.Companies.find(
(client) => client.name === tenant.displayName,
)
if (company) {
return {
if (company !== undefined && !mappingArray.find((item) => item.companyId === company.value)) {
newMappings.push({
Tenant: tenant,
companyName: company.name,
companyId: company.value,
}
})
}
})
setMappingArray((currentMappings) => [...currentMappings, ...newMappings])
Expand All @@ -89,32 +76,6 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
})
}

/*const onHaloAutomap = () => {
const newMappings = listBackendHaloResult.data?.Tenants.map(
(tenant) => {
const haloClient = listBackendHaloResult.data?.HaloClients.find(
(client) => client.name === tenant.displayName,
)
if (haloClient) {
console.log(haloClient)
console.log(tenant)
return {
Tenant: tenant,
haloName: haloClient.name,
haloId: haloClient.value,
}
}
},
//filter out any undefined values
).filter((item) => item !== undefined)
setHaloMappingsArray((currentHaloMappings) => [...currentHaloMappings, ...newMappings]).then(
() => {
listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })
},
)
setHaloAutoMap(true)
}*/

useEffect(() => {
if (listMappingBackendResult.isSuccess) {
setMappingArray(
Expand All @@ -127,7 +88,7 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
})),
)
}
}, [listMappingBackendResult])
}, [listMappingBackendResult, setMappingArray])

const Actions = (row, rowIndex, formatExtraData) => {
return (
Expand Down Expand Up @@ -232,6 +193,9 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
columns={columns}
data={mappingArray}
isModal={true}
refreshFunction={() =>
listMappingBackend({ path: `api/ExecExtensionMapping?List=${type}` })
}
/>
)
}
Expand Down
Loading