summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/shared/services/aaiService
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-09-26 10:04:17 +0300
committerEylon Malin <eylon.malin@intl.att.com>2019-09-26 10:04:44 +0300
commit5438f8b8657dfd140a339a2524b11957869e21e0 (patch)
tree8e697c4e9064016ec59d46f73075c9ec32cbab4a /vid-webpack-master/src/app/shared/services/aaiService
parent16b52c71ed49b9cd6ffa2cd1383d1b6c7724e17f (diff)
check if FLAG_FLASH_REPLACE_VF_MODULE open in the right place
modern View/Edit couldn't be opened when FLAG_FLASH_REPLACE_VF_MODULE is on before that fix. Issue-ID: VID-652 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Ib7ff6f374b6c8aa62133a7ef53fc21877f4b3c53
Diffstat (limited to 'vid-webpack-master/src/app/shared/services/aaiService')
-rw-r--r--vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts25
1 files changed, 6 insertions, 19 deletions
diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
index d421fe8e1..1cc5593f7 100644
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
@@ -4,7 +4,7 @@ import {Injectable} from '@angular/core';
import * as _ from 'lodash';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/do';
-import {of} from "rxjs";
+import {Observable, of} from "rxjs";
import {AicZone} from "../../models/aicZone";
import {CategoryParams} from "../../models/categoryParams";
@@ -29,22 +29,12 @@ import {VnfInstance} from "../../models/vnfInstance";
import {VfModuleInstance} from "../../models/vfModuleInstance";
import {ServiceInstance} from "../../models/serviceInstance";
import {VfModuleMap} from "../../models/vfModulesMap";
-import {
- updateAicZones,
- updateCategoryParameters,
- updateLcpRegionsAndTenants,
- updateServiceTypes,
- updateSubscribers,
- updateUserId
-} from "../../storeUtil/utils/general/general.actions";
-import {
- updateModel,
- createServiceInstance,
-} from "../../storeUtil/utils/service/service.actions";
+import {updateAicZones, updateCategoryParameters, updateLcpRegionsAndTenants, updateServiceTypes, updateSubscribers, updateUserId} from "../../storeUtil/utils/general/general.actions";
+import {createServiceInstance, updateModel,} from "../../storeUtil/utils/service/service.actions";
import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service";
import {VnfMember} from "../../models/VnfMember";
import {setOptionalMembersVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions";
-import {Observable} from "rxjs";import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
+import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
import {VPNModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/vpnStep/vpn.step.model";
import {ModelInfo} from "../../models/modelInfo";
@@ -66,11 +56,8 @@ export class AaiService {
};
retrieveServiceLatestUpdateableVersion = (modelInvariantId: string): Observable<ModelInfo> => {
- if (this.featureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE)){
- let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
- return this.http.get<ModelInfo>(pathQuery)
- }
- return;
+ let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
+ return this.http.get<ModelInfo>(pathQuery)
};
getUserId = (): Observable<any> => {