Skip to content

Add and remove to/from groups in EditUser and more #2081

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 6 commits into from
Feb 4, 2024
Merged

Add and remove to/from groups in EditUser and more #2081

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4ebc6a
Merge pull request #3 from KelvinTegelaar/dev
kris6673 Jan 23, 2024
42d15c7
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Jan 23, 2024
144145a
Yeah this is not great
kris6673 Jan 24, 2024
46a4691
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Jan 29, 2024
bfff6a7
Merge branches 'dev' and 'dev' of https://github.com/kris6673/CIPP in…
Feb 2, 2024
2c7bce3
IT WOOOOOOORKS
kris6673 Feb 2, 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
49 changes: 48 additions & 1 deletion src/views/identity/administration/EditUser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
} from 'src/components/forms'
import countryList from 'src/data/countryList'
import { useListUserQuery, useListUsersQuery } from 'src/store/api/users'
import { useListGroupsQuery } from 'src/store/api/groups'
import { useListDomainsQuery } from 'src/store/api/domains'
import { useListLicensesQuery } from 'src/store/api/licenses'
import { CippCodeBlock, ModalService } from 'src/components/utilities'
Expand Down Expand Up @@ -45,6 +46,12 @@ const EditUser = () => {
error: usersError,
} = useListUsersQuery({ tenantDomain })

const {
data: groups = [],
isFetching: groupsIsFetching,
error: groupsError,
} = useListGroupsQuery({ tenantDomain })

const {
data: domains = [],
isFetching: domainsIsFetching,
Expand All @@ -70,8 +77,11 @@ const EditUser = () => {
}, [userId, tenantDomain, dispatch])
const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
const onSubmit = (values) => {
console.log(values.AddToGroups)
const shippedValues = {
AddedAliases: values.addedAliases,
AddToGroups: Array.isArray(values.AddToGroups) ? values.AddToGroups : [],
RemoveFromGroups: Array.isArray(values.RemoveFromGroups) ? values.RemoveFromGroups : [],
BusinessPhone: values.businessPhones,
RemoveAllLicenses: values.RemoveAllLicenses,
City: values.city,
Expand All @@ -80,6 +90,7 @@ const EditUser = () => {
Country: values.country,
Department: values.department,
DisplayName: values.displayName,
userPrincipalName: values.userPrincipalName,
Domain: values.primDomain,
firstName: values.givenName,
Jobtitle: values.jobTitle,
Expand All @@ -97,7 +108,7 @@ const EditUser = () => {
addedAttributes: values.addedAttributes,
...(values.licenses ? values.license : ''),
}
//window.alert(JSON.stringify(shippedValues))
// window.alert(JSON.stringify(shippedValues))
genericPostRequest({ path: '/api/EditUser', values: shippedValues })
}
const usageLocation = useSelector((state) => state.app.usageLocation)
Expand Down Expand Up @@ -414,6 +425,42 @@ const EditUser = () => {
</CCol>
</CRow>
<CRow className="mb-3">
<CCol md={12}>
<RFFSelectSearch
multi={true}
label="Add user to group"
disabled={formDisabled}
values={groups?.map((group) => ({
value: {
groupid: group.id,
groupType: group.calculatedGroupType,
groupName: group.displayName,
},
name: `${group.displayName} - ${group.calculatedGroupType} `,
}))}
placeholder={!groupsIsFetching ? 'Select groups' : 'Loading...'}
name="AddToGroups"
/>
{groupsError && <span>Failed to load list of groups</span>}
</CCol>
<CCol md={12}>
<RFFSelectSearch
multi={true}
label="Remove user from group"
disabled={formDisabled}
values={groups?.map((group) => ({
value: {
groupid: group.id,
groupType: group.calculatedGroupType,
groupName: group.displayName,
},
name: `${group.displayName} - ${group.calculatedGroupType} `,
}))}
placeholder={!groupsIsFetching ? 'Select groups' : 'Loading...'}
name="RemoveFromGroups"
/>
{groupsError && <span>Failed to load list of groups</span>}
</CCol>
<CCol md={12}>
<RFFSelectSearch
label="Copy group membership from other user"
Expand Down