Revert "Temp changes" (8aad56f0) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

js-apps/meep-frontend/src/js/containers/cfg/cfg-network-element-container.js

+2 −13

Original line number	Diff line number	Diff line
		@@ -1537,7 +1537,7 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element }
		}
		};

		const cfgPaneElementTypes = [
		const elementTypes = [
		{
		label: 'Logical Domain',
		options: [ELEMENT_TYPE_OPERATOR_GENERIC, ELEMENT_TYPE_OPERATOR_CELL]
		@@ -1571,17 +1571,6 @@ const cfgPaneElementTypes = [
		}
		];

		const execPaneElementTypes = [
		{
		label: 'Process',
		options: [
		ELEMENT_TYPE_UE_APP,
		ELEMENT_TYPE_EDGE_APP,
		ELEMENT_TYPE_CLOUD_APP
		]
		}
		];

		var parentTypes = {};
		parentTypes[ELEMENT_TYPE_SCENARIO] = null;
		parentTypes[ELEMENT_TYPE_OPERATOR] = [ELEMENT_TYPE_SCENARIO];
		@@ -1734,7 +1723,7 @@ const HeaderGroup = ({ element, onTypeChange, onUpdate, typeDisabled, parentDisa

		var typeOverride = getElementTypeOverride(type);

		var elementTypes = pageType === TYPE_CFG ? cfgPaneElementTypes : execPaneElementTypes;
		elementTypes.length === 5 && pageType === TYPE_EXEC ? elementTypes.splice(0, 3) : '';

		return (
		<>

js-apps/meep-frontend/src/js/containers/exec/scenario-update-event-pane.js

+75 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import { connect } from 'react-redux';
		import { Select } from '@rmwc/select';
		import { Grid, GridCell } from '@rmwc/grid';
		import { Elevation } from '@rmwc/elevation';
		// import { TextField } from '@rmwc/textfield';

		import CfgNetworkElementContainer from '@/js/containers/cfg/cfg-network-element-container';
		import CancelApplyPair from '@/js/components/helper-components/cancel-apply-pair';
		@@ -28,15 +29,24 @@ import { validateNetworkElement } from '@/js/containers/cfg/cfg-page-container';
		import {
		TYPE_EXEC,
		UE_TYPE_STR,
		FOG_TYPE_STR,
		DC_TYPE_STR,
		UE_APP_TYPE_STR,
		EDGE_APP_TYPE_STR,
		CLOUD_APP_TYPE_STR,
		MAP_VIEW,
		NET_TOPOLOGY_VIEW,
		EXEC_EVT_SU_ACTION,
		EXEC_EVT_SU_REMOVE_ELEM_TYPE,
		EXEC_EVT_SU_REMOVE_ELEM_NAME,
		SCENARIO_UPDATE_ACTION_NONE,
		SCENARIO_UPDATE_ACTION_ADD,
		SCENARIO_UPDATE_ACTION_MODIFY,
		SCENARIO_UPDATE_ACTION_REMOVE,
		ELEMENT_TYPE_DC,
		ELEMENT_TYPE_EDGE,
		ELEMENT_TYPE_FOG,
		ELEMENT_TYPE_UE,
		ELEMENT_TYPE_UE_APP,
		ELEMENT_TYPE_EDGE_APP,
		ELEMENT_TYPE_CLOUD_APP
		@@ -44,7 +54,9 @@ import {

		import {
		uiExecChangeScenarioUpdateAction,
		uiExecScenarioUpdateRemoveEleName
		uiExecScenarioUpdateRemoveEleName,
		uiExecScenarioUpdateRemoveEleType,
		uiExecChangeSandboxCfg
		} from '@/js/state/ui';

		import {
		@@ -64,6 +76,16 @@ import { updateObject } from '@/js/util/object-util';

		import { addElementToScenario, updateElementInScenario } from '@/js/util/scenario-utils';

		const elementTypes = [
		ELEMENT_TYPE_UE,
		ELEMENT_TYPE_FOG,
		ELEMENT_TYPE_EDGE,
		ELEMENT_TYPE_DC,
		ELEMENT_TYPE_UE_APP,
		ELEMENT_TYPE_EDGE_APP,
		ELEMENT_TYPE_CLOUD_APP
		];

		var elementNames = [];

		class ScenarioUpdateEventPane extends Component {
		@@ -107,6 +129,18 @@ class ScenarioUpdateEventPane extends Component {
		elementNames.length = 0;
		var neType = '';
		switch(elementName) {
		case ELEMENT_TYPE_UE:
		neType = UE_TYPE_STR;
		break;
		case ELEMENT_TYPE_FOG:
		neType = FOG_TYPE_STR;
		break;
		case ELEMENT_TYPE_EDGE:
		neType = EDGE_APP_TYPE_STR;
		break;
		case ELEMENT_TYPE_DC:
		neType = DC_TYPE_STR;
		break;
		case ELEMENT_TYPE_UE_APP:
		neType = UE_APP_TYPE_STR;
		break;
		@@ -127,6 +161,9 @@ class ScenarioUpdateEventPane extends Component {
		var nl = zone.networkLocations[nInd];
		for (var plInd in nl.physicalLocations) {
		var pl = nl.physicalLocations[plInd];
		if (pl.type === neType) {
		elementNames.push(pl.name);
		}
		for (var prInd in pl.processes) {
		var pr = pl.processes[prInd];
		if (pr.type === neType) {
		@@ -177,6 +214,21 @@ class ScenarioUpdateEventPane extends Component {
		this.props.onClose(e);
		}

		onEditLocation() {
		this.toggleExecView();
		}

		onEditPath() {
		this.toggleExecView();
		}

		toggleExecView() {
		var sandboxCfg = updateObject({}, this.props.sandboxCfg);
		var sandbox = sandboxCfg[this.props.sandbox];
		sandbox.dashboardView1 = sandbox.dashboardView1 === NET_TOPOLOGY_VIEW ? MAP_VIEW : NET_TOPOLOGY_VIEW;
		this.props.changeSandboxCfg(sandboxCfg);
		}

		getPLFromScenario (elementName, scenario) {
		if (elementName === null) {
		return null;
		@@ -217,7 +269,7 @@ class ScenarioUpdateEventPane extends Component {
		eventScenarioUpdate: {
		action: action,
		node: {
		type: UE_TYPE_STR, // Change it to actual Procress Type
		type: UE_TYPE_STR,
		parent: parentVal,
		nodeDataUnion: {
		physicalLocation: pl
		@@ -262,8 +314,8 @@ class ScenarioUpdateEventPane extends Component {
		onDeleteElement={() => {}}
		onApplyCloneElement={() => {}}
		onCancelElement={e => this.onCancelElement(e)}
		onEditLocation={() => {}}
		onEditPath={() => {}}
		onEditLocation={elem => this.onEditLocation(elem)}
		onEditPath={elem => this.onEditPath(elem)}
		type={TYPE_EXEC}
		/>
		</Elevation>
		@@ -272,6 +324,20 @@ class ScenarioUpdateEventPane extends Component {
		}
		{ this.props.scenarioUpdateAction === 'REMOVE' ?
		<div>
		<Grid style={styles.block}>
		<GridCell span="8">
		<Select
		style={styles.select}
		label="Element Type"
		outlined
		options={elementTypes}
		onChange={e => { this.changeElementType(e.target.value); }}
		data-cy={EXEC_EVT_SU_REMOVE_ELEM_TYPE}
		value={this.props.scenarioUpdateRemoveEleType}
		/>
		</GridCell>
		<GridCell span="4"></GridCell>
		</Grid>
		<Grid style={styles.block}>
		<GridCell span="8">
		<Select
		@@ -333,7 +399,10 @@ const mapStateToProps = state => {
		return {
		scenarioUpdateAction: state.ui.scenarioUpdateAction,
		scenarioUpdateRemoveEleName: state.ui.scenarioUpdateRemoveEleName,
		scenarioUpdateRemoveEleType: state.ui.scenarioUpdateRemoveEleType,
		execConfigMode: state.exec.elementConfiguration.configurationMode,
		sandboxCfg: state.ui.sandboxCfg,
		sandbox: state.ui.sandbox,
		table: state.exec.table,
		scenario: state.exec.scenario
		};
		@@ -342,9 +411,11 @@ const mapStateToProps = state => {
		const mapDispatchToProps = dispatch => {
		return {
		changeActionType: event => dispatch(uiExecChangeScenarioUpdateAction(event)),
		changeRemoveActionEleType: event => dispatch(uiExecScenarioUpdateRemoveEleType(event)),
		changeRemoveActionEleName: event => dispatch(uiExecScenarioUpdateRemoveEleName(event)),
		execElemNew: elem => dispatch(execElemNew(elem)),
		execElemClear: elem => dispatch(execElemClear(elem)),
		changeSandboxCfg: cfg => dispatch(uiExecChangeSandboxCfg(cfg)),
		execElemSetErrMsg: msg => dispatch(execElemSetErrMsg(msg))
		};
		};

js-apps/meep-frontend/src/js/meep-constants.js

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ export const EXEC_EVT_NC_TYPE = 'exec-evt-nc-type';
		export const EXEC_EVT_NC_NAME = 'exec-evt-nc-name';

		export const EXEC_EVT_SU_ACTION = 'exec-evt-su-action';
		export const EXEC_EVT_SU_REMOVE_ELEM_TYPE = 'exec-evt-su-remove-elem-type';
		export const EXEC_EVT_SU_REMOVE_ELEM_NAME = 'exec-evt-su-remove-elem-name';

		export const MEEP_EVENT_COUNT = 'meep-event-count';

js-apps/meep-frontend/src/js/state/ui/index.js

+11 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ const initialState = {
		mobilityEventDestination: '',
		scenarioUpdateAction: SCENARIO_UPDATE_ACTION_NONE,
		scenarioUpdateRemoveEleName: '',
		scenarioUpdateRemoveEleType: '',
		devMode: false,
		currentDialog: '',
		automaticRefresh: false,
		@@ -159,6 +160,14 @@ export function uiExecScenarioUpdateRemoveEleName(event) {
		};
		}

		const UI_EXEC_SCENARIO_UPDATE_REMOVE_ELE_TYPE = 'UI_EXEC_SCENARIO_UPDATE_REMOVE_ELE_TYPE';
		export function uiExecScenarioUpdateRemoveEleType(event) {
		return {
		type: UI_EXEC_SCENARIO_UPDATE_REMOVE_ELE_TYPE,
		payload: event
		};
		}

		const UI_EXEC_CHANGE_EVENT_CREATION_MODE = 'UI_EXEC_CHANGE_EVENT_CREATION_MODE';
		export function uiExecChangeEventCreationMode(val) {
		return {
		@@ -361,6 +370,8 @@ export default function uiReducer(state = initialState, action) {
		return updateObject(state, { scenarioUpdateAction: action.payload });
		case UI_EXEC_SCENARIO_UPDATE_REMOVE_ELE_NAME:
		return updateObject(state, { scenarioUpdateRemoveEleName: action.payload });
		case UI_EXEC_SCENARIO_UPDATE_REMOVE_ELE_TYPE:
		return updateObject(state, { scenarioUpdateRemoveEleType: action.payload });
		case UI_CHANGE_DEV_MODE:
		return updateObject(state, { devMode: action.payload \|\| false });
		case UI_CHANGE_CURRENT_DIALOG: