From 4dc849f66bf9c8749ca8d2ef228fceee4d358ca1 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 15 Nov 2019 17:49:42 +0100 Subject: Fix naming convention Fourth stage, fix naming convention in UI-react so that it's clearer Issue-ID: CLAMP-552 Change-Id: I5d082aec575bf0d71dd08065b9d2bf1bb869d7ca Signed-off-by: sebdet --- ui-react/src/LoopUI.js | 4 +- ui-react/src/components/dialogs/UserInfo.js | 152 --------------------- ui-react/src/components/dialogs/UserInfo.test.js | 86 ------------ ui-react/src/components/dialogs/UserInfoModal.js | 152 +++++++++++++++++++++ .../src/components/dialogs/UserInfoModal.test.js | 86 ++++++++++++ .../dialogs/__snapshots__/UserInfo.test.js.snap | 137 ------------------- .../__snapshots__/UserInfoModal.test.js.snap | 137 +++++++++++++++++++ 7 files changed, 377 insertions(+), 377 deletions(-) delete mode 100644 ui-react/src/components/dialogs/UserInfo.js delete mode 100644 ui-react/src/components/dialogs/UserInfo.test.js create mode 100644 ui-react/src/components/dialogs/UserInfoModal.js create mode 100644 ui-react/src/components/dialogs/UserInfoModal.test.js delete mode 100644 ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap create mode 100644 ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap (limited to 'ui-react') diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index bf1e41988..b8fbe8991 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -40,7 +40,7 @@ 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'; -import UserInfo from './components/dialogs/UserInfo'; +import UserInfoModal from './components/dialogs/UserInfoModal'; import LoopService from './api/LoopService'; import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal'; import PerformAction from './components/dialogs/PerformActions'; @@ -254,7 +254,7 @@ export default class LoopUI extends React.Component { ()} /> ()} /> ()} /> - ()} /> + ()} /> ()} /> ()} /> diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js deleted file mode 100644 index 7d81b38b3..000000000 --- a/ui-react/src/components/dialogs/UserInfo.js +++ /dev/null @@ -1,152 +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 Form from 'react-bootstrap/Form'; -import Row from 'react-bootstrap/Row'; -import Col from 'react-bootstrap/Col'; -import styled from 'styled-components'; -import UserService from '../../api/UserService'; - -const ModalStyled = styled(Modal)` - background-color: transparent; -` - -export default class UserInfo extends React.Component { - - constructor(props, context) { - super(props, context); - - this.handleClose = this.handleClose.bind(this); - this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this); - this.renderReadModelPermission = this.renderReadModelPermission.bind(this); - this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this); - this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this); - this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this); - this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this); - this.renderUserName = this.renderUserName.bind(this); - this.state = { - show: true, - userInfo: {} - }; - } - componentWillMount() { - UserService.getUserInfo().then(userInfo => { - this.setState({ userInfo: userInfo }) - }); - } - - handleClose() { - this.props.history.push('/'); - } - renderReadTemplatePermission() { - if (this.state.userInfo["permissionReadTemplate"]) { - return - } else { - return; - } - } - renderReadModelPermission() { - if (this.state.userInfo["permissionReadCl"]) { - return - } else { - return; - } - } - renderReadToscaPermission() { - if (this.state.userInfo["permissionReadTosca"]) { - return - } else { - return; - } - } - renderUpdateTemplatePermission() { - if (this.state.userInfo["permissionUpdateTemplate"]) { - return - } else { - return; - } - } - renderUpdateModelPermission() { - if (this.state.userInfo["permissionUpdateCl"]) { - return - } else { - return; - } - } - renderUpdateToscaPermission() { - if (this.state.userInfo["permissionUpdateTosca"]) { - return - } else { - return; - } - } - renderUserName() { - if (this.state.userInfo["userName"]) { - return - } else { - return; - } - } - renderVersion() { - if (this.state.userInfo["cldsVersion"]) { - return - } else { - return; - } - } - render() { - return ( - - - User Info - - - - Current User: - {this.renderUserName()} - - - CLDS Version: - {this.renderVersion()} - - - User Permissions: - - {this.renderReadTemplatePermission()} - {this.renderReadModelPermission()} - {this.renderReadToscaPermission()} - {this.renderUpdateTemplatePermission()} - {this.renderUpdateModelPermission()} - {this.renderUpdateToscaPermission()} - - - - - - - - ); - } -} diff --git a/ui-react/src/components/dialogs/UserInfo.test.js b/ui-react/src/components/dialogs/UserInfo.test.js deleted file mode 100644 index beddde148..000000000 --- a/ui-react/src/components/dialogs/UserInfo.test.js +++ /dev/null @@ -1,86 +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 UserInfo from './UserInfo'; - -describe('Verify UserInfo', () => { - - beforeEach(() => { - fetch.resetMocks(); - fetch.mockImplementation(() => { - return Promise.resolve({ - ok: true, - status: 200, - json: () => { - return Promise.resolve({ - "userName": "test", - "cldsVersion": "1.0.0" - }); - }}); - }); - }) - - it('Test the render method full permission', () => { - const component = shallow() - component.setState({ userInfo: { - "userName": "test", - "cldsVersion": "1.0.0", - "permissionReadCl": true, - "permissionReadTemplate" : true, - "permissionReadTosca" : true, - "permissionUpdateTemplate" : true, - "permissionUpdateCl" : true, - "permissionUpdateTosca": true - }}); - expect(component).toMatchSnapshot(); - }); - - it('Test the render method no permission', () => { - const component = shallow() - component.setState({ userInfo: {} - }); - - expect(component.find('FormControl').length).toEqual(0); - }); - - it('Test the render method read permission', () => { - const component = shallow() - component.setState({ userInfo: { - "userName": "test", - "cldsVersion": "1.0.0", - "permissionReadCl": true, - "permissionReadTemplate" : true, - "permissionReadTosca" : true - }}); - - expect(component.find('FormControl').length).toEqual(5); - - const forms = component.find('FormControl'); - expect(forms.get(0).props.defaultValue).toEqual("test"); - expect(forms.get(1).props.defaultValue).toEqual("1.0.0"); - expect(forms.get(2).props.defaultValue).toEqual("Read Template"); - expect(forms.get(3).props.defaultValue).toEqual("Read Model"); - expect(forms.get(4).props.defaultValue).toEqual("Read Tosca"); - }); -}); diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/ui-react/src/components/dialogs/UserInfoModal.js new file mode 100644 index 000000000..1273d87c0 --- /dev/null +++ b/ui-react/src/components/dialogs/UserInfoModal.js @@ -0,0 +1,152 @@ +/*- + * ============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 Form from 'react-bootstrap/Form'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import styled from 'styled-components'; +import UserService from '../../api/UserService'; + +const ModalStyled = styled(Modal)` + background-color: transparent; +` + +export default class UserInfoModal extends React.Component { + + constructor(props, context) { + super(props, context); + + this.handleClose = this.handleClose.bind(this); + this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this); + this.renderReadModelPermission = this.renderReadModelPermission.bind(this); + this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this); + this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this); + this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this); + this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this); + this.renderUserName = this.renderUserName.bind(this); + this.state = { + show: true, + userInfo: {} + }; + } + componentWillMount() { + UserService.getUserInfo().then(userInfo => { + this.setState({ userInfo: userInfo }) + }); + } + + handleClose() { + this.props.history.push('/'); + } + renderReadTemplatePermission() { + if (this.state.userInfo["permissionReadTemplate"]) { + return + } else { + return; + } + } + renderReadModelPermission() { + if (this.state.userInfo["permissionReadCl"]) { + return + } else { + return; + } + } + renderReadToscaPermission() { + if (this.state.userInfo["permissionReadTosca"]) { + return + } else { + return; + } + } + renderUpdateTemplatePermission() { + if (this.state.userInfo["permissionUpdateTemplate"]) { + return + } else { + return; + } + } + renderUpdateModelPermission() { + if (this.state.userInfo["permissionUpdateCl"]) { + return + } else { + return; + } + } + renderUpdateToscaPermission() { + if (this.state.userInfo["permissionUpdateTosca"]) { + return + } else { + return; + } + } + renderUserName() { + if (this.state.userInfo["userName"]) { + return + } else { + return; + } + } + renderVersion() { + if (this.state.userInfo["cldsVersion"]) { + return + } else { + return; + } + } + render() { + return ( + + + User Info + + + + Current User: + {this.renderUserName()} + + + CLDS Version: + {this.renderVersion()} + + + User Permissions: + + {this.renderReadTemplatePermission()} + {this.renderReadModelPermission()} + {this.renderReadToscaPermission()} + {this.renderUpdateTemplatePermission()} + {this.renderUpdateModelPermission()} + {this.renderUpdateToscaPermission()} + + + + + + + + ); + } +} diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/ui-react/src/components/dialogs/UserInfoModal.test.js new file mode 100644 index 000000000..b5a2b272e --- /dev/null +++ b/ui-react/src/components/dialogs/UserInfoModal.test.js @@ -0,0 +1,86 @@ +/*- + * ============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 UserInfoModal from './UserInfoModal'; + +describe('Verify UserInfoModal', () => { + + beforeEach(() => { + fetch.resetMocks(); + fetch.mockImplementation(() => { + return Promise.resolve({ + ok: true, + status: 200, + json: () => { + return Promise.resolve({ + "userName": "test", + "cldsVersion": "1.0.0" + }); + }}); + }); + }) + + it('Test the render method full permission', () => { + const component = shallow() + component.setState({ userInfo: { + "userName": "test", + "cldsVersion": "1.0.0", + "permissionReadCl": true, + "permissionReadTemplate" : true, + "permissionReadTosca" : true, + "permissionUpdateTemplate" : true, + "permissionUpdateCl" : true, + "permissionUpdateTosca": true + }}); + expect(component).toMatchSnapshot(); + }); + + it('Test the render method no permission', () => { + const component = shallow() + component.setState({ userInfo: {} + }); + + expect(component.find('FormControl').length).toEqual(0); + }); + + it('Test the render method read permission', () => { + const component = shallow() + component.setState({ userInfo: { + "userName": "test", + "cldsVersion": "1.0.0", + "permissionReadCl": true, + "permissionReadTemplate" : true, + "permissionReadTosca" : true + }}); + + expect(component.find('FormControl').length).toEqual(5); + + const forms = component.find('FormControl'); + expect(forms.get(0).props.defaultValue).toEqual("test"); + expect(forms.get(1).props.defaultValue).toEqual("1.0.0"); + expect(forms.get(2).props.defaultValue).toEqual("Read Template"); + expect(forms.get(3).props.defaultValue).toEqual("Read Model"); + expect(forms.get(4).props.defaultValue).toEqual("Read Tosca"); + }); +}); diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap deleted file mode 100644 index 1ae567a2d..000000000 --- a/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap +++ /dev/null @@ -1,137 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Verify UserInfo Test the render method full permission 1`] = ` - - - - User Info - - - - - - Current User: - - - - - - - - CLDS Version: - - - - - - - - User Permissions: - - - - - - - - - - - - - - - -`; diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap new file mode 100644 index 000000000..fdb24a430 --- /dev/null +++ b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap @@ -0,0 +1,137 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Verify UserInfoModal Test the render method full permission 1`] = ` + + + + User Info + + + + + + Current User: + + + + + + + + CLDS Version: + + + + + + + + User Permissions: + + + + + + + + + + + + + + + +`; -- cgit 1.2.3-korg