From 80c8e05472a39fe8244d2af6eb6428ad6bdf4a45 Mon Sep 17 00:00:00 2001 From: TheMiloAnderson Date: Tue, 26 Nov 2019 18:10:55 -0800 Subject: [PATCH 1/4] Working on 'presidential event' toggle fix --- .../ArchiveEventsEditModal/LocationForm.js | 56 +++++++++++++------ .../ArchiveEventsEditModal/forms.js | 9 +++ .../ArchiveEventsEditModal/index.js | 4 ++ .../LookupOldEvents/achivedResultsTable.jsx | 24 ++++++-- 4 files changed, 71 insertions(+), 22 deletions(-) diff --git a/src/components/ArchiveEventsEditModal/LocationForm.js b/src/components/ArchiveEventsEditModal/LocationForm.js index 9539934..78dda59 100644 --- a/src/components/ArchiveEventsEditModal/LocationForm.js +++ b/src/components/ArchiveEventsEditModal/LocationForm.js @@ -16,6 +16,8 @@ const initialState = { showResponse: false, validating: '', value: undefined, + eventState: undefined, + includeState: false, }; class ArchiveLocationForm extends React.Component { @@ -55,20 +57,22 @@ class ArchiveLocationForm extends React.Component { tempLng, clearTempAddress, currentTownHall, + setFieldsValue, } = this.props; - if (this.state.includeState && tempAddressFullData.state && tempAddressFullData.stateName) { - updateEvent({ - ...currentTownHall, - ...tempAddressFullData, - }) - } - updateEvent({ - ...currentTownHall, - lat: tempLat, - lng: tempLng, - address: tempAddress - }); + // if (this.state.includeState && tempAddressFullData.state && tempAddressFullData.stateName) { + // updateEvent({ + // ...currentTownHall, + // ...tempAddressFullData, + // }) + // } + // updateEvent({ + // ...currentTownHall, + // lat: tempLat, + // lng: tempLng, + // address: tempAddress + // }); + setFieldsValue({'address': tempAddress}) clearTempAddress(); } @@ -118,7 +122,19 @@ class ArchiveLocationForm extends React.Component { } toggleIncludeState(value) { - console.log(value) + console.log(value); + const { + currentTownHall, + geoCodeLocation, + tempAddressFullData, + } = this.props; + // if user has not searched new address... + // if (!this.state.value && value) { + // geoCodeLocation(currentTownHall.address); + // this.setState({ + // eventState: tempAddressFullData.state, + // }); + // } this.setState({ includeState: value, }) @@ -150,7 +166,10 @@ class ArchiveLocationForm extends React.Component { } = this.state; return ( - + {getFieldDecorator('location', { initialValue: currentTownHall.location, })( @@ -165,8 +184,13 @@ class ArchiveLocationForm extends React.Component { - + > + {getFieldDecorator('presidential', { + valuePropName: 'checked', + initialValue: currentTownHall.chamber === 'nationwide' ? true : false, + })( + + )} {currentTownHall.meetingType === 'Tele-Town Hall' ? this.renderTeleInputs() : ( diff --git a/src/components/ArchiveEventsEditModal/forms.js b/src/components/ArchiveEventsEditModal/forms.js index f8c2cac..c6b3045 100644 --- a/src/components/ArchiveEventsEditModal/forms.js +++ b/src/components/ArchiveEventsEditModal/forms.js @@ -21,6 +21,7 @@ class ArchiveAddressDateEditForm extends React.Component { updateEvent, tempAddress, handleClose, + eventMoc, } = this.props; e.preventDefault(); if (tempAddress.address) { @@ -30,9 +31,15 @@ class ArchiveAddressDateEditForm extends React.Component { this.props.form.validateFieldsAndScroll((err, vals) => { if (!err) { const updateObj = {}; + console.log(vals); if (vals.location) { updateObj.location = vals.location; } + if (vals.presidential) { + updateObj.chamber = 'nationwide'; + } else { + updateObj.chamber = eventMoc.chamber; + } if (vals.address) { updateObj.address = vals.address; } @@ -98,6 +105,7 @@ class ArchiveAddressDateEditForm extends React.Component { const { getFieldDecorator, resetFields, + setFieldsValue, } = this.props.form; return (
diff --git a/src/components/ArchiveEventsEditModal/index.js b/src/components/ArchiveEventsEditModal/index.js index 08522e5..19ce279 100644 --- a/src/components/ArchiveEventsEditModal/index.js +++ b/src/components/ArchiveEventsEditModal/index.js @@ -3,6 +3,7 @@ import { connect } from 'react-redux'; import { Modal } from 'antd'; import ArchiveEditForm from './forms'; import selectionStateBranch from '../../state/selections'; +import mocsStateBranch from '../../state/mocs'; class ArchiveEventsEditModal extends React.Component { constructor(props) { @@ -29,6 +30,7 @@ class ArchiveEventsEditModal extends React.Component { clearTempAddress, updateEvent, setTimeZone, + eventMocs, } = this.props; return ( ) @@ -55,6 +58,7 @@ class ArchiveEventsEditModal extends React.Component { const mapStateToProps = state => ({ pathForEvents: selectionStateBranch.selectors.getEventsToShowUrl(state), tempAddress: selectionStateBranch.selectors.getTempAddress(state), + eventMocs: mocsStateBranch.selectors.getEventMocs(state), }); const mapDispatchToProps = dispatch => ({ diff --git a/src/containers/LookupOldEvents/achivedResultsTable.jsx b/src/containers/LookupOldEvents/achivedResultsTable.jsx index 5678973..62dafa8 100644 --- a/src/containers/LookupOldEvents/achivedResultsTable.jsx +++ b/src/containers/LookupOldEvents/achivedResultsTable.jsx @@ -11,6 +11,7 @@ import moment from 'moment-timezone'; import EditableCell from './editableCell'; import eventsStateBranch from '../../state/events'; import selectionStateBranch from '../../state/selections'; +import mocsStateBranch from '../../state/mocs'; import activism from '../../assets/img/icon-flags/activism.svg'; import campaign from '../../assets/img/icon-flags/campaign.svg'; @@ -51,13 +52,23 @@ class ResultsTable extends React.Component { this.handleSave = this.handleSave.bind(this); } + componentDidMount() { + const { + getAllMocData, + } = this.props; + getAllMocData(); + } + handleSave = (eventData) => { const { validateAndSaveOldEvent } = this.props; validateAndSaveOldEvent(eventData); }; render() { - const { showErrors } = this.props; + const { + showErrors, + allMocs, + } = this.props; const components = { body: { row: EditableFormRow, @@ -187,20 +198,21 @@ class ResultsTable extends React.Component { dataSource={this.props.filteredOldEvents} columns={columns} rowKey={(record) => `${record.eventId}-editable-${record.editable}`} + allMocs={allMocs} // expandedRowRender={(record) => record.eventId} /> ); }; }; -function mapStateToProps(state) { - return { - filteredOldEvents: selectionStateBranch.selectors.getFilteredEvents(state), - }; -} +const mapStateToProps = (state) => ({ + filteredOldEvents: selectionStateBranch.selectors.getFilteredEvents(state), + allMocs: mocsStateBranch.selectors.getAllMocs(state), +}) const mapDispatchToProps = dispatch => ({ validateAndSaveOldEvent: (data) => dispatch(eventsStateBranch.actions.validateAndSaveOldEvent(data)), + requestAllMocData: () => dispatch(mocsStateBranch.actions.requestAllMocData()), }); export default connect(mapStateToProps, mapDispatchToProps)(ResultsTable); \ No newline at end of file From 338539d60d265eef8549f284721d5de14d49ba37 Mon Sep 17 00:00:00 2001 From: TheMiloAnderson Date: Tue, 26 Nov 2019 18:58:18 -0800 Subject: [PATCH 2/4] Added moc prop to archive table cells --- .../LookupOldEvents/achivedResultsTable.jsx | 7 +++---- .../LookupOldEvents/editableCell.jsx | 2 ++ src/state/mocs/actions.js | 5 +++++ src/state/mocs/constants.js | 4 +++- src/state/mocs/logic.js | 21 +++++++++++++++++++ src/state/mocs/reducers.js | 7 +++++++ src/state/mocs/selectors.js | 2 +- 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/containers/LookupOldEvents/achivedResultsTable.jsx b/src/containers/LookupOldEvents/achivedResultsTable.jsx index 62dafa8..5c0550b 100644 --- a/src/containers/LookupOldEvents/achivedResultsTable.jsx +++ b/src/containers/LookupOldEvents/achivedResultsTable.jsx @@ -54,9 +54,9 @@ class ResultsTable extends React.Component { componentDidMount() { const { - getAllMocData, + requestAllMocData, } = this.props; - getAllMocData(); + requestAllMocData(); } handleSave = (eventData) => { @@ -180,6 +180,7 @@ class ResultsTable extends React.Component { ...col, onCell: record => ({ record, + moc: allMocs[record.govtrack_id], editable: col.editable && record.editable, className: `${record.editable}-editable-cell`, inputType: col.key, @@ -198,8 +199,6 @@ class ResultsTable extends React.Component { dataSource={this.props.filteredOldEvents} columns={columns} rowKey={(record) => `${record.eventId}-editable-${record.editable}`} - allMocs={allMocs} - // expandedRowRender={(record) => record.eventId} /> ); }; diff --git a/src/containers/LookupOldEvents/editableCell.jsx b/src/containers/LookupOldEvents/editableCell.jsx index 81d495b..6b5f154 100644 --- a/src/containers/LookupOldEvents/editableCell.jsx +++ b/src/containers/LookupOldEvents/editableCell.jsx @@ -55,7 +55,9 @@ export default class EditableCell extends React.Component { inputType, handleSave, record, + moc, } = this.props; + console.log(moc); switch (inputType) { case 'displayName': return ( diff --git a/src/state/mocs/actions.js b/src/state/mocs/actions.js index 27f208c..11d1390 100644 --- a/src/state/mocs/actions.js +++ b/src/state/mocs/actions.js @@ -11,8 +11,13 @@ import { UPDATE_IN_OFFICE_SUCCESS, UPDATE_DISPLAY_NAME, UPDATE_DISPLAY_NAME_SUCCESS, + GET_ALL_MOC_DATA } from './constants'; +export const requestAllMocData = () => ({ + type: GET_ALL_MOC_DATA +}); + export const requestMocIds = () => ({ type: GET_MOCS }); diff --git a/src/state/mocs/constants.js b/src/state/mocs/constants.js index 425a79d..a1fabd2 100644 --- a/src/state/mocs/constants.js +++ b/src/state/mocs/constants.js @@ -23,4 +23,6 @@ export const UPDATE_DISPLAY_NAME_SUCCESS = makeConstant(STATE_BRANCH, 'UPDATE_DI export const UPDATE_DISPLAY_NAME_FAIL = makeConstant(STATE_BRANCH, 'UPDATE_DISPLAY_NAME_FAIL'); export const ADD_STATE_LEG = 'ADD_STATE_LEG'; export const ADD_STATE_LEG_SUCCESS = 'ADD_STATE_LEG_SUCCESS'; -export const ADD_STATE_LEG_FAILURE = 'ADD_STATE_LEG_FAILURE'; \ No newline at end of file +export const ADD_STATE_LEG_FAILURE = 'ADD_STATE_LEG_FAILURE'; +export const GET_ALL_MOC_DATA = 'GET_ALL_MOC_DATA'; +export const GET_ALL_MOC_DATA_SUCCESS = 'GET_ALL_MOC_DATA_SUCCESS'; \ No newline at end of file diff --git a/src/state/mocs/logic.js b/src/state/mocs/logic.js index d2e1dd7..7f78088 100644 --- a/src/state/mocs/logic.js +++ b/src/state/mocs/logic.js @@ -18,6 +18,8 @@ import { UPDATE_DISPLAY_NAME_FAIL, ADD_STATE_LEG, ADD_STATE_LEG_SUCCESS, + GET_ALL_MOC_DATA, + GET_ALL_MOC_DATA_SUCCESS, } from "./constants"; import { updateInOfficeSuccess, @@ -27,6 +29,24 @@ import Candidate from './candidate-model'; import { map } from "lodash"; import StateLeg from "./state-leg-model"; +const fetchAllMocData = createLogic({ + type: GET_ALL_MOC_DATA, + processOptions: { + successType: GET_ALL_MOC_DATA_SUCCESS, + failType: GET_MOCS_FAILED, + }, + process(deps) { + const { + action, + firebasedb, + } = deps; + return firebasedb.ref('mocData').once('value') + .then((snapshot) => { + return snapshot.val(); + }) + } +}); + const fetchMocs = createLogic({ type: GET_MOCS, processOptions: { @@ -180,6 +200,7 @@ const updateDisplayNameLogic = createLogic({ export default [ addStateLegLogic, + fetchAllMocData, fetchMocs, addCandidateLogic, requestCongressLogic, diff --git a/src/state/mocs/reducers.js b/src/state/mocs/reducers.js index ab63570..a672873 100644 --- a/src/state/mocs/reducers.js +++ b/src/state/mocs/reducers.js @@ -9,11 +9,13 @@ import { UPDATE_IN_OFFICE_FAIL, UPDATE_DISPLAY_NAME_SUCCESS, UPDATE_DISPLAY_NAME_FAIL, + GET_ALL_MOC_DATA_SUCCESS, } from "./constants"; import { map } from 'lodash'; const initialState = { allMocIds: [], + allMocData: [], 116: [], 115: [], error: null, @@ -89,6 +91,11 @@ const mocReducer = (state = initialState, action) => { ...state, error: action.payload, } + case GET_ALL_MOC_DATA_SUCCESS: + return { + ...state, + allMocData: action.payload, + } default: return state; } diff --git a/src/state/mocs/selectors.js b/src/state/mocs/selectors.js index b4ab361..523847a 100644 --- a/src/state/mocs/selectors.js +++ b/src/state/mocs/selectors.js @@ -4,7 +4,7 @@ import { map } from 'lodash'; export const getAllMocsIds = state => state.mocs.allMocIds; export const get116thCongress = state => state.mocs[116]; export const get115thCongress = state => state.mocs[115]; - +export const getAllMocs = state => state.mocs.allMocData; export const getAllMocNames = createSelector([getAllMocsIds], (mocIdObjs) => { return map(mocIdObjs, 'nameEntered'); From c3bb7234f5d42383eef2330009859117415b36c3 Mon Sep 17 00:00:00 2001 From: TheMiloAnderson Date: Tue, 26 Nov 2019 20:54:27 -0800 Subject: [PATCH 3/4] Presidential switch is working --- .../ArchiveEventsEditModal/LocationForm.js | 25 ++++++++++++++++--- .../ArchiveEventsEditModal/forms.js | 25 ++++++++++++++++--- .../ArchiveEventsEditModal/index.js | 9 ++++--- .../LookupOldEvents/editableCell.jsx | 2 +- src/state/selections/logic.js | 1 - src/state/selections/reducers.js | 1 + src/state/selections/selectors.js | 4 +++ 7 files changed, 54 insertions(+), 13 deletions(-) diff --git a/src/components/ArchiveEventsEditModal/LocationForm.js b/src/components/ArchiveEventsEditModal/LocationForm.js index 78dda59..61c1c46 100644 --- a/src/components/ArchiveEventsEditModal/LocationForm.js +++ b/src/components/ArchiveEventsEditModal/LocationForm.js @@ -6,7 +6,7 @@ import { Switch, Button, } from 'antd'; -import { includes, debounce } from 'lodash'; +import { includes } from 'lodash'; const { Search } = Input; @@ -33,6 +33,15 @@ class ArchiveLocationForm extends React.Component { this.discardTempAddress = this.discardTempAddress.bind(this); } + componentDidMount() { + const { + geoCodeLocation, + getFieldValue, + } = this.props; + console.log(getFieldValue('address')); + geoCodeLocation(getFieldValue('address')); + } + componentDidUpdate(prevProps) { const { tempAddress } = this.props; if (!prevProps.tempAddress && tempAddress) { @@ -58,6 +67,7 @@ class ArchiveLocationForm extends React.Component { clearTempAddress, currentTownHall, setFieldsValue, + setAddressConfirm, } = this.props; // if (this.state.includeState && tempAddressFullData.state && tempAddressFullData.stateName) { @@ -72,19 +82,24 @@ class ArchiveLocationForm extends React.Component { // lng: tempLng, // address: tempAddress // }); + this.setState({ + showResponse: false, + }); setFieldsValue({'address': tempAddress}) - clearTempAddress(); + // clearTempAddress(); + setAddressConfirm(true); } discardTempAddress() { const { clearTempAddress, resetFields, + setAddressConfirm, } = this.props; this.setState({ showResponse: false, }); - clearTempAddress(); + setAddressConfirm(true); resetFields(['address']); } @@ -92,6 +107,7 @@ class ArchiveLocationForm extends React.Component { const { geoCodeLocation, currentTownHall, + setAddressConfirm, } = this.props; const { value, @@ -100,6 +116,7 @@ class ArchiveLocationForm extends React.Component { return; } geoCodeLocation(value); + setAddressConfirm(false); this.setState({ showResponse: true, validating: 'validating', @@ -238,7 +255,7 @@ class ArchiveLocationForm extends React.Component { ArchiveLocationForm.propTypes = { address: PropTypes.string, - clearTempAddress: PropTypes.func.isRequired, + // clearTempAddress: PropTypes.func.isRequired, geoCodeLocation: PropTypes.func.isRequired, getFieldDecorator: PropTypes.func.isRequired, style: PropTypes.shape({}), diff --git a/src/components/ArchiveEventsEditModal/forms.js b/src/components/ArchiveEventsEditModal/forms.js index c6b3045..fe6af84 100644 --- a/src/components/ArchiveEventsEditModal/forms.js +++ b/src/components/ArchiveEventsEditModal/forms.js @@ -13,23 +13,36 @@ class ArchiveAddressDateEditForm extends React.Component { super(props); this.handleSubmit = this.handleSubmit.bind(this); this.checkData = this.checkData.bind(this); + this.setAddressConfirm = this.setAddressConfirm.bind(this); + this.state = { + addressConfirm: true, + } + } + + setAddressConfirm(val) { + this.setState({ + addressConfirm: val, + }); } handleSubmit(e) { const { townHall, + moc, updateEvent, tempAddress, + clearTempAddress, handleClose, - eventMoc, + defaultUsState, } = this.props; e.preventDefault(); - if (tempAddress.address) { + if (!this.state.addressConfirm) { console.log('still have address') return; } this.props.form.validateFieldsAndScroll((err, vals) => { if (!err) { + clearTempAddress(); const updateObj = {}; console.log(vals); if (vals.location) { @@ -37,8 +50,10 @@ class ArchiveAddressDateEditForm extends React.Component { } if (vals.presidential) { updateObj.chamber = 'nationwide'; + updateObj.state = defaultUsState; } else { - updateObj.chamber = eventMoc.chamber; + updateObj.chamber = moc.chamber; + updateObj.state = moc.state; } if (vals.address) { updateObj.address = vals.address; @@ -101,11 +116,13 @@ class ArchiveAddressDateEditForm extends React.Component { clearTempAddress, updateEvent, handleClose, + defaultUsState, } = this.props; const { getFieldDecorator, resetFields, setFieldsValue, + getFieldValue, } = this.props.form; return ( diff --git a/src/components/ArchiveEventsEditModal/index.js b/src/components/ArchiveEventsEditModal/index.js index 19ce279..464694c 100644 --- a/src/components/ArchiveEventsEditModal/index.js +++ b/src/components/ArchiveEventsEditModal/index.js @@ -3,7 +3,6 @@ import { connect } from 'react-redux'; import { Modal } from 'antd'; import ArchiveEditForm from './forms'; import selectionStateBranch from '../../state/selections'; -import mocsStateBranch from '../../state/mocs'; class ArchiveEventsEditModal extends React.Component { constructor(props) { @@ -25,12 +24,13 @@ class ArchiveEventsEditModal extends React.Component { visible, handleClose, townHall, + moc, tempAddress, setTempAddress, clearTempAddress, updateEvent, setTimeZone, - eventMocs, + defaultUsState, } = this.props; return ( ) @@ -58,7 +59,7 @@ class ArchiveEventsEditModal extends React.Component { const mapStateToProps = state => ({ pathForEvents: selectionStateBranch.selectors.getEventsToShowUrl(state), tempAddress: selectionStateBranch.selectors.getTempAddress(state), - eventMocs: mocsStateBranch.selectors.getEventMocs(state), + defaultUsState: selectionStateBranch.selectors.getDefaultUsState(state), }); const mapDispatchToProps = dispatch => ({ diff --git a/src/containers/LookupOldEvents/editableCell.jsx b/src/containers/LookupOldEvents/editableCell.jsx index 6b5f154..5549f73 100644 --- a/src/containers/LookupOldEvents/editableCell.jsx +++ b/src/containers/LookupOldEvents/editableCell.jsx @@ -57,7 +57,6 @@ export default class EditableCell extends React.Component { record, moc, } = this.props; - console.log(moc); switch (inputType) { case 'displayName': return ( @@ -117,6 +116,7 @@ export default class EditableCell extends React.Component { visible={this.state.modalVisible} handleClose={this.handleCloseOnSubmit} townHall={record} + moc={moc} updateEvent={handleSave} /> ) diff --git a/src/state/selections/logic.js b/src/state/selections/logic.js index 30983a0..10315fb 100644 --- a/src/state/selections/logic.js +++ b/src/state/selections/logic.js @@ -61,7 +61,6 @@ const requestLatLngLogic = createLogic({ address: payload, }) .then((r) => { - console.log(r.body.results[0]); const { results, } = r.body; diff --git a/src/state/selections/reducers.js b/src/state/selections/reducers.js index 3421294..d0617d4 100644 --- a/src/state/selections/reducers.js +++ b/src/state/selections/reducers.js @@ -119,6 +119,7 @@ const selectionReducer = (state = initialState, action) => { lat: action.payload.lat, lng: action.payload.lng, address: action.payload.address, + usState: action.payload.state, } }; case CLEAR_ADDRESS: diff --git a/src/state/selections/selectors.js b/src/state/selections/selectors.js index af7c594..58425cd 100644 --- a/src/state/selections/selectors.js +++ b/src/state/selections/selectors.js @@ -39,6 +39,10 @@ export const getLegislativeBody = state => state.selections.filterByLegislativeB export const getNameFilter = state => state.selections.filterByName; export const getErrorFilter = state => state.selections.filterByError; +export const getDefaultUsState = createSelector([getTempAddress], (tempAddress) => { + return tempAddress.usState; +}); + export const getLiveEventUrl = createSelector([getActiveFederalOrState], (federalOrState) => { if (federalOrState !== FEDERAL_RADIO_BUTTON) { return `state_townhalls/${federalOrState}`; From 2866d25f24112e1d82f8a725a869b6a695459556 Mon Sep 17 00:00:00 2001 From: TheMiloAnderson Date: Tue, 26 Nov 2019 21:01:33 -0800 Subject: [PATCH 4/4] Cleanup --- .../{forms.js => ArchiveEditForm.js} | 8 +--- .../ArchiveEventsEditModal/LocationForm.js | 38 +------------------ .../ArchiveEventsEditModal/index.js | 2 +- src/containers/LookupOldEvents/index.jsx | 2 - 4 files changed, 4 insertions(+), 46 deletions(-) rename src/components/ArchiveEventsEditModal/{forms.js => ArchiveEditForm.js} (95%) diff --git a/src/components/ArchiveEventsEditModal/forms.js b/src/components/ArchiveEventsEditModal/ArchiveEditForm.js similarity index 95% rename from src/components/ArchiveEventsEditModal/forms.js rename to src/components/ArchiveEventsEditModal/ArchiveEditForm.js index fe6af84..d97d728 100644 --- a/src/components/ArchiveEventsEditModal/forms.js +++ b/src/components/ArchiveEventsEditModal/ArchiveEditForm.js @@ -8,7 +8,7 @@ import { import ArchiveLocationForm from './LocationForm'; import ArchiveDateTimeForm from './DateTimeForm'; -class ArchiveAddressDateEditForm extends React.Component { +class ArchiveEditForm extends React.Component { constructor(props) { super(props); this.handleSubmit = this.handleSubmit.bind(this); @@ -30,7 +30,6 @@ class ArchiveAddressDateEditForm extends React.Component { townHall, moc, updateEvent, - tempAddress, clearTempAddress, handleClose, defaultUsState, @@ -113,10 +112,8 @@ class ArchiveAddressDateEditForm extends React.Component { townHall, tempAddress, setTempAddress, - clearTempAddress, updateEvent, handleClose, - defaultUsState, } = this.props; const { getFieldDecorator, @@ -139,7 +136,6 @@ class ArchiveAddressDateEditForm extends React.Component { geoCodeLocation={setTempAddress} tempAddress={tempAddress.address} tempAddressFullData={tempAddress} - clearTempAddress={clearTempAddress} tempLat={tempAddress.lat} tempLng={tempAddress.lng} getFieldDecorator={getFieldDecorator} @@ -166,6 +162,6 @@ class ArchiveAddressDateEditForm extends React.Component { const WrappedArchiveAddressDateEditForm = Form.create({ name: 'address-date-form' -})(ArchiveAddressDateEditForm); +})(ArchiveEditForm); export default WrappedArchiveAddressDateEditForm; \ No newline at end of file diff --git a/src/components/ArchiveEventsEditModal/LocationForm.js b/src/components/ArchiveEventsEditModal/LocationForm.js index 61c1c46..c81c570 100644 --- a/src/components/ArchiveEventsEditModal/LocationForm.js +++ b/src/components/ArchiveEventsEditModal/LocationForm.js @@ -38,7 +38,6 @@ class ArchiveLocationForm extends React.Component { geoCodeLocation, getFieldValue, } = this.props; - console.log(getFieldValue('address')); geoCodeLocation(getFieldValue('address')); } @@ -59,40 +58,19 @@ class ArchiveLocationForm extends React.Component { clearAddressTimeout() { clearTimeout(this.confirmingTime); const { - updateEvent, - tempAddressFullData, tempAddress, - tempLat, - tempLng, - clearTempAddress, - currentTownHall, setFieldsValue, setAddressConfirm, } = this.props; - - // if (this.state.includeState && tempAddressFullData.state && tempAddressFullData.stateName) { - // updateEvent({ - // ...currentTownHall, - // ...tempAddressFullData, - // }) - // } - // updateEvent({ - // ...currentTownHall, - // lat: tempLat, - // lng: tempLng, - // address: tempAddress - // }); this.setState({ showResponse: false, }); - setFieldsValue({'address': tempAddress}) - // clearTempAddress(); + setFieldsValue({'address': tempAddress}); setAddressConfirm(true); } discardTempAddress() { const { - clearTempAddress, resetFields, setAddressConfirm, } = this.props; @@ -139,19 +117,6 @@ class ArchiveLocationForm extends React.Component { } toggleIncludeState(value) { - console.log(value); - const { - currentTownHall, - geoCodeLocation, - tempAddressFullData, - } = this.props; - // if user has not searched new address... - // if (!this.state.value && value) { - // geoCodeLocation(currentTownHall.address); - // this.setState({ - // eventState: tempAddressFullData.state, - // }); - // } this.setState({ includeState: value, }) @@ -255,7 +220,6 @@ class ArchiveLocationForm extends React.Component { ArchiveLocationForm.propTypes = { address: PropTypes.string, - // clearTempAddress: PropTypes.func.isRequired, geoCodeLocation: PropTypes.func.isRequired, getFieldDecorator: PropTypes.func.isRequired, style: PropTypes.shape({}), diff --git a/src/components/ArchiveEventsEditModal/index.js b/src/components/ArchiveEventsEditModal/index.js index 464694c..f687430 100644 --- a/src/components/ArchiveEventsEditModal/index.js +++ b/src/components/ArchiveEventsEditModal/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { Modal } from 'antd'; -import ArchiveEditForm from './forms'; +import ArchiveEditForm from './ArchiveEditForm'; import selectionStateBranch from '../../state/selections'; class ArchiveEventsEditModal extends React.Component { diff --git a/src/containers/LookupOldEvents/index.jsx b/src/containers/LookupOldEvents/index.jsx index a315756..0b7b2ec 100644 --- a/src/containers/LookupOldEvents/index.jsx +++ b/src/containers/LookupOldEvents/index.jsx @@ -4,13 +4,11 @@ import { } from 'react-redux'; import { map } from 'lodash'; import { - Button, Col, Switch, DatePicker, Select, Row, - Progress, Statistic, AutoComplete, } from 'antd';