From b27d2e04952bc99c54ac6fc452882cf81605e6f1 Mon Sep 17 00:00:00 2001 From: Mingliang Tao Date: Mon, 21 Jun 2021 16:27:30 +0800 Subject: [PATCH 1/3] Fix bug when item does not have categories --- webportal/src/app/market_list/components/item_list.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webportal/src/app/market_list/components/item_list.jsx b/webportal/src/app/market_list/components/item_list.jsx index 64e8a892..2e6f4870 100644 --- a/webportal/src/app/market_list/components/item_list.jsx +++ b/webportal/src/app/market_list/components/item_list.jsx @@ -13,7 +13,7 @@ import Loading from 'App/components/loading'; const { spacing, palette } = getTheme(); const isOfficial = item => { - return item.categories.includes('official example'); + return !isNil(item.categories) && item.categories.includes('official example'); }; const Section = styled.div` From 11a1ebdd165baf9be3e6bff5f178750a6422e958 Mon Sep 17 00:00:00 2001 From: Mingliang Tao Date: Mon, 21 Jun 2021 17:17:53 +0800 Subject: [PATCH 2/3] Update item_list.jsx --- webportal/src/app/market_list/components/item_list.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webportal/src/app/market_list/components/item_list.jsx b/webportal/src/app/market_list/components/item_list.jsx index 2e6f4870..8feb7f84 100644 --- a/webportal/src/app/market_list/components/item_list.jsx +++ b/webportal/src/app/market_list/components/item_list.jsx @@ -13,7 +13,9 @@ import Loading from 'App/components/loading'; const { spacing, palette } = getTheme(); const isOfficial = item => { - return !isNil(item.categories) && item.categories.includes('official example'); + return ( + !isNil(item.categories) && item.categories.includes("official example"); + ); }; const Section = styled.div` From 87dfaadc922166217c4e3627bfb69e4d3d308d1c Mon Sep 17 00:00:00 2001 From: Mingliang Tao Date: Mon, 21 Jun 2021 17:18:33 +0800 Subject: [PATCH 3/3] fix lint --- webportal/src/app/market_list/components/item_list.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webportal/src/app/market_list/components/item_list.jsx b/webportal/src/app/market_list/components/item_list.jsx index 8feb7f84..38c54d85 100644 --- a/webportal/src/app/market_list/components/item_list.jsx +++ b/webportal/src/app/market_list/components/item_list.jsx @@ -14,7 +14,8 @@ const { spacing, palette } = getTheme(); const isOfficial = item => { return ( - !isNil(item.categories) && item.categories.includes("official example"); + !isNil(item.ItemCategories) && + item.ItemCategories.some(category => category.name === 'official example') ); };