community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'application-mgt-new' into 'application-mgt-new'

Browse Source 
Improve the profile feature to Show the logged user name

See merge request entgra/carbon-device-mgt!312
This commit is contained in:
Dharmakeerthi Lasantha 2019-10-14 12:29:16 +00:00
commit ace268e12a
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js vendored
View File

@ -102,6 +102,7 @@ class App extends React.Component {
window.location.origin + "/publisher-ui-request-handler/user", window.location.origin + "/publisher-ui-request-handler/user",
"platform=publisher" "platform=publisher"
).then(res => { ).then(res => {
config.user = res.data.data;
const pageURL = window.location.pathname; const pageURL = window.location.pathname;
const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1); const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1);
if (lastURLSegment === "login") { if (lastURLSegment === "login") {

5
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppUploadForm.js vendored
View File

@ -221,7 +221,7 @@ class NewAppUploadForm extends React.Component {
}; };
handleLowerOsVersionChange = (lowerOsVersion) => { handleLowerOsVersionChange = (lowerOsVersion) => {
this.lowerOsVersion = lowerOsVersion; this.lowerOsVersion = parseFloat(lowerOsVersion);
this.setState({ this.setState({
osVersionsValidateStatus: 'validating', osVersionsValidateStatus: 'validating',
osVersionsHelperText: '' osVersionsHelperText: ''
@ -229,7 +229,7 @@ class NewAppUploadForm extends React.Component {
}; };
handleUpperOsVersionChange = (upperOsVersion) => { handleUpperOsVersionChange = (upperOsVersion) => {
this.upperOsVersion = upperOsVersion; this.upperOsVersion = parseFloat(upperOsVersion);
this.setState({ this.setState({
osVersionsValidateStatus: 'validating', osVersionsValidateStatus: 'validating',
osVersionsHelperText: '' osVersionsHelperText: ''
@ -479,6 +479,7 @@ class NewAppUploadForm extends React.Component {
required: true, required: true,
message: 'Please select' message: 'Please select'
}], }],
initialValue: false
})( })(
<Switch checkedChildren={<Icon type="check"/>} <Switch checkedChildren={<Icon type="check"/>}
unCheckedChildren={<Icon type="close"/>} unCheckedChildren={<Icon type="close"/>}

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js vendored
View File

@ -122,7 +122,7 @@ class Dashboard extends React.Component {
<SubMenu className="profile" <SubMenu className="profile"
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/>Profile <Icon type="user"/>{this.config.user}
</span>}> </span>}>
<Logout/> <Logout/>
</SubMenu> </SubMenu>

1
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js vendored
View File

@ -82,6 +82,7 @@ class App extends React.Component {
window.location.origin + "/store-ui-request-handler/user", window.location.origin + "/store-ui-request-handler/user",
"platform=publisher" "platform=publisher"
).then(res => { ).then(res => {
config.user = res.data.data;
const pageURL = window.location.pathname; const pageURL = window.location.pathname;
const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1); const lastURLSegment = pageURL.substr(pageURL.lastIndexOf('/') + 1);
if (lastURLSegment === "login") { if (lastURLSegment === "login") {

3
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js vendored
View File

@ -41,6 +41,7 @@ class Dashboard extends React.Component {
collapsed: false collapsed: false
}; };
this.logo = this.props.context.theme.logo; this.logo = this.props.context.theme.logo;
this.config = this.props.context;
} }
componentDidMount() { componentDidMount() {
@ -138,7 +139,7 @@ class Dashboard extends React.Component {
title={ title={
<span className="submenu-title-wrapper"> <span className="submenu-title-wrapper">
<Icon type="user"/> <Icon type="user"/>
Profile {this.config.user}
</span> }> </span> }>
<Logout/> <Logout/>
</SubMenu> </SubMenu>