From f792671ae247a931f34d902e9276202b5016ef9a Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 7 Jul 2019 19:23:03 +0300 Subject: Merge from ecomp 718fd196 - Modern UI Issue-ID: VID-378 Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f Signed-off-by: Ittay Stern --- .../app/shared/storeUtil/utils/ncf/ncf.actions.ts | 33 +++++++++++ .../shared/storeUtil/utils/ncf/ncf.reducer.spec.ts | 64 ++++++++++++++++++++++ .../app/shared/storeUtil/utils/ncf/ncf.reducer.ts | 26 +++++++++ 3 files changed, 123 insertions(+) create mode 100644 vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.actions.ts create mode 100644 vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.spec.ts create mode 100644 vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.ts (limited to 'vid-webpack-master/src/app/shared/storeUtil/utils/ncf') diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.actions.ts new file mode 100644 index 000000000..00b5d9f02 --- /dev/null +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.actions.ts @@ -0,0 +1,33 @@ +import {Action, ActionCreator} from "redux"; + +export enum NcfActions{ + DELETE_ACTION_NCF_INSTANCE = "DELETE_ACTION_NCF_INSTANCE", + UNDO_DELETE_ACTION_NCF_INSTANCE = "UNDO_DELETE_ACTION_NCF_INSTANCE" + +} +export interface DeleteActionNcfInstanceAction extends Action { + collectionResourceStoreKey: string, + ncfStoreKey : string; + serviceId : string; +} + +export interface UndoDeleteActionNcfInstanceAction extends Action { + collectionResourceStoreKey: string, + ncfStoreKey: string; + serviceId?: string; +} + + +export const deleteActionNcfInstance: ActionCreator = (collectionResourceStoreKey, ncfStoreKey, serviceId) => ({ + type: NcfActions.DELETE_ACTION_NCF_INSTANCE, + collectionResourceStoreKey: collectionResourceStoreKey, + ncfStoreKey: ncfStoreKey, + serviceId: serviceId +}); + +export const undoDeleteActionNcfInstance: ActionCreator = (collectionResourceStoreKey, ncfStoreKey, serviceId) => ({ + type: NcfActions.UNDO_DELETE_ACTION_NCF_INSTANCE, + collectionResourceStoreKey: collectionResourceStoreKey, + ncfStoreKey: ncfStoreKey, + serviceId: serviceId +}); diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.spec.ts new file mode 100644 index 000000000..ac7ab7419 --- /dev/null +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.spec.ts @@ -0,0 +1,64 @@ + +import {ServiceInstanceActions} from "../../../models/serviceInstanceActions"; +import {ncfReducer} from "./ncf.reducer"; +import {DeleteActionNcfInstanceAction, NcfActions, UndoDeleteActionNcfInstanceAction} from "./ncf.actions"; +describe('ncfReducer', () => { + + test('#DELETE_ACTION_NCF_INSTANCE', () => { + let ncfState = ncfReducer({ + serviceInstance: { + 'serviceModelId': { + collectionResources: { + 'collectionResourceStoreKey': { + ncfs: { + 'ncfStoreKey': { + isMissingData: true, + action: 'None' + } + } + } + } + } + } + }, + { + type: NcfActions.DELETE_ACTION_NCF_INSTANCE, + collectionResourceStoreKey: 'collectionResourceStoreKey', + ncfStoreKey: 'ncfStoreKey', + serviceId: 'serviceModelId' + }).serviceInstance['serviceModelId']['collectionResources']['collectionResourceStoreKey']['ncfs']['ncfStoreKey']; + + expect(ncfState).toBeDefined(); + expect(ncfState.action).toEqual(ServiceInstanceActions.None_Delete); + }); + + test('#UNDO_DELETE_ACTION_NCF_INSTANCE', () => { + let ncfState = ncfReducer({ + serviceInstance: { + 'serviceModelId': { + collectionResources: { + 'collectionResourceStoreKey': { + ncfs: { + 'ncfStoreKey': { + isMissingData: true, + action: 'Update_Delete' + } + } + } + + } + } + } + }, + { + type: NcfActions.UNDO_DELETE_ACTION_NCF_INSTANCE, + collectionResourceStoreKey: 'collectionResourceStoreKey', + ncfStoreKey: 'ncfStoreKey', + serviceId: 'serviceModelId' + }).serviceInstance['serviceModelId']['collectionResources']['collectionResourceStoreKey']['ncfs']['ncfStoreKey']; + + expect(ncfState).toBeDefined(); + expect(ncfState.action).toEqual(ServiceInstanceActions.Update); + }); + +}); diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.ts new file mode 100644 index 000000000..9bb069e0d --- /dev/null +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/ncf/ncf.reducer.ts @@ -0,0 +1,26 @@ +import {ServiceState} from "../main.reducer"; +import {Action} from "redux"; +import * as _ from "lodash"; +import {ServiceInstanceActions} from "../../../models/serviceInstanceActions"; +import {NcfActions, DeleteActionNcfInstanceAction, UndoDeleteActionNcfInstanceAction} from "./ncf.actions"; + +export function ncfReducer(state: ServiceState, action: Action): ServiceState { + switch (action.type) { + case NcfActions.DELETE_ACTION_NCF_INSTANCE : { + let newState = _.cloneDeep(state); + let ncf = newState.serviceInstance[(action).serviceId]['collectionResources'][(action).collectionResourceStoreKey]['ncfs'][(action).ncfStoreKey]; + let oldAction = ncf.action; + if(oldAction === ServiceInstanceActions.None_Delete || oldAction === ServiceInstanceActions.Update_Delete) return newState; + newState.serviceInstance[(action).serviceId]['collectionResources'][(action).collectionResourceStoreKey]['ncfs'][(action).ncfStoreKey].action = (oldAction + '_Delete') as ServiceInstanceActions; + return newState; + } + + case NcfActions.UNDO_DELETE_ACTION_NCF_INSTANCE : { + let newState = _.cloneDeep(state); + let ncf = newState.serviceInstance[(action).serviceId]['collectionResources'][(action).collectionResourceStoreKey]['ncfs'][(action).ncfStoreKey]; + let oldState = ncf.action; + newState.serviceInstance[(action).serviceId]['collectionResources'][(action).collectionResourceStoreKey]['ncfs'][(action).ncfStoreKey].action = (oldState.split('_')[0]) as ServiceInstanceActions; + return newState; + } + } +} -- cgit 1.2.3-korg