From 425610d654f33c516634c1f9af29beb0dcf6e6ae Mon Sep 17 00:00:00 2001
From: Loi Phan <phanhuuloi15@gmail.com>
Date: Sat, 4 Nov 2023 13:23:20 +0700
Subject: [PATCH] Apply form hook for room page

---
 .../src/components/Select/index.tsx           |  78 +++-
 .../src/components/SortBy/index.tsx           |   2 +-
 hotel-management/src/constants/path.ts        |   2 +-
 hotel-management/src/globals/types.ts         |   1 -
 hotel-management/src/helpers/utils.ts         |  25 +-
 hotel-management/src/helpers/validators.ts    |   4 +-
 hotel-management/src/hooks/useFetch.ts        |   5 +-
 hotel-management/src/hooks/useForm.ts         | 170 --------
 hotel-management/src/pages/Room/Form.tsx      | 383 ++++++------------
 hotel-management/src/pages/Room/Table.tsx     |   6 +-
 hotel-management/src/pages/User/Form.tsx      |   5 +-
 11 files changed, 208 insertions(+), 473 deletions(-)
 delete mode 100644 hotel-management/src/hooks/useForm.ts

diff --git a/hotel-management/src/components/Select/index.tsx b/hotel-management/src/components/Select/index.tsx
index 7317b3e..fc047d0 100644
--- a/hotel-management/src/components/Select/index.tsx
+++ b/hotel-management/src/components/Select/index.tsx
@@ -1,5 +1,11 @@
-import { FieldValues, RegisterOptions, useFormContext } from 'react-hook-form';
+import {
+  FieldValues,
+  RegisterOptions,
+  UseFormRegister,
+  useFormContext,
+} from 'react-hook-form';
 import { StyledSelect } from './styled';
+import React, { ReactNode } from 'react';
 
 export interface ISelectOptions {
   value: string;
@@ -8,31 +14,81 @@ export interface ISelectOptions {
 interface ISelect {
   options: ISelectOptions[];
   optionsConfigForm?: RegisterOptions<FieldValues, string> | undefined;
-  value?: number;
-  id: string;
+  value?: string;
+  onChange?: React.ChangeEventHandler<HTMLSelectElement> | undefined;
+  id?: string;
+  ariaLabel: string;
 }
 
-const Select = ({ options, id, optionsConfigForm }: ISelect) => {
-  const { register } = useFormContext() ?? {};
+interface IRender extends ISelect {
+  register: UseFormRegister<FieldValues>;
+  children: ReactNode[];
+}
 
-  if(!register) {
-    return null;
+const RenderSelect = ({
+  options,
+  id,
+  value,
+  optionsConfigForm,
+  onChange,
+  register,
+  children,
+  ariaLabel,
+}: IRender) => {
+  if (options && !register) {
+    return (
+      <StyledSelect
+        aria-label={ariaLabel}
+        id={id}
+        value={value}
+        onChange={onChange}
+      >
+        {children}
+      </StyledSelect>
+    );
   }
 
+  return (
+    <StyledSelect
+      aria-label={ariaLabel}
+      id={id}
+      value={value}
+      {...register(id!, optionsConfigForm)}
+      onChange={onChange}
+    >
+      {children}
+    </StyledSelect>
+  );
+};
+
+const Select = ({
+  options,
+  id,
+  optionsConfigForm,
+  value,
+  onChange,
+  ariaLabel
+}: ISelect) => {
+  const { register } = useFormContext() ?? {};
+
   if (!options) return;
 
   return (
-    <StyledSelect
-      aria-label="Sort"
+    <RenderSelect
+      register={register}
+      options={options}
+      optionsConfigForm={optionsConfigForm}
       id={id}
-      {...register(id, optionsConfigForm)}
+      value={value}
+      onChange={onChange}
+      ariaLabel={ariaLabel}
     >
       {options.map((option) => (
         <option value={option.value} key={option.value}>
           {option.label}
         </option>
       ))}
-    </StyledSelect>
+    </RenderSelect>
   );
 };
 
diff --git a/hotel-management/src/components/SortBy/index.tsx b/hotel-management/src/components/SortBy/index.tsx
index 1255c8a..def89c0 100644
--- a/hotel-management/src/components/SortBy/index.tsx
+++ b/hotel-management/src/components/SortBy/index.tsx
@@ -20,12 +20,12 @@ const SortBy = memo(({ options }: ISortByProps) => {
     setSearchParams(searchParams);
   };
 
-  // prettier-ignore
   return (
     <Select 
       options={options} 
       value={sortBy} 
       onChange={handleChange} 
+      ariaLabel='Sort'
     />
   );
 });
diff --git a/hotel-management/src/constants/path.ts b/hotel-management/src/constants/path.ts
index 7775173..03014d3 100644
--- a/hotel-management/src/constants/path.ts
+++ b/hotel-management/src/constants/path.ts
@@ -2,6 +2,6 @@ export const DASHBOARD = '/dashboard';
 export const USER = '/user';
 export const ROOM = '/room';
 export const OTHER_PATH = '*';
-export const BASE_URL = 'http://localhost:3000/';
+export const BASE_URL = 'https://hotel-management-api.loiphan.com/';
 export const USER_PATH = 'users';
 export const ROOM_PATH = 'rooms';
diff --git a/hotel-management/src/globals/types.ts b/hotel-management/src/globals/types.ts
index e12704c..46d566c 100644
--- a/hotel-management/src/globals/types.ts
+++ b/hotel-management/src/globals/types.ts
@@ -12,7 +12,6 @@ type TRoom = {
   name: string;
   price: number;
   discount: number;
-  description: string;
   status: boolean;
 };
 
diff --git a/hotel-management/src/helpers/utils.ts b/hotel-management/src/helpers/utils.ts
index 6b9092f..0b0b6cf 100644
--- a/hotel-management/src/helpers/utils.ts
+++ b/hotel-management/src/helpers/utils.ts
@@ -18,15 +18,6 @@ const isBool = (value: unknown) => {
   return typeof value === 'boolean';
 };
 
-/**
- * The function check value has type object or not
- * @param value The value need to checked
- * @returns A boolean indicating whether or not the argument has type object.
- */
-const isObject = (value: unknown) => {
-  return typeof value === 'object' && value !== null;
-};
-
 /**
  * Set required error for value
  * @param value The value set required or not
@@ -94,19 +85,16 @@ const searchQuery = (
   columnSearch: string,
   keySearch: string,
   sort: string,
-  order: string,
+  order: string
 ) => {
-  // prettier-ignore
-  const phoneParams = keySearch
-    ? `${columnSearch}_like=` + keySearch
+  const phoneParams = keySearch 
+    ? `${columnSearch}_like=` + keySearch 
     : '';
 
-  // prettier-ignore
-  const sortParams = sort
-    ? '_sort=' + sort
+  const sortParams = sort 
+    ? '_sort=' + sort 
     : '';
 
-  // prettier-ignore
   const orderParams = order 
     ? '_order=' + order 
     : '';
@@ -129,10 +117,9 @@ const searchQuery = (
 };
 
 export {
-  isObject,
   isRequired,
   getPropValues,
   getValueFromObj,
   searchQuery,
-  REQUIRED_FIELD_ERROR,
+  REQUIRED_FIELD_ERROR
 };
diff --git a/hotel-management/src/helpers/validators.ts b/hotel-management/src/helpers/validators.ts
index 9d5a449..2a17471 100644
--- a/hotel-management/src/helpers/validators.ts
+++ b/hotel-management/src/helpers/validators.ts
@@ -3,8 +3,8 @@
  * @param value Value need to be checked
  * @returns A boolean indicating whether or not the argument has valid
  */
-const isValidNumber = (value: string): boolean => {
-  return /^[0-9]*$/.test(value);
+const isValidNumber = (value: unknown): boolean => {
+  return /^[0-9]*$/.test(value as string);
 };
 
 /**
diff --git a/hotel-management/src/hooks/useFetch.ts b/hotel-management/src/hooks/useFetch.ts
index 8fbe38b..080c502 100644
--- a/hotel-management/src/hooks/useFetch.ts
+++ b/hotel-management/src/hooks/useFetch.ts
@@ -54,10 +54,11 @@ const useFetch = (
         const response = await fetch(BASE_URL + path + '?' + query);
         const json = await response.json();
 
-        if (!response.ok)
+        if (!response.ok) {
           throw new Error(
-            `Error code: ${response.status} \n Messages: ${response.statusText}`,
+            `Error code: ${response.status} \n Messages: ${response.text}`,
           );
+        }
 
         setIsPending(false);
         setData(json);
diff --git a/hotel-management/src/hooks/useForm.ts b/hotel-management/src/hooks/useForm.ts
deleted file mode 100644
index 7351140..0000000
--- a/hotel-management/src/hooks/useForm.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { useState, useEffect, useCallback, ChangeEvent } from 'react';
-
-// Utils
-import { getPropValues, isObject, isRequired } from '../helpers/utils';
-
-// Types
-import { TKeyValue, TValidator } from '../globals/types';
-
-// Constants
-import { ERROR, INITIAL_STATE_SCHEMA, VALUE } from '../constants/variables';
-
-/**
- * Custom hooks to validate your Form...
- *
- * @param stateSchema model you stateSchema.
- * @param stateValidatorSchema model your validation.
- * @param submitFormCallback function to be execute during form submission.
- * @returns
- */
-const useForm = (
-  stateSchema = {},
-  stateValidatorSchema = {} as TValidator,
-  submitFormCallback: (values: TKeyValue) => void,
-  initialValue: string = '',
-) => {
-  const [values, setValues] = useState<TKeyValue>(INITIAL_STATE_SCHEMA);
-  const [errors, setErrors] = useState(getPropValues(stateSchema, ERROR));
-  const [valid, isValid] = useState(getPropValues(stateSchema));
-  const [disable, setDisable] = useState(true);
-  const [isDirty, setIsDirty] = useState(false);
-
-  // Get a local copy of stateSchema
-  useEffect(() => {
-    setInitialErrorState(initialValue);
-    setDisable(true);
-    isValid(getPropValues(stateSchema));
-    setValues(getPropValues(stateSchema, VALUE));
-
-    // If initial value true, setValues again from stateSchema
-    // and enabled button
-    if (initialValue) {
-      setValues(getPropValues(stateSchema, VALUE));
-      setDisable(false);
-    }
-  }, [initialValue]); // eslint-disable-line
-
-  // Validate fields in forms
-  const validateFormFields = useCallback(
-    (name: string, value: string) => {
-      const validator = stateValidatorSchema;
-      // Making sure that stateValidatorSchema name is same in
-      // stateSchema
-      if (!validator[name]) return;
-
-      const field = validator[name];
-
-      let error = '';
-
-      // Skip check id field
-      if (name !== 'id' && name !== 'roomId') {
-        error = isRequired(value, field!.required);
-
-        if (isObject(field['validator']) && error === '') {
-          const fieldValidator = field['validator'];
-
-          // Test the function callback if the value is meet the criteria
-          const testFunc = fieldValidator!['func'];
-          if (!testFunc!(value)) {
-            error = fieldValidator!['error']!;
-          }
-        }
-      }
-
-      return error;
-    },
-    [stateValidatorSchema],
-  );
-
-  // Set Initial Error State
-  // When hooks was first rendered...
-  const setInitialErrorState = useCallback(
-    (initialValue: string) => {
-      Object.keys(errors).map((name) =>
-        setErrors((prevState) => ({
-          ...prevState,
-          [name]: !initialValue // Skip error when initialValue have values
-            ? validateFormFields(name, values[name] as string)
-            : '',
-        })),
-      );
-    },
-    [errors, values, validateFormFields],
-  );
-
-  // Used to disable submit button if there's a value in errors
-  // or the required field in state has no value.
-  // Wrapped in useCallback to cached the function to avoid intensive memory leaked
-  // in every re-render in component
-  const validateErrorState = useCallback(
-    () => Object.values(errors).some((error) => error),
-    [errors],
-  );
-
-  // For every changed in our state this will be fired
-  // To be able to disable the button
-  useEffect(() => {
-    if (isDirty) {
-      setDisable(validateErrorState());
-    }
-  }, [errors, isDirty, validateErrorState]);
-
-  // Event handler for handling changes in input.
-  const handleOnChange = useCallback(
-    (
-      event: ChangeEvent<
-        HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement
-      >,
-    ) => {
-      setIsDirty(true);
-
-      let error = '';
-      const name = (event.target! as HTMLInputElement).name;
-      let value: string | boolean = '';
-
-      if ((event.target! as HTMLInputElement).type === 'checkbox') {
-        value = (event.target! as HTMLInputElement).checked;
-      } else {
-        value = (event.target! as HTMLInputElement).value;
-      }
-
-      if (typeof value === 'string') {
-        error = validateFormFields(name, value)!;
-      }
-
-      setValues((prevState) => ({ ...prevState, [name]: value }));
-      setErrors((prevState) => ({ ...prevState, [name]: error }));
-      isValid((prevState) => ({ ...prevState, [name]: true }));
-    },
-    [validateFormFields],
-  );
-
-  const handleOnSubmit = useCallback(
-    (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-
-      // Making sure that there's no error in the state
-      // before calling the submit callback function
-      // and disabled button
-
-      if (!validateErrorState()) {
-        submitFormCallback(values);
-        setDisable(true);
-      }
-    },
-    [validateErrorState, submitFormCallback, values],
-  );
-
-  return {
-    handleOnChange,
-    handleOnSubmit,
-    values,
-    errors,
-    disable,
-    setValues,
-    setErrors,
-    valid,
-  };
-};
-
-export default useForm;
diff --git a/hotel-management/src/pages/Room/Form.tsx b/hotel-management/src/pages/Room/Form.tsx
index 1a0f6f5..b010635 100644
--- a/hotel-management/src/pages/Room/Form.tsx
+++ b/hotel-management/src/pages/Room/Form.tsx
@@ -1,11 +1,20 @@
-
 import styled from 'styled-components';
 import Button from '../../commons/styles/Button.ts';
 
 // Types
-import {
-  TRoom,
-} from '../../globals/types.ts';
+import { TRoom } from '../../globals/types.ts';
+import { useForm } from 'react-hook-form';
+import { ROOM_PATH } from '../../constants/path.ts';
+import { STATUS_CODE } from '../../constants/statusCode.ts';
+import toast from 'react-hot-toast';
+import { ADD_SUCCESS, EDIT_SUCCESS, errorMsg } from '../../constants/messages.ts';
+import { sendRequest } from '../../helpers/sendRequest.ts';
+import Input from '../../commons/styles/Input.ts';
+import FormRow from '../../components/LabelControl/index.tsx';
+import { INVALID_DISCOUNT, INVALID_FIELD, REQUIRED_FIELD_ERROR } from '../../constants/formValidateMessage.ts';
+import { isValidNumber, isValidString } from '../../helpers/validators.ts';
+import Form from '../../components/Form/index.tsx';
+import { useEffect } from 'react';
 
 const FormBtn = styled(Button)`
   width: 100%;
@@ -32,272 +41,126 @@ const RoomForm = ({
   room,
   isAdd,
 }: IRoomFormProp) => {
-  // const [reset, setReset] = useState(true);
+  const formMethods = useForm<TRoom>();
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors, isDirty, isValid },
+    trigger,
+  } = formMethods;
 
-  // if (isAdd) {
-  //   // If this is add form, reset value
-  //   room = null;
-  // }
+  useEffect(() => {
+    if(room) {
+      reset(room);
+    }
+  }, [room, reset]);
 
-  // // prettier-ignore
-  // const initialValue: string = isAdd 
-  //   ? '' 
-  //   : room! 
-  //   && room.id.toString();
+  // Submit form
+  const onSubmit = async (room: TRoom) => {
+    try {
+      if (isAdd) {
+        // Add request
+        const response = await sendRequest(
+          ROOM_PATH,
+          JSON.stringify(room),
+          'POST'
+        );
 
-  // const {
-  //   idValue,
-  //   nameValue,
-  //   priceValue,
-  //   discountValue,
-  //   statusValue,
-  //   descriptionValue,
-  // } = getValueFromObj<TRoom>(room);
+        if (response.statusCode === STATUS_CODE.CREATE) {
+          toast.success(ADD_SUCCESS);
+        } else {
+          throw new Error(errorMsg(response.statusCode, response.msg));
+        }
+      } else {
+        // Edit request
+        const response = await sendRequest(
+          ROOM_PATH + `/${room!.id}`,
+          JSON.stringify(room),
+          'PUT'
+        );
 
-  // // Define your state schema
-  // // prettier-ignore
-  // const stateSchema: TStateSchema = {
-  //   id: { 
-  //     value: idValue || '' 
-  //   },
-  //   name: { 
-  //     value: nameValue || '',
-  //     error: '' 
-  //   },
-  //   price: { 
-  //     value: priceValue || '',
-  //     error: '' 
-  //   },
-  //   discount: { 
-  //     value: discountValue || '',
-  //     error: '' 
-  //   },
-  //   status: { 
-  //     value: statusValue || '',
-  //     error: '' 
-  //   },
-  //   description: { 
-  //     value: descriptionValue || '',
-  //     error: '' 
-  //   },
-  // };
+        if (response.statusCode == STATUS_CODE.OK) {
+          toast.success(EDIT_SUCCESS);
+        } else {
+          throw new Error(errorMsg(response.statusCode, response.msg));
+        }
+      }
+      // Reload table data
+      setReload(!reload);
+    } catch (error: unknown) {
+      if (error instanceof Error) {
+        toast.error(error.message);
+      }
+    }
 
-  // // prettier-ignore
-  // const stateValidatorSchema: TValidator = {
-  //   name: addValidator({ 
-  //     validatorFunc: isValidString, 
-  //     prop: 'name' 
-  //   }),
-  //   price: addValidator({
-  //     validatorFunc: isValidNumber,
-  //     prop: 'price',
-  //   }),
-  //   discount: addValidator({ 
-  //     validatorFunc: isValidDiscount, 
-  //     customErrorMsg: DISCOUNT_FIELD_ERROR
-  //   }),
-  //   status: addValidator({
-  //     validatorFunc: skipCheck,
-  //     prop: 'status',
-  //     required: false,
-  //   }),
-  //   description: addValidator({ 
-  //     validatorFunc: isValidString, 
-  //     prop: 'description' 
-  //   }),
-  // };
-
-  // // Submit form
-  // const onSubmitForm = async (state: TKeyValue) => {
-  //   // Convert to room type
-  //   const data: TRoom = {
-  //     id: +state.id!,
-  //     name: '' + state.name,
-  //     discount: +state.discount!,
-  //     price: +state.price!,
-  //     status: !!state.status,
-  //     description: '' + state.description,
-  //   };
-
-  //   try {
-  //     if (isAdd) {
-  //       // Add request
-  //       const response = await sendRequest(
-  //         ROOM_PATH,
-  //         JSON.stringify(data),
-  //         'POST',
-  //       );
-
-  //       if (response.statusCode === STATUS_CODE.CREATE) {
-  //         toast.success(ADD_SUCCESS);
-
-  //         onResetForm();
-  //       } else {
-  //         throw new Error(errorMsg(response.statusCode, response.msg));
-  //       }
-  //     } else {
-  //       // Edit request
-  //       const response = await sendRequest(
-  //         ROOM_PATH + `/${room!.id}`,
-  //         JSON.stringify(data),
-  //         'PUT',
-  //       );
-
-  //       if (response.statusCode == STATUS_CODE.OK) {
-  //         toast.success(EDIT_SUCCESS);
-  //       } else {
-  //         throw new Error(errorMsg(response.statusCode, response.msg));
-  //       }
-  //     }
-  //     // Reload table data
-  //     setReload(!reload);
-  //   } catch (error: unknown) {
-  //     if (error instanceof Error) {
-  //       toast.error(error.message);
-  //     }
-  //   }
-
-  //   onClose();
-  // };
-
-  // // Close and reset form
-  // const closeAndReset = () => {
-  //   onClose();
-  //   onResetForm();
-  // };
-
-  // // prettier-ignore
-  // const { 
-  //   values,
-  //   errors,
-  //   valid,
-  //   handleOnChange,
-  //   handleOnSubmit,
-  //   disable }  =
-  //   useForm(
-  //     stateSchema,
-  //     stateValidatorSchema,
-  //     onSubmitForm,
-  //     initialValue
-  //   );
-
-  // // prettier-ignore
-  // const {
-  //   id,
-  //   name,
-  //   price,
-  //   discount, 
-  //   status,
-  //   description 
-  // } = values;
-
-  // // Clear form value when this is a add form
-  // useEffect(() => {
-  //   if (isAdd) {
-  //     Object.keys(values).forEach((key) => (values[key] = ''));
-  //   }
-  // }, [isAdd]); // eslint-disable-line
-
-  // // Reset form
-  // const onResetForm = () => {
-  //   setReset(!reset);
-  //   Object.keys(values).forEach((key) => (values[key] = ''));
-  // };
+    reset();
+    onClose();
+  };
 
   return (
-    // <Form onSubmit={handleOnSubmit}>
-    //   <Input type="hidden" name="id" value={id as string} />
-    //   <FormRow
-    //     label="Name"
-    //     error={
-    //       // prettier-ignore
-    //       errors.name && valid.name 
-    //         ? (errors.name as string) 
-    //         : ''
-    //     }
-    //   >
-    //     <Input
-    //       type="text"
-    //       name="name"
-    //       value={name as string}
-    //       onChange={handleOnChange}
-    //     />
-    //   </FormRow>
-    //   <FormRow
-    //     label="Price"
-    //     error={
-    //       // prettier-ignore
-    //       errors.price && valid.price 
-    //         ? (errors.price as string) 
-    //         : ''
-    //     }
-    //   >
-    //     <Input
-    //       type="text"
-    //       name="price"
-    //       value={price as string}
-    //       onChange={handleOnChange}
-    //     />
-    //   </FormRow>
+      <Form onSubmit={handleSubmit(onSubmit)}>
+        <Input type="hidden" id="id" {...register('id')} />
+        <FormRow label="Name" error={errors?.name?.message}>
+          <Input
+            type="text"
+            id="name"
+            {...register('name', {
+              required: REQUIRED_FIELD_ERROR,
+              validate: {
+                checkValidName: (value) =>
+                  isValidString(value) || INVALID_FIELD,
+              },
+              onChange: () => trigger('name'),
+            })}
+          />
+        </FormRow>
 
-    //   <FormRow
-    //     label="Discount"
-    //     error={
-    //       // prettier-ignore
-    //       errors.discount && valid.discount
-    //         ? (errors.discount as string) 
-    //         : ''
-    //     }
-    //   >
-    //     <Input
-    //       type="text"
-    //       name="discount"
-    //       value={discount as string}
-    //       onChange={handleOnChange}
-    //     />
-    //   </FormRow>
+        <FormRow
+          label="Price"
+          error={errors?.price?.message}
+        >
+          <Input
+            type="text"
+            id="price"
+            {...register('price', {
+              required: REQUIRED_FIELD_ERROR,
+              validate: {
+                checkIdentifiedCode: (v) => isValidNumber(v) || INVALID_FIELD,
+              },
+              onChange: () => trigger('price'),
+            })}
+          />
+        </FormRow>
 
-    //   <FormRow label="Status">
-    //     <Input
-    //       type="checkbox"
-    //       name="status"
-    //       checked={status as boolean}
-    //       onChange={handleOnChange}
-    //     />
-    //   </FormRow>
+        <FormRow label="discount" error={errors?.discount?.message}>
+          <Input
+            type="text"
+            id="phone"
+            {...register('discount', {
+              required: REQUIRED_FIELD_ERROR,
+              validate: {
+                checkPhoneNum: (v) => isValidNumber(v) || INVALID_DISCOUNT,
+              },
+              onChange: () => trigger('discount'),
+            })}
+          />
+        </FormRow>
 
-    //   <FormRow
-    //     label="Description"
-    //     error={
-    //       // prettier-ignore
-    //       errors.description && valid.description 
-    //         ? (errors.description as string) 
-    //         : ''
-    //     }
-    //   >
-    //     <TextArea
-    //       name="description"
-    //       rows={3}
-    //       value={description as string}
-    //       onChange={handleOnChange}
-    //     />
-    //   </FormRow>
-
-    //   <Form.Action>
-    //     <FormBtn type="submit" name="submit" disabled={disable}>
-    //       {
-    //         // prettier-ignore
-    //         isAdd
-    //           ? 'Add'
-    //           : 'Save'
-    //       }
-    //     </FormBtn>
-    //     <FormBtn type="button" styled="secondary" onClick={closeAndReset}>
-    //       Close
-    //     </FormBtn>
-    //   </Form.Action>
-    // </Form>
-    <p></p>
+        <Form.Action>
+          <FormBtn type="submit" name="submit" disabled={!isDirty || !isValid}>
+            {
+              // prettier-ignore
+              isAdd
+            ? 'Add'
+            : 'Save'
+            }
+          </FormBtn>
+          <FormBtn type="button" styled="secondary" onClick={onClose}>
+            Close
+          </FormBtn>
+        </Form.Action>
+      </Form>
   );
 };
 
diff --git a/hotel-management/src/pages/Room/Table.tsx b/hotel-management/src/pages/Room/Table.tsx
index f0edf54..81cd4e6 100644
--- a/hotel-management/src/pages/Room/Table.tsx
+++ b/hotel-management/src/pages/Room/Table.tsx
@@ -67,7 +67,7 @@ const RoomRow = ({
     }
   };
 
-  const { id, name, price, discount, status } = room;
+  const { id, name, price, status } = room;
 
   // prettier-ignore
   const statusText = status
@@ -79,7 +79,6 @@ const RoomRow = ({
       <div>{id}</div>
       <div>{name}</div>
       <div>{price}</div>
-      <div>{discount}</div>
       <div>{statusText}</div>
 
       <Menus.Menu>
@@ -162,12 +161,11 @@ const RoomTable = ({
 
         {rooms.length ? (
           <Menus>
-            <Table columns="10% 30% 20% 10% 20% 5%">
+            <Table columns="10% 40% 20% 20% 5%">
               <Table.Header>
                 <div>Id</div>
                 <div>Name</div>
                 <div>Price</div>
-                <div>Discount</div>
                 <div>Status</div>
               </Table.Header>
               <Table.Body<TRoom>
diff --git a/hotel-management/src/pages/User/Form.tsx b/hotel-management/src/pages/User/Form.tsx
index 02912cf..40a6d44 100644
--- a/hotel-management/src/pages/User/Form.tsx
+++ b/hotel-management/src/pages/User/Form.tsx
@@ -111,6 +111,7 @@ const UserForm = ({
         }
 
         // TODO Update status when user create
+        
       } else {
         // Edit request
         const response = await sendRequest(
@@ -190,7 +191,7 @@ const UserForm = ({
         </FormRow>
 
         <FormRow label="Room">
-          <Select id="roomId" options={options!} />
+          <Select id="roomId" options={options!} ariaLabel='RoomId'/>
         </FormRow>
 
         <FormRow label="Address" error={errors.address?.message}>
@@ -217,7 +218,7 @@ const UserForm = ({
               : 'Save'
             }
           </FormBtn>
-          <FormBtn type="button" styled="secondary">
+          <FormBtn type="button" styled="secondary" onClick={onClose}>
             Close
           </FormBtn>
         </Form.Action>