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

Add devicemgt React app UI improvements

See merge request entgra/carbon-device-mgt!353
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit 991110be6b

@ -124,7 +124,7 @@ class AddGroup extends React.Component {
<div> <div>
<Modal <Modal
title="ADD NEW GROUP" title="ADD NEW GROUP"
width="500px" width="40%"
visible={this.state.addModalVisible} visible={this.state.addModalVisible}
onOk={this.handleAddOk} onOk={this.handleAddOk}
onCancel={this.handleAddCancel} onCancel={this.handleAddCancel}
@ -141,8 +141,7 @@ class AddGroup extends React.Component {
<p>Create new device group on IoT Server.</p> <p>Create new device group on IoT Server.</p>
<Form <Form
labelCol={{ span: 5 }} labelCol={{ span: 5 }}
wrapperCol={{ span: 12 }} wrapperCol={{ span: 18 }}
style={{alignItems:"center"}}
> >
<Form.Item label="Name" style={{display:"block"}}> <Form.Item label="Name" style={{display:"block"}}>
{getFieldDecorator('name', { {getFieldDecorator('name', {

@ -291,7 +291,7 @@ class GroupActions extends React.Component {
<div> <div>
<Modal <Modal
title="Update Group" title="Update Group"
width="500px" width="40%"
visible={this.state.editModalVisible} visible={this.state.editModalVisible}
onOk={this.handleEditOk} onOk={this.handleEditOk}
onCancel={this.handleEditCancel} onCancel={this.handleEditCancel}
@ -308,8 +308,7 @@ class GroupActions extends React.Component {
<p>Enter new name and description for the group</p> <p>Enter new name and description for the group</p>
<Form <Form
labelCol={{ span: 5 }} labelCol={{ span: 5 }}
wrapperCol={{ span: 12 }} wrapperCol={{ span: 18 }}
style={{alignItems:"center"}}
> >
<Form.Item label="Name" style={{display:"block"}}> <Form.Item label="Name" style={{display:"block"}}>
{getFieldDecorator( {getFieldDecorator(
@ -351,22 +350,25 @@ class GroupActions extends React.Component {
onOk={this.handleShareOk} onOk={this.handleShareOk}
onCancel={this.handleShareCancel} onCancel={this.handleShareCancel}
footer={[ footer={[
<Button key="cancel" onClick={this.handleShareCancel}> <Button key="new-role" onClick={this.handleShareCancel}>
Cancel New Role
</Button>,
<Button key="new-role-selection" onClick={this.handleShareCancel}>
New Role from Selection
</Button>, </Button>,
<Button key="submit" type="primary" onClick={this.handleShareOk}> <Button key="submit" type="primary" onClick={this.handleShareOk}>
Submit Share
</Button>, </Button>,
]} ]}
> >
<p>Select user role(s)</p>
<Select <Select
placeholder={"Select user role(s)"}
mode="multiple" mode="multiple"
defaultValue={"admin"}
style={{ width: '100%' }} style={{ width: '100%' }}
onChange={this.handleRolesDropdownChange}> onChange={this.handleRolesDropdownChange}>
{item} {item}
</Select>, </Select>,
</Modal> </Modal>
</div> </div>
</div> </div>

@ -164,8 +164,8 @@ class GroupsTable extends React.Component {
return ( return (
<div> <div>
<div style={{background: '#f0f2f5', marginBottom:"5px"}}> <div style={{background: '#f0f2f5'}}>
<AddGroup fetchGroups={this.fetchGroups}/> <AddGroup fetchGroups={this.fetchGroups} style={{marginBottom:"10px"}}/>
</div> </div>
<div> <div>
<Table <Table

@ -55,7 +55,7 @@ class Policies extends React.Component {
</div> </div>
</PageHeader> </PageHeader>
<div style={{background: '#f0f2f5', padding: 24, minHeight: 720}}> <div style={{background: '#f0f2f5', padding: 24, minHeight: 720}}>
<p>sghdfugjhskf</p>
</div> </div>
</div> </div>
); );

@ -157,7 +157,7 @@ class NormalLoginForm extends React.Component {
)} )}
<br/> <br/>
<a className="login-form-forgot" href="">Forgot password</a> <a className="login-form-forgot" href="">Forgot password</a>
<Button block type="primary" htmlType="submit" className="login-form-button"> <Button loading={this.state.loading} block type="primary" htmlType="submit" className="login-form-button">
Log in Log in
</Button> </Button>
</Form.Item> </Form.Item>

Loading…
Cancel
Save