gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
sianida26 2024-02-28 18:25:14 +07:00
parent 8c279b5cd7
commit ad68fac107
13 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/(auth)/register/page.tsx
View File

@ -1,9 +1,8 @@
"use client";
import ClientError from "@/core/error/ClientError";
import createUserAction from "@/modules/auth/actions/createUserAction";
import createUser from "@/modules/auth/actions/createUserAction";
import { CreateUserSchema } from "@/modules/auth/formSchemas/CreateUserFormSchema";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import {
Paper,
@ -17,10 +16,11 @@ import {
} from "@mantine/core";
import { useForm } from "@mantine/form";
import { showNotification } from "@mantine/notifications";
import React, { useEffect, useState } from "react";
import React from "react";
export default function RegisterPage() {
const [errorMessage, setErrorMessage] = useState("");
//TODO: Display error message
// const [errorMessage, setErrorMessage] = useState("");
const form = useForm<CreateUserSchema>({
initialValues: {
@ -43,24 +43,24 @@ export default function RegisterPage() {
},
});
const handleSubmit = async (values: CreateUserSchema) => {
const handleSubmit = async () => {
withServerAction(createUserAction, form.values)
.then((response) => {
.then(() => {
showNotification({message: "Register Success", color: "green"})
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
if (e.errorCode === "INVALID_FORM_DATA") {
form.setErrors(e.formErrors ?? {});
} else {
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`);
// setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`);
}
} else if (e instanceof Error) {
setErrorMessage(`ERROR: ${e.message}`);
// setErrorMessage(`ERROR: ${e.message}`);
} else {
setErrorMessage(
`Unkown error is occured. Please contact administrator`
);
// setErrorMessage(
// `Unkown error is occured. Please contact administrator`
// );
}
})
};
@ -72,7 +72,7 @@ export default function RegisterPage() {
Register
</Text>
<form
onSubmit={form.onSubmit((values) => handleSubmit(values))}
onSubmit={form.onSubmit(() => handleSubmit())}
>
<Stack>
<TextInput

3
src/app/api/login/route.ts
View File

@ -3,10 +3,7 @@ import handleCatchApi from "@/core/utils/handleCatchApi";
import AuthError from "@/modules/auth/error/AuthError";
import signInSchema from "@/modules/auth/formSchemas/signInSchema";
import signIn from "@/modules/auth/services/signIn";
import getTokenFromHeaders from "@/modules/auth/utils/getTokenFromHeaders";
import { headers } from "next/headers";
import { NextRequest, NextResponse } from "next/server";
import { json } from "stream/consumers";
export const dynamic = "force-dynamic";

43
src/core/error/ClientError.ts Normal file
View File

@ -0,0 +1,43 @@
import "client-only"
export const ClientErrorCodes = ["UNKNOWN_ERROR", "UNSUPPORTED_CONTENT_TYPE"] as const;
interface ErrorOptions {
message?: string;
errorCode: (typeof ClientErrorCodes)[number] | (string & {});
statusCode?: number
formErrors?: Record<string, string>
}
class ClientError extends Error {
public readonly errorCode: ErrorOptions['errorCode'];
public readonly statusCode: ErrorOptions['statusCode'];
public readonly formErrors?: ErrorOptions['formErrors']
constructor(options: ErrorOptions) {
super(options.message ?? "Undetermined Error");
this.errorCode = options.errorCode ?? "UNKNOWN_ERROR";
this.statusCode = options.statusCode ?? 500;
this.formErrors = options.formErrors;
Object.setPrototypeOf(this, new.target.prototype);
}
getActionResponseObject() {
return {
success: false,
error: {
message: this.message,
errorCode: this.errorCode,
},
} as const;
}
getRestApiResponseObject(){
return {
message: this.message,
errorCode: this.errorCode
}
}
}
export default ClientError;

1
src/core/logger/Logger.ts
View File

@ -1,3 +1,4 @@
import "server-only"
import { appendFileSync } from "node:fs";
import { format } from 'date-fns';

4
src/modules/auth/actions/createUserAction.ts
View File

@ -1,10 +1,6 @@
"use server";
import { z } from "zod";
import prisma from "@/core/db";
import { cookies } from "next/headers";
import { redirect } from "next/navigation";
import { hashPassword } from "../utils/hashPassword";
import { createJwtToken } from "../utils/createJwtToken";
import createUser from "../services/createUser";
import ServerResponseAction from "@/modules/dashboard/types/ServerResponseAction";
import handleCatch from "@/modules/dashboard/utils/handleCatch";

4
src/modules/dashboard/utils/withServerAction.ts
View File

@ -1,4 +1,4 @@
import DashboardError from "../errors/DashboardError";
import ClientError from "@/core/error/ClientError";
import ServerResponseAction from "../types/ServerResponseAction";
/**
@ -21,7 +21,7 @@ async function withServerAction<T, Args extends unknown[] = []>(
} else {
if (result.dashboardError && result.error) {
const errorDetails = result.error;
throw new DashboardError({
throw new ClientError({
message: errorDetails.message,
errorCode: errorDetails.errorCode,
formErrors: errorDetails.errors,

9
src/modules/permission/modals/PermissionDeleteModal.tsx
View File

@ -1,5 +1,4 @@
"use client";
import { useRouter } from "next/navigation";
import React, { useState } from "react";
import {
Button,
@ -9,11 +8,9 @@ import {
Alert,
} from "@mantine/core";
import { showNotification } from "@/utils/notifications";
import { error } from "console";
import { revalidatePath } from "next/cache";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import deletePermission from "../actions/deletePermission";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import ClientError from "@/core/error/ClientError";
export interface DeleteModalProps {
data?: {
@ -24,8 +21,6 @@ export interface DeleteModalProps {
}
export default function DeleteModal(props: DeleteModalProps) {
const router = useRouter();
const [isSubmitting, setSubmitting] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
@ -51,7 +46,7 @@ export default function DeleteModal(props: DeleteModalProps) {
props.onClose()
})
.catch((e) => {
if (e instanceof DashboardError){
if (e instanceof ClientError){
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`)
}
else if (e instanceof Error) {

8
src/modules/permission/modals/PermissionFormModal.tsx
View File

@ -4,25 +4,23 @@ import {
Flex,
Modal,
Stack,
Switch,
TextInput,
Textarea,
Button,
ScrollArea,
Checkbox,
Skeleton,
Fieldset,
Alert,
} from "@mantine/core";
import { useForm, zodResolver } from "@mantine/form";
import { useRouter } from "next/navigation";
import React, { useCallback, useEffect, useState } from "react";
import React, { useEffect, useState } from "react";
import { TbDeviceFloppy } from "react-icons/tb";
import permissionFormDataSchema, { PermissionFormData } from "../formSchemas/PermissionFormData";
import getPermissionById from "../actions/getPermissionById";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import upsertPermission from "../actions/upsertPermission";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import ClientError from "@/core/error/ClientError";
export interface ModalProps {
title: string;
@ -103,7 +101,7 @@ export default function FormModal(props: ModalProps) {
closeModal();
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
if (e.errorCode === "INVALID_FORM_DATA") {
form.setErrors(e.formErrors ?? {});
} else {

6
src/modules/role/modals/DeleteModal.tsx
View File

@ -1,5 +1,4 @@
"use client";
import { useRouter } from "next/navigation";
import React, { useState } from "react";
import {
Button,
@ -11,7 +10,7 @@ import {
import { showNotification } from "@/utils/notifications";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import deleteRole from "../actions/deleteRole";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import ClientError from "@/core/error/ClientError";
export interface DeleteModalProps {
data?: {
@ -22,7 +21,6 @@ export interface DeleteModalProps {
}
export default function DeleteModal(props: DeleteModalProps) {
const router = useRouter();
const [isSubmitting, setSubmitting] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
@ -49,7 +47,7 @@ export default function DeleteModal(props: DeleteModalProps) {
props.onClose()
})
.catch((e) => {
if (e instanceof DashboardError){
if (e instanceof ClientError){
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`)
}
else if (e instanceof Error) {

12
src/modules/role/modals/FormModal.tsx
View File

@ -4,7 +4,6 @@ import {
Flex,
Modal,
Stack,
Switch,
TextInput,
Textarea,
Button,
@ -17,15 +16,14 @@ import {
} from "@mantine/core";
import { useForm, zodResolver } from "@mantine/form";
import { useRouter } from "next/navigation";
import React, { useCallback, useEffect, useMemo, useState } from "react";
import React, { useEffect, useState } from "react";
import { TbDeviceFloppy } from "react-icons/tb";
import { string } from "zod";
import roleFormDataSchema, { RoleFormData } from "../formSchemas/RoleFormData";
import getAllPermissions from "@/modules/permission/actions/getAllPermissions";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import getRoleById from "../actions/getRoleById";
import upsertRole from "../actions/upsertRole";
import ClientError from "@/core/error/ClientError";
export interface ModalProps {
title: string;
@ -74,7 +72,7 @@ export default function FormModal(props: ModalProps) {
setAllPermissions(response.data);
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`);
} else if (e instanceof Error) {
setErrorMessage(`ERROR: ${e.message}`);
@ -113,7 +111,7 @@ export default function FormModal(props: ModalProps) {
});
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`);
} else if (e instanceof Error) {
setErrorMessage(`ERROR: ${e.message}`);
@ -141,7 +139,7 @@ export default function FormModal(props: ModalProps) {
closeModal();
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
if (e.errorCode === "INVALID_FORM_DATA") {
form.setErrors(e.formErrors ?? {});
} else {

1
src/modules/role/tables/RolesTable/RolesTable.tsx
View File

@ -4,7 +4,6 @@ import { Text, Flex, Button } from "@mantine/core";
import { getCoreRowModel, useReactTable } from "@tanstack/react-table";
import React, { useState } from "react";
import { TbPlus } from "react-icons/tb";
import getAllRoles from "../../actions/getAllRoles";
import FormModal, { ModalProps } from "../../modals/FormModal";
import DeleteModal, { DeleteModalProps } from "../../modals/DeleteModal";
import createColumns from "./columns";

12
src/modules/userManagement/modals/UserDeleteModal.tsx
View File

@ -1,23 +1,16 @@
"use client";
import { useRouter } from "next/navigation";
import React, { useState } from "react";
import {
Avatar,
Button,
Center,
Flex,
Modal,
ScrollArea,
Text,
Stack,
TextInput,
Title,
Alert,
} from "@mantine/core";
import { showNotification } from "@/utils/notifications";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import deleteUser from "../actions/deleteUser";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import ClientError from "@/core/error/ClientError";
export interface DeleteModalProps {
data?: {
@ -28,7 +21,6 @@ export interface DeleteModalProps {
}
export default function UserDeleteModal(props: DeleteModalProps) {
const router = useRouter();
const [isSubmitting, setSubmitting] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
@ -55,7 +47,7 @@ export default function UserDeleteModal(props: DeleteModalProps) {
props.onClose()
})
.catch((e) => {
if (e instanceof DashboardError){
if (e instanceof ClientError){
setErrorMessage(`ERROR: ${e.message} (${e.errorCode})`)
}
else if (e instanceof Error) {

10
src/modules/userManagement/modals/UserFormModal.tsx
View File

@ -4,14 +4,10 @@ import {
Flex,
Modal,
Stack,
Switch,
TextInput,
Textarea,
Button,
ScrollArea,
Checkbox,
Skeleton,
Fieldset,
Alert,
Center,
Avatar,
@ -20,7 +16,7 @@ import {
} from "@mantine/core";
import { useForm, zodResolver } from "@mantine/form";
import { useRouter } from "next/navigation";
import React, { useCallback, useEffect, useState } from "react";
import React, { useEffect, useState } from "react";
import { TbDeviceFloppy } from "react-icons/tb";
import userFormDataSchema, {
UserFormData,
@ -28,7 +24,7 @@ import userFormDataSchema, {
import getUserDetailById from "../actions/getUserDetailById";
import withServerAction from "@/modules/dashboard/utils/withServerAction";
import upsertUser from "../actions/upsertUser";
import DashboardError from "@/modules/dashboard/errors/DashboardError";
import ClientError from "@/core/error/ClientError";
import stringToColorHex from "@/core/utils/stringToColorHex";
import getAllRoles from "@/modules/role/actions/getAllRoles";
import Role from "@/modules/role/types/Role";
@ -122,7 +118,7 @@ export default function UserFormModal(props: ModalProps) {
closeModal();
})
.catch((e) => {
if (e instanceof DashboardError) {
if (e instanceof ClientError) {
if (e.errorCode === "INVALID_FORM_DATA") {
form.setErrors(e.formErrors ?? {});
} else {