Merge pull request #780 from ajnart/rss-improvements

src/hooks/widgets/rss/useGetRssFeed.tsx

@@ -1,10 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-
-export const useGetRssFeed = (feedUrl: string) =>
-  useQuery({
-    queryKey: ['rss-feed', feedUrl],
-    queryFn: async () => {
-      const response = await fetch('/api/modules/rss');
-      return response.json();
-    },
-  });

src/widgets/rss/RssWidgetTile.tsx

@@ -14,7 +14,6 @@ import {
   Stack,
   Text,
   Title,
-  UnstyledButton,
 } from '@mantine/core';
 import {
   IconBulldozer,
@@ -25,11 +24,11 @@ import {
   IconRss,
   IconSpeakerphone,
 } from '@tabler/icons';
+import { useQuery } from '@tanstack/react-query';
+import dayjs from 'dayjs';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 import { useState } from 'react';
-import { useGetRssFeed } from '../../hooks/widgets/rss/useGetRssFeed';
-import { sleep } from '../../tools/client/time';
 import { defineWidget } from '../helper';
 import { IWidget } from '../widgets';
 
@@ -57,6 +56,15 @@ interface RssTileProps {
   widget: IRssWidget;
 }
 
+const useGetRssFeed = (feedUrl: string) =>
+  useQuery({
+    queryKey: ['rss-feed', feedUrl],
+    queryFn: async () => {
+      const response = await fetch('/api/modules/rss');
+      return response.json();
+    },
+  });
+
 function RssTile({ widget }: RssTileProps) {
   const { t } = useTranslation('modules/rss');
   const { data, isLoading, isFetching, isError, refetch } = useGetRssFeed(
@@ -65,9 +73,21 @@ function RssTile({ widget }: RssTileProps) {
   const { classes } = useStyles();
   const [loadingOverlayVisible, setLoadingOverlayVisible] = useState(false);
 
+  function formatDate(input: string): string {
+    // Parse the input date as a local date
+    const inputDate = dayjs(new Date(input));
+    const now = dayjs(); // Current date and time
+
+    // The difference between the input date and now
+    const difference = now.diff(inputDate, 'ms');
+    const duration = dayjs.duration(difference, 'ms');
+    const humanizedDuration = duration.humanize();
+    return `${humanizedDuration} ago`;
+  }
+
   if (!data || isLoading) {
     return (
-      <Center>
+      <Center h="100%">
         <Loader />
       </Center>
     );
@@ -87,32 +107,8 @@ function RssTile({ widget }: RssTileProps) {
 
   return (
     <Stack h="100%">
-      <LoadingOverlay visible={loadingOverlayVisible} />
+      <LoadingOverlay visible={isFetching} />
-      <Flex gap="md">
+      <Flex align="end">{data.feed.title && <Title order={5}>{data.feed.title}</Title>}</Flex>
-        {data.feed.image ? (
-          <Image
-            src={data.feed.image.url}
-            alt={data.feed.image.title}
-            width="auto"
-            height={40}
-            mx="auto"
-          />
-        ) : (
-          <Title order={6}>{data.feed.title}</Title>
-        )}
-        <UnstyledButton
-          onClick={async () => {
-            setLoadingOverlayVisible(true);
-            await Promise.all([sleep(1500), refetch()]);
-            setLoadingOverlayVisible(false);
-          }}
-          disabled={isFetching || isLoading}
-        >
-          <ActionIcon>
-            <IconRefresh />
-          </ActionIcon>
-        </UnstyledButton>
-      </Flex>
       <ScrollArea className="scroll-area-w100" w="100%">
         <Stack w="100%" spacing="xs">
           {data.feed.items.map((item: any, index: number) => (
@@ -150,7 +146,7 @@ function RssTile({ widget }: RssTileProps) {
                   {item.categories && (
                     <Flex gap="xs" wrap="wrap" h={20} style={{ overflow: 'hidden' }}>
                       {item.categories.map((category: any, categoryIndex: number) => (
-                        <Badge key={categoryIndex}>{category._}</Badge>
+                        <Badge key={categoryIndex}>{category}</Badge>
                       ))}
                     </Flex>
                   )}
@@ -160,7 +156,7 @@ function RssTile({ widget }: RssTileProps) {
                     {item.content}
                   </Text>
 
-                  {item.pubDate && <TimeDisplay date={item.pubDate} />}
+                  {item.pubDate && <TimeDisplay date={formatDate(item.pubDate)} />}
                 </Flex>
               </Flex>
             </Card>
@@ -169,23 +165,27 @@ function RssTile({ widget }: RssTileProps) {
       </ScrollArea>
 
       <Flex wrap="wrap" columnGap="md">
-        <Group spacing="sm">
+        {data.feed.copyright && (
-          <IconCopyright size={14} />
+          <Group spacing="sm">
-          <Text color="dimmed" size="sm">
+            <IconCopyright size={14} />
-            {data.feed.copyright}
+            <Text color="dimmed" size="sm">
-          </Text>
+              {data.feed.copyright}
-        </Group>
+            </Text>
-        <Group>
+          </Group>
-          <IconCalendarTime size={14} />
+        )}
-          <Text color="dimmed" size="sm">
+        {data.feed.pubDate && (
-            {data.feed.pubDate}
+          <Group>
-          </Text>
+            <IconCalendarTime size={14} />
-        </Group>
+            <Text color="dimmed" size="sm">
+              {data.feed.pubDate}
+            </Text>
+          </Group>
+        )}
         {data.feed.lastBuildDate && (
           <Group>
             <IconBulldozer size={14} />
             <Text color="dimmed" size="sm">
-              {data.feed.lastBuildDate}
+              {formatDate(data.feed.lastBuildDate)}
             </Text>
           </Group>
         )}
@@ -204,6 +204,25 @@ function RssTile({ widget }: RssTileProps) {
             </Text>
           </Group>
         )}
+        <ActionIcon
+          size="sm"
+          radius="xl"
+          pos="absolute"
+          right={10}
+          onClick={() => refetch()}
+          bottom={10}
+          styles={{
+            root: {
+              borderColor: 'red',
+            },
+          }}
+        >
+          {data.feed.image ? (
+            <Image src={data.feed.image.url} alt={data.feed.image.title} mx="auto" />
+          ) : (
+            <IconRefresh />
+          )}
+        </ActionIcon>
       </Flex>
     </Stack>
   );