From 07ad72ecda34cf53d67277e5ddeb8da87f4db3b1 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Fri, 18 Dec 2020 13:02:57 +0100
Subject: [PATCH] Fix key not found error when blueprint doesn't exist

---
 Elsa.sln                                                  | 1 +
 .../ElsaDashboard.Application/ClientApp/package.json      | 1 +
 .../Pages/WorkflowInstances/List.razor                    | 8 +++++---
 .../blazor/ElsaDashboard.Application/Shared/Pager.razor   | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Elsa.sln b/Elsa.sln
index ab5b97037..eb2e143bd 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{71
 		Dockerfile = Dockerfile
 		Nuget.Config = Nuget.Config
 		README.md = README.md
+		appveyor.yml = appveyor.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Abstractions", "src\core\Elsa.Abstractions\Elsa.Abstractions.csproj", "{3130C574-557C-4DA2-933E-AED7A9EBE48A}"
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/ClientApp/package.json b/src/dashboards/blazor/ElsaDashboard.Application/ClientApp/package.json
index e0cb1f314..73fa0c64e 100644
--- a/src/dashboards/blazor/ElsaDashboard.Application/ClientApp/package.json
+++ b/src/dashboards/blazor/ElsaDashboard.Application/ClientApp/package.json
@@ -1,4 +1,5 @@
 {
+    "private": true,
     "scripts": {
         "serve": "cross-env NODE_ENV=development concurrently \"postcss src/tailwind.css -o public/tailwind.css --watch\" \"live-server ./public\"",
         "build:css:blazor": "cross-env NODE_ENV=production postcss src/tailwind.css -o ../../ElsaDashboard.Application/wwwroot/tailwind.css",
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor b/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor
index fffea0733..be51934e2 100644
--- a/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor
+++ b/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor
@@ -1,4 +1,5 @@
 @page "/workflow-instances"
+@using Elsa.Client.Models
 <!-- Page title & actions -->
 <div class="border-b border-gray-200 px-4 py-4 sm:flex sm:items-center sm:justify-between sm:px-6 lg:px-8">
     <div class="flex-1 min-w-0">
@@ -33,7 +34,7 @@
     </div>
     <ButtonDropdown Text="@SelectedWorkflowText" Items="@WorkflowFilterItems" IconType="@typeof(Icons.Squares)"/>
     <ButtonDropdown Text="@SelectedWorkflowStatusText" Items="@WorkflowStatusFilterItems" IconType="@typeof(Icons.PlayCircle)"/>
-    <ButtonDropdown Text="@SelectedOrderByText" Items="@OrderByItems" IconType="@typeof(Icons.SortDescending)" />
+    <ButtonDropdown Text="@SelectedOrderByText" Items="@OrderByItems" IconType="@typeof(Icons.SortDescending)"/>
 </div>
 
 <!-- Workflow instances (only on smallest breakpoint) -->
@@ -86,8 +87,9 @@
             <tbody class="bg-white divide-y divide-gray-100">
             @foreach (var workflowInstance in WorkflowInstances.Items)
             {
-                var workflowBlueprint = WorkflowBlueprints[(workflowInstance.DefinitionId, workflowInstance.Version)];
-                var displayName = workflowBlueprint.DisplayName;
+                var workflowKey = (workflowInstance.DefinitionId, workflowInstance.Version);
+                var workflowBlueprint = WorkflowBlueprints.ContainsKey(workflowKey) ? WorkflowBlueprints[workflowKey] : new WorkflowBlueprint { DisplayName = "(Blueprint Not Found)" };
+                var displayName = workflowBlueprint.DisplayName!;
                 var statusColor = GetStatusColor(workflowInstance.WorkflowStatus);
                 var viewUrl = $"workflow-instances/{workflowInstance.EntityId}/viewer";
                 <tr>
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Shared/Pager.razor b/src/dashboards/blazor/ElsaDashboard.Application/Shared/Pager.razor
index da53278a8..1f5d281f3 100644
--- a/src/dashboards/blazor/ElsaDashboard.Application/Shared/Pager.razor
+++ b/src/dashboards/blazor/ElsaDashboard.Application/Shared/Pager.razor
@@ -59,8 +59,11 @@
 
 @code {
 
-    private RenderFragment RenderPageButtons(int start, int end)
+    private RenderFragment? RenderPageButtons(int start, int end)
     {
+        if (start - end <= 1)
+            return null;
+        
         return
             @<text>
                 @for (var i = start; i < end; i++)