diff options
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning')
4 files changed, 7 insertions, 10 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts index 8b7f1a4f5..01ae898f5 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts @@ -1,8 +1,5 @@ -import {TestBed, getTestBed} from '@angular/core/testing'; -import { - HttpClientTestingModule, - HttpTestingController -} from '@angular/common/http/testing'; +import {getTestBed, TestBed} from '@angular/core/testing'; +import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; import {NgRedux} from "@angular-redux/store"; import {DragAndDropService} from "./dragAndDrop.service"; import {AppState} from "../../../../shared/store/reducers"; @@ -15,7 +12,7 @@ class MockAppStore<T> { return { global: { flags: { - "DRAG_AND_DROP_OPERATION" : true + "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE" : true } }, service: { diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts index 01763c685..15da89ad3 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts @@ -11,7 +11,7 @@ export class DragAndDropService { constructor(private store: NgRedux<AppState>){} isAllow(): boolean { - return FeatureFlagsService.getFlagState(Features.DRAG_AND_DROP_OPERATION, this.store); + return FeatureFlagsService.getFlagState(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, this.store); } /******************************************************************** * manage drawing-board drag and drop operation @@ -23,7 +23,7 @@ export class DragAndDropService { ************************************************************/ drag(store, instanceId : string , nodes, {from, to}) :void{ - if (!store.getState().global.flags["DRAG_AND_DROP_OPERATION"]) return; + if (!store.getState().global.flags["FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE"]) return; let firstLevelNames : DragAndDropModel[] = [ new DragAndDropModel('VF',true), diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts index d3f04fe66..7ab2f5b5b 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts @@ -39,7 +39,7 @@ class MockAppStore<T> { global: { 'drawingBoardStatus': DrawingBoardModes.CREATE, flags : { - DRAG_AND_DROP_OPERATION : false + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE : false } } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts index 7a908b7fd..8ddb4ba2d 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts @@ -106,7 +106,7 @@ export class ObjectToInstanceTreeService { } sortElementsByPosition(nodes: any[]): any[] { - if (!FeatureFlagsService.getFlagState(Features.DRAG_AND_DROP_OPERATION, this.store)) return nodes; + if (!FeatureFlagsService.getFlagState(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, this.store)) return nodes; return nodes.sort((nodeA, nodeB) => { return nodeA.position - nodeB.position; }); |