From: sebdet Date: Thu, 4 Mar 2021 17:01:26 +0000 (+0100) Subject: Remove useless code X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=571c14dd12c6e99c6dcf13b73f438a9c48a73470;p=policy%2Fclamp.git Remove useless code Remove useless code due to the changes done for the policy create feature. The tosca list can now be seen directly in the policy framework dialog Issue-ID: POLICY-3106 Signed-off-by: sebdet Change-Id: I5fd61f28ed7071ceaf5729045983fc2d792bc9a4 Signed-off-by: sebdet (cherry picked from commit cc09b219f194d3aab112cbedc1468607fe2209e2) --- diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js index eef1ca215..a3aa89a08 100755 --- a/ui-react-lib/libIndex.js +++ b/ui-react-lib/libIndex.js @@ -46,9 +46,7 @@ export { default as PolicyToscaService } from './src/api/PolicyToscaService'; export { default as RefreshStatus } from './src/components/dialogs/RefreshStatus'; export { default as SvgGenerator } from './src/components/loop_viewer/svg/SvgGenerator'; export { default as TemplateService } from './src/api/TemplateService'; -export { default as UploadToscaPolicyModal } from './src/components/dialogs/Tosca/UploadToscaPolicyModal'; export { default as UserInfoModal } from './src/components/dialogs/UserInfoModal'; export { default as UserService } from './src/api/UserService'; export { default as ViewLoopTemplatesModal } from './src/components/dialogs/Tosca/ViewLoopTemplatesModal'; -export { default as ViewToscaPolicyModal } from './src/components/dialogs/Tosca/ViewToscaPolicyModal'; export { default as ViewAllPolicies } from './src/components/dialogs/Policy/ViewAllPolicies'; diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index 339a2c048..8dc3bdb03 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -45,8 +45,6 @@ import ViewAllPolicies from './components/dialogs/Policy/ViewAllPolicies'; import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal'; import UserInfoModal from './components/dialogs/UserInfoModal'; import LoopService from './api/LoopService'; -import UploadToscaPolicyModal from './components/dialogs/Tosca/UploadToscaPolicyModal'; -import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal'; import ViewLoopTemplatesModal from './components/dialogs/Tosca/ViewLoopTemplatesModal'; import ManageDictionaries from './components/dialogs/ManageDictionaries/ManageDictionaries'; import PerformAction from './components/dialogs/PerformActions'; @@ -299,8 +297,6 @@ export default class LoopUI extends React.Component { renderRoutes() { return( - ()} /> - ()} /> ()} /> ()} /> ()} /> diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap index 1a8a98257..c230dbcf6 100644 --- a/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -5,14 +5,6 @@ exports[`Verify LoopUI Test the render method 1`] = ` id="main_div" > - - - - { - if (event.target.files && event.target.files[0]) { - const scope = this; - let reader = new FileReader(); - this.setState({policyModelTosca: '' }); - reader.onload = function(e) { - scope.setState({ policyModelTosca: reader.result}); - }; - console.log("Filename is", event.target.files[0]); - reader.readAsText(event.target.files[0]); - } - this.setState({selectedFile: event.target.files[0]}); - }; - - handleClose() { - this.setState({ show: false }); - this.props.history.push('/'); - } - - handleCreateFromToscaPolicyModel(e) { - e.preventDefault(); - if(this.state.policyModelTosca) { - PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelTosca).then(resp => { - if(resp.status === 200) { - this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true}); - } else { - this.setState({apiResponseStatus: 500, apiResponseMessage: resp, upldBtnClicked: true}); - } - }); - } else { - this.setState({apiResponse: 500, apiResponseMessage: 'Parameters are missing', upldBtnClicked: true}); - } -} - - render() { - return ( - - - Upload Tosca Model - - - - - this.fileInput = fileInput}/> - - -

{this.state.selectedFile.name}

- - - - - - {!this.state.apiResponseStatus?:""} - {!this.state.apiResponseStatus?:""} - {this.state.apiResponseStatus? -

{this.state.apiResponseMessage}

- - :""} - - - ); - } -} diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js deleted file mode 100644 index e4842062a..000000000 --- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * ============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 { shallow } from 'enzyme'; -import UploadToscaPolicyModal from './UploadToscaPolicyModal'; - - -describe('Test Upload Tosca Policy Model', () => { - - it('Test handleUploadToscaPolicyModel for Tosca Model', () => { - - const component = shallow(); - - const fakeEvent = { preventDefault: () => console.log('preventDefault') }; - - component.setState({ - policyModelType: "TCA", - upldBtnClicked: false, - policyModelTosca: "TCAToscaModelYaml", - selectedFile: { name: "tca.yaml"} - }); - - const Button = component.find('Button').at(1); - - Button.simulate('click', fakeEvent); - - expect(component.state('policyModelTosca')).toEqual('TCAToscaModelYaml'); - - }); - - it('Test handleClose', () => { - - const historyMock = { push: jest.fn() }; - - const handleClose = jest.spyOn(UploadToscaPolicyModal.prototype,'handleClose'); - - const component = shallow() - - component.find('[variant="secondary"]').at(1).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/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js deleted file mode 100644 index d49232f2d..000000000 --- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js +++ /dev/null @@ -1,169 +0,0 @@ -/*- - * ============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, { forwardRef } from 'react' -import MaterialTable from "material-table"; -import Button from 'react-bootstrap/Button'; -import Modal from 'react-bootstrap/Modal'; -import styled from 'styled-components'; -import PolicyToscaService from '../../../api/PolicyToscaService'; -import ArrowUpward from '@material-ui/icons/ArrowUpward'; -import ChevronLeft from '@material-ui/icons/ChevronLeft'; -import ChevronRight from '@material-ui/icons/ChevronRight'; -import Clear from '@material-ui/icons/Clear'; -import FirstPage from '@material-ui/icons/FirstPage'; -import LastPage from '@material-ui/icons/LastPage'; -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'}; - -export default class ViewToscalPolicyModal extends React.Component { - - state = { - show: true, - content: 'Please select Tosca model to view the details', - selectedRow: -1, - toscaPolicyModelNames: [], - toscaColumns: [ - { title: "#", field: "index", render: rowData => rowData.tableData.id + 1, - cellStyle: cellStyle, - headerStyle: headerStyle - }, - { title: "Policy Model Type", field: "policyModelType", - cellStyle: cellStyle, - headerStyle: headerStyle - }, - { title: "Policy Acronym", field: "policyAcronym", - cellStyle: cellStyle, - headerStyle: headerStyle - }, - { title: "Version", field: "version", - cellStyle: cellStyle, - headerStyle: headerStyle - }, - { title: "Uploaded By", field: "updatedBy", - cellStyle: cellStyle, - headerStyle: headerStyle - }, - { title: "Uploaded Date", field: "updatedDate", 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.getPolicyToscaModels = this.getToscaPolicyModels.bind(this); - this.handleYamlContent = this.handleYamlContent.bind(this); - this.getToscaPolicyModelYaml = this.getToscaPolicyModelYaml.bind(this); - } - - componentWillMount() { - this.getToscaPolicyModels(); - } - - getToscaPolicyModels() { - PolicyToscaService.getToscaPolicyModels().then(toscaPolicyModelNames => { - this.setState({ toscaPolicyModelNames: toscaPolicyModelNames }); - }); - } - - getToscaPolicyModelYaml(policyModelType, policyModelVersion) { - if (typeof policyModelType !== "undefined") { - PolicyToscaService.getToscaPolicyModelYaml(policyModelType, policyModelVersion).then(toscaYaml => { - if (toscaYaml.length !== 0) { - this.setState({content: toscaYaml}) - } else { - this.setState({ content: 'Please select Tosca model to view the details' }) - } - }); - } else { - this.setState({ content: 'Please select Tosca model to view the details' }) - } - } - - handleYamlContent(event) { - this.setState({ content: event.target.value }); - } - - handleClose() { - this.setState({ show: false }); - this.props.history.push('/'); - } - - render() { - return ( - - - - - {this.getToscaPolicyModelYaml(rowData.policyModelType,rowData.version);this.setState({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/ViewToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js deleted file mode 100644 index a599cec04..000000000 --- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js +++ /dev/null @@ -1,195 +0,0 @@ -/*- - * ============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 { shallow } from 'enzyme'; -import ViewToscaPolicyModal from './ViewToscaPolicyModal'; -import { mount } from 'enzyme'; - - -describe('Verify ViewToscaPolicyModal', () => { - beforeEach(() => { - fetch.resetMocks(); - }); - - it('Test API Successful', () => { - fetch.mockImplementationOnce(() => { - return Promise.resolve({ - ok: true, - status: 200, - json: () => { - return Promise.resolve({ - "index": "1", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - const component = shallow(); - }); - - it('Test API Exception', () => { - fetch.mockImplementationOnce(() => { - return Promise.resolve({ - ok: false, - status: 500, - json: () => { - return Promise.resolve({ - "index": "1", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - const component = shallow(); - }); - - it('Test API Rejection', () => { - const myMockFunc = fetch.mockImplementationOnce(() => Promise.reject('error')); - setTimeout( - () => - myMockFunc().catch(e => { - console.info(e); - }), - 100 - ); - 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", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - const component = shallow(); - component.setState({ toscaNames: { - "index": "1", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - } - }); - expect(component).toMatchSnapshot(); - }); - - it('Test Table icons', () => { - fetch.mockImplementationOnce(() => { - return Promise.resolve({ - ok: true, - status: 200, - json: () => { - return Promise.resolve({ - "index": "1", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - 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", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym":"TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - const yamlContent = 'TCA 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', () => { - fetch.mockImplementationOnce(() => { - return Promise.resolve({ - ok: true, - status: 200, - json: () => { - return Promise.resolve({ - "index": "1", - "policyModelTosca":"TCA", - "policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app", - "version":"1.0.0", - "policyAcronym": "TCA", - "updatedDate": "2020-01-31T20:49:48.658795600Z", - "updatedBy": "admin" - }); - } - }); - }); - const historyMock = { push: jest.fn() }; - const handleClose = jest.spyOn(ViewToscaPolicyModal.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/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap deleted file mode 100644 index 5f19a9b7d..000000000 --- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap +++ /dev/null @@ -1,155 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`] = ` - - - - -
- -
- - - - - -`;