Skip to content

fix(ABTN-4037) : [ABZ] Rules: An error message should appear if User save a rule with duplicate tags #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radoslavdemirov wants to merge 1 commit into
base: abz/develop
Choose a base branch
from
Open

fix(ABTN-4037) : [ABZ] Rules: An error message should appear if User save a rule with duplicate tags #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions ui/react/components/Dialog/Section/Splits/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ const Splits = React.createClass({
self.props.deleteSplitRow(index);
};
},
getTagData() {
getTagData(itemsEnabled) {
return [
// {key: 'acquirer', name: 'Acquirer'},
{key: 'fee', name: 'Fee'},
{key: 'vat', name: 'VAT'},
{key: 'wth', name: 'WHT'},
{key: 'otherTax', name: 'Other Tax'},
{key: 'realtime', name: 'Real Time'},
{key: 'agentCommission', name: 'Delayed'},
{key: 'commission', name: 'Commission real time'}
{ key: 'fee', name: 'Fee', disabled: itemsEnabled['fee'] },
{ key: 'vat', name: 'VAT', disabled: itemsEnabled['vat'] },
{ key: 'wth', name: 'WHT', disabled: itemsEnabled['wth'] },
{ key: 'otherTax', name: 'Other Tax', disabled: itemsEnabled['otherTax'] },
{ key: 'realtime', name: 'Real Time', disabled: itemsEnabled['realtime'] },
{ key: 'agentCommission', name: 'Delayed', disabled: itemsEnabled['agentCommission'] },
{ key: 'commission', name: 'Commission real time', disabled: itemsEnabled['commission'] }
// {key: 'issuer', name: 'Issuer'},
// {key: 'commission', name: 'Commission'},
// {key: 'pending', name: 'Authorization required'},
Expand Down Expand Up @@ -84,8 +84,18 @@ const Splits = React.createClass({
createSplitRows() {
var self = this;

return this.props.data.map((split, index) => (
<div key={index} style={{marginBottom: '20px'}}>
return this.props.data.map((split, index, splits) => {
let itemsEnabled = {};
if (splits.length) {
splits.map((existingSplit, currentIndex) => {
if (currentIndex !== index) {
let tagsArray = existingSplit.splitName.tag;
tagsArray.map((tag) => (itemsEnabled[tag.key] = true));
}
});
}

return (<div key={index} style={{marginBottom: '20px'}}>
<div className={style.border}>
<div className={style.splitInput}>
<Input
Expand All @@ -98,9 +108,9 @@ const Splits = React.createClass({
<div className={style.splitInput}>
<MultiSelect
placeholder='Select Tags'
defaultSelected={self.defaultSelected(self.getTagData(), split.splitName.tag)}
defaultSelected={self.defaultSelected(self.getTagData(itemsEnabled), split.splitName.tag)}
onSelect={self.onChangeInput(index)}
data={self.getTagData()}
data={self.getTagData(itemsEnabled)}
label='Tag'
keyProp='splitName.tag'
/>
Expand Down Expand Up @@ -132,8 +142,8 @@ const Splits = React.createClass({
<button className={style.statusActionButton} onClick={self.onDeleteRow(index)}>
Delete this Split
</button>
</div>
));
</div>);
});
},
render() {
return (
Expand Down