[sdc] - last merges before moving to LF

Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

2 files changed, 101 insertions, 12 deletions

diff --git a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
index aebbdbf7af..7a859097a9 100644
--- a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
+++ b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
@@ -8,6 +8,8 @@ import {ReflectiveInjector} from '@angular/core';
 import {Cookie2Service} from "./cookie.service";
 import {UUID} from "angular2-uuid";
 import {Dictionary} from "../../utils/dictionary/dictionary";
+import {SEVERITY} from "../../utils/constants";
+import {IServerMessageModalModel} from "../../view-models/modals/message-modal/message-server-modal/server-message-modal-view-model";
 
 export class HttpInterceptor implements Interceptor {
 
@@ -27,17 +29,22 @@ export class HttpInterceptor implements Interceptor {
          */
 
         request.options.headers.append(this.cookieService.getUserIdSuffix(), this.cookieService.getUserId());
-            var uuidValue = this.getUuidValue(request.url);
-            if(uuidValue!= ''){
-                request.options.headers.set('X-ECOMP-ServiceID',uuidValue);
-            }
-            request.options.headers.set('X-ECOMP-RequestID', UUID.UUID());
+        request.options.withCredentials = true;
+        var uuidValue = this.getUuidValue(request.url);
+        if (uuidValue != '') {
+            request.options.headers.set('X-ECOMP-ServiceID', uuidValue);
+        }
+        request.options.headers.set('X-ECOMP-RequestID', UUID.UUID());
         return request;
 
     }
 
-    public interceptAfter(response: InterceptedResponse): InterceptedResponse {
-            
+    public interceptAfter(response:InterceptedResponse):InterceptedResponse {
+
+        if (response.response.status !== 200 && response.response.status !== 201) {
+            this.responseError(response.response.json());
+            //console.log("Error from BE:",response);
+        }
         return response;
 
     }
@@ -52,6 +59,88 @@ export class HttpInterceptor implements Interceptor {
             });
         }
         return '';
-    }
+    };
+
+    public formatMessageArrays = (message:string, variables:Array<string>)=> {
+        return message.replace(/\[%(\d+)\]/g, function (_, m) {
+            let tmp = [];
+            let list = variables[--m].split(";");
+            list.forEach(function (item) {
+                tmp.push("<li>" + item + "</li>");
+            });
+            return "<ul>" + tmp.join("") + "</ul>";
+        });
+    };
+
+    public responseError = (rejection:any)=> {
+
+        let text:string;
+        let variables;
+        let messageId:string = "";
+        let isKnownException = false;
+
+        if (rejection && rejection.serviceException) {
+            text = rejection.serviceException.text;
+            variables = rejection.serviceException.variables;
+            messageId = rejection.serviceException.messageId;
+            isKnownException = true;
+        } else if (rejection && rejection.requestError && rejection.requestError.serviceException) {
+            text = rejection.requestError.serviceException.text;
+            variables = rejection.requestError.serviceException.variables;
+            messageId = rejection.requestError.serviceException.messageId;
+            isKnownException = true;
+        } else if (rejection && rejection.requestError && rejection.requestError.policyException) {
+            text = rejection.requestError.policyException.text;
+            variables = rejection.requestError.policyException.variables;
+            messageId = rejection.requestError.policyException.messageId;
+            isKnownException = true;
+        } else if (rejection) {
+            text = 'Wrong error format from server';
+            console.error(text);
+            isKnownException = false;
+        }
+
+        let data:IServerMessageModalModel;
+        if (isKnownException) {
+            // Remove the "Error: " text at the begining
+            if (text.trim().indexOf("Error:") === 0) {
+                text = text.replace("Error:", "").trim();
+            }
+
+            //mshitrit DE199895 bug fix
+            let count:number = 0;
+            variables.forEach(function (item) {
+                variables[count] = item ? item.replace('<', '&lt').replace('>', '&gt') : '';
+                count++;
+            });
 
+            // Format the message in case has array to <ul><li>
+            text = this.formatMessageArrays(text, variables);
+
+            // Format the message %1 %2
+            text = text.format(variables);
+
+            // Need to inject the MessageService manually to prevent circular dependencies (because MessageService use $templateCache that use $http).
+            data = {
+                title: 'Error',
+                message: text,
+                messageId: messageId,
+                status: rejection.status,
+                severity: SEVERITY.ERROR
+            };
+        } else {
+            // Need to inject the MessageService manually to prevent circular dependencies (because MessageService use $templateCache that use $http).
+            data = {
+                title: 'Error',
+                message: rejection.status !== -1 ? rejection.statusText : "Error getting response from server",
+                messageId: messageId,
+                status: rejection.status,
+                severity: SEVERITY.ERROR
+            };
+        }
+        // let modalsHandler = this.$injector.get('ModalsHandler');
+
+      //  this.modalsHandler.openServerMessageModal(data);
+        console.error('ERROR data',data);
+    }
 }
diff --git a/catalog-ui/src/app/ng2/services/properties.service.ts b/catalog-ui/src/app/ng2/services/properties.service.ts
index a22e2aed20..3a02e503fa 100644
--- a/catalog-ui/src/app/ng2/services/properties.service.ts
+++ b/catalog-ui/src/app/ng2/services/properties.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models";
+import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, PropertyDeclareAPIModel, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models";
 import { DataTypeService } from "./data-type.service";
 import { PROPERTY_TYPES } from "app/utils";
 import { ContentAfterLastDotPipe } from "../pipes/contentAfterLastDot.pipe";
@@ -48,14 +48,14 @@ export class PropertiesService {
     }
 
     public getCheckedProperties = (properties: Array<PropertyFEModel>): Array<PropertyBEModel> => {
-        let selectedProps: Array<PropertyBEModel> = [];
+        let selectedProps: Array<PropertyDeclareAPIModel> = [];
         properties.forEach(prop => {
             if (prop.isSelected && !prop.isDeclared && !prop.isDisabled) {
-                selectedProps.push(new PropertyBEModel(prop));
+                selectedProps.push(new PropertyDeclareAPIModel(prop));
             } else if (prop.flattenedChildren) {
                 prop.flattenedChildren.forEach((child) => {
                     if (child.isSelected && !child.isDeclared && !child.isDisabled) {
-                        let childProp = new PropertyBEModel(prop, child); //create it from the parent
+                        let childProp = new PropertyDeclareAPIModel(prop, child); //create it from the parent
                         selectedProps.push(childProp);
                     }
                 })