diff --git a/src/entities/alarm/ui/alarm-item.tsx b/src/entities/alarm/ui/alarm-item.tsx index 6aad05b..7c9e30e 100644 --- a/src/entities/alarm/ui/alarm-item.tsx +++ b/src/entities/alarm/ui/alarm-item.tsx @@ -7,6 +7,7 @@ import { AlarmLinkOptions, AppAlarmMarkParams, AppAlarmMarkResponse } from '../m import { useStore } from '@/shared/model/store'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { showAlert } from '@/widgets/show-alert'; export interface AlarmItemProps { @@ -66,10 +67,18 @@ export const AlarmItem = ({ }; appAlarmMark(params).then((rs: AppAlarmMarkResponse) => { console.log(rs); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }).finally(() => { onClickToNavigate(); }); } + else{ + onClickToNavigate(); + } }; useEffect(() => { diff --git a/src/entities/alarm/ui/alarm-routes.tsx b/src/entities/alarm/ui/alarm-routes.tsx index 0272cc6..85f120d 100644 --- a/src/entities/alarm/ui/alarm-routes.tsx +++ b/src/entities/alarm/ui/alarm-routes.tsx @@ -21,9 +21,13 @@ export const AlarmRoutes = ({ const initOptions = () => { if(options?.linkUrl){ let linkUrl = options.linkUrl; + console.log('linkUrl1', linkUrl); + linkUrl = linkUrl.trim(); + if(linkUrl.indexOf('/support/notice/list/') > -1){ let linkArr: Array = linkUrl.split('/'); - if(linkArr.length === 5){ + console.log('linkArr', linkArr); + if(linkArr.length === 4){ setSeq(linkArr[linkArr.length - 1]); setNoticeDetailOn(true); setQnaDetailOn(false); @@ -33,7 +37,8 @@ export const AlarmRoutes = ({ } else if(linkUrl.indexOf('/support/qna/list/') > -1){ let linkArr: Array = linkUrl.split('/'); - if(linkArr.length === 5){ + console.log('linkArr', linkArr); + if(linkArr.length === 4){ setSeq(linkArr[linkArr.length - 1]); setNoticeDetailOn(false); setQnaDetailOn(true); @@ -42,7 +47,8 @@ export const AlarmRoutes = ({ } else if(linkUrl.indexOf('/settlement/list/') > -1){ let linkArr: Array = linkUrl.split('/'); - if(linkArr.length === 4){ + console.log('linkArr', linkArr); + if(linkArr.length === 3){ setSettlementId(linkArr[linkArr.length - 1]); setNoticeDetailOn(false); setQnaDetailOn(false);