Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions packages/shared/src/components/highlights/HighlightsPage.spec.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import { useQuery } from '@tanstack/react-query';
import { useRouter } from 'next/router';
import { HighlightsPage } from './HighlightsPage';

jest.mock('@tanstack/react-query', () => ({
...jest.requireActual('@tanstack/react-query'),
useQuery: jest.fn(),
}));

jest.mock('next/router', () => ({
useRouter: jest.fn(),
}));

const mockUseQuery = useQuery as jest.Mock;
const mockUseRouter = useRouter as jest.Mock;

describe('HighlightsPage', () => {
const highlightsPageData = {
majorHeadlines: {
edges: [],
},
channelConfigurations: [
{
channel: 'vibes',
displayName: 'Agentic',
},
],
};

beforeEach(() => {
jest.clearAllMocks();
mockUseRouter.mockReturnValue({
pathname: '/highlights',
query: {},
push: jest.fn(),
});
});

it('should use the agentic alias for the vibes channel tab URL', () => {
mockUseQuery.mockReturnValue({
data: highlightsPageData,
isFetching: false,
});

render(<HighlightsPage />);

expect(screen.getByRole('link', { name: 'Agentic' })).toHaveAttribute(
'href',
'/highlights/agentic',
);
});

it('should keep the agentic tab selected for the alias route', () => {
mockUseRouter.mockReturnValue({
pathname: '/highlights/[channel]',
query: { channel: 'agentic' },
push: jest.fn(),
});
mockUseQuery.mockReturnValue({
data: highlightsPageData,
isFetching: false,
});

render(<HighlightsPage />);

expect(screen.getByText('Agentic')).toHaveClass('bg-theme-active');
});
});
13 changes: 11 additions & 2 deletions packages/shared/src/components/highlights/HighlightsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import {
channelHighlightsFeedQueryOptions,
highlightsPageQueryOptions,
} from '../../graphql/highlights';
import {
getHighlightsChannelSlug,
resolveHighlightsChannelSlug,
} from '../../lib/highlights';
import { Tab, TabContainer } from '../tabs/TabContainer';
import { DigestCTA } from './DigestCTA';
import { HighlightItem } from './HighlightItem';
Expand Down Expand Up @@ -127,6 +131,9 @@ const ChannelTab = ({
export const HighlightsPage = (): ReactElement => {
const router = useRouter();
const channel = getSingleQueryParam(router.query.channel);
const resolvedChannel = channel
? resolveHighlightsChannelSlug(channel)
: undefined;
const expandedId = getSingleQueryParam(router.query.highlight);
const { data, isFetching } = useQuery(highlightsPageQueryOptions());

Expand All @@ -138,7 +145,7 @@ export const HighlightsPage = (): ReactElement => {
const majorLoading = isFetching && !data;

const activeTab =
channels.find((c) => c.channel === channel)?.displayName ??
channels.find((c) => c.channel === resolvedChannel)?.displayName ??
MAJOR_HEADLINES_LABEL;

return (
Expand Down Expand Up @@ -176,7 +183,9 @@ export const HighlightsPage = (): ReactElement => {
<Tab
key={ch.channel}
label={ch.displayName}
url={`${HIGHLIGHTS_BASE_URL}/${ch.channel}`}
url={`${HIGHLIGHTS_BASE_URL}/${getHighlightsChannelSlug(
ch.channel,
)}`}
>
<ChannelTab channel={ch} expandedId={expandedId} />
</Tab>
Expand Down
8 changes: 8 additions & 0 deletions packages/shared/src/lib/highlights.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const AGENTIC_HIGHLIGHTS_CHANNEL = 'vibes';
const AGENTIC_HIGHLIGHTS_SLUG = 'agentic';

export const getHighlightsChannelSlug = (channel: string): string =>
channel === AGENTIC_HIGHLIGHTS_CHANNEL ? AGENTIC_HIGHLIGHTS_SLUG : channel;

export const resolveHighlightsChannelSlug = (slug: string): string =>
slug === AGENTIC_HIGHLIGHTS_SLUG ? AGENTIC_HIGHLIGHTS_CHANNEL : slug;
68 changes: 68 additions & 0 deletions packages/webapp/__tests__/HighlightsChannelStaticProps.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { gqlClient } from '@dailydotdev/shared/src/graphql/common';
import {
HIGHLIGHTS_PAGE_QUERY,
POST_HIGHLIGHTS_FEED_QUERY,
} from '@dailydotdev/shared/src/graphql/highlights';
import { getStaticProps } from '../pages/highlights/[channel]';

jest.mock('@dailydotdev/shared/src/graphql/common', () => {
const actual = jest.requireActual('@dailydotdev/shared/src/graphql/common');

return {
...actual,
gqlClient: {
request: jest.fn(),
},
};
});

const mockRequest = gqlClient.request as jest.Mock;

describe('highlights channel static props', () => {
beforeEach(() => {
mockRequest.mockReset();
});

it('should resolve the agentic route alias to the vibes channel', async () => {
mockRequest.mockImplementation((query: string, variables?: object) => {
if (query === HIGHLIGHTS_PAGE_QUERY) {
return Promise.resolve({
majorHeadlines: {
edges: [],
pageInfo: {
endCursor: null,
hasNextPage: false,
},
},
channelConfigurations: [
{
channel: 'vibes',
displayName: 'Agentic',
},
],
});
}

if (query === POST_HIGHLIGHTS_FEED_QUERY) {
expect(variables).toEqual({ channel: 'vibes' });

return Promise.resolve({
postHighlights: [],
});
}

return Promise.reject(new Error('Unexpected query'));
});

const result = await getStaticProps({
params: { channel: 'agentic' },
} as never);

expect(result).toMatchObject({
props: {
dehydratedState: expect.any(Object),
},
revalidate: 60,
});
});
});
6 changes: 5 additions & 1 deletion packages/webapp/pages/highlights/[channel].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
highlightsPageQueryOptions,
} from '@dailydotdev/shared/src/graphql/highlights';
import { HighlightsPage } from '@dailydotdev/shared/src/components/highlights/HighlightsPage';
import { resolveHighlightsChannelSlug } from '@dailydotdev/shared/src/lib/highlights';
import { getLayout as getFooterNavBarLayout } from '../../components/layouts/FooterNavBarLayout';
import { getLayout } from '../../components/layouts/MainLayout';
import { defaultOpenGraph, defaultSeo } from '../../next-seo';
Expand Down Expand Up @@ -64,7 +65,10 @@ export async function getStaticProps({
}: GetStaticPropsContext<HighlightsChannelPageParams>): Promise<
GetStaticPropsResult<HighlightsChannelPageProps>
> {
const channel = params?.channel;
const channelSlug = params?.channel;
const channel = channelSlug
? resolveHighlightsChannelSlug(channelSlug)
: undefined;

if (!channel) {
return {
Expand Down
Loading