Revert "Put filter pokemonCard logic into redux" as it was overfitting redux way
This reverts commit e7e4e391d5
.
graphql
parent
e7e4e391d5
commit
7db1852489
|
@ -3,12 +3,44 @@ import PokemonCard, { PokemonCardProps } from 'components/PokemonCard';
|
|||
import Loading from 'components/Loading';
|
||||
|
||||
import { useAppSelector, useAppDispatch } from 'app/hooks';
|
||||
import {
|
||||
fetchPokemonsInTheRegion,
|
||||
searchedSortedFilteredPokemonCardList,
|
||||
} from './pokedexSlice';
|
||||
import { fetchPokemonsInTheRegion } from './pokedexSlice';
|
||||
import { fetchSelectedPokemonInfo } from 'features/InfoDialog/infoDialogSlice';
|
||||
|
||||
export const filterPokemonCardsByType = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
selectedType: string,
|
||||
) => {
|
||||
return pokemonList.filter(
|
||||
pokemon =>
|
||||
selectedType === 'All Types' ||
|
||||
pokemon.types.some(type => type === selectedType),
|
||||
);
|
||||
};
|
||||
|
||||
export const sortPokemonCardsByIdOrName = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
selectedSort: string,
|
||||
) => {
|
||||
return pokemonList.sort((a, b) => {
|
||||
if (selectedSort === 'id') {
|
||||
return a.id - b.id;
|
||||
} else if (selectedSort === 'name') {
|
||||
return a.name.localeCompare(b.name);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
export const searchPokemonCardsByName = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
searchInput: string,
|
||||
) => {
|
||||
return pokemonList.filter(pokemon =>
|
||||
pokemon.name.toLowerCase().includes(searchInput.toLowerCase()),
|
||||
);
|
||||
};
|
||||
|
||||
export interface PokedexProps {
|
||||
selectedRegion: string;
|
||||
selectedType: string;
|
||||
|
@ -27,8 +59,19 @@ const Pokedex = ({
|
|||
const isLoadingPokemons = useAppSelector(
|
||||
state => state.pokedex.isLoadingPokemons,
|
||||
);
|
||||
const pokemonCardListForRendering = searchedSortedFilteredPokemonCardList(
|
||||
useAppSelector(state => state),
|
||||
const pokemonList = useAppSelector(state => state.pokedex.pokemonCardList);
|
||||
|
||||
const filteredPokemonList = filterPokemonCardsByType(
|
||||
pokemonList,
|
||||
selectedType,
|
||||
);
|
||||
const sortedFilteredPokemonCardList = sortPokemonCardsByIdOrName(
|
||||
filteredPokemonList,
|
||||
selectedSort,
|
||||
);
|
||||
const searchedPokemonCardList = searchPokemonCardsByName(
|
||||
sortedFilteredPokemonCardList,
|
||||
searchInput,
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
|
@ -41,7 +84,7 @@ const Pokedex = ({
|
|||
<Loading />
|
||||
) : (
|
||||
<div className="all__pokemons">
|
||||
{pokemonCardListForRendering.map(pokemonCard => (
|
||||
{searchedPokemonCardList.map(pokemonCard => (
|
||||
<PokemonCard
|
||||
key={pokemonCard.id}
|
||||
id={pokemonCard.id}
|
||||
|
|
|
@ -2,7 +2,7 @@ import {
|
|||
filterPokemonCardsByType,
|
||||
sortPokemonCardsByIdOrName,
|
||||
searchPokemonCardsByName,
|
||||
} from 'features/Pokedex/pokedexSlice';
|
||||
} from 'features/Pokedex/Pokedex';
|
||||
import { PokemonCardProps } from 'components/PokemonCard';
|
||||
import pokemon3_venusaur_card from 'features/Pokedex/__test__/pokemon3_venusaur_Card.json';
|
||||
import pokemon4_charmander_card from 'features/Pokedex/__test__/pokemon4_charmandar_Card.json';
|
|
@ -7,7 +7,6 @@ import { getStartAndEndIdsForRegion } from './utils';
|
|||
import { PokemonResponseData } from 'types/api';
|
||||
import { pokeRestApi } from 'app/services/pokeRestApi';
|
||||
import { RootState } from 'app/store';
|
||||
import { PokemonCardProps } from 'components/PokemonCard';
|
||||
|
||||
export const fetchPokemonsInTheRegion = createAsyncThunk<
|
||||
PokemonResponseData[],
|
||||
|
@ -67,57 +66,3 @@ export const pokedexSlice: Slice<PokedexStateProps> = createSlice({
|
|||
export const { setIsLoadingPokemons } = pokedexSlice.actions;
|
||||
|
||||
export default pokedexSlice.reducer;
|
||||
|
||||
/// selectors
|
||||
export const filterPokemonCardsByType = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
selectedType: string,
|
||||
) => {
|
||||
return pokemonList.filter(
|
||||
pokemon =>
|
||||
selectedType === 'All Types' ||
|
||||
pokemon.types.some(type => type === selectedType),
|
||||
);
|
||||
};
|
||||
|
||||
export const sortPokemonCardsByIdOrName = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
selectedSort: string,
|
||||
) => {
|
||||
return pokemonList.sort((a, b) => {
|
||||
if (selectedSort === 'id') {
|
||||
return a.id - b.id;
|
||||
} else if (selectedSort === 'name') {
|
||||
return a.name.localeCompare(b.name);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
export const searchPokemonCardsByName = (
|
||||
pokemonList: PokemonCardProps[],
|
||||
searchInput: string,
|
||||
) => {
|
||||
return pokemonList.filter(pokemon =>
|
||||
pokemon.name.toLowerCase().includes(searchInput.toLowerCase()),
|
||||
);
|
||||
};
|
||||
|
||||
export const filteredPokemonListByType = (state: RootState) =>
|
||||
filterPokemonCardsByType(
|
||||
state.pokedex.pokemonCardList,
|
||||
state.filter.selectedType,
|
||||
);
|
||||
|
||||
export const sortedFilteredPokemonCardList = (state: RootState) =>
|
||||
sortPokemonCardsByIdOrName(
|
||||
filteredPokemonListByType(state),
|
||||
state.filter.selectedSort,
|
||||
);
|
||||
|
||||
export const searchedSortedFilteredPokemonCardList = (state: RootState) =>
|
||||
searchPokemonCardsByName(
|
||||
sortedFilteredPokemonCardList(state),
|
||||
state.filter.searchInput,
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue