Merge "Update policy model UI"

2 files changed, 193 insertions, 1 deletions

diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 428e443cf..8b49d9150 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -30,7 +30,9 @@ import Select from 'react-select';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
 import LoopService from '../../../api/LoopService';
+import LoopCache from '../../../api/LoopCache';
 import JSONEditor from '@json-editor/json-editor';
+import Alert from 'react-bootstrap/Alert';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -49,7 +51,9 @@ export default class PolicyModal extends React.Component {
 		pdpGroupList: [],
 		pdpSubgroupList: [],
 		chosenPdpGroup: '',
-		chosenPdpSubgroup: ''
+		chosenPdpSubgroup: '',
+		showSucAlert: false,
+		showFailAlert: false
 	};
 
 	constructor(props, context) {
@@ -60,6 +64,8 @@ export default class PolicyModal extends React.Component {
 		this.handlePdpGroupChange = this.handlePdpGroupChange.bind(this);
 		this.handlePdpSubgroupChange = this.handlePdpSubgroupChange.bind(this);
 		this.createJsonEditor = this.createJsonEditor.bind(this);
+		this.handleRefresh = this.handleRefresh.bind(this);
+		this.disableAlert =  this.disableAlert.bind(this);
 	}
 
 	handleSave() {
@@ -195,12 +201,67 @@ export default class PolicyModal extends React.Component {
 		this.setState({ chosenPdpSubgroup: e.value });
 	}
 
+	handleRefresh() {
+		var newLoopCache, toscaModel, editorData;
+		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+			LoopService.refreshMicroServicePolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
+				newLoopCache =  new LoopCache(data);
+				toscaModel = newLoopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
+				editorData = newLoopCache.getMicroServicePropertiesForName(this.state.policyName);
+				document.getElementById("editor").innerHTML = "";
+				this.setState({
+					loopCache: newLoopCache,
+					jsonEditor: this.createJsonEditor(toscaModel,editorData),
+					showSucAlert: true,
+					showMessage: "Successfully refreshed"
+				});
+			})
+			.catch(error => {
+				console.error("Error while refreshing the Operational Policy Json Representation");
+				this.setState({
+					showFailAlert: true,
+					showMessage: "Refreshing of UI failed"
+				});
+			});
+		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+			LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
+				var newLoopCache =  new LoopCache(data);
+				toscaModel = newLoopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
+				editorData = newLoopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
+				document.getElementById("editor").innerHTML = "";
+				this.setState({
+					loopCache: newLoopCache,
+					jsonEditor: this.createJsonEditor(toscaModel,editorData),
+					showSucAlert: true,
+					showMessage: "Successfully refreshed"
+				});
+			})
+			.catch(error => {
+				console.error("Error while refreshing the Operational Policy Json Representation");
+				this.setState({
+					showFailAlert: true,
+					showMessage: "Refreshing of UI failed"
+				});
+			});
+		}
+	}
+
+	disableAlert() {
+		this.setState ({ showSucAlert: false, showFailAlert: false });
+	}
+
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Edit the policy</Modal.Title>
 				</Modal.Header>
+				<Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+				<Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
 				<Modal.Body>
 					<div id="editor" />
 					<Form.Group as={Row} controlId="formPlaintextEmail">
@@ -220,6 +281,9 @@ export default class PolicyModal extends React.Component {
 					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
 					</Button>
+					<Button variant="primary" onClick={this.handleRefresh}>
+						Refresh
+					</Button>
 				</Modal.Footer>
 			</ModalStyled>
 
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
new file mode 100644
index 000000000..bf0b91096
--- /dev/null
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
@@ -0,0 +1,128 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import PolicyModal from './PolicyModal';
+import LoopCache from '../../../api/LoopCache';
+import LoopService from '../../../api/LoopService';
+
+describe('Verify PolicyModal', () => {
+    beforeEach(() => {
+        fetch.resetMocks();
+        fetch.mockImplementation(() => {
+            return Promise.resolve({
+                ok: true,
+                status: 200,
+                text: () => "OK"
+            });
+        });
+    })
+    const loopCacheStr = {
+            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+            "operationalPolicies": [{
+                "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+                "configurationsJson": {
+                    "guard_policies": {},
+                    "operational_policy": {
+                        "controlLoop": {},
+                        "policies": []
+                    }
+                },
+                "policyModel": {"policyPdpGroup": {"supportedPdpGroups":[{"monitoring": ["xacml"]}]}},
+                "jsonRepresentation" : {"schema": {}}
+             }]
+    };
+    const loopCache = new LoopCache(loopCacheStr);
+    const historyMock = { push: jest.fn() };
+    const flushPromises = () => new Promise(setImmediate);
+    const match = {params: {policyName:"OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", policyInstanceType: "OPERATIONAL-POLICY"}}
+        
+    it('Test handleClose', () => {
+      const handleClose = jest.spyOn(PolicyModal.prototype,'handleClose');
+      const component = mount(<PolicyModal history={historyMock} match={match} loopCache={loopCache}/>)
+
+      component.find('[variant="secondary"]').prop('onClick')();
+
+      expect(handleClose).toHaveBeenCalledTimes(1);
+      expect(component.state('show')).toEqual(false);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    });
+
+    it('Test handleSave', async () => {
+        const loadLoopFunction = jest.fn();
+        const handleSave = jest.spyOn(PolicyModal.prototype,'handleSave');
+        const component = mount(<PolicyModal history={historyMock} 
+                          loopCache={loopCache} match={match} loadLoopFunction={loadLoopFunction} />)
+
+        component.find('[variant="primary"]').get(0).props.onClick();
+        await flushPromises();
+        component.update();
+
+        expect(handleSave).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(false);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    });
+
+    it('Test handleRefresh', async () => {
+        LoopService.refreshOperationalPolicyJson = jest.fn().mockImplementation(() => {
+            return Promise.resolve(loopCacheStr);
+        });
+        const updateLoopFunction = jest.fn();
+        const handleRefresh = jest.spyOn(PolicyModal.prototype,'handleRefresh');
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} updateLoopFunction={updateLoopFunction} />)
+
+        component.find('[variant="primary"]').get(1).props.onClick();
+        await flushPromises();
+        component.update();
+
+        expect(handleRefresh).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(true);
+        expect(component.state('showSucAlert')).toEqual(true);
+        expect(component.state('showMessage')).toEqual("Successfully refreshed");
+    });
+
+    it('Test handlePdpGroupChange', () => {
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} />)
+        component.setState({ 
+                "pdpGroup": [{"option1":["subPdp1","subPdp2"]}],
+                "chosenPdpGroup": "option2"
+        });
+        expect(component.state('chosenPdpGroup')).toEqual("option2");
+
+        const instance = component.instance();
+        const event = {label:"option1", value:"option1"}
+        instance.handlePdpGroupChange(event);
+        expect(component.state('chosenPdpGroup')).toEqual("option1");
+        expect(component.state('chosenPdpSubgroup')).toEqual("");
+        expect(component.state('pdpSubgroupList')).toEqual([{label:"subPdp1", value:"subPdp1"}, {label:"subPdp2", value:"subPdp2"}]);
+    });
+
+    it('Test handlePdpSubgroupChange', () => {
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} />)
+
+        const instance = component.instance();
+        const event = {label:"option1", value:"option1"}
+        instance.handlePdpSubgroupChange(event);
+        expect(component.state('chosenPdpSubgroup')).toEqual("option1");
+    });
+});
\ No newline at end of file