Modular structure of clamp including controlloop

This commit is the first commit that puts in multi module structure while
changing the existing CLAMP code as little as possible.
It adds a structure where common, models, participant and runtime are direct children under clamp,
and current clamp code is moved under runtime. This runtime directory will host controlloop
runtime code in later commits.

Issue-ID: POLICY-3215
Signed-off-by: Sirisha_Manchikanti <sirisha.manchikanti@est.tech>
Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7
Signed-off-by: liamfallon <liam.fallon@est.tech>

3 files changed, 0 insertions, 1289 deletions

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
deleted file mode 100644
index 90bbc887c..000000000
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ /dev/null
@@ -1,631 +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 Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Row from 'react-bootstrap/Row';
-import Col from 'react-bootstrap/Col';
-import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateService';
-import CsvToJson from '../../../utils/CsvToJson';
-import MaterialTable, {MTableToolbar} from "material-table";
-import IconButton from '@material-ui/core/IconButton';
-import Tooltip from '@material-ui/core/Tooltip';
-import AddBox from '@material-ui/icons/AddBox';
-import ArrowUpward from '@material-ui/icons/ArrowUpward';
-import Check from '@material-ui/icons/Check';
-import ChevronLeft from '@material-ui/icons/ChevronLeft';
-import VerticalAlignTopIcon from '@material-ui/icons/VerticalAlignTop';
-import VerticalAlignBottomIcon from '@material-ui/icons/VerticalAlignBottom';
-import ChevronRight from '@material-ui/icons/ChevronRight';
-import Clear from '@material-ui/icons/Clear';
-import DeleteOutline from '@material-ui/icons/DeleteOutline';
-import Edit from '@material-ui/icons/Edit';
-import FilterList from '@material-ui/icons/FilterList';
-import FirstPage from '@material-ui/icons/FirstPage';
-import LastPage from '@material-ui/icons/LastPage';
-import Remove from '@material-ui/icons/Remove';
-import Search from '@material-ui/icons/Search';
-import ViewColumn from '@material-ui/icons/ViewColumn';
-
-
-const ModalStyled = styled(Modal)`
-	@media (min-width: 1200px) {
-		.modal-xl {
-			max-width: 96%;
-		}
-	}
-	background-color: transparent;
-`
-
-const MTableToolbarStyled = styled(MTableToolbar)`
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-`
-const ColPullLeftStyled = styled(Col)`
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	margin-left: -40px;
-`
-
-const cellStyle = { border: '1px solid black' };
-const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
-const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
-
-let dictList = [];
-let subDictFlag = false;
-
-function SelectSubDictType(props) {
-	const {onChange} = props;
-	const selectedValues = (e) => {
-		let options = e.target.options;
-		let SelectedDictTypes = '';
-		for (let dictType = 0, values = options.length; dictType < values; dictType++) {
-			if (options[dictType].selected) {
-				SelectedDictTypes = SelectedDictTypes.concat(options[dictType].value);
-				SelectedDictTypes = SelectedDictTypes.concat('|');
-			}
-		}
-		SelectedDictTypes = SelectedDictTypes.slice(0,-1);
-		onChange(SelectedDictTypes);
-	}
-	// When the subDictFlag is true, we need to disable selection of element "type"
-	return(
-		<div>
-			<select disabled={subDictFlag} multiple={true} onChange={selectedValues}>
-				<option value="string">string</option>
-				<option value="number">number</option>
-				<option value="datetime">datetime</option>
-				<option value="map">map</option>
-				<option value="json">json</option>
-			</select>
-		</div>
-	);
-}
-
-function SubDict(props) {
-	const {onChange} = props;
-	const subDicts = [];
-	subDicts.push('none');
-	if (dictList !== undefined  && dictList.length > 0) {
-		let item;
-        	for(item in dictList) {
-            		if(dictList[item].secondLevelDictionary === 1) {
-                		subDicts.push(dictList[item].name);
-            		}
-        	}
-	}
-	let optionItems = [];
-	for (let i=0; i<subDicts.length; ++i) {
-		if (i === 0) {
-			optionItems.push(<option selected key={subDicts[i]}>{subDicts[i]}</option>);
-		} else {
-			optionItems.push(<option key={subDicts[i]}>{subDicts[i]}</option>);
-		}
-	}
-
- 	function selectedValue (e) {
-		onChange(e.target.value);
-	}
-	// When the subDictFlag is true, we need to disable selection of
-	// the sub-dictionary flag
-	return(
-			<select disabled={subDictFlag} onChange={selectedValue} >
-				{optionItems}
-			</select>
-	);
-}
-
-export default class ManageDictionaries extends React.Component {
-	constructor(props, context) {
-		super(props, context);
-		this.addDictionaryElementRow = this.addDictionaryElementRow.bind(this);
-		this.addDictionaryRow = this.addDictionaryRow.bind(this);
-		this.addReplaceDictionaryRequest = this.addReplaceDictionaryRequest.bind(this);
-		this.clickHandler = this.clickHandler.bind(this);
-		this.deleteDictionaryElementRow = this.deleteDictionaryElementRow.bind(this);
-		this.deleteDictionaryRequest = this.deleteDictionaryRequest.bind(this);
-		this.deleteDictionaryRow = this.deleteDictionaryRow.bind(this);
-		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
-		this.getDictionaries = this.getDictionaries.bind(this);
-		this.getDictionaryElements = this.getDictionaryElements.bind(this);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleDictionaryRowClick = this.handleDictionaryRowClick.bind(this);
-		this.importCsvData = this.importCsvData.bind(this);
-		this.updateDictionaryElementRow = this.updateDictionaryElementRow.bind(this);
-		this.updateDictionaryElementsRequest = this.updateDictionaryElementsRequest.bind(this);
-		this.updateDictionaryRow = this.updateDictionaryRow.bind(this);
-		this.readOnly = props.readOnly !== undefined ? props.readOnly : false;
-		this.state = {
-			show: true,
-			currentSelectedDictionary: null,
-			exportFilename: '',
-			content: null,
-			dictionaryElements: [],
-			tableIcons: {
-				Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
-				Delete: forwardRef((props, ref) => <DeleteOutline {...props} ref={ref} />),
-				DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-				Edit: forwardRef((props, ref) => <Edit {...props} ref={ref} />),
-				Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
-				Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-				Export: forwardRef((props, ref) => <VerticalAlignBottomIcon {...props} ref={ref} />),
-				Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
-				FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-				LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-				NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-				PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
-				ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-				Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-				SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
-				ThirdStateCheck: forwardRef((props, ref) => <Remove {...props} ref={ref} />),
-				ViewColumn: forwardRef((props, ref) => <ViewColumn {...props} ref={ref} />)
-			},
-			dictColumns: [
-				{
-					title: "Dictionary Name", field: "name",editable: 'onAdd',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Sub Dictionary ?", field: "secondLevelDictionary", lookup: {0: 'No', 1: 'Yes'},
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Dictionary Type", field: "subDictionaryType",lookup: {string: 'string', number: 'number'},
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Updated By", field: "updatedBy", editable: 'never',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Last Updated Date", field: "updatedDate", editable: 'never',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				}
-			],
-			dictElementColumns: [
-				{
-					title: "Element Short Name", field: "shortName",editable: 'onAdd',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Element Name", field: "name",
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Element Description", field: "description",
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Element Type", field: "type",
-					editComponent: props => (
-						<div>
-							<SelectSubDictType  value={props.value} onChange={props.onChange} />
-						</div>
-					),
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Sub-Dictionary", field: "subDictionary",
-					editComponent: props => (
-						 <div>
-							 <SubDict value={props.value} onChange={props.onChange} />
-						 </div>
-				      ),
-				    cellStyle: cellStyle,
-				    headerStyle: headerStyle
-				},
-				{
-					title: "Updated By", field: "updatedBy", editable: 'never',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				},
-				{
-					title: "Updated Date", field: "updatedDate", editable: 'never',
-					cellStyle: cellStyle,
-					headerStyle: headerStyle
-				}
-			]
-		}
-	}
-
-	componentDidMount() {
-		this.getDictionaries();
-	}
-
-	getDictionaries() {
-		TemplateMenuService.getDictionary().then(arrayOfdictionaries => {
-			this.setState({ dictionaries: arrayOfdictionaries, currentSelectedDictionary: null })
-			// global variable setting used functional components in this file
-			dictList = arrayOfdictionaries;
-		}).catch(() => {
-			console.error('Failed to retrieve dictionaries');
-			this.setState({ dictionaries: [], currentSelectedDictionary: null })
-		});
-	}
-
-	getDictionaryElements(dictionaryName) {
-		TemplateMenuService.getDictionaryElements(dictionaryName).then(dictionaryElements => {
-			this.setState({ dictionaryElements: dictionaryElements.dictionaryElements} );
-			this.setState({ currentSelectDictionary: dictionaryName });
-		}).catch(() => console.error('Failed to retrieve dictionary elements'))
-	}
-
-	clickHandler(rowData) {
-		this.getDictionaries();
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	addReplaceDictionaryRequest(dictionaryEntry) {
-		TemplateMenuService.insDictionary(dictionaryEntry)
-		.then(resp => {
-			this.getDictionaries();
-		})
-		.catch(() => console.error('Failed to insert new dictionary elements'));
-	}
-
-	updateDictionaryElementsRequest(dictElements) {
-		let reqData = { "name": this.state.currentSelectedDictionary, 'dictionaryElements': dictElements };
-		TemplateMenuService.insDictionaryElements(reqData)
-		.then(resp => { this.getDictionaryElements(this.state.currentSelectedDictionary) })
-		.catch(() => console.error('Failed to update dictionary elements'));
-	}
-
-	deleteDictionaryRequest(dictionaryName) {
-		TemplateMenuService.deleteDictionary(dictionaryName)
-		.then(resp => {
-			this.getDictionaries();
-		})
-		.catch(() => console.error('Failed to delete dictionary'));
-	}
-
-	deleteDictionaryElementRequest(dictionaryName, elemenetShortName) {
-		TemplateMenuService.deleteDictionaryElements({ 'name': dictionaryName, 'shortName': elemenetShortName })
-		.then(resp => {
-			this.getDictionaryElements(dictionaryName);
-		})
-		.catch(() => console.error('Failed to delete dictionary elements'));
-	}
-
-	fileSelectedHandler = (event) => {
-
-		if (event.target.files[0].type === 'text/csv' || event.target.files[0].type === 'application/vnd.ms-excel') {
-			if (event.target.files && event.target.files[0]) {
-				const reader = new FileReader();
-				reader.onload = (e) => {
-					let errorMessages = this.importCsvData(reader.result);
-					if (errorMessages !== '') {
-						alert(errorMessages);
-					}
-				}
-				reader.readAsText(event.target.files[0]);
-			}
-		} else {
-			alert('Please upload .csv extention files only.');
-		}
-	}
-
-	importCsvData(rawCsvData) {
-
-		const jsonKeyNames = [ 'shortName', 'name', 'description', 'type', 'subDictionary' ];
-		const userHeaderNames = [ 'Element Short Name', 'Element Name', 'Element Description', 'Element Type', 'Sub-Dictionary'  ];
-		const validTypes = ['string','number','datetime','json','map'];
-
-		let mandatory;
-
-		if (subDictFlag) {
-			mandatory = [ true, true, true, false, false ];
-		} else {
-			mandatory = [ true, true, true, true, false ];
-		}
-
-		let result = CsvToJson(rawCsvData, ',', '||||', userHeaderNames, jsonKeyNames, mandatory);
-
-		let errorMessages = result.errorMessages;
-		let jsonObjArray = result.jsonObjArray;
-
-		let validTypesErrorMesg = '';
-
-		for (let i=0; i < validTypes.length; ++i) {
-			if (i === 0) {
-				validTypesErrorMesg = validTypes[i];
-			} else {
-				validTypesErrorMesg += ',' + validTypes[i];
-			}
-		}
-
-		if (errorMessages !== '') {
-			return errorMessages;
-		}
-
-		// Perform further checks on data that is now in JSON form
-		let subDictionaries = [];
-
-		// NOTE: dictList is a global variable  maintained faithfully
-		//       by the getDictionaries() method outside this import
-		//       functionality.
-		let item;
-		for (item in dictList) {
-			if (dictList[item].secondLevelDictionary === 1) {
-				subDictionaries.push(dictList[item].name);
-			}
-		};
-
-		// Check for valid Sub-Dictionary and Element Type values
-		subDictionaries = subDictionaries.toString();
-		let row = 2;
-		let dictElem;
-		for (dictElem of jsonObjArray) {
-			let itemKey;
-			for (itemKey in dictElem){
-				let value = dictElem[itemKey].trim();
-				let keyIndex = jsonKeyNames.indexOf(itemKey);
-				if (itemKey === 'shortName' && /[^a-zA-Z0-9-_.]/.test(value)) {
-					errorMessages += '\n' + userHeaderNames[keyIndex] +
-						' at row #' + row +
-						' can only contain alphanumeric characters and periods, hyphens or underscores';
-				}
-				if (itemKey === 'type' && validTypes.indexOf(value) < 0) {
-					errorMessages += '\nInvalid value of "' + value + '" for "' + userHeaderNames[keyIndex] + '" at row #' + row;
-					errorMessages += '\nValid types are: ' + validTypesErrorMesg;
-				}
-				if (value !== "" && itemKey === 'subDictionary' && subDictionaries.indexOf(value) < 0) {
-					errorMessages += '\nInvalid Sub-Dictionary value of "' + value + '" at row #' + row;
-				}
-			}
-			++row;
-		}
-		if (errorMessages === '') {
-			// We made it through all the checks. Send it to back end
-			this.updateDictionaryElementsRequest(jsonObjArray);
-		}
-
-		return errorMessages;
-	}
-
-	addDictionaryRow(newData) {
-		let validData = true;
-		return new Promise((resolve, reject) => {
-			setTimeout(() => {
-					if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
-						validData = false;
-						alert('Please enter alphanumeric input. Only allowed special characters are:(period, hyphen, underscore)');
-						reject();
-					}
-					for (let i = 0; i < this.state.dictionaries.length; i++) {
-						if (this.state.dictionaries[i].name === newData.name) {
-							validData = false;
-							alert(newData.name + ' dictionary name already exists')
-							reject();
-						}
-					}
-					if (validData) {
-						this.addReplaceDictionaryRequest(newData);
-					}
-					resolve();
-			}, 1000);
-		});
-	}
-
-
-	updateDictionaryRow(newData, oldData) {
-		let validData = true;
-		return new Promise((resolve, reject) => {
-			setTimeout(() => {
-				if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
-					validData = false;
-					alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
-					reject();
-				}
-				if (validData) {
-					this.addReplaceDictionaryRequest(newData);
-				}
-				resolve();
-			}, 1000);
-		});
-	}
-
-	deleteDictionaryRow(oldData) {
-		return new Promise((resolve, reject) => {
-			setTimeout(() => {
-				this.deleteDictionaryRequest(oldData.name);
-				resolve();
-			}, 1000);
-		});
-	}
-
-	addDictionaryElementRow(newData) {
-		return new Promise((resolve, reject) => {
-			setTimeout(() => {
-				let dictionaryElements = this.state.dictionaryElements;
-				let errorMessages = '';
-				for (let i = 0; i < this.state.dictionaryElements.length; i++) {
-					if (this.state.dictionaryElements[i].shortName === newData.shortName) {
-						alert('Short Name "' + newData.shortName + '" already exists');
-						reject("");
-					}
-				}
-				// MaterialTable returns no property at all if the user has not touched a
-				// new column, so we want to add the property with an emptry string
-				// for several cases if that is the case to simplify other checks.
-				if (newData.description === undefined) {
-					newData.description = "";
-				}
-				if (newData.subDictionary === undefined) {
-					newData.subDictionary = null;
-				}
-				if (newData.type === undefined) {
-					newData.type = "";
-				}
-				if (!newData.shortName && /[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
-					errorMessages += '\nShort Name is limited to alphanumeric characters and also period, hyphen, and underscore';
-				}
-				if (!newData.shortName){
-					errorMessages += '\nShort Name must be specified';
-				}
-				if (!newData.name){
-					errorMessages += '\nElement Name must be specified';
-				}
-				if (!newData.type && !subDictFlag){
-					errorMessages += '\nElement Type must be specified';
-				}
-				if (errorMessages === '') {
-					dictionaryElements.push(newData);
-					this.updateDictionaryElementsRequest([newData]);
-					resolve();
-				} else {
-					alert(errorMessages);
-					reject("");
-				}
-			}, 1000);
-		});
-	}
-
-	updateDictionaryElementRow(newData, oldData) {
-		return new Promise((resolve, reject) => {
-			setTimeout(() => {
-				let dictionaryElements = this.state.dictionaryElements;
-				let validData =  true;
-				if (!newData.type) {
-					validData = false;
-					alert('Element Type cannot be null');
-					reject();
-				}
-				if (validData) {
-					const index = dictionaryElements.indexOf(oldData);
-					dictionaryElements[index] = newData;
-					this.updateDictionaryElementsRequest([newData]);
-				}
-				resolve();
-			}, 1000);
-		});
-	}
-
-
-	deleteDictionaryElementRow(oldData) {
-		return new Promise((resolve) => {
-			setTimeout(() => {
-				this.deleteDictionaryElementRequest(this.state.currentSelectedDictionary, oldData.shortName);
-				resolve();
-			}, 1000);
-		});
-	}
-
-	handleDictionaryRowClick(event, rowData) {
-		subDictFlag = rowData.secondLevelDictionary === 1 ? true : false;
-		this.setState({
-			currentSelectedDictionary : rowData.name,
-			exportFilename: rowData.name
-		})
-		this.getDictionaryElements(rowData.name);
-	}
-
-	render() {
-		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
-				<Modal.Header closeButton>
-					<Modal.Title>Manage Dictionaries</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					{this.state.currentSelectedDictionary === null ?
-						<MaterialTable
-                        				title={"Dictionary List"}
-                        				data={this.state.dictionaries}
-                        				columns={this.state.dictColumns}
-                        				icons={this.state.tableIcons}
-                        				onRowClick={this.handleDictionaryRowClick}
-                        				options={{
-								headerStyle: rowHeaderStyle,
-                        				}}
-                        				editable={!this.readOnly ?
-								{
-									onRowAdd: this.addDictionaryRow,
-									onRowUpdate: this.updateDictionaryRow,
-									onRowDelete: this.deleteDictionaryRow
-								} : undefined }
-						/> : null
-					}
-					{this.state.currentSelectedDictionary !== null ?
-						<MaterialTable
-                        				title={'Dictionary Elements List for ' + (subDictFlag ? 'Sub-Dictionary "' : '"') + this.state.currentSelectedDictionary + '"'}
-                        				data={this.state.dictionaryElements}
-                        				columns={this.state.dictElementColumns}
-                        				icons={this.state.tableIcons}
-                        				options={{
-								exportAllData: true,
-								exportButton: true,
-								exportFileName: this.state.exportFilename,
-								headerStyle:{backgroundColor:'white',  fontSize: '15pt', text: 'bold', border: '1px solid black'}
-                        				}}
-                        				components={{
-								Toolbar: props => (
-									<Row>
-										<Col sm="11">
-											<MTableToolbarStyled {...props} />
-										</Col>
-										<ColPullLeftStyled sm="1">
-											<Tooltip title="Import" placement = "bottom">
-												<IconButton aria-label="import" disabled={this.readOnly} onClick={() => this.fileUpload.click()}>
-													<VerticalAlignTopIcon />
-												</IconButton>
-											</Tooltip>
-                                							<input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}}
-												style={{ visibility: 'hidden', width: '1px' }} onChange={this.fileSelectedHandler} />
-										</ColPullLeftStyled>
-									</Row>
-                            					)
-                        				}}
-                        				editable={!this.readOnly ?
-								{
-                            						onRowAdd: this.addDictionaryElementRow,
-                            						onRowUpdate: this.updateDictionaryElementRow,
-                            						onRowDelete: this.deleteDictionaryElementRow
-                        					} : undefined
-							 }
-						/> : null
-					}
-					{this.state.currentSelectedDictionary !== null ? <button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Close</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
deleted file mode 100644
index a4c1335d8..000000000
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ /dev/null
@@ -1,462 +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 { mount } from 'enzyme';
-import { render } from 'enzyme';
-import ManageDictionaries from './ManageDictionaries';
-import TemplateMenuService from '../../../api/TemplateService'
-
-const TestDictionaryElements = {
-    name: "test",
-    secondLevelDictionary: 0,
-    subDictionaryType: "", 
-    dictionaryElements: [
-      {
-        shortName: "alertType",
-        name: "Alert Type",
-        description: "Type of Alert",
-        type: "string",
-        subDictionary: "", 
-        createdDate: "2020-06-12T13:58:51.443931Z",
-        updatedDate: "2020-06-13T16:27:57.084870Z",
-        updatedBy: "admin",
-        createdBy: "admin"
-      }
-    ]
-};
-
-const TestDictionaries =
-[
-  {
-    name: "test",
-    secondLevelDictionary: 0,
-    subDictionaryType: "string",
-    dictionaryElements: [ TestDictionaryElements ],
-    createdDate: "2020-06-14T21:00:33.231166Z",
-    updatedDate: "2020-06-14T21:00:33.231166Z",
-    updatedBy: "admin",
-    createdBy: "admin"
-  },
-  {
-    name: "testSub1",
-    secondLevelDictionary: 1,
-    subDictionaryType: "string",
-    dictionaryElements: [
-      {
-        shortName: "subElem",
-        name: "Sub Element",
-        description: "Sub Element Description",
-        type: "string",
-        createdDate: "2020-06-14T21:04:44.402287Z",
-        updatedDate: "2020-06-14T21:04:44.402287Z",
-        updatedBy: "admin",
-        createdBy: "admin"
-      }
-    ],
-    createdDate: "2020-06-14T21:01:16.390250Z",
-    updatedDate: "2020-06-14T21:01:16.390250Z",
-    updatedBy: "admin",
-    createdBy: "admin"
-  }
-];
-
-
-const historyMock = { push: jest.fn() };
-
-let errorMessage = '';
-
-window.alert = jest.fn().mockImplementation((mesg) => { errorMessage = mesg ; return });
-
-TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve(TestDictionaries);
-});
-
-TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve({ ok: true, status: 200 });
-});
-
-TemplateMenuService.deleteDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
-});
-
-TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve(TestDictionaryElements);
-});
-
-TemplateMenuService.deleteDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
-});
-
-TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
-});
-
-
-describe('Verify ManageDictionaries', () => {
-
-	beforeEach(() => {
-		fetch.resetMocks();
-	});
-
-	it('Test API Successful', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ManageDictionaries />);
-		expect(component).toMatchSnapshot();
-	});
-
-	it('Test API Exception', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: false,
-				status: 500,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ManageDictionaries />);
-	});
-
-	it('Test Table icons', () => {
-
-		const component = mount(<ManageDictionaries />);
-		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
-	});
-
-	test('Test add/replace and delete dictionary requests', async () => {
-
-		const component = shallow(<ManageDictionaries history={historyMock}/>)
-		const instance = component.instance();
-
-		const flushPromises = () => new Promise(setImmediate);
-
-		instance.addReplaceDictionaryRequest({name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string"});
-		instance.deleteDictionaryRequest("test");
-
-		await flushPromises();
-
-		expect(component.state('currentSelectedDictionary')).toEqual(null);
-		expect(component.state('dictionaries')).toEqual(TestDictionaries);
-	});
-
-	test('Test update dictionary row', async () => {
-
-		const component = shallow(<ManageDictionaries history={historyMock}/>)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
-
-		await expect(instance.updateDictionaryRow(rowData, rowData)).resolves.toEqual(undefined);
-
-	}, 2000);
-
-	test('Test add dictionary row', async () => {
-
-		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
-
-		await instance.addDictionaryRow(rowData);
-                expect(addReplaceRequest).toHaveBeenCalledWith(rowData);
-
-	}, 2000);
-
-	test('Test add dictionary row with errors name already exists', async () => {
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test", secondLevelDictionary: 0, subDictionaryType: "" };
-
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
-
-	}, 2000);
-
-	test('Test add dictionary row with errors illegal chars in name', async () => {
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
-
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
-
-	}, 2000);
-
-	test('Test update dictionary row with errors illegal chars in name', async () => {
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
-
-		await expect(instance.updateDictionaryRow(rowData)).rejects.toEqual(undefined);
-	});
-
-
-	test('Test add dictionary row with errors (illegal chars)', async () => {
-
-		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
-
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
-
-	}, 2000);
-
-
-	test('Test delete dictionary row', async () => {
-
-		const deleteRequest = jest.spyOn(ManageDictionaries.prototype,'deleteDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
-
-		await instance.deleteDictionaryRow(rowData);
-                expect(deleteRequest).toHaveBeenCalledWith("newdict");
-
-	}, 2000);
-
-	test('Test handle select dictionary row click', async () => {
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
-
-		instance.handleDictionaryRowClick("event", rowData);
-		expect(component.state('currentSelectedDictionary')).toEqual("newdict");
-	}, 2000);
-
-	test('Test dictionary element row add, update, delete', async () => {
-
-		const rowData = {
-			createdBy: "admin",
-			createdDate: "2020-06-15T13:59:20.467381Z",
-			description: "Description",
-			name: "Some Elem",
-			shortName: "someElem",
-			type: "string",
-			updatedBy: "admin",
-			updatedDate: "2020-06-15T13:59:20.467381Z"
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		const badRowData = {
-			description: "Description",
-			name: "Some Elem",
-			shortName: "someElem",
-			type: "string"
-		};
-
-                await instance.clickHandler();
-                await instance.getDictionaryElements("test");
-
-		await expect(instance.addDictionaryElementRow(rowData)).resolves.toEqual(undefined);
-		await expect(instance.updateDictionaryElementRow(rowData, rowData)).resolves.toEqual(undefined);
-		await expect(instance.deleteDictionaryElementRow(rowData)).resolves.toEqual(undefined);
-	});
-
-	test('Test dictionary element row add with errors', async () => {
-
-		const badRowData = {
-			description: "",
-			name: "",
-			shortName: "some#Elem",
-			type: ""
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
-
-	test('Test dictionary element update with error illegal name', async () => {
-
-		const badRowData = {
-			description: "",
-			name: "test@@",
-			shortName: "some#Elem",
-			type: ""
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		await expect(instance.updateDictionaryElementRow(badRowData)).rejects.toEqual(undefined);
-	});
-
-	test('Test dictionary element addition with duplicate name error', async () => {
-
-		const badRowData = {
-			description: "description",
-			name: "Alert Type",
-			shortName: "alertType",
-			type: "string"
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		component.setState({ currentSelectedDictionary: 'test' });
-
-		await instance.getDictionaryElements();
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
-
-	test('Test dictionary element addition with empty name error', async () => {
-
-		const badRowData = {
-			description: "description",
-			name: "Alert Type",
-			shortName: "",
-			type: "string"
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		component.setState({ currentSelectedDictionary: 'test' });
-
-		await instance.getDictionaryElements();
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
-
-
-	it('Test Import CSV Sunny Day', async () => {
-
-                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-                        return Promise.resolve({ ok: true, status: 200 });
-                });
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"alertType","Alert Type","Alert Type Description","string","","admin","2020-06-11T13:56:14.927437Z"';
-
-                let expectedResult = [
-                                {
-                                        description: "Alert Type Description",
-                                        name: "Alert Type",
-                                        shortName: "alertType",
-                                        subDictionary: "",
-                                        type: "string"
-                                }
-		];
-
-		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-
-		await expect(instance.importCsvData(rawCsvData)).toEqual('');
-                expect(updateDictionaryElementsRequest).toHaveBeenCalledWith(expectedResult);
-	});
-
-	it('Test Import CSV Mandatory Field Check Errors', () => {
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"","","","","","",""';
-
-		// The empty values for all the fields in row 1 of the rawCsvData will trigger a bunch of errors.
-		// Getting Enzyme to properly match them with embedded newlines turned out to be impossible
-		// and maybe not desirable anyway; so our test for "success" here is simply that the
-		// routine returns a non-empty error string.
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		expect(instance.importCsvData(rawCsvData)).not.toEqual('');
-	});
-
-	it('Test Import CSV Errors in Row Data', async () => {
-
-                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-                        return Promise.resolve({ ok: true, status: 200 });
-                });
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"alert@Type","Alert Type","Alert Type Description","strin","subby","admin","2020-06-11T13:56:14.927437Z"';
-
-                let expectedResult = [
-                                {
-                                        description: "Alert Type Description",
-                                        name: "Alert Type",
-                                        shortName: "alertType",
-                                        subDictionary: "",
-                                        type: "string"
-                                }
-		];
-
-		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-
-		await expect(instance.importCsvData(rawCsvData)).not.toEqual('');
-	});
-
-
-	it('Test handleClose', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const handleClose = jest.spyOn(ManageDictionaries.prototype,'handleClose');
-		const component = shallow(<ManageDictionaries history={historyMock} />)
-		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/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
deleted file mode 100644
index 6b583632f..000000000
--- a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
+++ /dev/null
@@ -1,196 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify ManageDictionaries Test API Successful 1`] = `
-<Styled(Modal)
-  backdrop="static"
-  keyboard={false}
-  onHide={[Function]}
-  show={true}
-  size="xl"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      Manage Dictionaries
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <WithStyles(Component)
-      columns={
-        Array [
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "onAdd",
-            "field": "name",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Dictionary Name",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "secondLevelDictionary",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "lookup": Object {
-              "0": "No",
-              "1": "Yes",
-            },
-            "title": "Sub Dictionary ?",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "subDictionaryType",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "lookup": Object {
-              "number": "number",
-              "string": "string",
-            },
-            "title": "Dictionary Type",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "never",
-            "field": "updatedBy",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Updated By",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "never",
-            "field": "updatedDate",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Last Updated Date",
-          },
-        ]
-      }
-      editable={
-        Object {
-          "onRowAdd": [Function],
-          "onRowDelete": [Function],
-          "onRowUpdate": [Function],
-        }
-      }
-      icons={
-        Object {
-          "Add": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Check": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Clear": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Delete": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "DetailPanel": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Edit": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Export": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Filter": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "FirstPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "LastPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "NextPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "PreviousPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ResetSearch": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Search": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "SortArrow": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ThirdStateCheck": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ViewColumn": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-        }
-      }
-      onRowClick={[Function]}
-      options={
-        Object {
-          "headerStyle": Object {
-            "backgroundColor": "#ddd",
-            "border": "1px solid black",
-            "fontSize": "15pt",
-            "text": "bold",
-          },
-        }
-      }
-      title="Dictionary List"
-    />
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Close
-    </Button>
-  </ModalFooter>
-</Styled(Modal)>
-`;