Merge "Prevent adding same type of Op policy"

diff --combined src/main/java/org/onap/clamp/loop/LoopService.java
index ca3681b,d14667e..3f568a3
--- 1/src/main/java/org/onap/clamp/loop/LoopService.java
--- 2/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@@ -118,6 -118,12 +118,12 @@@ public class LoopService 
      Loop addOperationalPolicy(String loopName, String policyType, String policyVersion) throws IOException {
          Loop loop = getLoop(loopName);
          PolicyModel policyModel = policyModelsService.getPolicyModel(policyType, policyVersion);
+         Set<OperationalPolicy> opPolicySet = loop.getOperationalPolicies();
+         for (OperationalPolicy opPolicy : opPolicySet) {
+               if (opPolicy.getPolicyModel().equals(policyModel)) {
+                       throw new IllegalArgumentException("This type of Operational Policy is already added to the loop. Please choose another one.");
+               }
+         }
          if (policyModel == null) {
              return null;
          }
@@@ -131,7 -137,7 +137,7 @@@
       *
       * @param loopName      The loop name
       * @param policyType    The policy model type
 -     * @param policyVersion The policy model  version
 +     * @param policyVersion The policy model version
       * @return The loop modified
       */
      Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {

diff --combined ui-react/src/api/LoopService.js
index f10d187,9d3b369..3b9ed86
--- 1/ui-react/src/api/LoopService.js
--- 2/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@@ -226,22 -226,21 +226,21 @@@ export default class LoopService 
                        credentials: 'same-origin'
                })
                                .then(function (response) {
-                                       console.debug("Add Operational Policy response received: ", response.status);
+                               console.debug("Add Operational Policy response received: ", response.status);
                                if (response.ok) {
                                        return response.json();
                                } else {
-                                       console.error("Add Operational Policy query failed");
-                                       return {};
+                                       return response.text();
                                }
                        })
-                       .catch(function (error) {
-                               console.error("Add Operational Policy error received", error);
-                               return {};
-                       });
+                       .then(function (object) {
+                               console.error("Add Operational Policy query failed");
+                               throw new Error(object);
+                       })
        }
  
 -      static removeOperationalPolicyType(loopName, policyType, policyVersion) {
 -              return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
 +      static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) {
 +              return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
                        method: 'PUT',
                        headers: {
                                "Content-Type": "application/json"

diff --combined ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 8c67405,4c6b6a7..5154a88
--- 1/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
--- 2/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@@ -37,7 -37,7 +37,7 @@@ import Search from '@material-ui/icons/
  import LoopService from '../../../api/LoopService';
  import Tabs from 'react-bootstrap/Tabs';
  import Tab from 'react-bootstrap/Tab';
- 
+ import Alert from 'react-bootstrap/Alert';
  
  const ModalStyled = styled(Modal)`
        background-color: transparent;
@@@ -65,6 -65,7 +65,7 @@@ export default class ModifyLoopModal ex
                toscaPolicyModelsData: [],
                selectedPolicyModelsData: [],
                key: 'add',
+               showFailAlert: false,
                toscaColumns: [
                        { title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
                                cellStyle: cellStyle,
@@@ -78,10 -79,6 +79,10 @@@
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
                        },
 +                      { title: "Policy Name", field: "policyName",
 +              cellStyle: cellStyle,
 +                headerStyle: headerStyle
 +            },
                        { title: "Version", field: "version",
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
@@@ -94,7 -91,7 +95,7 @@@
                                cellStyle: cellStyle,
                                headerStyle: headerStyle
                        },
 -             { title: "Add", field: "updatedDate", editable: 'never',
 +             { title: "Created Date", field: "createdDate", editable: 'never',
                cellStyle: cellStyle,
                headerStyle: headerStyle
               }
@@@ -132,9 -129,7 +133,9 @@@
                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 => {
@@@ -166,21 -161,36 +167,36 @@@
                this.props.history.push('/');
        }
  
+       renderAlert() {
+               return (
+                       <div>
+                               <Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+                                       {this.state.showMessage}
+                               </Alert>
+                       </div>
+               );
+       }
+ 
        handleAdd() {
-               LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
-               this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-               this.handleClose();
+               LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version)
+               .then(pars => {
+                       this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+                       this.handleClose();
+               })
+               .catch(error => {
+                       this.setState({ showFailAlert: true, showMessage: "Adding failed with error: " + error.message});
+               });
        }
  
        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>
@@@ -198,18 -208,19 +214,19 @@@
                                                                rowStyle: rowData => ({
                                                                        backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.tableData !== undefined
                                                                        && this.state.selectedRowData.tableData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
-                                                               })
+                                                                       })
                                                        }}
                                                        />
                                                        <div>
                                                                <TextModal value={this.state.content} onChange={this.handleYamlContent}/>
                                                        </div>
                                                </Modal.Body>
+                                               {this.renderAlert()}
                                        </Tab>
                                        <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}