From fd1b7e06c1f58b689684d79daf0dbc77ec75c16a Mon Sep 17 00:00:00 2001 From: GotPPay Date: Wed, 23 May 2018 04:48:57 +0200 Subject: [PATCH] integrate draggable dialog package --- package.json | 2 +- .../Shared/ValidationErrorsInfoDialog.js | 44 ++++++++++--------- .../steppers/components/VerticalNonLinear.js | 14 +++--- .../eligibility/components/eligibility.js | 7 +-- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index f0ca223..ee5092c 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "react": "^15.5.4", "react-cookie": "^2.1.2", "react-data-components": "^1.1.1", + "react-dialog": "^1.0.2", "react-dom": "^15.5.4", - "react-draggable": "^3.0.5", "react-geosuggest": "^2.5.0", "react-geosuggest-sw": "^1.4.13", "react-google-maps": "^7.2.0", diff --git a/src/components/Shared/ValidationErrorsInfoDialog.js b/src/components/Shared/ValidationErrorsInfoDialog.js index b3fc455..9251358 100644 --- a/src/components/Shared/ValidationErrorsInfoDialog.js +++ b/src/components/Shared/ValidationErrorsInfoDialog.js @@ -1,7 +1,8 @@ import React, { Component } from 'react'; -import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; -import Draggable, { DraggableCore } from 'react-draggable'; // Both at the same time +import Dialog from 'react-dialog' + +import 'react-dialog/css/index.css'; export class ValidationErrorsInfoDialog extends React.Component { @@ -23,7 +24,7 @@ export class ValidationErrorsInfoDialog extends React.Component { }; render() { - + const actions = [ - - {this.props.errorMessages.map(errorMessage => { - return ( -
- {errorMessage.message} -
-
- ); - })} -
+
+ { + this.state.open && + + {this.props.errorMessages.map(errorMessage => { + return ( +
+ {errorMessage.message} +
+
+ );}) + } +
+ }
); } diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index 1c07f4d..fd2d0de 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js @@ -405,8 +405,9 @@ class VerticalNonLinear extends React.Component { }, return_time: new Date(), pickupTimeHide: false, - showValidationErrors: false, - validationErrors: [], + showValidationErrors:false, + validationErrors:[], + draggableDialog: false }; } @@ -524,8 +525,9 @@ class VerticalNonLinear extends React.Component { if (error.response.status === 422) { //Unprocessable Entity (validation failed) self.setState(Object.assign(self.state, { - showValidationErrors: true, - validationErrors: error.response.data.data + showValidationErrors:true, + validationErrors:error.response.data.data, + draggableDialog:true, })); } }); @@ -896,8 +898,8 @@ class VerticalNonLinear extends React.Component {
- - + + { @@ -107,7 +108,7 @@ class SignUp extends React.Component { }).catch(function (err) { if (err.response.status === 422){ //Unprocessable Entity (validation failed) - state.setState(Object.assign(state.state, {showValidationErrors:true, validationErrors:err.response.data.data})) + state.setState(Object.assign(state.state, {showValidationErrors:true, validationErrors:err.response.data.data, draggableDialog:false})) }else{ console.log('Error to get eligibility: ', err); alert('NO benefits found for this member'); @@ -192,7 +193,7 @@ class SignUp extends React.Component { return (
- +