Skip to content

Improve Extension Mappings #2439

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

Merged
merged 2 commits into from
May 13, 2024
Merged

Improve Extension Mappings #2439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d265bba
Improve Extension Mappings
JohnDuprey May 13, 2024
b0ed799
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 13, 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
122 changes: 85 additions & 37 deletions src/views/cipp/app-settings/SettingsExtensionMappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ export function SettingsExtensionMappings() {
setHaloExtensionconfig({
path: 'api/ExecExtensionMapping?AddMapping=Halo',
values: { mappings: originalFormat },
}).then(() => {
listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })
setMappingValue({})
})
}
const onNinjaOrgsSubmit = () => {
Expand All @@ -52,6 +55,9 @@ export function SettingsExtensionMappings() {
setNinjaOrgsExtensionconfig({
path: 'api/ExecExtensionMapping?AddMapping=NinjaOrgs',
values: { mappings: originalFormat },
}).then(() => {
listNinjaOrgsBackend({ path: 'api/ExecExtensionMapping?List=NinjaOrgs' })
setMappingValue({})
})
}

Expand All @@ -68,7 +74,6 @@ export function SettingsExtensionMappings() {
const onNinjaFieldsSubmit = (values) => {
setNinjaFieldsExtensionconfig({
path: 'api/ExecExtensionMapping?AddMapping=NinjaFields',

values: { mappings: values },
})
}
Expand All @@ -91,8 +96,11 @@ export function SettingsExtensionMappings() {
},
//filter out any undefined values
).filter((item) => item !== undefined)
setHaloMappingsArray((currentHaloMappings) => [...currentHaloMappings, ...newMappings])

setHaloMappingsArray((currentHaloMappings) => [...currentHaloMappings, ...newMappings]).then(
() => {
listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })
},
)
setHaloAutoMap(true)
}

Expand Down Expand Up @@ -235,7 +243,7 @@ export function SettingsExtensionMappings() {
<CippButtonCard
title={'HaloPSA Mapping'}
titleType="big"
isFetching={listHaloBackend.isFetching}
isFetching={listBackendHaloResult.isFetching}
CardButton={
<>
<CButton form="haloform" className="me-2" type="submit">
Expand All @@ -253,7 +261,7 @@ export function SettingsExtensionMappings() {
</>
}
>
{listBackendHaloResult.isFetching ? (
{listBackendHaloResult.isFetching && listBackendHaloResult.isUninitialized ? (
<CSpinner color="primary" />
) : (
<Form
Expand Down Expand Up @@ -281,43 +289,62 @@ export function SettingsExtensionMappings() {
<RFFSelectSearch
placeholder="Select a Tenant"
name={`tenant_selector`}
values={listBackendHaloResult.data?.Tenants.map((tenant) => ({
values={listBackendHaloResult.data?.Tenants.filter((tenant) => {
return !Object.keys(listBackendHaloResult.data?.Mappings).includes(
tenant.customerId,
)
}).map((tenant) => ({
name: tenant.displayName,
value: tenant.customerId,
}))}
onChange={(e) => {
setMappingArray(e.value)
}}
isLoading={listBackendHaloResult.isFetching}
/>
</CCol>
<CCol xs="1" className="d-flex justify-content-center align-items-center">
<FontAwesomeIcon icon={'link'} size="xl" className="my-4" />
</CCol>
<CCol xs="5">
<RFFSelectSearch
name={mappingArray}
values={listBackendHaloResult.data?.HaloClients.map((client) => ({
name="halo_client"
values={listBackendHaloResult.data?.HaloClients.filter((client) => {
return !Object.values(listBackendHaloResult.data?.Mappings)
.map((value) => {
return value.value
})
.includes(client.value)
}).map((client) => ({
name: client.name,
value: client.value,
}))}
onChange={(e) => setMappingValue(e)}
placeholder="Select a HaloPSA Client"
isLoading={listBackendHaloResult.isFetching}
/>
</CCol>
<CButton
onClick={() =>
//set the new mapping in the array
setHaloMappingsArray([
...haloMappingsArray,
{
Tenant: listBackendHaloResult.data?.Tenants.find(
(tenant) => tenant.customerId === mappingArray,
),
haloName: mappingValue.label,
haloId: mappingValue.value,
},
])
}
onClick={() => {
if (
mappingValue.value !== undefined &&
Object.values(haloMappingsArray)
.map((item) => item.haloId)
.includes(mappingValue.value) === false
) {
//set the new mapping in the array
setHaloMappingsArray([
...haloMappingsArray,
{
Tenant: listBackendHaloResult.data?.Tenants.find(
(tenant) => tenant.customerId === mappingArray,
),
haloName: mappingValue.label,
haloId: mappingValue.value,
},
])
}
}}
className={`my-4 circular-button`}
title={'+'}
>
Expand Down Expand Up @@ -381,7 +408,7 @@ export function SettingsExtensionMappings() {
</>
}
>
{listBackendNinjaOrgsResult.isFetching ? (
{listBackendNinjaOrgsResult.isFetching && listBackendNinjaOrgsResult.isUninitialized ? (
<CSpinner color="primary" />
) : (
<Form
Expand Down Expand Up @@ -409,43 +436,64 @@ export function SettingsExtensionMappings() {
<RFFSelectSearch
placeholder="Select a Tenant"
name={`tenant_selector`}
values={listBackendNinjaOrgsResult.data?.Tenants.map((tenant) => ({
values={listBackendNinjaOrgsResult.data?.Tenants.filter((tenant) => {
return !Object.keys(
listBackendNinjaOrgsResult.data?.Mappings,
).includes(tenant.customerId)
}).map((tenant) => ({
name: tenant.displayName,
value: tenant.customerId,
}))}
onChange={(e) => {
setMappingArray(e.value)
}}
isLoading={listBackendNinjaOrgsResult.isFetching}
/>
</CCol>
<CCol xs="1" className="d-flex justify-content-center align-items-center">
<FontAwesomeIcon icon={'link'} size="xl" className="my-4" />
</CCol>
<CCol xs="5">
<RFFSelectSearch
name={mappingArray}
values={listBackendNinjaOrgsResult.data?.NinjaOrgs.map((client) => ({
name="ninja_org"
values={listBackendNinjaOrgsResult.data?.NinjaOrgs.filter(
(client) => {
return !Object.values(listBackendNinjaOrgsResult.data?.Mappings)
.map((value) => {
return value.value
})
.includes(client.value.toString())
},
).map((client) => ({
name: client.name,
value: client.value,
}))}
onChange={(e) => setMappingValue(e)}
placeholder="Select a NinjaOne Organization"
isLoading={listBackendNinjaOrgsResult.isFetching}
/>
</CCol>
<CButton
onClick={() =>
onClick={() => {
//set the new mapping in the array
setNinjaMappingsArray([
...ninjaMappingsArray,
{
Tenant: listBackendNinjaOrgsResult.data?.Tenants.find(
(tenant) => tenant.customerId === mappingArray,
),
ninjaName: mappingValue.label,
ninjaId: mappingValue.value,
},
])
}
if (
mappingValue.value !== undefined &&
Object.values(ninjaMappingsArray)
.map((item) => item.ninjaId)
.includes(mappingValue.value) === false
) {
setNinjaMappingsArray([
...ninjaMappingsArray,
{
Tenant: listBackendNinjaOrgsResult.data?.Tenants.find(
(tenant) => tenant.customerId === mappingArray,
),
ninjaName: mappingValue.label,
ninjaId: mappingValue.value,
},
])
}
}}
className={`my-4 circular-button`}
title={'+'}
>
Expand Down