From: drveerendra Date: Tue, 12 Nov 2019 00:37:39 +0000 (-0500) Subject: Adding View BP template Menu X-Git-Tag: 5.0.0~93^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=684057e69bea57d0bd954a84a10581a81d546006;p=clamp.git Adding View BP template Menu Adding View Blue Print templates option under Template menu. Adding few more test cases for ViewTosca Modals to cover the api calls. Issue-ID: CLAMP-544 Change-Id: Ibf881f46fd03e9149a88ccc211a996d99fd74748 Signed-off-by: drveerendra --- diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index 05f466bc..f767da9a 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -42,7 +42,8 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C import LoopProperties from './components/dialogs/LoopProperties'; import UserInfo from './components/dialogs/UserInfo'; import LoopService from './api/LoopService'; -import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal'; +import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal'; +import ViewBlueprintMicroServiceTemplatesModal from './components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal'; import PerformAction from './components/dialogs/PerformActions'; import RefreshStatus from './components/dialogs/RefreshStatus'; import DeployLoop from './components/dialogs/DeployLoop'; @@ -248,7 +249,8 @@ export default class LoopUI extends React.Component { render() { return ( - ()} /> + ()} /> + ()} /> ()} /> ()} /> diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap index ab4ea499..22f54975 100644 --- a/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -5,7 +5,11 @@ exports[`Verify LoopUI Test the render method 1`] = ` id="main_div" > + @@ -28,7 +30,11 @@ exports[`Verify OnapClamp Test the render method 1`] = ` id="main_div" > + props.theme.toscaTextareaBackgroundColor};; +text-align: justify; +font-size: ${props => props.theme.toscaTextareaFontSize};; +width: 100%; +height: 300px; +` +const cellStyle = { border: '1px solid black' }; +const headerStyle = { backgroundColor: '#ddd', border: '2px solid black' }; +const rowHeaderStyle = {backgroundColor:'#ddd', fontSize: '15pt', text: 'bold', border: '1px solid black'}; + +export default class ViewBlueprintMicroServiceTemplatesModal extends React.Component { + state = { + show: true, + content: 'Please select Blue print template to view the details', + selectedRow: -1, + bpTemplNames: [], + bpTemplColumns: [ + { title: "#", field: "index", render: rowData => rowData.tableData.id + 1, + cellStyle: cellStyle, + headerStyle: headerStyle + }, + { title: "Template Name", field: "templateName", + cellStyle: cellStyle, + headerStyle: headerStyle + }, + { title: "Policy Model", field: "templatePolicy[0].policyModelId", + cellStyle: cellStyle, + headerStyle: headerStyle + }, + { title: "Template ID", field: "templateId", + cellStyle: cellStyle, + headerStyle: headerStyle + }, + { title: "Uploaded By", field: "updatedBy", + cellStyle: cellStyle, + headerStyle: headerStyle + }, + { title: "Uploaded Date", field: "timestamp", editable: 'never', + cellStyle: cellStyle, + headerStyle: headerStyle + } + ], + tableIcons: { + FirstPage: forwardRef((props, ref) => ), + LastPage: forwardRef((props, ref) => ), + NextPage: forwardRef((props, ref) => ), + PreviousPage: forwardRef((props, ref) => ), + ResetSearch: forwardRef((props, ref) => ), + Search: forwardRef((props, ref) => ), + SortArrow: forwardRef((props, ref) => ) + } + }; + + constructor(props, context) { + super(props, context); + this.handleClose = this.handleClose.bind(this); + this.getBlueprintMicroServiceTemplates = this.getBlueprintMicroServiceTemplates.bind(this); + this.handleYamlContent = this.handleYamlContent.bind(this); + } + + componentWillMount() { + this.getBlueprintMicroServiceTemplates(); + } + + getBlueprintMicroServiceTemplates() { + TemplateMenuService.getBlueprintMicroServiceTemplates().then(bpTemplNames => { + this.setState({ bpTemplNames: bpTemplNames }) + }); + } + + handleYamlContent = event => { + this.setState({ + content: event.target.value + }); + } + + handleClose() { + this.setState({ show: false }); + this.props.history.push('/') + } + + render() { + return ( + + + + + {this.setState({content: rowData.templateYaml, selectedRow: rowData.tableData.id})}} + options={{ + headerStyle:rowHeaderStyle, + rowStyle: rowData => ({ + backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF' + }) + }} + /> +
+ +
+ + + + + + ); + } + } diff --git a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js new file mode 100644 index 00000000..4a8d9c3f --- /dev/null +++ b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js @@ -0,0 +1,193 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2019 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 { shallow } from 'enzyme'; +import ViewBlueprintMicroServiceTemplatesModal from './ViewBlueprintMicroServiceTemplatesModal'; +import { mount } from 'enzyme'; + +describe('Verify ViewBlueprintMicroServiceTemplatesModal', () => { + beforeEach(() => { + fetch.resetMocks(); + } + ); + + it('Test API Successful', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const component = shallow(); + }); + + it('Test API Exception', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: false, + status: 500, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const component = shallow(); + }); + + it('Test API Rejection', () => { + const myMockFunc = fetch.mockImplementationOnce(() => Promise.reject('error')); + setTimeout( () => myMockFunc().catch(e => { + console.log(e); + }), + 100 + ); + new Promise(resolve => setTimeout(resolve, 200)); + const component = shallow(); + expect(myMockFunc.mock.calls.length).toBe(1); + }); + + it('Test the tosca model view render method', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const component = shallow(); + component.setState({ bpTemplNames: { + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + } + }); + expect(component).toMatchSnapshot(); + }); + + it('Test Table icons', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const component = mount(); + expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy(); + }); + + it('Test handleYamlContent', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const yamlContent = 'MTCA Tosca model details'; + const component = shallow(); + component.find('[value="Please select Blue print template to view the details"]').prop('onChange')({ target: { value: yamlContent }}); + expect(component.state('content')).toEqual(yamlContent); + }); + + it('Test handleClose', () => { + fetch.mockImplementationOnce(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "content": "MTCA version 1", + "templateName": "MTCA", + "templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app", + "updatedBy":"tester", + "templateId":"aaaa_bbbb_cccc", + "timestamp":"2019-09-06 19:09:42" + }); + } + }); + }); + const historyMock = { push: jest.fn() }; + const handleClose = jest.spyOn(ViewBlueprintMicroServiceTemplatesModal.prototype,'handleClose'); + const component = shallow() + component.find('[variant="secondary"]').prop('onClick')(); + expect(handleClose).toHaveBeenCalledTimes(1); + expect(component.state('show')).toEqual(false); + expect(historyMock.push.mock.calls[0]).toEqual([ '/']); + handleClose.mockClear(); + }); + }); \ No newline at end of file diff --git a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js similarity index 75% rename from ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js rename to ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js index fbfb4a78..6a93d4d9 100644 --- a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js +++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js @@ -39,12 +39,20 @@ import Search from '@material-ui/icons/Search'; const ModalStyled = styled(Modal)` background-color: transparent; ` +const TextModal = styled.textarea` + margin-top: 20px; + white-space:pre; + background-color: ${props => props.theme.toscaTextareaBackgroundColor}; + text-align: justify; + font-size: ${props => props.theme.toscaTextareaFontSize}; + width: 100%; + height: 300px; +` +const cellStyle = { border: '1px solid black' }; +const headerStyle = { backgroundColor: '#ddd', border: '2px solid black' }; +const rowHeaderStyle = {backgroundColor:'#ddd', fontSize: '15pt', text: 'bold', border: '1px solid black'}; -const vtmCellStyle = { border: '1px solid black' }; -const vtmHeaderStyle = { backgroundColor: '#ddd', border: '2px solid black' }; -const vtmRowHeaderStyle = {backgroundColor:'#ddd', fontSize: '15pt', text: 'bold', border: '1px solid black'}; - -export default class ViewToscalModal extends React.Component { +export default class ViewToscalPolicyModal extends React.Component { state = { show: true, @@ -53,28 +61,28 @@ export default class ViewToscalModal extends React.Component { toscaNames: [], toscaColumns: [ { title: "#", field: "index", render: rowData => rowData.tableData.id + 1, - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + cellStyle: cellStyle, + headerStyle: headerStyle }, { title: "Micro Service Name", field: "toscaModelName", - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + cellStyle: cellStyle, + headerStyle: headerStyle }, { title: "PolicyType", field: "policyType", - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + cellStyle: cellStyle, + headerStyle: headerStyle }, - { title: "Version", field: "version", - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + { title: "Version", field: "toscaModelRevisions[0].version", + cellStyle: cellStyle, + headerStyle: headerStyle }, { title: "Uploaded By", field: "userId", - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + cellStyle: cellStyle, + headerStyle: headerStyle }, { title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never', - cellStyle: vtmCellStyle, - headerStyle: vtmHeaderStyle + cellStyle: cellStyle, + headerStyle: headerStyle } ], tableIcons: { @@ -91,16 +99,16 @@ export default class ViewToscalModal extends React.Component { constructor(props, context) { super(props, context); this.handleClose = this.handleClose.bind(this); - this.getToscaModels = this.getToscaModels.bind(this); + this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this); this.handleYamlContent = this.handleYamlContent.bind(this); } componentWillMount() { - this.getToscaModels(); + this.getToscaPolicyModels(); } - getToscaModels() { - TemplateMenuService.getToscaModels().then(toscaNames => { + getToscaPolicyModels() { + TemplateMenuService.getToscaPolicyModels().then(toscaNames => { this.setState({ toscaNames: toscaNames }); }); } @@ -118,24 +126,23 @@ export default class ViewToscalModal extends React.Component { return ( - View Tosca Model {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}} options={{ - headerStyle: vtmRowHeaderStyle, + headerStyle: rowHeaderStyle, rowStyle: rowData => ({ backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF' }) }} />
-