Skip to content

Feat/ahsan new #81

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
Dec 21, 2022
Merged

Feat/ahsan new #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6691d1
user roles updates
AhsanKhan7 Dec 21, 2022
f5df868
Merge branch 'dev' of https://github.com/zenml-io/zenml-dashboard int…
AhsanKhan7 Dec 21, 2022
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
100 changes: 51 additions & 49 deletions src/ui/layouts/settings/Organization/UpdateMember.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,54 +51,56 @@ export const UpdateMember: React.FC<{ member: any }> = ({ member }) => {

const handleChange = (value: string) => {
setRole(value);

// if (role.length < member?.roles?.length) {
// member?.roles?.map((meme: any) => {
// // @ts-ignore
// if (meme?.id !== value[0]?.value)
// return console.log(role)
// })
// }
}
}

useEffect(() => {
setUsername(member?.name)
}, [member])

// eslint-disable-next-line
}, [])

const onUpdate = async () => {
setSubmitting(true);
try {
if (password) {
await fetchApiWithAuthRequest({
url: apiUrl(endpoints.users.updateUser(member.id)),
method: httpMethods.put,
authenticationToken,
headers: {
'Content-Type': 'application/json',
},
data: { name: username, password: password },
});
} else {
await fetchApiWithAuthRequest({
url: apiUrl(endpoints.users.updateUser(member.id)),
method: httpMethods.put,
authenticationToken,
headers: {
'Content-Type': 'application/json',
},
data: { name: username },
})
try {
if (password) {
await fetchApiWithAuthRequest({
url: apiUrl(endpoints.users.updateUser(member.id)),
method: httpMethods.put,
authenticationToken,
headers: {
'Content-Type': 'application/json',
},
data: { name: username, password: password },
});
} else {
await fetchApiWithAuthRequest({
url: apiUrl(endpoints.users.updateUser(member.id)),
method: httpMethods.put,
authenticationToken,
headers: {
'Content-Type': 'application/json',
},
data: { name: username },
})
}

const { data } = await axios.get(`${process.env.REACT_APP_BASE_API_URL}/role_assignments?user_name_or_id=${member?.name}`, { headers: { Authorization: `Bearer ${authToken}` } })

for (let index = 0; index < data?.length; index++) {
const singleDelRole = data[index];
await axios.delete(`https://appserver.zenml.io/api/v1/role_assignments/${singleDelRole?.id}`,
{ headers: { Authorization: `Bearer ${authToken}` } }
)
}

for (let index = 0; index < role.length; index++) {
const singleRole = role[index];
await axios.post(`${process.env.REACT_APP_BASE_API_URL}/role_assignments`,
// @ts-ignore
{ user: member.id, role: singleRole?.value },
{ headers: { Authorization: `Bearer ${authToken}` }}
)
// @ts-ignore
{ user: member.id, role: singleRole?.value },
{ headers: { Authorization: `Bearer ${authToken}` } }
)
}

setSubmitting(false);
setPopupOpen(false);
dispatch(
Expand All @@ -107,11 +109,11 @@ export const UpdateMember: React.FC<{ member: any }> = ({ member }) => {
type: toasterTypes.success,
}),
);
await dispatch(organizationActions.getMembers({}));
await dispatch(organizationActions.getMembers({}));
} catch (err) {
setSubmitting(false);
setPopupOpen(false);

dispatch(
showToasterAction({
// @ts-ignore
Expand Down Expand Up @@ -145,14 +147,14 @@ export const UpdateMember: React.FC<{ member: any }> = ({ member }) => {
<>
{popupOpen && (
<Popup onClose={() => setPopupOpen(false)}>

<FlexBox.Row alignItems="center" justifyContent="space-between">
<H3 bold color="darkGrey">{translate('updateMemberPopup.title')}</H3>
</FlexBox.Row>
<Box marginTop="sm"><Paragraph>{`${translate('updateMemberPopup.text')} ${member?.name}.`}</Paragraph></Box>

<Box marginTop='lg'>

<Box>
<FormTextField
label={translate('updateMemberPopup.form.username.label')}
Expand All @@ -164,13 +166,13 @@ export const UpdateMember: React.FC<{ member: any }> = ({ member }) => {
</Box>

<Box marginTop='md'>
<Paragraph size="body" style={{ color: 'black' }}><label htmlFor={username}>{'Roles'}</label></Paragraph>
<Select options={allRoles} isMulti onChange={(e: any) => handleChange(e)}
value={role}
placeholder={'Roles'}
styles={colourStyles}
isClearable={false}
/>
<Paragraph size="body" style={{ color: 'black' }}><label htmlFor={username}>{'Roles'}</label></Paragraph>
<Select options={allRoles} isMulti onChange={(e: any) => handleChange(e)}
value={role}
placeholder={'Roles'}
styles={colourStyles}
isClearable={false}
/>
</Box>

<Box marginTop="md">
Expand All @@ -185,7 +187,7 @@ export const UpdateMember: React.FC<{ member: any }> = ({ member }) => {
}}
showPasswordOption
/>
</Box>
</Box>
</Box>

<FlexBox justifyContent="flex-end" marginTop="xl" flexWrap>
Expand Down