Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

1 files changed, 41 insertions, 35 deletions

diff --git a/catalog-ui/src/app/services/header-interceptor.ts b/catalog-ui/src/app/services/header-interceptor.ts
index 931b292d60..5f4819ae88 100644
--- a/catalog-ui/src/app/services/header-interceptor.ts
+++ b/catalog-ui/src/app/services/header-interceptor.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,17 +19,19 @@
  */
 
 'use strict';
-import {IAppConfigurtaion} from "../models/app-config";
-import {Dictionary} from "../utils/dictionary/dictionary";
-import {SharingService} from "./sharing-service";
-
-//Method name should be exactly "response" - http://docs.angularjs.org/api/ng/service/$http
-export interface IInterceptor {
-    request:Function;
+import { SharingService } from 'app/services-ng2';
+import { IAppConfigurtaion } from '../models/app-config';
+import { ServerErrorResponse } from '../models/server-error-response';
+import { Dictionary } from '../utils/dictionary/dictionary';
 
+// Method name should be exactly "response" - http://docs.angularjs.org/api/ng/service/$http
+export interface Interceptor {
+    request: Function;
+    response: Function;
+    responseError: Function;
 }
 
-export class HeaderInterceptor implements IInterceptor {
+export class HeaderInterceptor implements Interceptor {
     public static $inject = [
         '$injector',
         '$q',
@@ -39,51 +41,55 @@ export class HeaderInterceptor implements IInterceptor {
         '$location'
     ];
 
-    public static Factory($injector:ng.auto.IInjectorService,
-                          $q:ng.IQService,
-                          uuid4:any,
-                          sharingService:SharingService,
-                          sdcConfig:IAppConfigurtaion,
-                          $location:ng.ILocationService) {
-        return new HeaderInterceptor($injector, $q, uuid4, sharingService, sdcConfig, $location);
-    }
-
-    constructor(private $injector:ng.auto.IInjectorService,
-                private $q:ng.IQService,
-                private uuid4:any,
-                private sharingService:SharingService,
-                private sdcConfig:IAppConfigurtaion,
-                private $location:ng.ILocationService) {
-        console.debug('header-interceptor: initializing AuthenticationInterceptor');
+    constructor(private $injector: ng.auto.IInjectorService,
+                private $q: ng.IQService,
+                private uuid4: any,
+                private sharingService: SharingService,
+                private sdcConfig: IAppConfigurtaion,
+                private $location: ng.ILocationService) {
     }
 
-    public request = (requestSuccess):ng.IPromise<any> => {
+    public request = (requestSuccess): ng.IPromise<any> => {
         requestSuccess.headers['X-ECOMP-RequestID'] = this.uuid4.generate();
         /**
          * For every request to the server, that the service id, or resource id is sent in the URL, need to pass UUID in the header.
          * Check if the unique id exists in uuidMap, and if so get the UUID and add it to the header.
          */
-        let map:Dictionary<string, string> = this.sharingService.getUuidMap();
+        const map: Dictionary<string, string> = this.sharingService.getUuidMap();
         if (map && requestSuccess.url.indexOf(this.sdcConfig.api.root) === 0) {
-            console.log("header-interceptor: url: " + requestSuccess.url);
-            map.forEach((key:string) => {
+            map.forEach((key: string) => {
                 if (requestSuccess.url.indexOf(key) !== -1) {
                     requestSuccess.headers['X-ECOMP-ServiceID'] = this.sharingService.getUuidValue(key);
                 }
             });
         }
         return requestSuccess;
-    };
+    }
 
-    public response = (responseSuccess):ng.IPromise<any> => {
-        let responseData = responseSuccess.data;
+    public response = (responseSuccess): ng.IPromise<any> => {
+        const responseData = responseSuccess.data;
         if (responseData) {
-            let data = JSON.stringify(responseData);
-            if (data && (data.indexOf("Global Logon: Login") > 0)) {
+            const data = JSON.stringify(responseData);
+            if (data && (data.indexOf('Global Logon: Login') > 0)) {
                 this.$location.path('dashboard/welcome');
                 window.location.reload();
             }
         }
         return responseSuccess;
     }
+
+    public responseError = (response): ng.IPromise<any> => {
+        const errorResponse: ServerErrorResponse = new ServerErrorResponse(response, true);
+        const modalService = this.$injector.get('ModalServiceSdcUI');
+
+        const errorDetails = {
+            'Error Code': errorResponse.messageId,
+            'Status Code': errorResponse.status
+        };
+        if (errorResponse.ecompRequestId) {
+            errorDetails['Transaction ID'] = errorResponse.ecompRequestId;
+        }
+        modalService.openErrorDetailModal('Error', errorResponse.message, 'error-modal', errorDetails);
+        return this.$q.reject(errorResponse);
+    }
 }