Skip to content
Merged
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
41 changes: 0 additions & 41 deletions packages/shared/src/components/MainFeedLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ import { checkIsExtension } from '../lib/func';
import { useReadingReminderHero } from '../hooks/notifications/useReadingReminderHero';
import { useTrackQuestClientEvent } from '../hooks/useTrackQuestClientEvent';
import { useReadingReminderVariation } from '../hooks/notifications/useReadingReminderVariation';
import { useNoAiFeed } from '../hooks/useNoAiFeed';

const FeedExploreHeader = dynamic(
() =>
Expand Down Expand Up @@ -225,8 +224,6 @@ export default function MainFeedLayout({
hasUser: !!user,
});
const { isCustomDefaultFeed, defaultFeedId } = useCustomDefaultFeed();
const shouldEvaluateNoAi =
feedName === SharedFeedPage.MyFeed && !isCustomDefaultFeed;
const isLaptop = useViewSize(ViewSize.Laptop);
const feedVersion = useFeature(feature.feedVersion);
const { time, contentCurationFilter } = useSearchContextProvider();
Expand Down Expand Up @@ -306,14 +303,6 @@ export default function MainFeedLayout({
feature: featureFeedV2Highlights,
shouldEvaluate: shouldEvaluateFeedV2Highlights,
});
const {
isNoAi,
isNoAiAvailable,
isLoaded: isNoAiLoaded,
toggleNoAi,
} = useNoAiFeed({
shouldEvaluate: shouldEvaluateNoAi,
});

const { isSearchPageLaptop } = useSearchResultsLayout();

Expand Down Expand Up @@ -389,7 +378,6 @@ export default function MainFeedLayout({
highlightsLimit: FEED_V2_HIGHLIGHTS_LIMIT,
}
: {}),
...(shouldEvaluateNoAi && isNoAi ? { noAi: true } : {}),
version:
isDevelopment && !isProductionAPI
? 1
Expand All @@ -411,8 +399,6 @@ export default function MainFeedLayout({
tokenRefreshed,
feedVersion,
isFeedV2HighlightsEnabled,
isNoAi,
shouldEvaluateNoAi,
]);

const [selectedAlgo, setSelectedAlgo, loadedAlgo] = usePersistentContext(
Expand Down Expand Up @@ -465,10 +451,6 @@ export default function MainFeedLayout({
return null;
}

if (shouldEvaluateNoAi && !isNoAiLoaded) {
return null;
}

if (feedNameProp === 'default' && isCustomDefaultFeed) {
if (!defaultFeedId) {
return null;
Expand All @@ -491,15 +473,6 @@ export default function MainFeedLayout({
<SearchControlHeader
algoState={[selectedAlgo, handleSelectedAlgoChange]}
feedName={feedName}
noAiState={
shouldEvaluateNoAi
? {
isAvailable: isNoAiAvailable,
isEnabled: isNoAi,
onToggle: toggleNoAi,
}
: undefined
}
/>
),
};
Expand Down Expand Up @@ -579,15 +552,6 @@ export default function MainFeedLayout({
<SearchControlHeader
algoState={[selectedAlgo, handleSelectedAlgoChange]}
feedName={feedName}
noAiState={
shouldEvaluateNoAi
? {
isAvailable: isNoAiAvailable,
isEnabled: isNoAi,
onToggle: toggleNoAi,
}
: undefined
}
/>
),
};
Expand Down Expand Up @@ -619,11 +583,6 @@ export default function MainFeedLayout({
isLaptop,
loadedAlgo,
tokenRefreshed,
shouldEvaluateNoAi,
isNoAiLoaded,
isNoAiAvailable,
isNoAi,
toggleNoAi,
]);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import React, { useContext, useMemo } from 'react';
import { FeedSettingsEditContext } from '../FeedSettingsEditContext';
import useFeedSettings from '../../../../hooks/useFeedSettings';
import { useAdvancedSettings } from '../../../../hooks/feed/useAdvancedSettings';
import { useConditionalFeature, useToastNotification } from '../../../../hooks';
import { useLogContext } from '../../../../contexts/LogContext';
import { useSettingsContext } from '../../../../contexts/SettingsContext';
import {
getAdvancedContentTypes,
getContentCurationList,
Expand All @@ -17,33 +14,21 @@ import {
TypographyType,
} from '../../../typography/Typography';
import { FilterCheckbox } from '../../../fields/FilterCheckbox';
import { Switch } from '../../../fields/Switch';
import { FeedType } from '../../../../graphql/feed';
import { featureNoAiFeed } from '../../../../lib/featureManagement';
import { SidebarSettingsFlags } from '../../../../graphql/settings';
import { labels } from '../../../../lib/labels';
import { LogEvent, Origin, TargetId } from '../../../../lib/log';

export const TOGGLEABLE_TYPES = ['Videos', 'Polls', 'Social'];
const CUSTOM_FEEDS_ONLY = ['Article'];
const ADVANCED_SETTINGS_KEY = 'advancedSettings';

export const FeedSettingsContentPreferencesSection = (): ReactElement => {
const { feed, editFeedSettings } = useContext(FeedSettingsEditContext);
const { flags, updateFlag } = useSettingsContext();
const { displayToast } = useToastNotification();
const { logEvent } = useLogContext();
const { advancedSettings } = useFeedSettings({ feedId: feed?.id });
const {
selectedSettings,
onToggleSettings,
checkSourceBlocked,
onToggleSource,
} = useAdvancedSettings({ feedId: feed?.id });
const { value: isNoAiFeatureEnabled } = useConditionalFeature({
feature: featureNoAiFeed,
shouldEvaluate: feed?.type === FeedType.Main,
});
const toggleableTypes = useMemo(
() =>
getAdvancedContentTypes(
Expand Down Expand Up @@ -113,47 +98,6 @@ export const FeedSettingsContentPreferencesSection = (): ReactElement => {
})}
</div>
</div>
{feed?.type === FeedType.Main && isNoAiFeatureEnabled && (
<div className="flex flex-col gap-4">
<div className="flex flex-col gap-1">
<Typography bold type={TypographyType.Body}>
No AI mode
</Typography>
<Typography
type={TypographyType.Callout}
color={TypographyColor.Tertiary}
>
Keep AI topics filtered out across My Feed. You can hide the
homepage toggle once this is set.
</Typography>
</div>
<Switch
inputId="no-ai-feed-preference-switch"
name="no_ai_feed_preference"
compact={false}
checked={flags?.noAiFeedEnabled ?? false}
onClick={() => {
const newState = !(flags?.noAiFeedEnabled ?? false);

editFeedSettings(() =>
updateFlag(SidebarSettingsFlags.NoAiFeedEnabled, newState),
);
displayToast(
newState ? labels.feed.noAi.hidden : labels.feed.noAi.visible,
);
logEvent({
event_name: LogEvent.ToggleNoAiFeed,
target_id: newState ? TargetId.On : TargetId.Off,
extra: JSON.stringify({
origin: Origin.Settings,
}),
});
}}
>
Keep AI topics filtered out
</Switch>
</div>
)}
<div className="flex flex-col gap-4">
<div className="flex flex-col gap-1">
<Typography bold type={TypographyType.Body}>
Expand Down
119 changes: 2 additions & 117 deletions packages/shared/src/components/layout/common.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { render, screen } from '@testing-library/react';
import SettingsContext from '../../contexts/SettingsContext';
import { useAuthContext } from '../../contexts/AuthContext';
import { useLogContext } from '../../contexts/LogContext';
Expand All @@ -10,7 +10,6 @@ import { useFeedName } from '../../hooks/feed/useFeedName';
import { useQueryState } from '../../hooks/utils/useQueryState';
import { checkIsExtension, getCurrentBrowserName } from '../../lib/func';
import { ActionType } from '../../graphql/actions';
import { LogEvent, Origin, TargetId } from '../../lib/log';
import { SharedFeedPage } from '../utilities';
import { SearchControlHeader } from './common';

Expand Down Expand Up @@ -96,12 +95,10 @@ const mockGetCurrentBrowserName = getCurrentBrowserName as jest.Mock;

const createActionsState = ({
dismissedInstallExtension = false,
dismissedNoAiToggle = false,
isActionsFetched = true,
completeAction = jest.fn(),
}: {
dismissedInstallExtension?: boolean;
dismissedNoAiToggle?: boolean;
isActionsFetched?: boolean;
completeAction?: jest.Mock;
} = {}) => ({
Expand All @@ -110,31 +107,18 @@ const createActionsState = ({
return dismissedInstallExtension;
}

if (type === ActionType.DismissNoAiFeedToggle) {
return dismissedNoAiToggle;
}

return false;
}),
completeAction,
isActionsFetched,
});

const renderComponent = ({
noAiState,
}: {
noAiState?: {
isAvailable: boolean;
isEnabled: boolean;
onToggle: () => Promise<void>;
};
} = {}) =>
const renderComponent = () =>
render(
<SettingsContext.Provider value={{ sortingEnabled: false } as never}>
<SearchControlHeader
feedName={SharedFeedPage.MyFeed}
algoState={[0, jest.fn()]}
noAiState={noAiState}
/>
</SettingsContext.Provider>,
);
Expand Down Expand Up @@ -219,103 +203,4 @@ describe('SearchControlHeader', () => {
screen.getByRole('link', { name: 'Get it for Chrome' }),
).toBeInTheDocument();
});

it('does not render the No AI switch when unavailable', () => {
mockUseActions.mockReturnValue(
createActionsState({ dismissedInstallExtension: true }),
);

renderComponent({
noAiState: {
isAvailable: false,
isEnabled: false,
onToggle: jest.fn().mockResolvedValue(undefined),
},
});

expect(screen.queryByText('No AI mode')).not.toBeInTheDocument();
expect(
screen.queryByRole('checkbox', { name: 'Toggle No AI mode' }),
).not.toBeInTheDocument();
});

it('renders a No AI switch and logs when toggled', async () => {
const onToggle = jest.fn().mockResolvedValue(undefined);
const logEvent = jest.fn();
mockUseLogContext.mockReturnValue({ logEvent });
mockUseActions.mockReturnValue(
createActionsState({ dismissedInstallExtension: true }),
);

renderComponent({
noAiState: {
isAvailable: true,
isEnabled: false,
onToggle,
},
});

expect(screen.getByText('No AI mode')).toBeInTheDocument();
const switchInput = screen.getByRole('checkbox', {
name: 'Toggle No AI mode',
});
fireEvent.click(switchInput);

expect(onToggle).toHaveBeenCalledTimes(1);
await waitFor(() => {
expect(logEvent).toHaveBeenCalledWith({
event_name: LogEvent.ToggleNoAiFeed,
target_id: TargetId.On,
extra: JSON.stringify({
origin: Origin.Feed,
}),
});
});
});

it('does not render the No AI switch after dismissal', () => {
mockUseActions.mockReturnValue(
createActionsState({
dismissedInstallExtension: true,
dismissedNoAiToggle: true,
}),
);

renderComponent({
noAiState: {
isAvailable: true,
isEnabled: false,
onToggle: jest.fn().mockResolvedValue(undefined),
},
});

expect(screen.queryByText('No AI mode')).not.toBeInTheDocument();
expect(
screen.queryByRole('checkbox', { name: 'Toggle No AI mode' }),
).not.toBeInTheDocument();
});

it('dismisses the No AI header card', () => {
const completeAction = jest.fn();
mockUseActions.mockReturnValue(
createActionsState({
dismissedInstallExtension: true,
completeAction,
}),
);

renderComponent({
noAiState: {
isAvailable: true,
isEnabled: false,
onToggle: jest.fn().mockResolvedValue(undefined),
},
});

fireEvent.click(screen.getByRole('button', { name: 'Dismiss No AI mode' }));

expect(completeAction).toHaveBeenCalledWith(
ActionType.DismissNoAiFeedToggle,
);
});
});
Loading
Loading