Merge "Prevent adding same type of Op policy"

[clamp.git] / ui-react / src / components / dialogs / Loop / ModifyLoopModal.js

diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 4c6b6a7..5154a88 100644 (file)
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -79,6 +79,10 @@ export default class ModifyLoopModal extends React.Component {
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
                        },
+                       { title: "Policy Name", field: "policyName",
+               cellStyle: cellStyle,
+                headerStyle: headerStyle
+            },
                        { title: "Version", field: "version",
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
@@ -91,7 +95,7 @@ export default class ModifyLoopModal extends React.Component {
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
                        },
-             { title: "Add", field: "updatedDate", editable: 'never',
+             { title: "Created Date", field: "createdDate", editable: 'never',
                cellStyle: cellStyle,
                headerStyle: headerStyle
              }
@@ -129,7 +133,9 @@ export default class ModifyLoopModal extends React.Component {
                var operationalPolicies = this.state.loopCache.getOperationalPolicies();
                var selectedPolicyModels = [];
                for (var policy in operationalPolicies) {
-                       selectedPolicyModels.push(operationalPolicies[policy]["policyModel"]);
+                   var newRow = operationalPolicies[policy]["policyModel"];
+                   newRow["policyName"] = operationalPolicies[policy].name;
+                       selectedPolicyModels.push(newRow);
                }
 
                PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
@@ -183,14 +189,14 @@ export default class ModifyLoopModal extends React.Component {
        }
 
        handleRemove() {
-               LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+               LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version,this.state.selectedRowData.policyName);
                this.props.loadLoopFunction(this.state.loopCache.getLoopName());
                this.handleClose();
        }
 
        render() {
                return (
-                       <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+                       <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
                                <Modal.Header closeButton>
                                        <Modal.Title>Modify Loop Operational Policies</Modal.Title>
                                </Modal.Header>
@@ -220,7 +226,7 @@ export default class ModifyLoopModal extends React.Component {
                                        <Tab eventKey="remove" title="Remove Operational Policies">
                                                <Modal.Body>
                                                        <MaterialTable
-                                                       title={"Already added Tosca Policy Models"}
+                                                       title={"Tosca Policy Models already added"}
                                                        data={this.state.selectedPolicyModelsData}
                                                        columns={this.state.toscaColumns}
                                                        icons={this.state.tableIcons}