diff --git a/packages/common/components/src/api/popup.ts b/packages/common/components/src/api/popup.ts index 0fee0f5b7..23f2eb808 100644 --- a/packages/common/components/src/api/popup.ts +++ b/packages/common/components/src/api/popup.ts @@ -1,6 +1,22 @@ import { getApiClient } from "./client"; import { ENDPOINT } from "../config"; +export interface Popup { + popupSn: number; + popupTypeCd: string; + popupTypeNm: string; + contsTypeCd: string; + contsTypeNm: string; + popupTtl: string; + popupWdth: number; + popupHgt: number; + popupEndUseYn: string; + useYn: string; + mdfcnDt: string; + mdfr: string; + mdfrNm: string; +} + export interface PopupInfo { popupSn: number; popupTypeCd: string; @@ -23,39 +39,10 @@ export interface PopupInfo { mdfrNm: string; } -interface SortConfig { - empty: boolean; - sorted: boolean; - unsorted: boolean; -} - -interface PageableConfig { - sort: SortConfig; - offset: number; - pageNumber: number; - pageSize: number; - paged: boolean; - unpaged: boolean; -} - -interface PageableList { - content: T[]; - pageable: PageableConfig; - sort: SortConfig; - totalPages: number; - totalElements: number; - number: number; - numberOfElements: number; - size: number; - first: boolean; - last: boolean; - empty: boolean; -} - const client = getApiClient(); export const getUserPopupList = async () => { - const response = await client.get>( + const response = await client.get( `${ENDPOINT.CMS_SERVICE.POPUPS}/user/list`, ); return response.data; diff --git a/packages/common/components/src/ui/header/index.tsx b/packages/common/components/src/ui/header/index.tsx index 8457b28dd..5733c4168 100644 --- a/packages/common/components/src/ui/header/index.tsx +++ b/packages/common/components/src/ui/header/index.tsx @@ -11,7 +11,7 @@ import { getUserPopupList, getSiteInfo, getUserInfo, - type PopupInfo, + type Popup, } from "../../api"; import { DropdownMenu, @@ -50,7 +50,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { queryFn: () => getUserPopupList(), }); - const openPopup = useCallback(async (popup: PopupInfo) => { + const openPopup = useCallback(async (popup: Popup) => { try { const cookieName = `cs-popup-hide-for-day-${popup.popupSn}`; const hasCookie = getCookie(cookieName); @@ -79,10 +79,10 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { }, []); useEffect(() => { - if (!userPopupList?.content?.length) return; + if (!userPopupList?.length) return; const timer = setTimeout(() => { - userPopupList.content.forEach((popup) => { + userPopupList.forEach((popup) => { openPopup(popup); }); }, 500);