From dbb8f311a8b1a9d66c704c02817efb1ca34a8d70 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal Date: Tue, 28 Jan 2025 16:39:26 +0530 Subject: [PATCH] fix: page name and recents empty state --- .../components/home/widgets/recents/index.tsx | 16 ++++++++++++---- .../components/home/widgets/recents/page.tsx | 5 ++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/core/components/home/widgets/recents/index.tsx b/web/core/components/home/widgets/recents/index.tsx index 8530563de34..83b3a4592be 100644 --- a/web/core/components/home/widgets/recents/index.tsx +++ b/web/core/components/home/widgets/recents/index.tsx @@ -2,14 +2,18 @@ import { useRef, useState } from "react"; import { observer } from "mobx-react"; -// types +import { usePathname } from "next/navigation"; import useSWR from "swr"; import { Briefcase, FileText } from "lucide-react"; +// plane types import { TActivityEntityData, THomeWidgetProps, TRecentActivityFilterKeys } from "@plane/types"; -// components +// plane ui import { LayersIcon } from "@plane/ui"; +// components import { ContentOverflowWrapper } from "@/components/core/content-overflow-HOC"; +// hooks import { useProject } from "@/hooks/store"; +// plane web services import { WorkspaceService } from "@/plane-web/services"; import { NoProjectsEmptyState, RecentsEmptyState } from "../empty-states"; import { EWidgetKeys, WidgetLoader } from "../loaders"; @@ -34,12 +38,16 @@ type TRecentWidgetProps = THomeWidgetProps & { export const RecentActivityWidget: React.FC = observer((props) => { const { presetFilter, showFilterSelect = true, workspaceSlug } = props; - // state + // states const [filter, setFilter] = useState(presetFilter ?? filters[0].name); + // navigation + const pathname = usePathname(); // ref const ref = useRef(null); // store hooks const { joinedProjectIds, loader } = useProject(); + // derived values + const isWikiApp = pathname.includes(`/${workspaceSlug.toString()}/pages`); const { data: recents, isLoading } = useSWR( workspaceSlug ? `WORKSPACE_RECENT_ACTIVITY_${workspaceSlug}_${filter}` : null, @@ -71,7 +79,7 @@ export const RecentActivityWidget: React.FC = observer((prop } }; - if (!loader && joinedProjectIds?.length === 0) return ; + if (!loader && !isWikiApp && joinedProjectIds?.length === 0) return ; if (!isLoading && recents?.length === 0) return ( diff --git a/web/core/components/home/widgets/recents/page.tsx b/web/core/components/home/widgets/recents/page.tsx index 125c424c1ec..41d73a1e556 100644 --- a/web/core/components/home/widgets/recents/page.tsx +++ b/web/core/components/home/widgets/recents/page.tsx @@ -10,6 +10,7 @@ import { getFileURL } from "@plane/utils"; import { ListItem } from "@/components/core/list"; // helpers import { calculateTimeAgo } from "@/helpers/date-time.helper"; +import { getPageName } from "@/helpers/page.helper"; // hooks import { useMember } from "@/hooks/store"; @@ -55,7 +56,9 @@ export const RecentPage = (props: BlockProps) => { )} -
{pageDetails?.name}
+
+ {getPageName(pageDetails?.name)} +
{calculateTimeAgo(activity.visited_at)}
}