Skip to content

Commit

Permalink
Add ID and UUID info to list, subscriber, and campaign views
Browse files Browse the repository at this point in the history
  • Loading branch information
knadh committed Jan 4, 2019
1 parent e7c75b3 commit ab1a6bb
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 9 deletions.
11 changes: 7 additions & 4 deletions frontend/my/src/Campaign.js
Original file line number Diff line number Diff line change
Expand Up @@ -481,10 +481,13 @@ class Campaign extends React.PureComponent {
<Col span={ 16 }>
{ !this.state.record.id && <h1>Create a campaign</h1> }
{ this.state.record.id &&
<h1>
<Tag color={ cs.CampaignStatusColors[this.state.record.status] }>{ this.state.record.status }</Tag>
{ this.state.record.name }
</h1>
<div>
<h1>
<Tag color={ cs.CampaignStatusColors[this.state.record.status] }>{ this.state.record.status }</Tag>
{ this.state.record.name }
</h1>
<span className="text-tiny text-grey">ID { this.state.record.id } &mdash; UUID { this.state.record.uuid }</span>
</div>
}
</Col>
<Col span={ 8 } className="right">
Expand Down
23 changes: 22 additions & 1 deletion frontend/my/src/Lists.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import { Row, Col, Modal, Form, Input, Select, Button, Table, Icon, Tooltip, Tag
import Utils from "./utils"
import * as cs from "./constants"

const tagColors = {
"private": "orange",
"public": "green"
}

class CreateFormDef extends React.PureComponent {
state = {
confirmDirty: false,
Expand Down Expand Up @@ -46,6 +51,22 @@ class CreateFormDef extends React.PureComponent {
})
}

modalTitle(formType, record) {
if(formType === cs.FormCreate) {
return "Create a list"
}

return (
<div>
<Tag color={ tagColors.hasOwnProperty(record.type) ? tagColors[record.type] : "" }>{ record.type }</Tag>
{" "}
{ record.name }
<br />
<span className="text-tiny text-grey">ID { record.id } &mdash; UUID { record.uuid }</span>
</div>
)
}

render() {
const { formType, record, onClose } = this.props
const { getFieldDecorator } = this.props.form
Expand All @@ -60,7 +81,7 @@ class CreateFormDef extends React.PureComponent {
}

return (
<Modal visible={ true } title={ formType === cs.FormCreate ? "Create a list" : record.name }
<Modal visible={ true } title={ this.modalTitle(this.state.form, record) }
okText={ this.state.form === cs.FormCreate ? "Create" : "Save" }
confirmLoading={ this.state.modalWaiting }
onCancel={ onClose }
Expand Down
10 changes: 6 additions & 4 deletions frontend/my/src/Subscribers.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ class CreateFormDef extends React.PureComponent {
}

return (
<span>
<Tag color={ tagColors.hasOwnProperty(record.status) ? tagColors[record.status] : "" }>{ record.status }</Tag>
{" "}
<div>
<Tag color={ tagColors.hasOwnProperty(record.status) ? tagColors[record.status] : "" }>{ record.status }</Tag>
{" "}
{ record.name } ({ record.email })
</span>
<br />
<span className="text-tiny text-grey">ID { record.id } &mdash; UUID { record.uuid }</span>
</div>
)
}

Expand Down

0 comments on commit ab1a6bb

Please sign in to comment.