Skip to content

fix electionSelect #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JesseSilverberg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix electionSelect #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 8 additions & 44 deletions src/components/Search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,13 @@ function Search(props) {
if (e) {
e.preventDefault();
}
const relevantElections = getRelevantElections(searchQuery);
const electionId = getElectionId(relevantElections);

const requests = [
getLocations(searchQuery, electionId),
getRepresentatives(searchQuery),
];
let representatives = await getRepresentatives(searchQuery);

const relevantElections = getRelevantElections(representatives);
const electionId = getElectionId(relevantElections);

let [locations, representatives] = await Promise.all(requests);
let locations = await getLocations(searchQuery, electionId);

// TODO let's maybe move this outta here into a function
if (locations.error) {
Expand Down Expand Up @@ -81,46 +79,12 @@ function Search(props) {
// this.showEasterEgg(searchValue);
};

const getRelevantElections = searchValue => {
const getRelevantElections = representatives => {
if (!elections.length) {
return;
}
let usersState = null;
// this is pretty gross, but it's parsing the search string and trying to determine the state
let searchValueSegments = searchValue
.replace(/,|[0-9]|United States/gi, '')
.split(' ')
.filter(segment => segment !== '')
.slice(-2);

// grabbing the last 2 items in this array since some states can have 2 words in their names
// first we'll check the last word to see if it matches anything
// if the length is greater than 2 the input probably contains the full name of the state, not an abbreviation
// so we need to look only at the values in our states map
if (searchValueSegments[1] && searchValueSegments[1].length > 2) {
usersState = Object.values(statesMap).filter(state =>
state
.toLowerCase()
.includes(searchValueSegments[1].toLowerCase())
);
if (usersState && usersState.length > 1) {
usersState = Object.values(statesMap).filter(state =>
state
.toLowerCase()
.includes(
`${searchValueSegments[0].toLowerCase()} ${searchValueSegments[1].toLowerCase()}`
)
);
}
usersState = Object.keys(statesMap).find(state => {
return statesMap[state] === usersState[0];
});
} else if (
searchValueSegments[1] &&
searchValueSegments[1].length === 2
) {
usersState = searchValueSegments[1].toUpperCase();
}

const usersState = representatives.normalizedInput.state;

// once we have the user's state figured out, we need to check the current elections and see if there's anything specific to their state in there

Expand Down