add / edit / delete user warrens

This commit is contained in:
2025-07-21 19:27:41 +02:00
parent 50e066f794
commit 2c26002507
86 changed files with 2197 additions and 300 deletions

View File

@@ -0,0 +1,248 @@
<script setup lang="ts">
import {
Combobox,
ComboboxAnchor,
ComboboxEmpty,
ComboboxGroup,
ComboboxInput,
ComboboxItem,
ComboboxItemIndicator,
ComboboxList,
} from '@/components/ui/combobox';
import {
AlertDialog,
AlertDialogTrigger,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogDescription,
AlertDialogContent,
AlertDialogFooter,
AlertDialogCancel,
} from '@/components/ui/alert-dialog';
import { toTypedSchema } from '@vee-validate/yup';
import { useForm } from 'vee-validate';
import { userWarrenSchema } from '~/lib/schemas/admin';
import type { AuthUserWithWarrens } from '~/shared/types/admin';
import { createUserWarren } from '~/lib/api/admin/createUserWarren';
const adminStore = useAdminStore();
const { user } = defineProps<{
user: AuthUserWithWarrens;
}>();
const availableWarrens = computed<typeof adminStore.resources.warrens>(() =>
Object.entries(adminStore.resources.warrens)
.filter(
([_, warren]) =>
user.warrens.findIndex((uw) => uw.warrenId === warren.id) === -1
)
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
);
const creating = ref(false);
const open = ref(false);
const form = useForm({
validationSchema: toTypedSchema(userWarrenSchema),
initialValues: {
userId: user.id,
canListFiles: false,
canReadFiles: false,
canModifyFiles: false,
canDeleteFiles: false,
},
});
const onSubmit = form.handleSubmit(async (values) => {
if (creating.value) {
return;
}
creating.value = true;
const result = await createUserWarren(values);
if (result.success) {
form.resetForm();
open.value = false;
}
creating.value = false;
});
</script>
<template>
<AlertDialog v-model:open="open">
<AlertDialogTrigger as-child>
<slot />
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>Add user warren</AlertDialogTitle>
<AlertDialogDescription
>Assign {{ user.name }} current user to an existing
warren</AlertDialogDescription
>
</AlertDialogHeader>
<div class="flex flex-col">
<Combobox>
<ComboboxAnchor as-child>
<ComboboxTrigger as-child>
<Button variant="outline" class="justify-between">
{{
(form.values.warrenId
? adminStore.resources.warrens[
form.values.warrenId
].name
: undefined) ?? 'Select warren'
}}
<Icon
name="lucide:chevrons-up-down"
class="ml-2 h-4 w-4 shrink-0 opacity-50"
/>
</Button>
</ComboboxTrigger>
</ComboboxAnchor>
<ComboboxList>
<div class="relative w-full max-w-sm items-center">
<ComboboxInput
class="h-10 rounded-none border-0 focus-visible:ring-0"
placeholder="Select warren..."
:display-value="(warren) => warren?.name"
/>
<span
class="absolute inset-y-0 start-0 flex items-center justify-center px-3"
>
<Icon
name="lucide:search"
class="text-muted-foreground size-4"
/>
</span>
</div>
<ComboboxEmpty>No warrens found</ComboboxEmpty>
<ComboboxGroup>
<ComboboxItem
v-for="warren in availableWarrens"
:key="warren.id"
:value="warren"
@select="
() => {
form.setFieldValue(
'warrenId',
warren.id
);
}
"
>
{{ warren.name }}
<ComboboxItemIndicator>
<Icon
name="lucide:check"
class="ml-auto h-4 w-4"
/>
</ComboboxItemIndicator>
</ComboboxItem>
</ComboboxGroup>
</ComboboxList>
</Combobox>
<span
v-if="form.errors.value.warrenId"
class="text-destructive-foreground text-sm"
>{{ form.errors.value.warrenId }}</span
>
</div>
<form
id="add-user-warren-form"
class="flex w-full flex-col gap-4"
@submit.prevent="onSubmit"
>
<FormField type="hidden" name="userId" :value="user.id" />
<div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
<FormField
v-slot="{ value, handleChange }"
name="canListFiles"
>
<FormItem class="flex flex-row justify-between">
<FormLabel class="grow">List files</FormLabel>
<FormControl>
<Switch
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField
v-slot="{ value, handleChange }"
name="canReadFiles"
>
<FormItem class="flex flex-row justify-between">
<FormLabel class="grow">Read files</FormLabel>
<FormControl>
<Switch
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField
v-slot="{ value, handleChange }"
name="canModifyFiles"
>
<FormItem class="flex flex-row justify-between">
<FormLabel class="grow">Modify files</FormLabel>
<FormControl>
<Switch
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField
v-slot="{ value, handleChange }"
name="canDeleteFiles"
>
<FormItem class="flex flex-row justify-between">
<FormLabel class="grow">Delete files</FormLabel>
<FormControl>
<Switch
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
</div>
</form>
<AlertDialogFooter class="space-y-0">
<AlertDialogCancel>Cancel</AlertDialogCancel>
<Button
type="submit"
form="add-user-warren-form"
:disabled="creating"
>Add</Button
>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</template>

View File

@@ -121,11 +121,14 @@ const onSubmit = form.handleSubmit(async (values) => {
</FormField>
</form>
<AlertDialogFooter>
<AlertDialogFooter class="gap-y-0">
<AlertDialogCancel variant="outline" @click="cancel"
>Cancel</AlertDialogCancel
>
<AlertDialogAction type="submit" form="create-user-form"
<AlertDialogAction
type="submit"
form="create-user-form"
:disabled="creating"
>Create</AlertDialogAction
>
</AlertDialogFooter>

View File

@@ -97,7 +97,7 @@ async function submit() {
</div>
</div>
</AlterDialogContent>
<AlertDialogFooter>
<AlertDialogFooter class="gap-y-0">
<AlertDialogCancel @click="close">Cancel</AlertDialogCancel>
<AlertDialogAction
:disabled="!emailMatches || deleting"

View File

@@ -1,4 +1,5 @@
<script setup lang="ts">
import { Accordion } from '@/components/ui/accordion';
import {
AlertDialog,
AlertDialogAction,
@@ -14,14 +15,14 @@ import { useForm } from 'vee-validate';
import { toTypedSchema } from '@vee-validate/yup';
import { editUserSchema } from '~/lib/schemas/admin';
import { editUser } from '~/lib/api/admin/editUser';
import type { AuthUser } from '~/shared/types/auth';
import type { AuthUserWithWarrens } from '~/shared/types/admin';
const adminStore = useAdminStore();
const isValid = computed(() => Object.keys(form.errors.value).length < 1);
// We'll only update this value if there is a user to prevent layout shifts on close
const user = ref<AuthUser>();
const user = ref<AuthUserWithWarrens>();
const editing = ref(false);
const isChanged = computed(() => {
@@ -52,8 +53,13 @@ const form = useForm({
adminStore.$subscribe((_mutation, state) => {
if (state.editUserDialog != null && !editing.value) {
user.value = state.editUserDialog.user;
form.setValues(user.value);
user.value = state.resources.users.find(
(u) => u.id === state.editUserDialog?.user.id
);
if (user.value != null) {
form.setValues(user.value);
}
}
});
@@ -73,7 +79,14 @@ const onSubmit = form.handleSubmit(async (values) => {
});
if (result.success) {
close();
const newUser: AuthUserWithWarrens = {
id: result.user.id,
name: result.user.name,
email: result.user.email,
admin: result.user.admin,
warrens: user.value.warrens,
};
adminStore.setEditUserDialog(newUser);
}
editing.value = false;
@@ -83,102 +96,141 @@ const onSubmit = form.handleSubmit(async (values) => {
<template>
<AlertDialog :open="adminStore.editUserDialog != null">
<AlertDialogTrigger><slot /></AlertDialogTrigger>
<AlertDialogContent @escape-key-down="close">
<AlertDialogHeader>
<AlertDialogContent
v-if="user != null"
class="flex max-h-[95vh] flex-col"
@escape-key-down="close"
>
<AlertDialogHeader class="shrink">
<AlertDialogTitle>Edit user</AlertDialogTitle>
<AlertDialogDescription>
Edit the user's fields, manage permissions or assign warrens
Modify the user's fields, manage permissions or assign
warrens
</AlertDialogDescription>
</AlertDialogHeader>
<form
id="edit-user-form"
class="flex flex-col gap-2"
@submit.prevent="onSubmit"
<ScrollArea
class="flex h-full grow flex-col justify-start overflow-hidden"
>
<FormField v-slot="{ componentField }" name="name">
<FormItem>
<FormLabel>Username</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="username"
type="text"
placeholder="confused-cat"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<form
id="edit-user-form"
class="flex flex-col gap-2"
@submit.prevent="onSubmit"
>
<FormField v-slot="{ componentField }" name="name">
<FormItem>
<FormLabel>Username</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="username"
type="text"
placeholder="confused-cat"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField v-slot="{ componentField }" name="email">
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="email"
type="email"
placeholder="confusedcat@example.com"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField v-slot="{ componentField }" name="email">
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="email"
type="email"
placeholder="confusedcat@example.com"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<FormField v-slot="{ componentField }" name="password">
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="password"
type="password"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
<FormDescription
>Leave empty to keep the current
password</FormDescription
<FormField v-slot="{ componentField }" name="password">
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<Input
v-bind="componentField"
id="password"
type="password"
autocomplete="off"
data-1p-ignore
data-protonpass-ignore
data-bwignore
/>
</FormControl>
<FormMessage />
<FormDescription
>Leave empty to keep the current
password</FormDescription
>
</FormItem>
</FormField>
<FormField v-slot="{ value, handleChange }" name="admin">
<FormItem>
<FormLabel>Admin</FormLabel>
<FormControl>
<Switch
id="admin"
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
<AlertDialogAction
type="submit"
form="edit-user-form"
:disabled="!isChanged || !isValid"
>Save</AlertDialogAction
>
</form>
<Separator orientation="horizontal" class="my-4" />
<div class="flex w-full flex-col gap-2">
<AdminAddUserWarrenDialog :user>
<Button variant="outline" size="icon">
<Icon name="lucide:folder-plus" />
</Button>
</AdminAddUserWarrenDialog>
<Accordion
v-if="user.warrens.length > 0"
class="flex w-full flex-col gap-2"
collapsible
type="single"
>
<AdminUserWarrenListing
v-for="warren in user.warrens"
:key="warren.warrenId"
:user-warren="warren"
/>
</Accordion>
<div v-else class="flex flex-col gap-4">
<span class="text-muted-foreground"
>This user is not assigned to any warrens</span
>
</FormItem>
</FormField>
<FormField v-slot="{ value, handleChange }" name="admin">
<FormItem>
<FormLabel>Admin</FormLabel>
<FormControl>
<Switch
id="admin"
:model-value="value"
@update:model-value="handleChange"
/>
</FormControl>
<FormMessage />
</FormItem>
</FormField>
</form>
</div>
</div>
<Separator orientation="horizontal" class="mt-4" />
</ScrollArea>
<AlertDialogFooter class="gap-y-0">
<AlertDialogCancel @click="close">Cancel</AlertDialogCancel>
<AlertDialogAction
type="submit"
form="edit-user-form"
:disabled="!isChanged || !isValid"
>Save</AlertDialogAction
>
<AlertDialogCancel @click="close">Close</AlertDialogCancel>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>

View File

@@ -1,6 +1,7 @@
<script setup lang="ts">
import type { AuthUser } from '#shared/types/auth';
const session = useAuthSession();
const { user } = defineProps<{
user: AuthUser;
}>();
@@ -12,13 +13,20 @@ const AVATAR =
<template>
<div
class="group/user bg-accent/30 flex cursor-pointer flex-row items-center justify-between gap-4 overflow-hidden rounded-lg p-2 pl-3"
class="group/user bg-accent/30 flex flex-row items-center justify-between gap-4 overflow-hidden rounded-lg p-2 pl-3"
>
<Avatar>
<AvatarImage :src="AVATAR" />
</Avatar>
<div class="flex min-w-0 shrink grow flex-col leading-4">
<span class="truncate text-sm font-medium">{{ user.name }}</span>
<span class="truncate text-sm font-medium">
{{ user.name }}
<span
v-if="user.id === session?.user.id"
class="text-muted-foreground font-normal"
>(You)</span
>
</span>
<span class="text-muted-foreground truncate text-xs">{{
user.email
}}</span>

View File

@@ -0,0 +1,113 @@
<script setup lang="ts">
import {
AccordionItem,
AccordionTrigger,
AccordionContent,
} from '@/components/ui/accordion';
import { useDebounceFn } from '@vueuse/core';
import { toast } from 'vue-sonner';
import { deleteUserWarren } from '~/lib/api/admin/deleteUserWarren';
import { editUserWarren } from '~/lib/api/admin/editUserWarren';
import type { UserWarren } from '~/shared/types/warrens';
const props = defineProps<{
userWarren: UserWarren;
}>();
const userWarren = props.userWarren;
const adminStore = useAdminStore();
const updatePermissionsDebounced = useDebounceFn(
async (userWarren: UserWarren) => {
const result = await editUserWarren(userWarren);
if (result.success) {
toast.success('Permissions', {
description: `Successfully updated the user's permissions`,
});
} else {
toast.error('Permissions', {
description: `Failed to update the user's permissions`,
});
}
},
1000,
{ maxWait: 5000 }
);
function permissionChanged(userWarren: UserWarren) {
updatePermissionsDebounced(userWarren);
}
async function onDeleteClicked() {
const { success } = await deleteUserWarren(
userWarren.userId,
userWarren.warrenId
);
if (!success) {
return;
}
if (adminStore.editUserDialog != null) {
// TODO: remove
/* adminStore.editUserDialog.user.warrens =
adminStore.editUserDialog.user.warrens.filter(
(uw) =>
uw.userId !== userWarren.userId ||
uw.warrenId != userWarren.warrenId
); */
}
}
</script>
<template>
<AccordionItem
:value="userWarren.warrenId"
class="bg-accent/30 group/user-warren w-full justify-start rounded-md"
>
<AccordionTrigger class="items-center px-4">
<div class="flex w-full flex-row justify-between">
<div
class="flex w-full flex-col gap-0 overflow-hidden text-left leading-4"
>
<span class="font-medium !no-underline">{{
adminStore.resources.warrens[userWarren.warrenId]?.name
}}</span>
<span class="text-muted-foreground text-xs">{{
adminStore.resources.warrens[userWarren.warrenId]?.path
}}</span>
</div>
<Button
class="transition-all not-pointer-coarse:opacity-0 not-pointer-coarse:group-hover/user-warren:opacity-100"
variant="destructive"
size="icon"
@click="onDeleteClicked"
>
<Icon name="lucide:trash-2" />
</Button>
</div>
</AccordionTrigger>
<AccordionContent class="px-4">
<div class="grid w-full grid-cols-1 gap-4 pt-1 sm:grid-cols-2">
<div
v-for="[permissionKey] in getUserWarrenPermissions(
userWarren
)"
:key="permissionKey"
class="flex w-full flex-row items-center justify-between"
>
<Label :for="permissionKey" class="grow">{{
getUserWarrenPermissionName(permissionKey)
}}</Label>
<Switch
:id="permissionKey"
v-model="userWarren[permissionKey]"
@update:model-value="
() => permissionChanged(userWarren)
"
/>
</div>
</div>
</AccordionContent>
</AccordionItem>
</template>

View File

@@ -0,0 +1,26 @@
<script setup lang="ts">
import type { AdminWarrenData } from '~/shared/types/warrens';
const { warren } = defineProps<{
warren: AdminWarrenData;
}>();
</script>
<template>
<div
class="group/warren bg-accent/30 flex shrink grow flex-row items-center gap-4 rounded-lg p-2 pl-4"
>
<Icon class="size-5" name="lucide:folder-root" />
<div class="flex min-w-0 shrink grow flex-col leading-4">
<p class="truncate text-sm font-medium">{{ warren.name }}</p>
<span class="text-muted-foreground truncate text-xs">{{
warren.path
}}</span>
</div>
<div
class="flex justify-end transition-all not-pointer-coarse:opacity-0 not-pointer-coarse:group-hover/warren:opacity-100"
>
<slot name="actions" />
</div>
</div>
</template>