From: drveerendra Date: Thu, 31 Oct 2019 16:45:30 +0000 (-0400) Subject: Adding viewToscamodels menu X-Git-Tag: 5.0.0~108 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f6b2625c5876c5ef1b8ead0b3962362fb2924f95;p=clamp.git Adding viewToscamodels menu Updated package.json file to include material table and material UI react libraries. Added ViewToscalModals folder which contains js file, corresponding test file and its snapshots Issue-ID: CLAMP-544 Change-Id: I6b9328d6270fc32b41a152c91a9fd872f3524beb Signed-off-by: drveerendra --- diff --git a/ui-react/package.json b/ui-react/package.json index 0e0c6ab6..d876b6c7 100644 --- a/ui-react/package.json +++ b/ui-react/package.json @@ -34,6 +34,9 @@ "bootstrap-css-only": "4.3.1", "styled-components": "4.3.2", "react-router-dom": "5.0.1", + "@material-ui/core": "4.3.2", + "@material-ui/icons": "4.2.1", + "material-table": "1.48.0", "react-select": "3.0.4" }, "devDependencies": { @@ -91,3 +94,4 @@ ] } } + diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index ff3c4445..11808da3 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -42,6 +42,7 @@ 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 ViewToscaModals from './components/dialogs/ViewToscaModals/ViewToscaModals'; import PerformAction from './components/dialogs/PerformActions'; import RefreshStatus from './components/dialogs/RefreshStatus'; import DeployLoop from './components/dialogs/DeployLoop'; @@ -247,6 +248,7 @@ 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 ecf439e4..3c84e956 100644 --- a/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -4,6 +4,10 @@ exports[`Verify LoopUI Test the render method 1`] = ` + + rowData.tableData.id + 1, + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Micro Service Name", field: "toscaModelName", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "PolicyType", field: "policyType", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Version", field: "version", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Uploaded By", field: "userId", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never', + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + } + ], + 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.getToscaModals = this.getToscaModals.bind(this); + this.handleYamlContent = this.handleYamlContent.bind(this); + } + + componentWillMount() { + this.getToscaModals(); + } + + getToscaModals() { + TemplateMenu.getToscaModals().then(toscaNames => { + this.setState({ toscaNames: toscaNames }); + }); + } + + handleYamlContent(event) { + console.log('inside handleYamlContent'); + this.setState({ content: event.target.value }); + } + + handleClose() { + this.setState({ show: false }); + this.props.history.push('/'); + } + + render() { + return ( + + + View Tosca Model + + + {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}} + options={{ + headerStyle: vtmRowHeaderStyle, + rowStyle: rowData => ({ + backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF' + }) + }} + /> + + + + + + + + + ); + } +} diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js new file mode 100644 index 00000000..4284dd3e --- /dev/null +++ b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js @@ -0,0 +1,89 @@ +/*- + * ============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 ViewToscaModals from './ViewToscaModals'; +import { mount } from 'enzyme'; + + +describe('Verify ViewToscaModals', () => { + beforeEach(() => { + fetch.resetMocks(); + fetch.mockImplementation(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "index": "1", + "toscaModelYaml":"MTCA", + "toscaModelName":"DCAE_MTCAConfig", + "version":"16", + "userId":"aj928f", + "policyType":"mtca", + "lastUpdatedDate":"05-07-2019 19:09:42" + }); + } + }); + }); + }); + + it('Test the tosca model view render method', () => { + const component = shallow(); + component.setState({ toscaNames: { + "index": "1", + "toscaModelYaml": "MTCA", + "toscaModelName": "DCAE_MTCAConfig", + "version" : "16", + "userId" : "aj928f", + "policyType" : "mtca", + "lastUpdatedDate" : "05-07-2019 19:09:42" + } + }); + expect(component).toMatchSnapshot(); + }); + + it('Test Table icons', () => { + const component = mount(); + expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy(); + + }); + + it('Test handleYamlContent', () => { + const yamlContent = 'MTCA Tosca model details'; + const component = shallow(); + component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }}); + expect(component.state('content')).toEqual(yamlContent); + }); + + it('Test handleClose', () => { + const historyMock = { push: jest.fn() }; + const handleClose = jest.spyOn(ViewToscaModals.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(); + }); +}); diff --git a/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap b/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap new file mode 100644 index 00000000..55137b92 --- /dev/null +++ b/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap @@ -0,0 +1,169 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Verify ViewToscaModals Test the tosca model view render method 1`] = ` + + + + View Tosca Model + + + + + + + + + + + + +`; diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js index b68e2376..2ce92b39 100644 --- a/ui-react/src/components/menu/MenuBar.js +++ b/ui-react/src/components/menu/MenuBar.js @@ -87,6 +87,9 @@ export default class MenuBar extends React.Component { return ( + + View Tosca Model + Open CL Properties CL diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap index 3ee73346..1e13b3bd 100644 --- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap +++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap @@ -2,6 +2,61 @@ exports[`Verify MenuBar Test the render method 1`] = ` + + + View Tosca Model + + @@ -11,7 +66,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -44,7 +99,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -62,7 +117,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -95,7 +150,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -113,7 +168,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -146,7 +201,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -168,7 +223,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -201,7 +256,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -219,7 +274,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -252,7 +307,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -270,7 +325,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -303,7 +358,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -321,7 +376,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -354,7 +409,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -372,7 +427,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -405,7 +460,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -423,7 +478,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -456,7 +511,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -478,7 +533,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -511,7 +566,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function], @@ -544,7 +599,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "$$typeof": Symbol(react.forward_ref), "attrs": Array [], "componentStyle": ComponentStyle { - "componentId": "sc-kpOJdX", + "componentId": "sc-jKJlTe", "isStatic": false, "rules": Array [ " @@ -577,7 +632,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` "displayName": "Styled(Link)", "foldedComponentIds": Array [], "render": [Function], - "styledComponentId": "sc-kpOJdX", + "styledComponentId": "sc-jKJlTe", "target": [Function], "toString": [Function], "warnTooManyClasses": [Function],