Merge pull request #9165 from Couchers-org/na/web/excludeattending

Do frontend of exclude attending and remove dashboardNews

Author: nabramow

app/web/features/communities/events/DiscoverEventsList.test.tsx

@@ -89,6 +89,22 @@ describe("DiscoverEventsList", () => {
     expect(screen.getByRole("link", { name: "create" })).toBeInTheDocument();
   });
 
+  it("Excludes events the user is already attending or organizing", async () => {
+    mockEventSearch.mockResolvedValue({
+      eventsList: [],
+      totalItems: 0,
+      nextPageToken: "",
+    });
+
+    render(<DiscoverEventsList />, { wrapper });
+
+    await waitFor(() => {
+      expect(mockEventSearch).toHaveBeenCalledWith(
+        expect.objectContaining({ excludeAttending: true }),
+      );
+    });
+  });
+
   it("Renders error message when there is an error", async () => {
     mockEventSearch.mockRejectedValue(new Error("Error occurred"));
 

app/web/features/communities/events/DiscoverEventsList.tsx

@@ -97,6 +97,7 @@ const DiscoverEventsList = () => {
     isMyCommunities,
     isOnlineOnly,
     searchLocation: locationResult,
+    excludeAttending: true,
   });
 
   const hasEvents = data && data.eventsList && data.eventsList.length > 0;

app/web/features/communities/events/hooks.ts

@@ -134,6 +134,7 @@ export function useEventSearch({
   isMyCommunities,
   isOnlineOnly,
   searchLocation,
+  excludeAttending,
 }: {
   pageNumber: number;
   pageSize: number;
@@ -143,6 +144,7 @@ export function useEventSearch({
   searchLocation?: GeocodeResult | "";
   attending?: boolean;
   organizing?: boolean;
+  excludeAttending?: boolean;
 }) {
   return useQuery<EventSearchRes.AsObject, RpcError>({
     queryKey: [
@@ -152,6 +154,7 @@ export function useEventSearch({
       pageNumber,
       pastEvents,
       searchLocation,
+      excludeAttending,
     ],
     queryFn: () =>
       service.search.EventSearch({
@@ -161,6 +164,7 @@ export function useEventSearch({
         isMyCommunities,
         isOnlineOnly,
         searchLocation,
+        excludeAttending,
       }),
   });
 }

app/web/features/dashboard/CommunityEvents.test.tsx

@@ -106,6 +106,7 @@ describe("Community events", () => {
       pageSize: 3,
       myCommunities: true,
       myCommunitiesExcludeGlobal: true,
+      excludeAttending: true,
     });
   });
 });

app/web/features/dashboard/CommunityEvents.tsx

@@ -54,6 +54,7 @@ export default function CommunityEvents() {
         pageSize: 3,
         myCommunities: true,
         myCommunitiesExcludeGlobal: true,
+        excludeAttending: true,
       }),
     getNextPageParam: (lastPage) =>
       lastPage.nextPageToken ? lastPage.nextPageToken : undefined,

app/web/features/dashboard/Dashboard.tsx

@@ -1,14 +1,12 @@
-import { Alert, Box, Grid, Typography } from "@mui/material";
+import { Box, Grid } from "@mui/material";
 import Divider from "components/Divider";
 import HtmlMeta from "components/HtmlMeta";
 import PageContainer from "components/PageContainer";
 import PageTitle from "components/PageTitle";
-import StyledLink from "components/StyledLink";
 import { useTranslation } from "i18n";
 import { DASHBOARD, GLOBAL } from "i18n/namespaces";
 import { theme } from "theme";
 
-import dashboardNews from "../../dashboardNews.json";
 import CommunitiesSection from "./CommunitiesSection";
 import CommunityEvents from "./CommunityEvents";
 import DashboardMyPublicTrips from "./DashboardMyPublicTrips";
@@ -46,46 +44,6 @@ export default function Dashboard() {
 
             <PageTitle>{t("dashboard:welcome")}</PageTitle>
 
-            <Alert
-              severity="info"
-              sx={{
-                marginBottom: theme.spacing(2),
-                [theme.breakpoints.down("sm")]: { py: 0.75 },
-              }}
-            >
-              <Typography
-                variant="body1"
-                sx={{
-                  [theme.breakpoints.down("sm")]: { fontSize: "0.8125rem" },
-                }}
-              >
-                New blog post:{" "}
-                <StyledLink href={dashboardNews["2026-05-25"].link}>
-                  {dashboardNews["2026-05-25"].title}
-                </StyledLink>
-              </Typography>
-            </Alert>
-
-            <Alert
-              severity="info"
-              sx={{
-                marginBottom: theme.spacing(2),
-                [theme.breakpoints.down("sm")]: { py: 0.75 },
-              }}
-            >
-              <Typography
-                variant="body1"
-                sx={{
-                  [theme.breakpoints.down("sm")]: { fontSize: "0.8125rem" },
-                }}
-              >
-                New blog post:{" "}
-                <StyledLink href={dashboardNews["2026-05-15"].link}>
-                  {dashboardNews["2026-05-15"].title}
-                </StyledLink>
-              </Typography>
-            </Alert>
-
             <ReminderCarousel />
 
             <Divider spacing={3} />

app/web/service/events.ts

@@ -259,6 +259,7 @@ export async function listAllEvents({
 }
 
 export interface ListMyEventsInput {
+  excludeAttending?: boolean;
   myCommunities?: boolean;
   myCommunitiesExcludeGlobal?: boolean;
   pageNumber?: number;
@@ -269,6 +270,7 @@ export interface ListMyEventsInput {
 }
 
 export async function listMyEvents({
+  excludeAttending,
   myCommunities,
   myCommunitiesExcludeGlobal,
   pageNumber,
@@ -278,8 +280,13 @@ export async function listMyEvents({
   showCancelled,
 }: ListMyEventsInput) {
   const req = new ListMyEventsReq();
-  req.setAttending(true);
-  req.setOrganizing(true);
+
+  if (excludeAttending) {
+    req.setExcludeAttending(true);
+  } else {
+    req.setAttending(true);
+    req.setOrganizing(true);
+  }
 
   if (myCommunities !== undefined) {
     req.setMyCommunities(myCommunities);

app/web/service/search.ts

@@ -187,6 +187,7 @@ export async function EventSearch({
   searchLocation,
   attending,
   organizing,
+  excludeAttending,
 }: {
   pageNumber: number;
   pageSize: number;
@@ -196,6 +197,7 @@ export async function EventSearch({
   searchLocation?: GeocodeResult | "";
   attending?: boolean;
   organizing?: boolean;
+  excludeAttending?: boolean;
 }): Promise<EventSearchRes.AsObject> {
   const req = new EventSearchReq();
   req.setPageSize(pageSize);
@@ -232,6 +234,9 @@ export async function EventSearch({
   if (organizing !== undefined) {
     req.setOrganizing(organizing);
   }
+  if (excludeAttending !== undefined) {
+    req.setExcludeAttending(excludeAttending);
+  }
 
   const res = await client.search.eventSearch(req);
   return res.toObject();