From a7a5b698c973c2077b73ecb709577eeead77b544 Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Wed, 19 Jun 2019 12:54:52 -0400 Subject: [PATCH] Fix naming conflict between searchBar and building containers --- src/containers/SearchBar/actions.js | 18 +++++++++--------- src/containers/SearchBar/constants.js | 6 +++--- src/containers/SearchBar/index.js | 16 ++++++++-------- src/containers/SearchBar/reducer.js | 12 ++++++------ src/containers/SearchBar/sagas.js | 12 ++++++------ src/screens/BuildingsHomePage/index.js | 16 ++++++++-------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/containers/SearchBar/actions.js b/src/containers/SearchBar/actions.js index c15f8068..2db65a2a 100644 --- a/src/containers/SearchBar/actions.js +++ b/src/containers/SearchBar/actions.js @@ -2,9 +2,9 @@ import ReactGA from 'react-ga'; import { UPDATE_BUILDING_SEARCH_PARAMS, - LOAD_BUILDINGS, - LOAD_BUILDINGS_SUCCESS, - LOAD_BUILDINGS_ERROR, + SEARCH_BUILDINGS, + SEARCH_BUILDINGS_SUCCESS, + SEARCH_BUILDINGS_ERROR, } from './constants'; /** @@ -32,15 +32,15 @@ export function updateBuildingSearchParams(term, type, borough, zipcode, city) { * @returns {object} An action object with a type of LOAD_BUILDINGS * and filterName and value */ -export function loadBuildings(args) { +export function searchBuildings(args) { return { - type: LOAD_BUILDINGS, + type: SEARCH_BUILDINGS, args, }; } // TODO: Add doctring -export function buildingsLoaded(buildings, args) { +export function buildingsSearched(buildings, args) { if (args) { const address = `Address searched: ${args.address}`; if (buildings.length > 0) { @@ -50,16 +50,16 @@ export function buildingsLoaded(buildings, args) { } } return { - type: LOAD_BUILDINGS_SUCCESS, + type: SEARCH_BUILDINGS_SUCCESS, payload: buildings, }; } // TODO: Add doctring -export function buildingsLoadingError(error, args) { +export function buildingsSearchingError(error, args) { ReactGA.event({ category: 'Search', action: 'Error', label: `Searched for ${args.address}, Failed due to ${error}` }); return { - type: LOAD_BUILDINGS_ERROR, + type: SEARCH_BUILDINGS_ERROR, error, }; } diff --git a/src/containers/SearchBar/constants.js b/src/containers/SearchBar/constants.js index e5988943..b0a679aa 100644 --- a/src/containers/SearchBar/constants.js +++ b/src/containers/SearchBar/constants.js @@ -1,5 +1,5 @@ export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; export const UPDATE_BUILDING_SEARCH_PARAMS = 'UPDATE_BUILDING_SEARCH_PARAMS'; -export const LOAD_BUILDINGS = 'LOAD_BUILDINGS'; -export const LOAD_BUILDINGS_SUCCESS = 'LOAD_BUILDINGS_SUCCESS'; -export const LOAD_BUILDINGS_ERROR = 'LOAD_BUILDINGS_ERROR'; +export const SEARCH_BUILDINGS = 'SEARCH_BUILDINGS'; +export const SEARCH_BUILDINGS_SUCCESS = 'SEARCH_BUILDINGS_SUCCESS'; +export const SEARCH_BUILDINGS_ERROR = 'SEARCH_BUILDINGS_ERROR'; diff --git a/src/containers/SearchBar/index.js b/src/containers/SearchBar/index.js index 1ef6ff92..ee34c163 100644 --- a/src/containers/SearchBar/index.js +++ b/src/containers/SearchBar/index.js @@ -9,8 +9,8 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { updateBuildingSearchParams, - loadBuildings, - buildingsLoaded, + searchBuildings, + buildingsSearched, } from './actions'; import './styles.css'; import { buildingListPropTypes } from './propTypes'; @@ -58,7 +58,7 @@ class SearchBar extends Component { // Use the buildings stored in cookies to populate the buildingList const buildingList = localStorage.activeBuildings; if (buildingList !== undefined) { - this.props.buildingsLoaded(JSON.parse(buildingList)); + this.props.buildingsSearched(JSON.parse(buildingList)); } } } @@ -117,7 +117,7 @@ class SearchBar extends Component { if (stateSource.type === 'address + borough' && stateSource.borough) { args.boro = SEARCH_BOROUGH_LIST[stateSource.borough]; } - this.props.loadBuildings(args); + this.props.searchBuildings(args); } checkTermLength = () => { @@ -350,16 +350,16 @@ class SearchBar extends Component { SearchBar.propTypes = { buildingList: buildingListPropTypes, updateBuildingSearchParams: PropTypes.func, - loadBuildings: PropTypes.func, - buildingsLoaded: PropTypes.func, + searchBuildings: PropTypes.func, + buildingsSearched: PropTypes.func, setNavbar: PropTypes.func, }; function mapDispatchToProps(dispatch) { return bindActionCreators({ updateBuildingSearchParams, - loadBuildings, - buildingsLoaded, + searchBuildings, + buildingsSearched, }, dispatch); } diff --git a/src/containers/SearchBar/reducer.js b/src/containers/SearchBar/reducer.js index 7ba9238d..dc5aebc2 100644 --- a/src/containers/SearchBar/reducer.js +++ b/src/containers/SearchBar/reducer.js @@ -1,8 +1,8 @@ import { UPDATE_BUILDING_SEARCH_PARAMS, - LOAD_BUILDINGS, - LOAD_BUILDINGS_SUCCESS, - LOAD_BUILDINGS_ERROR, + SEARCH_BUILDINGS, + SEARCH_BUILDINGS_SUCCESS, + SEARCH_BUILDINGS_ERROR, } from './constants'; const initState = { @@ -27,20 +27,20 @@ export default function (state = initState, action) { zipcode: action.zipcode, city: action.city, }; - case LOAD_BUILDINGS: + case SEARCH_BUILDINGS: return { ...state, loading: true, error: false, }; - case LOAD_BUILDINGS_SUCCESS: + case SEARCH_BUILDINGS_SUCCESS: return { ...state, buildings: action.payload, loading: false, error: false, }; - case LOAD_BUILDINGS_ERROR: + case SEARCH_BUILDINGS_ERROR: return { ...state, loading: false, diff --git a/src/containers/SearchBar/sagas.js b/src/containers/SearchBar/sagas.js index cf49827f..2b9a5c3b 100644 --- a/src/containers/SearchBar/sagas.js +++ b/src/containers/SearchBar/sagas.js @@ -3,12 +3,12 @@ import request from '../../utils/request'; import { getHeaders, buildingsURL } from '../../utils/restServices'; import { - LOAD_BUILDINGS, + SEARCH_BUILDINGS, } from './constants'; import { - buildingsLoaded, - buildingsLoadingError, + buildingsSearched, + buildingsSearchingError, } from './actions'; /** @@ -28,9 +28,9 @@ function* getBuildingsByFilter(action) { ); console.log(res); // eslint-disable-line if (!res.err) { - yield put(buildingsLoaded(res.data, action.args)); + yield put(buildingsSearched(res.data, action.args)); } else { - yield put(buildingsLoadingError(res.err, action.args)); + yield put(buildingsSearchingError(res.err, action.args)); } } @@ -38,5 +38,5 @@ function* getBuildingsByFilter(action) { * TODO: docstring */ export default function* buildingsWatcher() { - yield takeLatest(LOAD_BUILDINGS, getBuildingsByFilter); + yield takeLatest(SEARCH_BUILDINGS, getBuildingsByFilter); } diff --git a/src/screens/BuildingsHomePage/index.js b/src/screens/BuildingsHomePage/index.js index 89cb4f50..9e4b4eae 100644 --- a/src/screens/BuildingsHomePage/index.js +++ b/src/screens/BuildingsHomePage/index.js @@ -9,8 +9,8 @@ import BuildingListTable from '../../components/BuildingListTable'; import { buildingListPropTypes } from '../../containers/SearchBar/propTypes'; import { updateBuildingSearchParams, - loadBuildings, - buildingsLoaded, + searchBuildings, + buildingsSearched, } from '../../containers/SearchBar/actions'; import userPropType from '../../containers/User/propTypes'; import NotAuthorized from '../../components/NotAuthorized'; @@ -29,7 +29,7 @@ class BuildingsHomePage extends Component { logoOnClick={() => { const buildingList = localStorage.activeBuildings; if (buildingList !== undefined) { - this.props.buildingsLoaded(JSON.parse(buildingList)); + this.props.buildingsSearched(JSON.parse(buildingList)); } }} user={this.props.user} @@ -45,7 +45,7 @@ class BuildingsHomePage extends Component { buildings={this.props.buildingList.buildings} loading={this.props.buildingList.loading} updateSearchParams={this.props.updateBuildingSearchParams} - loadBuildings={this.props.loadBuildings} + loadBuildings={this.props.searchBuildings} error={this.props.buildingList.error} /> @@ -57,8 +57,8 @@ class BuildingsHomePage extends Component { BuildingsHomePage.propTypes = { buildingList: buildingListPropTypes, updateBuildingSearchParams: PropTypes.func, - loadBuildings: PropTypes.func, - buildingsLoaded: PropTypes.func, + searchBuildings: PropTypes.func, + buildingsSearched: PropTypes.func, user: userPropType, }; @@ -68,8 +68,8 @@ function mapStateToProps({ buildingList }) { function mapDispatchToProps(dispatch) { return bindActionCreators({ updateBuildingSearchParams, - loadBuildings, - buildingsLoaded, + searchBuildings, + buildingsSearched, }, dispatch); } -- GitLab