From d748deb178c7dc6a2261437fd6637c556c9d04e0 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 9 Apr 2017 19:11:41 -0600 Subject: [PATCH] Check cpic action. --- bikeshop_project/assets/js/bikes/actions.js | 3 +- .../js/bikes/components/BikeForm/index.jsx | 69 ++----------------- bikeshop_project/assets/js/bikes/sagas.js | 15 +++- .../assets/js/bikes/services/index.js | 17 +++++ 4 files changed, 39 insertions(+), 65 deletions(-) diff --git a/bikeshop_project/assets/js/bikes/actions.js b/bikeshop_project/assets/js/bikes/actions.js index 1dcd937..1f9bea2 100644 --- a/bikeshop_project/assets/js/bikes/actions.js +++ b/bikeshop_project/assets/js/bikes/actions.js @@ -12,4 +12,5 @@ export const editBike = createAction('edit bike'); export const createBike = createAction('create bike'); export const updateBike = createAction('update bike'); export const mergeBike = createAction('merge bike'); -export const saveBike = createAction('save bike'); \ No newline at end of file +export const saveBike = createAction('save bike'); +export const checkCpic = createAction('check cpic'); \ No newline at end of file diff --git a/bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx b/bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx index 8a11776..32f6c8e 100644 --- a/bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx +++ b/bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx @@ -12,7 +12,7 @@ import fetch from 'isomorphic-fetch'; import moment from 'moment-timezone'; import Source from '../Source'; import Size from '../Size'; -import { updateBike, saveBike } from '../../actions'; +import { updateBike, saveBike, checkCpic } from '../../actions'; const styles = { block: { @@ -73,7 +73,6 @@ const renderSelectField = ({ input, label, meta: { touched, error }, children, . ); const validate = (values) => { - console.log(values); const errors = {}; const requiredFields = ['make', 'colour', 'size', 'serial_number', 'donation_source']; @@ -96,66 +95,6 @@ const handleSubmit = (data, dispatch, props) => { }; class BikeForm extends React.Component { - constructor({ bike, create }) { - super(); - if (!create) { - this.state = { - bike, - }; - } else { - this.state = { - bike: {}, - }; - } - } - - handleCpicCheck() { - const id = this.state.bike.id; - const serialNumber = this.state.bike.serial_number; - const data = JSON.stringify({ serial_number: serialNumber }); - const csrfToken = Cookies.get('csrftoken'); - - fetch(`/api/v1/bikes/${id}/check/`, { - credentials: 'same-origin', - method: 'PUT', - headers: { - 'Content-Type': 'application/json', - 'X-CSRFToken': csrfToken, - }, - body: data, - }).then((response) => { - if (response.status >= 400) { - throw new Error('Bad response from server'); - } - }).catch((error) => { - console.error(error); - }); - } - - handleSave() { - const id = this.state.bike.id; - const data = JSON.stringify(this.state.bike); - const csrfToken = Cookies.get('csrftoken'); - const url = this.props.create ? `/api/v1/bikes/${id}/` : '/api/v1/bikes/'; - - fetch(url, { - credentials: 'same-origin', - method: this.props.create ? 'PUT' : 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-CSRFToken': csrfToken, - }, - body: data, - }).then((response) => { - if (response.status >= 400) { - throw new Error('Bad response from server'); - } - console.log(response.json()); - }).then(() => { - this.props.getBikes(); - }); - } - render() { const { create } = this.props; @@ -263,7 +202,7 @@ class BikeForm extends React.Component { />
- + this.props.checkCpic(this.props.id)} disabled={!!this.props.cpic_searched} primary />
} @@ -317,6 +256,10 @@ BikeForm = connect( initialValues: state.bikes.form.bike, // pull initial values from account reducer create: state.bikes.form.create, cpic_searched: selector(state, 'cpic_searched_at'), + id: selector(state, 'id'), + }), + dispatch => ({ + checkCpic: id => dispatch(checkCpic(id)), }), )(BikeForm); diff --git a/bikeshop_project/assets/js/bikes/sagas.js b/bikeshop_project/assets/js/bikes/sagas.js index 904e4bd..be59325 100644 --- a/bikeshop_project/assets/js/bikes/sagas.js +++ b/bikeshop_project/assets/js/bikes/sagas.js @@ -1,7 +1,7 @@ import { call, put, takeEvery } from 'redux-saga/effects'; import { fetchBikes as fetchBikesAction, setBikes, setBikesIsFetching, setBikesFetched, setBikesFetchFailed, setBikeSaved, setBikeSaveFailed, setBikeIsSaving, updateBike as updateBikeAction, - mergeBike, saveBike as saveBikeAction } from './actions'; + mergeBike, saveBike as saveBikeAction, checkCpic as checkCpicAction } from './actions'; import { normalize } from 'normalizr'; import * as schema from './schema'; import Api from './services'; @@ -62,10 +62,23 @@ function* watchSaveBike() { yield takeEvery(saveBikeAction.toString(), saveBike) } +function* checkCpic(action) { + try { + yield call(Api.cpicBike, action.payload); + } catch (e) { + throw(e); + } +} + +function* watchCheckCpic() { + yield takeEvery(checkCpicAction.toString(), checkCpic) +} + export default function* rootSaga() { yield [ watchFetchBikes(), watchUpdateBike(), watchSaveBike(), + watchCheckCpic(), ]; }; diff --git a/bikeshop_project/assets/js/bikes/services/index.js b/bikeshop_project/assets/js/bikes/services/index.js index 06828d1..7da1f26 100644 --- a/bikeshop_project/assets/js/bikes/services/index.js +++ b/bikeshop_project/assets/js/bikes/services/index.js @@ -58,6 +58,23 @@ const Api = { throw error; }); }, + cpicBike(id) { + fetch(`/api/v1/bikes/${id}/check/`, { + credentials: 'same-origin', + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + 'X-CSRFToken': csrfToken, + }, + }) + .then(checkStatus) + .then(parseJson) + .then(data => data) + .catch((error) => { + console.log('request failed', error); + throw error; + }); + } }; export default Api;