matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl-fe: fix suggestions

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-09-07 20:07:28 +02:00
parent 4e5a71c40f
commit a77608a98b
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pl-fe/src/features/feed-suggestions/feed-suggestions.tsx
View File

@ -109,7 +109,7 @@ const FeedSuggestions: React.FC<IFeedSuggesetions> = ({ statusId, onMoveUp, onMo
<CardBody>
<HStack space={4} alignItems='center' className='overflow-x-auto md:space-x-0 lg:overflow-x-hidden'>
{suggestedProfiles.slice(0, 4).map((suggestedProfile) => (
<SuggestionItem key={suggestedProfile.account} accountId={suggestedProfile.account} />
<SuggestionItem key={suggestedProfile.account_id} accountId={suggestedProfile.account_id} />
))}
</HStack>
</CardBody>

4
packages/pl-fe/src/features/follow-recommendations/index.tsx
View File

@ -42,8 +42,8 @@ const FollowRecommendations: React.FC = () => {
>
{suggestions.map((suggestion) => (
<AccountContainer
key={suggestion.account}
id={suggestion.account}
key={suggestion.account_id}
id={suggestion.account_id}
withAccountNote
/>
))}

2
packages/pl-fe/src/features/search/components/search-results.tsx
View File

@ -129,7 +129,7 @@ const SearchResults = () => {
if (results.accounts && results.accounts.size > 0) {
searchResults = results.accounts.map(accountId => <AccountContainer key={accountId} id={accountId} />);
} else if (!submitted && suggestions && !suggestions.isEmpty()) {
searchResults = suggestions.map(suggestion => <AccountContainer key={suggestion.account} id={suggestion.account} />);
searchResults = suggestions.map(suggestion => <AccountContainer key={suggestion.account_id} id={suggestion.account_id} />);
} else if (loaded) {
noResultsMessage = (
<div className='empty-column-indicator'>

21
packages/pl-fe/src/reducers/suggestions.ts
View File

@ -12,30 +12,31 @@ import {
import type { Suggestion as SuggestionEntity } from 'pl-api';
import type { AnyAction } from 'redux';
const SuggestionRecord = ImmutableRecord({
source: '',
account: '',
});
const ReducerRecord = ImmutableRecord({
items: ImmutableOrderedSet<Suggestion>(),
items: ImmutableOrderedSet<MinifiedSuggestion>(),
isLoading: false,
});
type State = ReturnType<typeof ReducerRecord>;
type Suggestion = ReturnType<typeof SuggestionRecord>;
const minifySuggestion = ({ account, ...suggestion }: SuggestionEntity) => ({
...suggestion,
account_id: account.id,
});
type MinifiedSuggestion = ReturnType<typeof minifySuggestion>;
const importSuggestions = (state: State, suggestions: SuggestionEntity[]) =>
state.withMutations(state => {
state.update('items', items => items.concat(suggestions.map(x => ({ ...x, account: x.account.id })).map(suggestion => SuggestionRecord(suggestion))));
state.update('items', items => items.concat(suggestions.map(minifySuggestion)));
state.set('isLoading', false);
});
const dismissAccount = (state: State, accountId: string) =>
state.update('items', items => items.filterNot(item => item.account === accountId));
state.update('items', items => items.filterNot(item => item.account_id === accountId));
const dismissAccounts = (state: State, accountIds: string[]) =>
state.update('items', items => items.filterNot(item => accountIds.includes(item.account)));
state.update('items', items => items.filterNot(item => accountIds.includes(item.account_id)));
const suggestionsReducer = (state: State = ReducerRecord(), action: AnyAction) => {
switch (action.type) {