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

Fix ui issues in android enterprise

Browse Source 
- Hide managed configs when android enterprise is disabled
- Send current host and port to get android enterprise token
This commit is contained in:
Jayasanka Weerasinghe 2019-10-16 12:06:19 +00:00 committed by Dharmakeerthi Lasantha
parent 8b52acf1f5
commit 12d68579a6
3 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,9 +79,10 @@ class App extends React.Component {
getAndroidEnterpriseToken = (config) => { getAndroidEnterpriseToken = (config) => {
axios.get( axios.get(
window.location.origin + config.serverConfig.invoker.uri + "/device-mgt/android/v1.0/enterprise/store-url?approveApps=true" + window.location.origin + config.serverConfig.invoker.uri +
"/device-mgt/android/v1.0/enterprise/store-url?approveApps=true" +
"&searchEnabled=true&isPrivateAppsEnabled=true&isWebAppEnabled=true&isOrganizeAppPageVisible=true&isManagedConfigEnabled=true" + "&searchEnabled=true&isPrivateAppsEnabled=true&isWebAppEnabled=true&isOrganizeAppPageVisible=true&isManagedConfigEnabled=true" +
"&host=https://localhost:9443", "&host=" + window.location.origin,
).then(res => { ).then(res => {
config.androidEnterpriseToken = res.data.data.token; config.androidEnterpriseToken = res.data.data.token;
this.setState({ this.setState({

60
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js vendored
View File

@ -72,7 +72,7 @@ const formats = [
class AppDetailsDrawer extends React.Component { class AppDetailsDrawer extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
const drawerWidth = window.innerWidth<=770 ? '80%' : '40%'; const drawerWidth = window.innerWidth <= 770 ? '80%' : '40%';
this.state = { this.state = {
loading: false, loading: false,
@ -460,7 +460,9 @@ class AppDetailsDrawer extends React.Component {
<Divider/> <Divider/>
{/*display manage config button only if the app is public android app*/} {/*display manage config button only if the app is public android app*/}
{(app.type === "PUBLIC") && (app.deviceType === "android") && ( {(app.type === "PUBLIC") && (app.deviceType === "android") &&
(config.androidEnterpriseToken !== null) &&
(
<div> <div>
<div> <div>
<Text strong={true}>Set up managed configurations</Text> <Text strong={true}>Set up managed configurations</Text>
@ -490,8 +492,9 @@ class AppDetailsDrawer extends React.Component {
<div className="releases-details"> <div className="releases-details">
{(app.type === "ENTERPRISE") && ( {(app.type === "ENTERPRISE") && (
<Link to={`/publisher/apps/${app.deviceType}/${app.id}/add-release`}><Button htmlType="button" <Link to={`/publisher/apps/${app.deviceType}/${app.id}/add-release`}><Button
size="small">Add htmlType="button"
size="small">Add
new release</Button></Link>)} new release</Button></Link>)}
<List <List
style={{paddingTop: 16}} style={{paddingTop: 16}}
@ -499,29 +502,30 @@ class AppDetailsDrawer extends React.Component {
dataSource={app.applicationReleases} dataSource={app.applicationReleases}
renderItem={release => ( renderItem={release => (
<div className="app-release-cards"> <div className="app-release-cards">
<List.Item> <List.Item>
<Link to={"apps/releases/" + release.uuid}> <Link to={"apps/releases/" + release.uuid}>
<Card className="release-card"> <Card className="release-card">
<Meta <Meta
avatar={ avatar={
<Avatar size="large" shape="square" src={release.iconPath}/> <Avatar size="large" shape="square" src={release.iconPath}/>
} }
title={release.version} title={release.version}
description={ description={
<div style={{ <div style={{
fontSize: "0.7em" fontSize: "0.7em"
}} className="description-view"> }} className="description-view">
<IconText type="check" text={release.currentStatus}/> <IconText type="check" text={release.currentStatus}/>
<Divider type="vertical"/> <Divider type="vertical"/>
<IconText type="upload" text={release.releaseType}/> <IconText type="upload" text={release.releaseType}/>
<Divider type="vertical"/> <Divider type="vertical"/>
<IconText type="star-o" text={release.rating.toFixed(1)}/> <IconText type="star-o"
</div> text={release.rating.toFixed(1)}/>
} </div>
/> }
</Card> />
</Link> </Card>
</List.Item> </Link>
</List.Item>
</div> </div>
)} )}
/> />
@ -661,7 +665,7 @@ class AppDetailsDrawer extends React.Component {
<div className="app-rate"> <div className="app-rate">
{app.applicationReleases.length > 0 && ( {app.applicationReleases.length > 0 && (
<DetailedRating type="app" uuid={app.applicationReleases[0].uuid} />)} <DetailedRating type="app" uuid={app.applicationReleases[0].uuid}/>)}
</div> </div>
</Spin> </Spin>
</Drawer> </Drawer>

11
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.html
View File

@ -18,10 +18,11 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/>
<title>Entgra App Publisher</title> <meta charset="utf-8"/>
<script src="https://apis.google.com/js/client.js"></script> <title>Entgra App Publisher</title>
</head> <script src="https://apis.google.com/js/client.js"></script>
</head>
<div id="root"></div> <div id="root"></div>
</html> </html>