Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

feat: admin location controls - ban user #7975

Merged
merged 1 commit into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion packages/client-core/i18n/en/admin.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"delete": "Delete",
"view": "View",
"kick": "Kick",
"ban": "Ban",
"yes": "Yes",
"no": "No",
"refresh": "Refresh",
Expand Down Expand Up @@ -205,7 +206,8 @@
"confirmInstanceDelete": "Do you want to delete instance",
"location": "Location",
"count": "Count",
"kickDuration": "Kick Duration"
"kickDuration": "Kick Duration",
"confirmUserBan": "Are you sure you want to ban this user?"
},
"resources": {
"resources": "resources",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ interface Props {
onClose: () => void
}

const INFINITY = 'INFINITY'

const InstanceDrawer = ({ open, selectedInstance, onClose }: Props) => {
const page = useHookstate(0)
const rowsPerPage = useHookstate(INSTANCE_USERS_PAGE_LIMIT)
Expand Down Expand Up @@ -64,16 +66,29 @@ const InstanceDrawer = ({ open, selectedInstance, onClose }: Props) => {
>
<span className={styles.spanWhite}>{t('admin:components.common.kick')}</span>
</Button>
<Button
className={styles.actionStyle}
onClick={() => {
kickData.merge({ userId: id, instanceId: selectedInstance!.id, duration: INFINITY })
openKickDialog.set(true)
}}
>
<span className={styles.spanWhite}>{t('admin:components.common.ban')}</span>
</Button>
</>
)
})

const handleSubmitKickUser = () => {
if (!kickData.value.duration) {
const handleSubmitKickUser = async () => {
if (!kickData.value.duration || !selectedInstance) {
return
}
AdminInstanceUserService.kickUser({ ...kickData.value })
await AdminInstanceUserService.kickUser({ ...kickData.value })
await AdminInstanceUserService.fetchUsersInInstance(selectedInstance.id)
openKickDialog.set(false)
if (kickData.value.duration === INFINITY) {
kickData.merge({ duration: '8' })
}
}

const rows = adminInstanceUserState.value.users.map((el) => createData(el.id, el.name))
Expand Down Expand Up @@ -104,12 +119,16 @@ const InstanceDrawer = ({ open, selectedInstance, onClose }: Props) => {
onClose={() => openKickDialog.set(false)}
description={
<Box>
<InputText
name="kickDuration"
label={t('admin:components.instance.kickDuration')}
value={kickData.value.duration}
onChange={(event) => kickData.merge({ duration: event.target.value })}
/>
{kickData.value.duration === INFINITY ? (
<span>{t('admin:components.instance.confirmUserBan')}</span>
) : (
<InputText
name="kickDuration"
label={t('admin:components.instance.kickDuration')}
value={kickData.value.duration}
onChange={(event) => kickData.merge({ duration: event.target.value })}
/>
)}
</Box>
}
/>
Expand Down
12 changes: 8 additions & 4 deletions packages/client-core/src/admin/services/InstanceService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,18 @@ export const AdminInstanceUserService = {
dispatchAction(AdminInstanceUserActions.instanceUsersRetrieved({ users }))
},
kickUser: async (kickData: { userId: UserInterface['id']; instanceId: Instance['id']; duration: string }) => {
console.log('kicking user', kickData)

const duration = new Date()
duration.setHours(duration.getHours() + parseInt(kickData.duration, 10))
if (kickData.duration === 'INFINITY') {
duration.setFullYear(duration.getFullYear() + 10) // ban for 10 years
} else {
duration.setHours(duration.getHours() + parseInt(kickData.duration, 10))
}

const userKick = await API.instance.client.service('user-kick').create({ ...kickData, duration })

console.log('kicked user', userKick)
console.log('user kicked ->', userKick)

NotificationService.dispatchNotify(`user was kicked`, { variant: 'default' })
}
}

Expand Down