From 75cf90c7eac1703f7f051c086e0c17154e0f4ee0 Mon Sep 17 00:00:00 2001 From: ajnart Date: Sun, 16 Apr 2023 17:51:07 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20RSS=20client=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dashboard/Tiles/Widgets/WidgetsEditModal.tsx | 2 +- src/widgets/rss/RssWidgetTile.tsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx b/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx index 03c2d6b34..34d7d985d 100644 --- a/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx +++ b/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx @@ -254,7 +254,7 @@ const WidgetOptionTypeSwitch: FC<{ withinPortal searchable creatable - getCreateLabel={(query) => t('common:createItem', query)} + getCreateLabel={(query) => t('common:createItem', { item: query })} onChange={(values) => handleChange( key, diff --git a/src/widgets/rss/RssWidgetTile.tsx b/src/widgets/rss/RssWidgetTile.tsx index 132c07b81..c3022fd00 100644 --- a/src/widgets/rss/RssWidgetTile.tsx +++ b/src/widgets/rss/RssWidgetTile.tsx @@ -29,7 +29,7 @@ const definition = defineWidget({ options: { rssFeedUrl: { type: 'multiple-text', - defaultValue: ['https://github.com/ajnart/homarr/tags.atom'], + defaultValue: [], }, refreshInterval: { type: 'slider', @@ -103,13 +103,13 @@ function RssTile({ widget }: RssTileProps) { ); } - if (data.length < 1 || isError) { + if (data.length < 1 || !data[0].feed || isError) { return (
- {t('card.errors.general.title')} - {t('card.errors.general.text')} + {t('descriptor.card.errors.general.title')} + {t('descriptor.card.errors.general.text')}
); @@ -120,7 +120,7 @@ function RssTile({ widget }: RssTileProps) { {data.map((feed, index) => ( - {feed.feed.items.map((item: any, index: number) => ( + {feed.feed && feed.feed.items.map((item: any, index: number) => (