Skip to content

Commit 1ed9fff

Browse files
authored
AYS-283 | Creating Emergency Evacuation Application Detail Page (#206)
1 parent d1c122c commit 1ed9fff

File tree

16 files changed

+648
-85
lines changed

16 files changed

+648
-85
lines changed

src/app/(private)/admin-registration-applications/[id]/page.tsx

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '@/components/ui/form'
1515
import { useForm } from 'react-hook-form'
1616
import { zodResolver } from '@hookform/resolvers/zod'
17-
import { FormSchema } from '@/modules/adminRegistrationApplications/constants/formSchema'
17+
import { FormSchema } from '@/modules/adminRegistrationApplications/constants/formValidationSchema'
1818
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
1919
import { useTranslation } from 'react-i18next'
2020
import { LoadingSpinner } from '@/components/ui/loadingSpinner'
@@ -30,6 +30,8 @@ import {
3030
DialogTrigger,
3131
} from '@/components/ui/dialog'
3232
import { DialogDescription } from '@radix-ui/react-dialog'
33+
import PrivateRoute from '@/app/hocs/isAuth'
34+
import { Permission } from '@/constants/permissions'
3335

3436
const Page = ({ params }: { params: { slug: string; id: string } }) => {
3537
const { t } = useTranslation()
@@ -49,15 +51,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
4951
const fetchDetails = () => {
5052
getAdminRegistrationApplication(params.id)
5153
.then((response) => {
52-
if (response.data.isSuccess) {
53-
setAdminRegistrationApplicationDetails(response.data.response)
54-
} else {
55-
toast({
56-
title: t('error'),
57-
description: t('applicationError'),
58-
variant: 'destructive',
59-
})
60-
}
54+
setAdminRegistrationApplicationDetails(response.response)
6155
})
6256
.catch(() => {
6357
toast({
@@ -68,19 +62,21 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
6862
})
6963
.finally(() => setIsLoading(false))
7064
}
71-
65+
7266
fetchDetails()
7367
}, [params.id, t, toast])
68+
7469

7570
return (
71+
// <PrivateRoute requiredPermissions={[Permission.APPLICATION_DETAIL]}>
7672
<div className="p-6 bg-white dark:bg-gray-800 rounded-md shadow-md text-black dark:text-white">
7773
{isLoading && <LoadingSpinner />}
7874
{!isLoading && adminRegistrationApplicationDetails && (
7975
<Form {...form}>
8076
<form className="space-y-6">
8177
<div className="flex justify-between items-center mb-6">
8278
<h1 className="text-2xl font-bold">
83-
{t('applicationDetailsTitle')}
79+
{t('adminRegistrationApplications.detailsTitle')}
8480
</h1>
8581
{adminRegistrationApplicationDetails.status === 'COMPLETED' && (
8682
<div className="flex space-x-8 ml-auto">
@@ -157,7 +153,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
157153
name="reason"
158154
render={({ field }) => (
159155
<FormItem className="sm:col-span-2">
160-
<FormLabel>{t('reason')}</FormLabel>
156+
<FormLabel>{t('adminRegistrationApplications.reason')}</FormLabel>
161157
<FormControl>
162158
<Input
163159
{...field}
@@ -194,7 +190,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
194190
name="status"
195191
render={({ field }) => (
196192
<FormItem className="sm:col-span-1">
197-
<FormLabel>{t('applicationStatus')}</FormLabel>
193+
<FormLabel>{t('adminRegistrationApplications.status')}</FormLabel>
198194
<FormControl>
199195
<Input
200196
{...field}
@@ -236,7 +232,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
236232
name="createdUser"
237233
render={({ field }) => (
238234
<FormItem className="sm:col-span-1">
239-
<FormLabel>{t('applicationCreatedUser')}</FormLabel>
235+
<FormLabel>{t('adminRegistrationApplications.createdUser')}</FormLabel>
240236
<FormControl>
241237
<Input
242238
{...field}
@@ -255,7 +251,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
255251
name="createDate"
256252
render={({ field }) => (
257253
<FormItem className="sm:col-span-1">
258-
<FormLabel>{t('createDate')}</FormLabel>
254+
<FormLabel>{t('adminRegistrationApplications.createdAt')}</FormLabel>
259255
<FormControl>
260256
<Input
261257
{...field}
@@ -296,7 +292,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
296292
name="updateDate"
297293
render={({ field }) => (
298294
<FormItem className="sm:col-span-1">
299-
<FormLabel>{t('updateDate')}</FormLabel>
295+
<FormLabel>{t('adminRegistrationApplications.updatedAt')}</FormLabel>
300296
<FormControl>
301297
<Input
302298
{...field}
@@ -434,6 +430,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
434430
</Form>
435431
)}
436432
</div>
433+
// </PrivateRoute>
437434
)
438435
}
439436

src/app/(private)/admin-registration-applications/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const Page = () => {
8181
>
8282
<div className="flex flex-col w-full gap-4">
8383
<h1 className="text-2xl font-medium">
84-
{t('adminRegistrationApplications')}
84+
{t('adminRegistrationApplications.title')}
8585
</h1>
8686
<DataTableToolbar table={table} filterFields={filterFields} />
8787
</div>

0 commit comments

Comments
 (0)