diff options
Diffstat (limited to 'vid-webpack-master/src/app/shared/storeUtil/utils/network')
3 files changed, 25 insertions, 37 deletions
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.actions.ts index c90d8eb3d..50bb98ee3 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.actions.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.actions.ts @@ -1,5 +1,7 @@ import {Action, ActionCreator} from "redux"; import {NetworkInstance} from "../../../models/networkInstance"; +import {ActionOnFirstLevel} from "../firstLevel/firstLevel.actions"; + export enum NetworkActions { UPDATE_NETWORK_INSTANCE = "UPDATE_NETWORK_INSTANCE", @@ -37,15 +39,7 @@ export interface CreateNetworkInstanceAction extends Action { networkStoreKey?:string; } -export interface DeleteActionNetworkInstanceAction extends Action { - networkStoreKey: string; - serviceId?: string; -} -export interface UndoDeleteActionNetworkInstanceAction extends Action { - networkStoreKey: string; - serviceId?: string; -} export const updateNetworkInstance: ActionCreator<UpdateNetworkInstanceAction> = (networkInstance, networkfModelName, serviceUuid, networkStoreKey) => ({ type: NetworkActions.UPDATE_NETWORK_INSTANCE, @@ -71,15 +65,17 @@ export const createNetworkInstance: ActionCreator<CreateNetworkInstanceAction> = }); -export const deleteActionNetworkInstance: ActionCreator<DeleteActionNetworkInstanceAction> = (networkStoreKey, serviceId) => ({ +export const deleteActionNetworkInstance: ActionCreator<ActionOnFirstLevel> = (networkStoreKey, serviceId) => ({ type: NetworkActions.DELETE_ACTION_NETWORK_INSTANCE, - networkStoreKey: networkStoreKey, + firstLevelName: 'networks', + storeKey: networkStoreKey, serviceId: serviceId }); -export const undoDeleteActionNetworkInstance: ActionCreator<UndoDeleteActionNetworkInstanceAction> = (networkStoreKey, serviceId) => ({ +export const undoDeleteActionNetworkInstance: ActionCreator<ActionOnFirstLevel> = (networkStoreKey, serviceId) => ({ type: NetworkActions.UNDO_DELETE_ACTION_NETWORK_INSTANCE, - networkStoreKey: networkStoreKey, + firstLevelName: 'networks', + storeKey: networkStoreKey, serviceId: serviceId }); diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.spec.ts index ba41ad6e6..7bf37fa0e 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.spec.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.spec.ts @@ -1,12 +1,13 @@ import {networkReducer} from "./network.reducers"; import { - CreateNetworkInstanceAction, DeleteActionNetworkInstanceAction, - NetworkActions, UndoDeleteActionNetworkInstanceAction, + CreateNetworkInstanceAction, + NetworkActions, UpdateNetworkCollectionFunction, UpdateNetworkInstanceAction } from "./network.actions"; import {NetworkInstance} from "../../../models/networkInstance"; import {ServiceInstanceActions} from "../../../models/serviceInstanceActions"; +import {ActionOnFirstLevel} from "../firstLevel/firstLevel.actions"; describe('networkReducer', () => { @@ -78,9 +79,10 @@ describe('networkReducer', () => { } } }}, - <DeleteActionNetworkInstanceAction>{ + <ActionOnFirstLevel>{ type: NetworkActions.DELETE_ACTION_NETWORK_INSTANCE, - networkStoreKey: 'networkStoreKey', + firstLevelName: 'networks', + storeKey: 'networkStoreKey', serviceId: 'serviceModelId' }).serviceInstance['serviceModelId'].networks['networkStoreKey']; @@ -99,9 +101,9 @@ describe('networkReducer', () => { } } }}, - <UndoDeleteActionNetworkInstanceAction>{ + <ActionOnFirstLevel>{ type: NetworkActions.UNDO_DELETE_ACTION_NETWORK_INSTANCE, - networkStoreKey: 'networkStoreKey', + storeKey: 'networkStoreKey', serviceId: 'serviceModelId' }).serviceInstance['serviceModelId'].networks['networkStoreKey']; diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.ts index bcbbea57d..a8154e856 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/network/network.reducers.ts @@ -2,8 +2,8 @@ import {Action} from "redux"; import * as _ from "lodash"; import {NetworkInstance} from "../../../models/networkInstance"; import { - CreateNetworkInstanceAction, DeleteActionNetworkInstanceAction, - NetworkActions, UndoDeleteActionNetworkInstanceAction, + CreateNetworkInstanceAction, + NetworkActions, UpdateNetworkCollectionFunction, UpdateNetworkInstanceAction } from "./network.actions"; @@ -11,6 +11,8 @@ import {ServiceInstance} from "../../../models/serviceInstance"; import {calculateNextUniqueModelName} from "../vnf/vnf.reducers"; import {ServiceState} from "../main.reducer"; import {ServiceInstanceActions} from "../../../models/serviceInstanceActions"; +import {deleteFirstLevel, updateServiceValidationCounter} from "../reducersHelper"; +import {ActionOnFirstLevel} from "../firstLevel/firstLevel.actions"; export function networkReducer(state: ServiceState , action: Action) : ServiceState { @@ -58,23 +60,18 @@ export function networkReducer(state: ServiceState , action: Action) : ServiceSt Object.assign(state, {'networkFunctions': networkFunctionReduxObj}); return Object.assign({}, state); } + case NetworkActions.DELETE_ACTION_NETWORK_INSTANCE : { - let newState = _.cloneDeep(state); - let network = newState.serviceInstance[(<DeleteActionNetworkInstanceAction>action).serviceId].networks[(<DeleteActionNetworkInstanceAction>action).networkStoreKey]; - let oldAction = network.action; - if(oldAction === ServiceInstanceActions.None_Delete || oldAction === ServiceInstanceActions.Update_Delete) return newState; - newState.serviceInstance[(<DeleteActionNetworkInstanceAction>action).serviceId].networks[(<DeleteActionNetworkInstanceAction>action).networkStoreKey].action = (oldAction + '_Delete') as ServiceInstanceActions; - updateServiceValidationCounter(newState, network['isMissingData'], false , (<DeleteActionNetworkInstanceAction>action).serviceId); + return deleteFirstLevel(state, <ActionOnFirstLevel>action,true); - return newState; } case NetworkActions.UNDO_DELETE_ACTION_NETWORK_INSTANCE : { let newState = _.cloneDeep(state); - let network = newState.serviceInstance[(<UndoDeleteActionNetworkInstanceAction>action).serviceId].networks[(<UndoDeleteActionNetworkInstanceAction>action).networkStoreKey]; + let network = newState.serviceInstance[(<ActionOnFirstLevel>action).serviceId].networks[(<ActionOnFirstLevel>action).storeKey]; let oldState = network.action; - newState.serviceInstance[(<UndoDeleteActionNetworkInstanceAction>action).serviceId].networks[(<UndoDeleteActionNetworkInstanceAction>action).networkStoreKey].action = (oldState.split('_')[0]) as ServiceInstanceActions; - updateServiceValidationCounter(newState, network['isMissingData'], false , (<DeleteActionNetworkInstanceAction>action).serviceId); + newState.serviceInstance[(<ActionOnFirstLevel>action).serviceId].networks[(<ActionOnFirstLevel>action).storeKey].action = (oldState.split('_')[0]) as ServiceInstanceActions; + updateServiceValidationCounter(newState, network['isMissingData'], false , (<ActionOnFirstLevel>action).serviceId); return newState; } } @@ -91,12 +88,5 @@ const updateUniqueNames = (oldName : string, newName : string, serviceInstance : }; -const updateServiceValidationCounter = (newState: any, oldValidationState: boolean, newValidationState: boolean, serviceUuid: string) => { - if (oldValidationState && !newValidationState) { - newState.serviceInstance[serviceUuid].validationCounter--; - } else if (!oldValidationState && newValidationState) { - newState.serviceInstance[serviceUuid].validationCounter++; - } -}; |