From 4feb70f1a6ddce552f12e2b9cc5daf0d24fd4d82 Mon Sep 17 00:00:00 2001
From: RachithaRamappa93 <rachitha.ramappa@att.com>
Date: Thu, 18 Feb 2021 22:03:28 +0530
Subject: Audit screen fix

Change-Id: I03aa8b5a7c78a0a1441d0ba20ec15169b90d4362
Issue-ID: VID-945
Signed-off-by: rachitha.ramappa@att.com
---
 .../drawing-board-header.service.ts                    | 18 ++++++++++++++----
 .../auditInfoModal/auditInfoModal.component.ts         | 14 +++++++++++++-
 .../src/app/shared/storeUtil/utils/main.reducer.ts     |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'vid-webpack-master')

diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
index 80ce6e055..4dcee2deb 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
@@ -50,11 +50,21 @@ export class DrawingBoardHeaderService{
     let instance: ServiceInstance = this.store.getState().service.serviceInstance[serviceModelId];
     let model =  new ServiceModel(this.store.getState().service.serviceHierarchy[serviceModelId]);
     let serviceInfoModel: ServiceInfoModel = this.store.getState().service.serviceInfoModel;
-    console.log("ShowAuditInfo : ServiceInfoModel from drawing-board-header service : ", serviceInfoModel);
-    if(serviceInfoModel != null || serviceInfoModel != undefined){
+    if(serviceInfoModel == null || serviceInfoModel == undefined){
+      console.log("serviceInfoModel is null or undefined");
+      let serviceInfoModelNew : any = {
+        serviceInstanceId : instance.instanceId,
+        serviceInstanceName: instance.instanceName,
+        serviceModelVersion: instance.modelInfo.modelVersion,
+        serviceModelName: instance.modelInfo.modelName,
+        aLaCarte: true
+      };
+      console.log("New service Info Model : ", serviceInfoModelNew);
+      AuditInfoModalComponent.openModal.next(serviceInfoModelNew);
+    // AuditInfoModalComponent.openInstanceAuditInfoModal.next({instanceId : serviceModelId , type : 'SERVICE', model : model , instance : instance});
+    } else {
+      console.log("ServiceInfoModel is not null: ", serviceInfoModel);
       AuditInfoModalComponent.openModal.next(serviceInfoModel);
-    } else{
-      AuditInfoModalComponent.openInstanceAuditInfoModal.next({instanceId : serviceModelId , type : 'SERVICE', model : model , instance : instance});
     }
   }
 
diff --git a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.ts b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.ts
index df05fe2a6..aa2565939 100644
--- a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.ts
+++ b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.ts
@@ -68,7 +68,19 @@ export class AuditInfoModalComponent {
       if (jobData) {
         this.jobDataLocal = jobData;
         this.isAlaCarte = jobData.aLaCarte;
-        this.openAuditInfoModal(jobData);
+        //this.openAuditInfoModal(jobData);
+		if(jobData.jobId != null || jobData.jobId != undefined){
+          console.log("jobId not null : ", jobData.jobId);
+          this.openAuditInfoModal(jobData);
+        } else{
+          this._serviceInfoService.getInstanceAuditStatus(jobData.serviceInstanceId, 'SERVICE').subscribe((res : AuditStatus[]) =>{
+            this.msoInfoData = res;
+			this.sortMsoInfo();
+			this.isALaCarteFlagOn = true;
+			this.isAlaCarte = true;
+          });
+        }
+		
         _iframeService.addClassOpenModal(this.parentElementClassName);
         this.serviceModelName = jobData.serviceModelName ? jobData.serviceModelName : '';
         this.serviceModelId = jobData.serviceModelId;
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/main.reducer.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/main.reducer.ts
index a8254b45d..5c3f0c789 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/main.reducer.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/main.reducer.ts
@@ -31,7 +31,7 @@ import {pnfReducer} from "./pnf/pnf.reducers";
 
 export let initialState: ServiceState = {
   serviceHierarchy: {},
-  serviceInfoModel: {},
+  serviceInfoModel: null,
   serviceInstance: {},
   lcpRegionsAndTenants: new LcpRegionsAndTenants(),
   subscribers: null,
-- 
cgit 1.2.3-korg