Commit ffe50306 authored by Juorder Antonio's avatar Juorder Antonio

fix bug of removing dns item in correct way

parent 1bfafb31
...@@ -246,24 +246,11 @@ export default class DNSZoneForm extends React.Component { ...@@ -246,24 +246,11 @@ export default class DNSZoneForm extends React.Component {
); );
} }
removeRow(e, object) { removeRow(e, object, i) {
e.preventDefault(); e.preventDefault();
let index = null;
if (typeof object === 'object') { if (typeof object === 'object') {
const element = this.defaultRows.filter((item, i) => { return this.showSweetConfirm(object, i);
const isRightName = item.name === object.name;
if (isRightName) {
index = i;
return isRightName;
}
return isRightName;
});
if (element.length > 0) {
const item = element.pop();
return this.showSweetConfirm(item, index);
}
} }
this.newRows.splice(object, 1); this.newRows.splice(object, 1);
...@@ -326,9 +313,13 @@ export default class DNSZoneForm extends React.Component { ...@@ -326,9 +313,13 @@ export default class DNSZoneForm extends React.Component {
// No show records // No show records
// //
const inMutableFields = window.manager_config.dns.inmutable; const inMutableFields = window.manager_config.dns.inmutable;
const mutableFields = this.state.fields.filter((record) => { const mutableFields = {};
return !inMutableFields.includes(record.type.toLowerCase()); this.state.fields.forEach((record, index) => {
if (!inMutableFields.includes(record.type.toLowerCase())) {
mutableFields[index] = record;
}
}); });
const mutableFieldsLength = Object.keys(mutableFields).length;
const types = this.types.map((item) => { const types = this.types.map((item) => {
return ( return (
<option <option
...@@ -476,6 +467,7 @@ export default class DNSZoneForm extends React.Component { ...@@ -476,6 +467,7 @@ export default class DNSZoneForm extends React.Component {
this.removeRow(e, index); this.removeRow(e, index);
}} }}
> >
{"DELETE"}
<i <i
className='fa fa-trash-o' className='fa fa-trash-o'
title='Delete' title='Delete'
...@@ -487,9 +479,11 @@ export default class DNSZoneForm extends React.Component { ...@@ -487,9 +479,11 @@ export default class DNSZoneForm extends React.Component {
); );
}); });
if (mutableFields.length > 0) { if (mutableFieldsLength > 0) {
const length = mutableFields.length; const length = mutableFieldsLength;
fields = mutableFields.map((element, i) => { const mutableFieldsArray = Object.keys(mutableFields);
fields = mutableFieldsArray.map((i) => {
const element = mutableFields[i];
const isDisabled = element.enabled ? null : true; const isDisabled = element.enabled ? null : true;
return ( return (
<div <div
...@@ -552,9 +546,10 @@ export default class DNSZoneForm extends React.Component { ...@@ -552,9 +546,10 @@ export default class DNSZoneForm extends React.Component {
<button <button
className='btn btn-danger' className='btn btn-danger'
onClick={(e) => { onClick={(e) => {
this.removeRow(e, element); this.removeRow(e, element, i);
}} }}
> >
{i}
<i <i
className='fa fa-trash-o' className='fa fa-trash-o'
title='Delete' title='Delete'
......
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