Merge branch 'dev' into features/UpgradePackageVersions

jmanuelcorral · jmanuelcorral · commit f7d9fc9cde96 · 2019-03-21T16:38:59.000+01:00
diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml
@@ -2,6 +2,21 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/ApiGateways/*
+    - k8s/helm/apigwmm/*
+    - k8s/helm/apigwms/*
+    - k8s/helm/apigwwm/*
+    - k8s/helm/apigwws/*
+    exclude:
+    - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
+    - src/ApiGateways/Web.Bff.Shopping/aggregator/*
 steps:
 - task: DockerCompose@0
   displayName: Compose build apigws
diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Basket/*
+    - k8s/helm/basket-api/*
 steps:
 - task: DockerCompose@0
   displayName: Compose build basket
diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Catalog/*
+    - k8s/helm/catalog-api/*    
 steps:
 - task: DockerCompose@0
   displayName: Compose build catalog
diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Identity/*
+    - k8s/helm/identity-api/*      
 steps:
 - task: DockerCompose@0
   displayName: Compose build identity
diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Location/*
+    - k8s/helm/locations-api/*          
 steps:
 - task: DockerCompose@0
   displayName: Compose build locations
diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Marketing/*
+    - k8s/helm/marketing-api/*            
 steps:
 - task: DockerCompose@0
   displayName: Compose build marketing
diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
@@ -2,6 +2,15 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
+    - k8s/helm/mobileshoppingagg/*          
 steps:
 - task: DockerCompose@0
   displayName: Compose build mobileshoppingagg
diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml
@@ -2,6 +2,18 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Ordering/*
+    - k8s/helm/ordering-api/*  
+    - k8s/helm/ordering-backgroundtasks/*
+    - k8s/helm/ordering-signalrhub/*
 steps:
 - task: DockerCompose@0
   displayName: Compose build ordering 
diff --git a/build/azure-devops/payment-api/azure-pipelines.yml b/build/azure-devops/payment-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Payment/*
+    - k8s/helm/payment-api/*  
 steps:
 - task: DockerCompose@0
   displayName: Compose build payment
diff --git a/build/azure-devops/web-shopping-agg/azure-pipelines.yml b/build/azure-devops/web-shopping-agg/azure-pipelines.yml
@@ -2,6 +2,15 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/ApiGateways/Web.Bff.Shopping/aggregator/*
+    - k8s/helm/webshoppingagg/*           
 steps:
 - task: DockerCompose@0
   displayName: Compose build webshoppingagg
diff --git a/build/azure-devops/webhooks-api/azure-pipelines.yml b/build/azure-devops/webhooks-api/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Services/Webhooks/*
+    - k8s/helm/webhooks-api/*  
 steps:
 - task: DockerCompose@0
   displayName: Compose build webhooks
diff --git a/build/azure-devops/webhooks-client/azure-pipelines.yml b/build/azure-devops/webhooks-client/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Web/WebhookClient/*
+    - k8s/helm/webhooks-web/*      
 steps:
 - task: DockerCompose@0
   displayName: Compose build webhooks.client
diff --git a/build/azure-devops/webmvc/azure-pipelines.yml b/build/azure-devops/webmvc/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Web/WebMVC/*
+    - k8s/helm/webmvc/*        
 steps:
 - task: DockerCompose@0
   displayName: Compose build webmvc
diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Web/WebSPA/*
+    - k8s/helm/webspa/*            
 steps:
 - task: DockerCompose@0
   displayName: Compose build webspa
diff --git a/build/azure-devops/webstatus/azure-pipelines.yml b/build/azure-devops/webstatus/azure-pipelines.yml
@@ -2,6 +2,16 @@ pool:
   vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/BuildingBlocks/*
+    - src/Web/WebStatus/*
+    - k8s/helm/webstatus/*        
 steps:
 - task: DockerCompose@0
   displayName: Compose build webstatus
diff --git a/src/Web/WebhookClient/Pages/Index.cshtml b/src/Web/WebhookClient/Pages/Index.cshtml
@@ -4,9 +4,17 @@
     ViewData["Title"] = "Home page";
 }
 
+<section class="esh-catalog-hero">
+</section>
+
 <div class="text-center">
-    <h1 class="display-4">Welcome</h1>
-    <p>eShopOnContainers - Webhook client</p>
+    <p>&nbsp;</p>
+    <img class="esh-app-footer-brand" src="~/images/brand.png" />
+    <h2>eShopOnContainers - Order Management</h2>
+    <p>
+        This is a <bold>sample</bold> web client that uses the Webhooks API to show you all orders that reached the "paid" status. This is accomplished by creating a Webhook
+        that will be called by eShopOnContainers core when the order reached this "paid" status. If not created you can create this webhook going to <a asp-page="RegisterWebhook">webhook registration</a>.
+    </p>
     @if (!User.Identity.IsAuthenticated)
     {
         <a class="btn-primary btn" href="@Url.Action("SignIn", "Account")">Login</a>
@@ -15,8 +23,8 @@
 </div>
 
 <div class="table">
-    <h3>Current webhooks received</h3>
-    <p>(Data since last time web started up)<p>
+    <h3>Current webhooks received (orders paid)</h3>
+    <p>(Data since last time web started up). <strong>Note: </strong>Must manually refresh this page.<p>
     <table class="table">
         @foreach (var webhook in Model.WebHooksReceived)
         {
diff --git a/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml b/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml
@@ -4,9 +4,9 @@
     ViewData["Title"] = "RegisterWebhook";
 }
 
-<h3>Register webhook</h3>
+<h3>Register a new webhook</h3>
 
-<p>This page registers the "OrderPaid" Webhook by sending a POST to webhooks.</p>
+<p>This page registers the "OrderPaid" Webhook by sending a POST to the WebHooks API. Once the Webhook is set, you will be able to see new paid orders from the <a asp-page="Index">Index</a> page.</p>
 
 <form method="post">
     <p>Token: <input type="text" asp-for="Token" /></p>
@@ -15,5 +15,6 @@
 
 @if (Model.ResponseCode != (int)System.Net.HttpStatusCode.OK)
 {
-    <p>Error @Model.ResponseCode (@Model.ResponseMessage) when calling the Webhooks API (@Model.RequestUrl) with GrantUrl: @Model.GrantUrl):(</p>
+    <p>Error @Model.ResponseCode (@Model.ResponseMessage) when calling the Webhooks API (@Model.RequestUrl) with GrantUrl: @Model.GrantUrl)</p>
+    <p>Data sent to the webhooks API was <raw>@Model.RequestBodyJson</raw></p>
 }
diff --git a/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs b/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using WebhookClient.Models;
 
 namespace WebhookClient.Pages
@@ -27,7 +28,7 @@ public class RegisterWebhookModel : PageModel
         public string RequestUrl { get; set; }
         public string GrantUrl { get; set; }
         public string ResponseMessage { get; set; }
-
+        public string RequestBodyJson { get; set; }
 
         public RegisterWebhookModel(IOptions<Settings> settings, IHttpClientFactory httpClientFactory)
         {
@@ -69,6 +70,7 @@ public async Task<IActionResult> OnPost()
             }
             else
             {
+                RequestBodyJson = JsonConvert.SerializeObject(payload);
                 ResponseCode = (int)response.StatusCode;
                 ResponseMessage = response.ReasonPhrase;
                 GrantUrl = granturl;
diff --git a/src/Web/WebhookClient/Pages/Shared/_Layout.cshtml b/src/Web/WebhookClient/Pages/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - WebhookClient</title>
+    <title>@ViewData["Title"] - Order Management</title>
 
     <environment include="Development">
         <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
@@ -21,7 +21,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">WebhookClient</a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index">Order Management</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -50,7 +50,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2019 - WebhookClient - <a asp-area="" asp-page="/RegisterWebhook">Register Webhook</a> | <a asp-area="" asp-page="/WebhooksList">Webhooks registered in API</a>
+            &copy; 2019 - Order Management - <a asp-area="" asp-page="/RegisterWebhook">Register Webhook</a> | <a asp-area="" asp-page="/WebhooksList">Webhooks registered in API</a>
         </div>
     </footer>
 
diff --git a/src/Web/WebhookClient/wwwroot/css/site.css b/src/Web/WebhookClient/wwwroot/css/site.css
@@ -54,3 +54,15 @@ body {
   height: 60px;
   line-height: 60px; /* Vertically center the text there */
 }
+
+.esh-catalog-hero {
+    background-image: url("../images/main_banner.png");
+    background-size: cover;
+    height: 260px;
+    width: 100%;
+}
+
+.esh-app-footer-brand {
+    height: 50px;
+    width: 230px;
+}
diff --git a/src/Web/WebhookClient/wwwroot/images/brand.png b/src/Web/WebhookClient/wwwroot/images/brand.png
diff --git a/src/Web/WebhookClient/wwwroot/images/main_banner.png b/src/Web/WebhookClient/wwwroot/images/main_banner.png
