From 84a2d500a75067508081cc68055484fc265d3910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= <ramon.tomas84@hotmail.com>
Date: Tue, 11 Jul 2017 13:48:07 +0200
Subject: [PATCH] Added alert when error ocurrs listing catalog products,
 orders and campaigns in SPA app

---
 .../campaigns/campaigns.component.html        |  3 ++
 .../campaigns/campaigns.component.scss        |  4 +++
 .../modules/campaigns/campaigns.component.ts  | 28 +++++++++++------
 .../modules/catalog/catalog.component.html    |  3 ++
 .../modules/catalog/catalog.component.scss    |  4 +++
 .../modules/catalog/catalog.component.ts      | 30 ++++++++++++-------
 .../modules/orders/orders.component.html      |  3 ++
 .../modules/orders/orders.component.scss      |  4 +++
 .../Client/modules/orders/orders.component.ts | 19 ++++++++----
 .../shared/components/identity/identity.scss  |  2 +-
 10 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.html b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.html
index d2379bd4e..ad724c408 100644
--- a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.html
+++ b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.html
@@ -1,5 +1,8 @@
 <esh-header url="/catalog">Back to catalog</esh-header>
 <div class="container">
+    <div class="alert alert-warning esh-campaign-alert" role="alert" [hidden]="!errorReceived">
+        Error requesting campaigns list, please try later on
+    </div>
     <div *ngIf="campaigns?.data?.length > 0">
         <esh-pager [model]="paginationInfo" (changed)="onPageChanged($event)"></esh-pager>        
         <div class="card-group esh-campaign-items row">
diff --git a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.scss b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.scss
index 17d9da105..371461d64 100644
--- a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.scss
+++ b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.scss
@@ -62,4 +62,8 @@
         text-align: center;
         text-transform: uppercase;
     }
+
+    &-alert {
+        margin-top: 10px;
+    }
 }
diff --git a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.ts b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.ts
index c7cf85bc0..3674d8d9f 100644
--- a/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.ts
+++ b/src/Web/WebSPA/Client/modules/campaigns/campaigns.component.ts
@@ -3,6 +3,7 @@ import { CampaignsService }        from './campaigns.service';
 import { ICampaign }               from '../shared/models/campaign.model';
 import { IPager }               from '../shared/models/pager.model';
 import { ConfigurationService } from '../shared/services/configuration.service';
+import { Observable } from 'rxjs/Observable';
 
 @Component({
     selector: 'esh-campaigns',
@@ -14,6 +15,7 @@ export class CampaignsComponent implements OnInit {
     paginationInfo: IPager;
     campaigns: ICampaign;
     isCampaignDetailFunctionEnabled: boolean = false;
+    errorReceived: boolean;
 
     constructor(private service: CampaignsService, private configurationService: ConfigurationService) { }
 
@@ -37,20 +39,28 @@ export class CampaignsComponent implements OnInit {
     }   
 
     getCampaigns(pageSize: number, pageIndex: number) {
-        this.service.getCampaigns(pageIndex, pageSize).subscribe(campaigns => {
-            this.campaigns = campaigns;
-            this.paginationInfo = {
-                actualPage : campaigns.pageIndex,
-                itemsPage : campaigns.pageSize,
-                totalItems : campaigns.count,
-                totalPages: Math.ceil(campaigns.count / campaigns.pageSize),
-                items: campaigns.pageSize
-            };
+        this.errorReceived = false;
+        this.service.getCampaigns(pageIndex, pageSize)
+            .catch((err) => this.handleError(err))
+            .subscribe(campaigns => {
+                this.campaigns = campaigns;
+                this.paginationInfo = {
+                    actualPage : campaigns.pageIndex,
+                    itemsPage : campaigns.pageSize,
+                    totalItems : campaigns.count,
+                    totalPages: Math.ceil(campaigns.count / campaigns.pageSize),
+                    items: campaigns.pageSize
+                };
         });
     }
 
     onNavigateToDetails(uri: string) {
         window.open(uri, "_blank");
     }
+
+    private handleError(error: any) {
+        this.errorReceived = true;
+        return Observable.throw(error);
+    }  
 }
 
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
index a7fc93e7a..d03b8433b 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
@@ -6,6 +6,9 @@
 
 <section class="esh-catalog-filters">
     <div class="container">
+        <div class="alert alert-warning esh-catalog-alert" role="alert" [hidden]="!errorReceived">
+            Error requesting catalog products, please try later on
+        </div>
         <label class="esh-catalog-label" data-title="brand">
             <select class="esh-catalog-filter" (change)="onBrandFilterChanged($event, $event.target.value)">
                 <option *ngFor="let brand of brands" [value]="brand.id">{{brand.brand}}</option>
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.scss b/src/Web/WebSPA/Client/modules/catalog/catalog.component.scss
index 56291fdd2..55377107e 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.scss
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.scss
@@ -151,4 +151,8 @@
             content: '$';
         }
     }
+
+    &-alert {
+        margin-top: 10px;
+    }
 }
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts
index b5315fca1..03e8a27fe 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts
@@ -10,6 +10,7 @@ import { ICatalogBrand }        from '../shared/models/catalogBrand.model';
 import { IPager }               from '../shared/models/pager.model';
 import { BasketWrapperService}  from '../shared/services/basket.wrapper.service';
 import { SecurityService }      from '../shared/services/security.service';
+import { Observable } from 'rxjs/Observable';
 
 @Component({
     selector: 'esh-catalog .esh-catalog',
@@ -25,6 +26,7 @@ export class CatalogComponent implements OnInit {
     paginationInfo: IPager;
     authenticated: boolean = false;
     authSubscription: Subscription;
+    errorReceived: boolean;
 
     constructor(private service: CatalogService, private basketService: BasketWrapperService, private configurationService: ConfigurationService, private securityService: SecurityService) {
         this.authenticated = securityService.IsAuthorized;
@@ -79,17 +81,18 @@ export class CatalogComponent implements OnInit {
     }
 
     getCatalog(pageSize: number, pageIndex: number, brand?: number, type?: number) {
-        this.service.getCatalog(pageIndex, pageSize, brand, type).subscribe(catalog => {
-            this.catalog = catalog;
-
-            this.paginationInfo = {
-                actualPage : catalog.pageIndex,
-                itemsPage : catalog.pageSize,
-                totalItems : catalog.count,
-                totalPages: Math.ceil(catalog.count / catalog.pageSize),
-                items: catalog.pageSize
-            };
-
+        this.errorReceived = false;
+        this.service.getCatalog(pageIndex, pageSize, brand, type)
+            .catch((err) => this.handleError(err))
+            .subscribe(catalog => {
+                this.catalog = catalog;
+                this.paginationInfo = {
+                    actualPage : catalog.pageIndex,
+                    itemsPage : catalog.pageSize,
+                    totalItems : catalog.count,
+                    totalPages: Math.ceil(catalog.count / catalog.pageSize),
+                    items: catalog.pageSize
+                };
         });
     }
 
@@ -108,5 +111,10 @@ export class CatalogComponent implements OnInit {
             this.brands.unshift(allBrands);
         });
     }
+
+    private handleError(error: any) {
+        this.errorReceived = true;
+        return Observable.throw(error);
+    }
 }
 
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.component.html b/src/Web/WebSPA/Client/modules/orders/orders.component.html
index f6c547279..7c720dd67 100644
--- a/src/Web/WebSPA/Client/modules/orders/orders.component.html
+++ b/src/Web/WebSPA/Client/modules/orders/orders.component.html
@@ -2,6 +2,9 @@
     <esh-header url="/catalog">Back to catalog</esh-header>
 
     <div class="container">
+        <div class="alert alert-warning esh-orders-alert" role="alert" [hidden]="!errorReceived">
+            Error requesting order list, please try later on
+        </div>
         <article class="esh-orders-titles row">
             <section class="esh-orders-title col-xs-2">Order number</section>
             <section class="esh-orders-title col-xs-4">Date</section>
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.component.scss b/src/Web/WebSPA/Client/modules/orders/orders.component.scss
index 013780e18..c7a6a7664 100644
--- a/src/Web/WebSPA/Client/modules/orders/orders.component.scss
+++ b/src/Web/WebSPA/Client/modules/orders/orders.component.scss
@@ -78,4 +78,8 @@
             transition: color $animation-speed-default;
         }
     }
+
+    &-alert {
+        margin-top: 10px;
+    }
 }
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.component.ts b/src/Web/WebSPA/Client/modules/orders/orders.component.ts
index c33b3e9ba..105965200 100644
--- a/src/Web/WebSPA/Client/modules/orders/orders.component.ts
+++ b/src/Web/WebSPA/Client/modules/orders/orders.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit }    from '@angular/core';
 import { OrdersService }        from './orders.service';
 import { IOrder }               from '../shared/models/order.model';
 import { ConfigurationService } from '../shared/services/configuration.service';
+import { Observable } from 'rxjs/Observable';
 
 @Component({
     selector: 'esh-orders',
@@ -11,6 +12,7 @@ import { ConfigurationService } from '../shared/services/configuration.service';
 export class OrdersComponent implements OnInit {
     private oldOrders: IOrder[];
     private interval = null;
+    errorReceived: boolean;
 
     orders: IOrder[];
 
@@ -36,13 +38,20 @@ export class OrdersComponent implements OnInit {
         }, 1000);
     }
 
-
     getOrders() {
-        this.service.getOrders().subscribe(orders => {
-            this.orders = orders;
-            this.oldOrders = this.orders;
-            console.log('orders items retrieved: ' + orders.length);
+        this.errorReceived = false;
+        this.service.getOrders()
+            .catch((err) => this.handleError(err))
+            .subscribe(orders => {
+                this.orders = orders;
+                this.oldOrders = this.orders;
+                console.log('orders items retrieved: ' + orders.length);
         });
     }
+
+    private handleError(error: any) {
+        this.errorReceived = true;
+        return Observable.throw(error);
+    }  
 }
 
diff --git a/src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss b/src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss
index df26fa9db..e20683458 100644
--- a/src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss
+++ b/src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss
@@ -31,7 +31,7 @@
         height: 0;
         min-width: 14rem;
         overflow: hidden;
-        padding: .5rem;
+        padding: .3rem;
         position: absolute;
         right: 0;
         top: 2.5rem;