From 81f5cab8902c7221013a751c72f3634b429fde29 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 6 Nov 2019 11:40:46 +0100 Subject: Upgrade the libs Upgrade the version of some libraries for NPM so for React UI Issue-ID: CLAMP-544 Change-Id: Ie5238c699a2b441892e6e12f3a6f17640d26b10c Signed-off-by: sebdet --- .../dialogs/ViewToscaModals/ViewToscaModals.js | 151 ------------------ .../ViewToscaModals/ViewToscaModals.test.js | 89 ----------- .../__snapshots__/ViewToscaModals.test.js.snap | 169 --------------------- 3 files changed, 409 deletions(-) delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap (limited to 'ui-react/src/components/dialogs/ViewToscaModals') diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js deleted file mode 100644 index 8073dc35..00000000 --- a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js +++ /dev/null @@ -1,151 +0,0 @@ -/*- - * ============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, { 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 TemplateMenu from '../../../api/TemplateMenu'; -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 StyledToscaView = styled.textarea` -` -const StyledToscaDiv = styled.div` -` -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 ViewToscalModals extends React.Component { - - state = { - show: true, - content: 'Please select Tosca model to view the details', - selectedRow: -1, - toscaNames: [], - toscaColumns: [ - { title: "#", field: "index", render: rowData => 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 deleted file mode 100644 index 4284dd3e..00000000 --- a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============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 deleted file mode 100644 index 55137b92..00000000 --- a/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap +++ /dev/null @@ -1,169 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Verify ViewToscaModals Test the tosca model view render method 1`] = ` - - - - View Tosca Model - - - - - - - - - - - - -`; -- cgit