From 67c76a46e6a96c4c41fddddb9245234063b5306e Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 15 Nov 2019 17:33:44 +0100 Subject: Fix naming convention Third stage, fix naming convention in UI-react so that it's clearer Issue-ID: CLAMP-552 Change-Id: I16bed5be640d87e3458cdbd7a83fdfe1e37a7b98 Signed-off-by: sebdet --- ui-react/src/LoopUI.js | 2 +- .../src/components/dialogs/Loop/OpenLoopModal.js | 111 +++++++++++++++++++++ .../components/dialogs/Loop/OpenLoopModal.test.js | 82 +++++++++++++++ .../Loop/__snapshots__/OpenLoopModal.test.js.snap | 90 +++++++++++++++++ .../components/dialogs/OpenLoop/OpenLoopModal.js | 111 --------------------- .../dialogs/OpenLoop/OpenLoopModal.test.js | 82 --------------- .../__snapshots__/OpenLoopModal.test.js.snap | 90 ----------------- 7 files changed, 284 insertions(+), 284 deletions(-) create mode 100644 ui-react/src/components/dialogs/Loop/OpenLoopModal.js create mode 100644 ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js create mode 100644 ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap delete mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js delete mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js delete mode 100644 ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index e709c71f2..bf1e41988 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -36,7 +36,7 @@ import LoopCache from './api/LoopCache'; import LoopActionService from './api/LoopActionService'; import { Route } from 'react-router-dom' -import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal'; +import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal'; import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal'; import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal'; import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal'; diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js new file mode 100644 index 000000000..fbfc727eb --- /dev/null +++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js @@ -0,0 +1,111 @@ +/*- + * ============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 Select from 'react-select'; +import Button from 'react-bootstrap/Button'; +import Modal from 'react-bootstrap/Modal'; +import Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import FormCheck from 'react-bootstrap/FormCheck' +import styled from 'styled-components'; +import LoopService from '../../../api/LoopService'; + +const ModalStyled = styled(Modal)` + background-color: transparent; +` +const CheckBoxStyled = styled(FormCheck.Input)` + margin-left:3rem; +` + +export default class OpenLoopModal extends React.Component { + constructor(props, context) { + super(props, context); + + this.getLoopNames = this.getLoopNames.bind(this); + this.handleOpen = this.handleOpen.bind(this); + this.handleClose = this.handleClose.bind(this); + this.handleDropdownListChange = this.handleDropdownListChange.bind(this); + this.state = { + show: true, + chosenLoopName: '', + loopNames: [] + }; + } + + componentWillMount() { + this.getLoopNames(); + } + + handleClose() { + this.setState({ show: false }); + this.props.history.push('/'); + } + + handleDropdownListChange(e) { + this.setState({ chosenLoopName: e.value }); + } + + getLoopNames() { + LoopService.getLoopNames().then(loopNames => { + const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } }); + this.setState({ loopNames: loopOptions }) + }); + } + + handleOpen() { + console.info("Loop " + this.state.chosenLoopName + " is chosen"); + this.setState({ show: false }); + this.props.history.push('/'); + this.props.loadLoopFunction(this.state.chosenLoopName); + } + + render() { + return ( + + + Open Model + + + + Model Name + + - - - - - Read Only - - - - - - - - - - - ); - } -} diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js deleted file mode 100644 index 208c947c3..000000000 --- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js +++ /dev/null @@ -1,82 +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 OpenLoopModal from './OpenLoopModal'; - -describe('Verify OpenLoopModal', () => { - - beforeEach(() => { - fetch.resetMocks(); - fetch.mockResponseOnce(JSON.stringify([ - "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca", - "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3", - "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2" - ])); - }) - - it('Test the render method', () => { - - const component = shallow(); - expect(component).toMatchSnapshot(); - }); - - it('Onchange event', () => { - const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'}; - const component = shallow(); - - component.find('StateManager').simulate('change', event); - component.update(); - expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3"); - }); - - it('Test handleClose', () => { - const historyMock = { push: jest.fn() }; - const handleClose = jest.spyOn(OpenLoopModal.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(); - }); - - it('Test handleSubmit', () => { - const historyMock = { push: jest.fn() }; - const loadLoopFunction = jest.fn(); - const handleOpen = jest.spyOn(OpenLoopModal.prototype,'handleOpen'); - const component = shallow() - - component.find('[variant="primary"]').prop('onClick')(); - - expect(handleOpen).toHaveBeenCalledTimes(1); - expect(component.state('show')).toEqual(false); - expect(historyMock.push.mock.calls[0]).toEqual([ '/']); - - handleOpen.mockClear(); - }); - -}); diff --git a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap deleted file mode 100644 index 9e7222415..000000000 --- a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap +++ /dev/null @@ -1,90 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Verify OpenLoopModal Test the render method 1`] = ` - - - - Open Model - - - - - - Model Name - - - - - - - - - Read Only - - - - - - - - - - -`; -- cgit 1.2.3-korg