Merge pull request #203 from Neshura87/neshura-deny-reason

Add Deny Reason to Application Route
This commit is contained in:
Xylight authored and GitHub committed 2023-11-29 07:36:37 -08:00
commit 3dc4bbf8b2
2 files changed
+89 -16

No files matched your search

@@ -0,0 +1,38 @@
<script lang="ts">
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import type { Person } from 'lemmy-js-client'
import { Button, Modal } from 'mono-svelte'
export let open: boolean = false
export let user: Person
export let denying: boolean
export let denyReason: string = ''
let loading = false
function deny() {
denying = true
open = false
}
</script>
<Modal bind:open>
<h1 class="text-2xl font-bold" slot="title">Deny Application</h1>
<form on:submit|preventDefault={() => deny()} class="flex flex-col gap-4">
<p class="inline-flex flex-row gap-2 items-center">
Denying <UserLink avatar {user} />'s Application
</p>
<MarkdownEditor
bind:value={denyReason}
label="Deny Reason (optional)"
placeholder="Application Reason breaks rule #3"
rows={4}
/>
<Button color="primary" size="lg" submit {loading} disabled={loading}>
Deny
</Button>
</form>
</Modal>
@@ -4,31 +4,45 @@
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { Material, toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { RegistrationApplicationView } from 'lemmy-js-client'
import type {ApproveRegistrationApplication, RegistrationApplicationView} from 'lemmy-js-client'
import { Button } from 'mono-svelte'
import { Check, Icon, XMark } from 'svelte-hero-icons'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import { publishedToDate } from '$lib/components/util/date'
import ApplicationDenyModal from "$lib/components/lemmy/modal/ApplicationDenyModal.svelte";
export let application: RegistrationApplicationView
let approving = false
let denying = false
let denyReason = ''
let reviewing = false
async function review(approve: boolean) {
if (!$profile?.jwt) return
let registrationApplicationAnswer: ApproveRegistrationApplication = {
approve: approve,
id: application.registration_application.id,
}
if (approve) {
approving = true
} else {
denying = true
reviewing = true
while (reviewing) {
await new Promise(res => setTimeout(res, 1000))
}
if (!denying) return
if (denyReason != "") {
registrationApplicationAnswer.deny_reason = denyReason
}
}
try {
await getClient().approveRegistrationApplication({
approve: approve,
id: application.registration_application.id,
})
await getClient().approveRegistrationApplication(registrationApplicationAnswer)
toast({
content: `Successfully ${
approve ? 'approved' : 'denied'
@@ -37,6 +51,7 @@
})
application.creator_local_user.accepted_application = approve
application.admin = $profile.user!.local_user_view.person
application.registration_application.deny_reason = denyReason
$profile.user!.notifications.applications -= 1
} catch (err) {
@@ -48,9 +63,13 @@
approving = false
denying = false
denyReason = ''
}
</script>
{#if reviewing}
<ApplicationDenyModal bind:open={reviewing} bind:denying bind:denyReason user={application.creator}/>
{/if}
<Material class="flex flex-col gap-2">
<div class="flex flex-col gap-1">
<span class="text-slate-600 dark:text-zinc-400">
@@ -70,17 +89,33 @@
</div>
<div class="flex flex-col md:flex-row gap-2 md:items-center">
{#if application.admin}
<div class="flex items-center gap-1 text-sm">
<SectionTitle>
{#if typeof application.registration_application.deny_reason !== 'undefined' && application.registration_application.deny_reason !== ''}
<div>
<div class="flex items-center gap-1 text-sm">
<SectionTitle>
{application.creator_local_user.accepted_application
? 'Approved'
: 'Denied'} by
</SectionTitle>
<UserLink avatar user={application.admin} />
<SectionTitle>:</SectionTitle>
</div>
<p>{application.registration_application.deny_reason}</p>
</div>
<div class="md:ml-auto" />
{:else}
<div class="flex items-center gap-1 text-sm">
<SectionTitle>
{application.creator_local_user.accepted_application
? 'Approved'
: 'Denied'} by
</SectionTitle>
<UserLink avatar user={application.admin} />
</div>
<div class="md:ml-auto" />
</SectionTitle>
<UserLink avatar user={application.admin} />
</div>
<div class="md:ml-auto" />
{/if}
{/if}
<div class="ml-auto">
<div class="ml-auto self-end">
<Button
size="square-md"
class="hover:bg-slate-200 {application.creator_local_user
@@ -89,8 +124,8 @@
: ''}"
aria-label="Deny"
on:click={() => review(false)}
loading={denying}
disabled={approving || denying}
loading={denying || reviewing}
disabled={approving || denying || reviewing}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
@@ -103,7 +138,7 @@
aria-label="Approve"
on:click={() => review(true)}
loading={approving}
disabled={approving || denying}
disabled={approving || denying || reviewing}
>
<Icon src={Check} mini size="16" slot="prefix" />
</Button>