From 5f98f5d2da9d6227d466797ada3c9562fa0b856a Mon Sep 17 00:00:00 2001 From: sebdet Date: Tue, 2 Jun 2020 18:09:45 +0200 Subject: Removal of useless code Removal of previous modal not used anymore Issue-ID: CLAMP-854 Signed-off-by: sebdet Change-Id: Ica6a316369433714323bf0fddff60722281d0f5f --- .../ConfigurationPolicyModal.js | 127 --------------------- .../ConfigurationPolicyModal.test.js | 78 ------------- 2 files changed, 205 deletions(-) delete mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js delete mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js (limited to 'ui-react/src/components/dialogs/ConfigurationPolicy') diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js deleted file mode 100644 index 3ff1ebec..00000000 --- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js +++ /dev/null @@ -1,127 +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 Button from 'react-bootstrap/Button'; -import Modal from 'react-bootstrap/Modal'; -import styled from 'styled-components'; -import LoopService from '../../../api/LoopService'; -import JSONEditor from '@json-editor/json-editor'; - -const ModalStyled = styled(Modal)` - background-color: transparent; -` - -export default class ConfigurationPolicyModal extends React.Component { - - state = { - show: true, - loopCache: this.props.loopCache, - jsonEditor: null, - policyName: this.props.match.params.policyName - }; - - constructor(props, context) { - super(props, context); - this.handleClose = this.handleClose.bind(this); - this.handleSave = this.handleSave.bind(this); - this.renderJsonEditor = this.renderJsonEditor.bind(this); - } - - handleSave() { - var errors = this.state.jsonEditor.validate(); - var editorData = this.state.jsonEditor.getValue(); - - if (errors.length !== 0) { - console.error("Errors detected during config policy data validation ", errors); - this.setState({ show: false }); - this.props.history.push('/'); - } - else { - console.info("NO validation errors found in config policy data"); - this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]); - LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => { - this.setState({ show: false }); - this.props.history.push('/'); - this.props.loadLoopFunction(this.state.loopCache.getLoopName()); - }); - } - } - - handleClose() { - this.setState({ show: false }); - this.props.history.push('/'); - } - - componentDidMount() { - this.renderJsonEditor(); - } - - renderJsonEditor() { - console.debug("Rendering ConfigurationPolicyModal ", this.state.policyName); - var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName); - if (toscaModel == null) { - return; - } - var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName); - - this.setState({ - jsonEditor: new JSONEditor(document.getElementById("editor"), - { - schema: toscaModel, - startval: editorData, - theme: 'bootstrap4', - object_layout: 'grid', - disable_properties: true, - disable_edit_json: false, - disable_array_reorder: true, - disable_array_delete_last_row: true, - disable_array_delete_all_rows: false, - show_errors: 'always' - }) - }) - } - - render() { - return ( - - - Configuration policies - - -
- - - - - - - - - ); - } -} \ No newline at end of file diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js deleted file mode 100644 index a19c18c9..00000000 --- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js +++ /dev/null @@ -1,78 +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 { mount } from 'enzyme'; -import ConfigurationPolicyModal from './ConfigurationPolicyModal'; -import LoopCache from '../../../api/LoopCache'; - -describe('Verify ConfigurationPolicyModal', () => { - beforeEach(() => { - fetch.resetMocks(); - fetch.mockImplementation(() => { - return Promise.resolve({ - ok: true, - status: 200, - text: () => "OK" - }); - }); - }) - const loopCache = new LoopCache({ - "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca", - "microServicePolicies": [{ - "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca", - "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app", - "properties": {"domain": "measurementsForVfScaling"}, - "shared": false, - "jsonRepresentation": {"schema": {}} - }] - }); - const historyMock = { push: jest.fn() }; - const matchMock = { params:{ policyName: "TCA_h2NMX_v1_0_ResourceInstanceName1_tca" } } - const flushPromises = () => new Promise(setImmediate); - - it('Test handleClose', () => { - const handleClose = jest.spyOn(ConfigurationPolicyModal.prototype,'handleClose'); - const component = mount() - - component.find('[variant="secondary"]').prop('onClick')(); - - expect(handleClose).toHaveBeenCalledTimes(1); - expect(component.state('show')).toEqual(false); - expect(historyMock.push.mock.calls[0]).toEqual([ '/']); - }); - - it('Test handleSave', async () => { - const loadLoopFunction = jest.fn(); - const handleSave = jest.spyOn(ConfigurationPolicyModal.prototype,'handleSave'); - const component = mount() - - component.find('[variant="primary"]').prop('onClick')(); - await flushPromises(); - component.update(); - - expect(handleSave).toHaveBeenCalledTimes(1); - expect(component.state('show')).toEqual(false); - expect(component.state('policyName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca"); - expect(historyMock.push.mock.calls[0]).toEqual([ '/']); - }); -}); \ No newline at end of file -- cgit