Commit e6e99881 authored by Shani's avatar Shani

Merge branch 'fraud_detection' into dev

parents bf1f878a f56ed8b7
......@@ -441,8 +441,6 @@ class InputProcessor extends Component {
getStepContent = () => {
const { settings, usageTypes, usageTypesData, propertyTypes, subscriberFields, customRatingFields, action, type, format, fileType } = this.props;
const { stepIndex, errors, steps } = this.state;
const keyValue = settings.getIn(['receiver', 'key'], null);
const keyLabel = settings.getIn(['receiver', 'key_label'], settings.get('file_type'));
switch (stepIndex) {
case steps.get('parser', {}).idx: return (
......@@ -524,8 +522,6 @@ class InputProcessor extends Component {
onCancelKeyAuth={this.onCancelKeyAuth}
fileType={fileType}
OnChangeUploadingFile={this.changeUploadingFile}
keyValue={keyValue}
keyLabel={keyLabel}
/>
);
......
......@@ -139,16 +139,20 @@ class Connection extends Component {
return receiverTypes.map((name, type) => this.renderReceiverType(name, type)).toArray();
}
renderPanelHeader = keyLabel => (
<div style={{ fontSize: 12, fontWeight: 'bold' }}>
{keyLabel}
<div className="pull-right">
<Button onClick={this.onCancelKeyAuth} bsSize="small" bsStyle="link" style={{ padding: 0 }} >
<i className="fa fa-trash-o danger-red" />
</Button>
renderPanelHeader = () => {
const { receiver, fileType } = this.props;
const keyLabel = receiver.get('key_label', fileType);
return (
<div style={{ fontSize: 12, fontWeight: 'bold' }}>
{keyLabel}
<div className="pull-right">
<Button onClick={this.onCancelKeyAuth} bsSize="small" bsStyle="link" style={{ padding: 0 }} >
<i className="fa fa-trash-o danger-red" />
</Button>
</div>
</div>
</div>
);
);
}
onChangeReceiverField = (e) => {
const { index } = this.props;
......@@ -161,7 +165,7 @@ class Connection extends Component {
}
renderReceiver = () => {
const { keyLabel, index, receiver } = this.props;
const { index, receiver } = this.props;
const periodOptions = [{ min: 1, label: '1 Minute' },
{ min: 15, label: '15 Minutes' },
......@@ -233,7 +237,7 @@ class Connection extends Component {
<input name="file" type="file" onClick={this.onClickFileSelect} onChange={this.onChangeFileSelect} />
)}
{ receiver.get('key', false) !== false && (
<Panel header={this.renderPanelHeader(keyLabel)} className="mb0" />
<Panel header={this.renderPanelHeader()} className="mb0" />
)}
</div>
</div>}
......
......@@ -37,7 +37,7 @@ class Receiver extends Component {
}
renderReceivers = () => {
const { settings, fileType, keyValue, keyLabel } = this.props;
const { settings, fileType } = this.props;
const receivers = settings.get('receiver', Immutable.List());
return receivers.map((receiver, key) => (
<Connection
......@@ -50,8 +50,6 @@ class Receiver extends Component {
onCancelKeyAuth={this.props.onCancelKeyAuth}
fileType={fileType}
OnChangeUploadingFile={this.props.OnChangeUploadingFile}
keyValue={keyValue}
keyLabel={keyLabel}
/>
)).toArray();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment