+ {tags.map(this._renderChip, this)}
+
+
Platform Properties
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
index 34387fca7ea..0f994eb417d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
@@ -97,8 +97,8 @@ class PlatformListing extends Component {
handleRowClick={this._onRowClick.bind(this)}
noDataMessage={{type: 'button', text: 'Create Platform'}}/>
-
-
);
+
+ );
}
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/User/Login/Login.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/User/Login/Login.jsx
index 3b93e9e1b4c..5987730bab1 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/User/Login/Login.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/User/Login/Login.jsx
@@ -20,10 +20,10 @@ import qs from 'qs';
import PropTypes from 'prop-types';
import React, {Component} from 'react';
import Checkbox from 'material-ui/Checkbox';
+import TextField from 'material-ui/TextField';
import {Redirect, Switch} from 'react-router-dom';
import RaisedButton from 'material-ui/RaisedButton';
import {Card, CardActions, CardTitle} from 'material-ui/Card';
-import {TextValidator, ValidatorForm} from 'react-material-ui-form-validator';
//todo: remove the {TextValidator, ValidatorForm} and implement it manually.
@@ -40,36 +40,43 @@ class Login extends Component {
constructor() {
super();
this.state = {
- isLoggedIn: true,
+ isLoggedIn: false,
referrer: "/",
userName: "",
password: "",
- rememberMe: true
+ rememberMe: true,
+ errors: {}
}
}
+ componentWillMount() {
+ console.log("IN Login")
+ }
+
componentDidMount() {
- let queryString = this.props.location.search;
- console.log(queryString);
- queryString = queryString.replace(/^\?/, '');
- /* With QS version up we can directly use {ignoreQueryPrefix: true} option */
- let params = qs.parse(queryString);
- if (params.referrer) {
- this.setState({referrer: params.referrer});
- }
+ console.log("in Login")
+ // let queryString = this.props.location.search;
+ // console.log(queryString);
+ // queryString = queryString.replace(/^\?/, '');
+ // /* With QS version up we can directly use {ignoreQueryPrefix: true} option */
+ // let params = qs.parse(queryString);
+ // if (params.referrer) {
+ // this.setState({referrer: params.referrer});
+ // }
}
- handleLogin(event) {
+ _handleLogin(event) {
event.preventDefault();
+ this._validateForm();
}
/**
* Handles the username field change event.
* */
- onUserNameChange(event) {
+ _onUserNameChange(event, value) {
this.setState(
{
- userName: event.target.value
+ userName: value
}
);
}
@@ -77,10 +84,10 @@ class Login extends Component {
/**
* Handles the password field change event.
* */
- onPasswordChange(event) {
+ _onPasswordChange(event, value) {
this.setState(
{
- password: event.target.value
+ password: value
}
);
}
@@ -88,7 +95,7 @@ class Login extends Component {
/**
* Handles the remember me check.
* */
- handleRememberMe() {
+ _handleRememberMe() {
this.setState(
{
rememberMe: !this.state.rememberMe
@@ -96,6 +103,22 @@ class Login extends Component {
);
}
+ /**
+ * Validate the login form.
+ * */
+ _validateForm() {
+ let errors = {};
+ if (!this.state.password) {
+ errors["passwordError"] = "Password is Required";
+ }
+
+ if (!this.state.userName) {
+ errors["userNameError"] = "User Name is Required";
+ }
+
+ this.setState({errors: errors}, console.log(errors));
+ }
+
render() {
if (!this.state.isLoggedIn) {
@@ -107,37 +130,32 @@ class Login extends Component {