From 743c96972d7f623aefe08022dd67153c5d72869f Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <noreply@wonky.codeberg.org>
Date: Tue, 13 Dec 2022 11:29:34 +0100
Subject: [PATCH] new attempt to prevent doubled history

---
 .../ProductInventoryTableComponent.razor         |  2 +-
 .../Pages/CrmCompanyInventoryPage.razor.cs       | 12 +++++++++---
 .../Pages/CrmCompanyInvoiceListPage.razor.cs     | 16 +++++++++++-----
 Wonky.Client/wwwroot/appsettings.json            |  4 ++--
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Wonky.Client/Components/ProductInventoryTableComponent.razor b/Wonky.Client/Components/ProductInventoryTableComponent.razor
index 9dc3b1a0..1d346cd9 100644
--- a/Wonky.Client/Components/ProductInventoryTableComponent.razor
+++ b/Wonky.Client/Components/ProductInventoryTableComponent.razor
@@ -53,7 +53,7 @@
                     @product.Quantity
                 </td>
                 <td class="align-middle">
-                    <a class="btn btn-info d-block" type="button" @onclick="() => CallShowReorderModal(product.Sku)"><i class="bi-arrow-right-circle"></i> Se Historik</a>
+                    <a class="btn btn-info d-block" type="button" @onclick="() => CallShowReorderModal(product.Sku)"><i class="bi-pen"></i> Genbestil</a>
                 </td>
             </tr>            
         }
diff --git a/Wonky.Client/Pages/CrmCompanyInventoryPage.razor.cs b/Wonky.Client/Pages/CrmCompanyInventoryPage.razor.cs
index 57cbb3f3..b016b5e5 100644
--- a/Wonky.Client/Pages/CrmCompanyInventoryPage.razor.cs
+++ b/Wonky.Client/Pages/CrmCompanyInventoryPage.razor.cs
@@ -43,9 +43,15 @@ public partial class CrmCompanyInventoryPage : IDisposable
         Interceptor.RegisterBeforeSendEvent();
 
         Company = await CompanyRepo.GetCompanyById(CompanyId);
-        
-        var _ = await HistoryRepo.ErpInvoiceToCrmRpc(CompanyId, Company.HistorySync);
-        
+        while (string.IsNullOrWhiteSpace(Company.HistorySync))
+        {
+            await Task.Delay(1000);
+        }
+        var ts = await HistoryRepo.ErpInvoiceToCrmRpc(CompanyId, Company.HistorySync);
+        while (string.IsNullOrWhiteSpace(ts))
+        {
+            await Task.Delay(1000);
+        }
         await FetchInventory();
         Working = false;
     }
diff --git a/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs
index 876fc041..c570f0f4 100644
--- a/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs
+++ b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs
@@ -24,13 +24,19 @@ public partial class CrmCompanyInvoiceListPage : IDisposable
     {
         Interceptor.RegisterEvent();
         Interceptor.RegisterBeforeSendEvent();
-
+        
         Company = await CompanyRepo.GetCompanyById(CompanyId);
-        
-        var _ = await HistoryRepo.ErpInvoiceToCrmRpc(CompanyId, Company.HistorySync);
-        
-        History = await HistoryRepo.FetchInvoiceList(CompanyId);
 
+        while (string.IsNullOrWhiteSpace(Company.HistorySync))
+        {
+            await Task.Delay(1000);
+        }
+        var ts = await HistoryRepo.ErpInvoiceToCrmRpc(CompanyId, Company.HistorySync);
+        while (string.IsNullOrWhiteSpace(ts))
+        {
+            await Task.Delay(1000);
+        }
+        History = await HistoryRepo.FetchInvoiceList(CompanyId);
         Working = false;
     }
     
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 2fa6d186..ee1ff149 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,13 +1,13 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.84.1",
+        "version": "0.84.3",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"
     },
     "apiConfig": {
-        "baseUrl": "https://eta.innotec.dk",
+        "baseUrl": "https://zeta.innotec.dk",
         "catalog": "api/v2/catalog",
         "crmCustomers": "api/v2/crm/companies",
         "crmInventoryExt": "history/inventory",