From fa94a96fed5fd7af230a90373a04da47370e2eea Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Thu, 20 May 2021 15:43:35 +0100
Subject: Merge master into tosca-poc branch

This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master

With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical

Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 ui-react/src/components/dialogs/UserInfoModal.js | 110 -----------------------
 1 file changed, 110 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/UserInfoModal.js

(limited to 'ui-react/src/components/dialogs/UserInfoModal.js')

diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/ui-react/src/components/dialogs/UserInfoModal.js
deleted file mode 100644
index 4b779dece..000000000
--- a/ui-react/src/components/dialogs/UserInfoModal.js
+++ /dev/null
@@ -1,110 +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 UserInfoModal extends React.Component {
-
-	constructor(props, context) {
-		super(props, context);
-
-		this.handleClose = this.handleClose.bind(this);
-	    this.renderPermissions = this.renderPermissions.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('/');
-	}
-	renderPermissions() {
-          if (this.state.userInfo["allPermissions"]) {
-	        var listOfPermissions = this.state.userInfo["allPermissions"].map(function(perm) {
-	            return <Form.Control plaintext readOnly defaultValue={perm} />;
-	        })
-		    return listOfPermissions;
-		  } else {
-		    return;
-		  }
- 	}
-	renderUserName() {
-		if (this.state.userInfo["userName"]) {
-			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
-		} else  {
-			return;
-		}
-	}
-	renderVersion() {
-		if (this.state.userInfo["cldsVersion"]) {
-			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["cldsVersion"]} />
-		} else  {
-			return;
-		}
-	}
-	render() {
-		return (
-			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title>User Info</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<Form.Group as={Row} controlId="userName">
-						<Form.Label column sm="3">Current User:</Form.Label>
-						<Col>{this.renderUserName()}</Col>
-					</Form.Group>
-					<Form.Group as={Row} controlId="cldsVersion">
-						<Form.Label column sm="3">CLDS Version:</Form.Label>
-						<Col>{this.renderVersion()}</Col>
-					</Form.Group>
-					<Form.Group as={Row} controlId="userPermissions">
-						<Form.Label column sm="3">User Permissions:</Form.Label>
-						<Col>
-							{this.renderPermissions()}
-						</Col>
-					</Form.Group>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
-- 
cgit 1.2.3-korg