fix: 오류 수정
- 예약 물품 조회 시 인터넷 예약만 조회됨 -> 모든 예약물품 조회
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { useSnackbar } from 'notistack'
|
||||
import { errorStateAtom } from '@stores'
|
||||
import { useRecoilState } from 'recoil'
|
||||
import CustomAlert from '@components/CustomAlert'
|
||||
import { ButtonProps } from '@material-ui/core/Button'
|
||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||
import { errorStateAtom } from '@stores'
|
||||
import { useSnackbar } from 'notistack'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import { useRecoilState } from 'recoil'
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
@@ -39,7 +39,7 @@ const GlobalError = () => {
|
||||
if (errorState.error) {
|
||||
if (errorState.status === 400) {
|
||||
const errors = errorState.errors.map(item => {
|
||||
return item.defaultMessage
|
||||
return item.defaultMessage || item.message
|
||||
})
|
||||
|
||||
setAlertState({
|
||||
|
||||
@@ -205,6 +205,7 @@ const ReserveItem = (props: ReserveItemProps) => {
|
||||
categoryId:
|
||||
keywordState?.categoryId !== 'all' ? keywordState?.categoryId : null,
|
||||
isUse: Boolean(handlePopup),
|
||||
isPopup: Boolean(handlePopup),
|
||||
})
|
||||
|
||||
//목록 조회
|
||||
|
||||
@@ -106,6 +106,7 @@ interface ReserveItemSearchPayload extends SearchPayload {
|
||||
locationId?: string
|
||||
categoryId?: string
|
||||
isUse?: boolean
|
||||
isPopup?: boolean
|
||||
}
|
||||
|
||||
export const reserveItemService = {
|
||||
@@ -117,6 +118,7 @@ export const reserveItemService = {
|
||||
locationId,
|
||||
categoryId,
|
||||
isUse = false,
|
||||
isPopup = false,
|
||||
}: ReserveItemSearchPayload) => {
|
||||
return useSWR<Page, AxiosError>(
|
||||
[
|
||||
@@ -126,6 +128,7 @@ export const reserveItemService = {
|
||||
locationId,
|
||||
categoryId,
|
||||
isUse,
|
||||
isPopup,
|
||||
],
|
||||
url =>
|
||||
common.fetcher(url, {
|
||||
@@ -134,6 +137,7 @@ export const reserveItemService = {
|
||||
locationId,
|
||||
categoryId,
|
||||
isUse,
|
||||
isPopup,
|
||||
}),
|
||||
|
||||
{ revalidateOnFocus: false, errorRetryCount: 0 },
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { DEFAULT_ERROR_MESSAGE } from '@constants'
|
||||
import { AxiosError } from 'axios'
|
||||
import { atom, DefaultValue, selector } from 'recoil'
|
||||
import { DEFAULT_ERROR_MESSAGE } from '@constants'
|
||||
|
||||
/**
|
||||
* Global error 상태관리
|
||||
@@ -10,6 +10,7 @@ interface IErrors {
|
||||
defaultMessage: string
|
||||
field: string
|
||||
rejectedValue?: string
|
||||
message?: string
|
||||
}
|
||||
|
||||
export interface IErrorProps {
|
||||
|
||||
Reference in New Issue
Block a user