onClickToNavigate(favoriteItems[i]?.programPath) }
+ onClick={ () => onClickToNavigate(favoriteItems[i]?.programPath) }
>
- 
{ favoriteItems[i]?.menuName }
@@ -112,10 +112,10 @@ export const FavoriteWrapper = ({
useEffect(() => {
getFavoriteList();
}, [changeMenuId]);
-
+
return (
<>
-
- {
+ {
diff --git a/src/widgets/sub-layout/index.tsx b/src/widgets/sub-layout/index.tsx
index ca53846..8e0b8cf 100644
--- a/src/widgets/sub-layout/index.tsx
+++ b/src/widgets/sub-layout/index.tsx
@@ -96,28 +96,44 @@ export const SubLayout = () => {
};
const callSortcutDefault = () => {
+ console.log("============================callSortcutDefault")
let userInfo = useStore.getState().UserStore.userInfo;
if(userInfo.usrid){
let params: ShortcutUserParams = {
usrid: userInfo.usrid
};
shortcutUser(params).then((rs: ShortcutUserResponse) => {
- useStore.getState().UserStore.setUserFavorite(rs.shortcuts);
+ // Modify iconFilePath to use menu_icon_{menuId}.svg format
+ console.log("============================rs", rs)
+ const modifiedShortcuts = rs.shortcuts.map(shortcut => ({
+ ...shortcut,
+ iconFilePath: `menu_icon_${shortcut.menuId}.svg`
+ }));
+
+ console.log("============================modifiedShortcuts", modifiedShortcuts)
+ useStore.getState().UserStore.setUserFavorite(modifiedShortcuts);
});
}
-
};
const callShortcutUser = () => {
+ console.log("============================callShortcutUser")
let userInfo = useStore.getState().UserStore.userInfo;
if(userInfo.usrid){
let params: ShortcutUserParams = {
usrid: userInfo.usrid
};
shortcutUser(params).then((rs: ShortcutUserResponse) => {
- if(rs.shortcuts){
+ console.log("============================rs", rs)
+ if(!rs.usingDefault && rs.shortcuts){
if(rs.shortcuts.length > 0){
- useStore.getState().UserStore.setUserFavorite(rs.shortcuts);
+ const modifiedShortcuts = rs.shortcuts.map(shortcut => ({
+ ...shortcut,
+ iconFilePath: `/images/menu_icon_${shortcut.menuId}.svg`
+ }));
+
+ console.log("============================modifiedShortcuts", modifiedShortcuts)
+ useStore.getState().UserStore.setUserFavorite(modifiedShortcuts);
}
else{
callSortcutDefault();