summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-09-18 13:49:29 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-18 13:49:29 +0000
commit2f9bd74801137872422428cc97838943558398b1 (patch)
tree5338f5dd5ae0747e02ecda477e941862f37c12d7 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree
parentbedaaafc685d279615e755419ca4d8653b8a29f7 (diff)
parentf46e53e0c71db2388469558d48f8ffa25130f3d8 (diff)
Merge "add new flag FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE"
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree')
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts2
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts2
2 files changed, 2 insertions, 2 deletions
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;
});