Skip to content

Commit a130ec5

Browse files
committed
Moved logging to Home page
1 parent 5dc5176 commit a130ec5

3 files changed

Lines changed: 34 additions & 56 deletions

File tree

RFPResponsePOC/RFPResponsePOC.Client/Layout/MainLayout.razor

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
@inject SettingsService SettingsService
1313
@inject LogService _LogService
1414
@inject AppMetadata _AppMetadata
15-
@inject HttpClient Http
1615
<RadzenDialog />
1716
<RadzenNotification />
1817
<RadzenTooltip />
@@ -23,14 +22,7 @@
2322
<img src="images\\RFPResponseCreatorLogo_small.png" alt="RFP Response Creator Logo" class="logo me-3" style="height:40px; width: auto;" />
2423
</div>
2524
<div class="d-flex align-items-center">
26-
@if (UpdateAvailable)
27-
{
28-
<a href="https://BlazorData.net/" target="_blank" class="me-2">* Update Available - Close web browser and reload *</a>
29-
}
30-
else
31-
{
32-
<a href="https://BlazorData.net/" target="_blank" class="me-2">BlazorData.net</a>
33-
}
25+
<a href="https://BlazorData.net/" target="_blank" class="me-2">BlazorData.net</a>
3426
<RadzenButton Click="@(async () => await SaveSettingsaaAndCloseBrowserTab())" Disabled="@isSaving" Size="ButtonSize.ExtraSmall">
3527
@if (isSaving)
3628
{
@@ -69,36 +61,6 @@
6961
ZipService objZipService = new ZipService();
7062
private IJSObjectReference _browserModule;
7163
private bool isSaving;
72-
bool UpdateAvailable = false;
73-
private string versionLocal = string.Empty;
74-
private string versionPublished = string.Empty;
75-
76-
protected override async Task OnInitializedAsync()
77-
{
78-
try
79-
{
80-
var guid = SettingsService.Settings?.ApplicationSettings?.GUID;
81-
versionLocal = _AppMetadata.Version;
82-
83-
if (!string.IsNullOrEmpty(guid) && !string.IsNullOrEmpty(versionLocal))
84-
{
85-
var response = await Http.GetAsync($"https://blazordata.net/api/VersionOnline/GetRFPResponseCreatorVersionOnline?paramGUID={guid}&paramCurrentVersion={versionLocal}");
86-
response.EnsureSuccessStatusCode();
87-
versionPublished = await response.Content.ReadAsStringAsync();
88-
89-
if (ConvertToInteger(versionPublished) > ConvertToInteger(versionLocal))
90-
{
91-
UpdateAvailable = true;
92-
}
93-
}
94-
}
95-
catch (Exception ex)
96-
{
97-
await _LogService.WriteToLogAsync(ex.Message);
98-
}
99-
100-
await base.OnInitializedAsync();
101-
}
10264

10365
protected override async Task OnAfterRenderAsync(bool firstRender)
10466
{
@@ -152,19 +114,4 @@
152114
}
153115
objRef?.Dispose();
154116
}
155-
156-
private int ConvertToInteger(string strParamVersion)
157-
{
158-
int intVersionNumber = 0;
159-
var strSegments = strParamVersion.Split('.');
160-
int i = 0;
161-
List<int> colMultiplyers = new List<int> { 10000, 100, 1 };
162-
foreach (var strSegment in strSegments)
163-
{
164-
int intSegmentNumber = Convert.ToInt32(strSegment);
165-
intVersionNumber += intSegmentNumber * colMultiplyers[i];
166-
i++;
167-
}
168-
return intVersionNumber;
169-
}
170-
}
117+
}

RFPResponsePOC/RFPResponsePOC.Client/Pages/Home.razor

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ else
440440
bool ResponseVisible = false;
441441
bool KnowledgebaseVisible = false;
442442
bool KnowledgebaseFileExists = false;
443-
443+
private string versionLocal = string.Empty;
444+
private string versionPublished = string.Empty;
444445
int selectedTabIndex = 0;
445446
int selectedWorkflowTabIndex = 0;
446447
int selectedAccordionIndex = -1; // -1 means no item is expanded by default
@@ -558,6 +559,33 @@ else
558559
}
559560
}
560561

562+
protected override async Task OnInitializedAsync()
563+
{
564+
try
565+
{
566+
var guid = _SettingsService.Settings?.ApplicationSettings?.GUID;
567+
versionLocal = _AppMetadata.Version;
568+
569+
if (!string.IsNullOrEmpty(guid) && !string.IsNullOrEmpty(versionLocal))
570+
{
571+
var response = await Http.GetAsync($"https://blazordata.net/api/VersionOnline/GetRFPResponseCreatorVersionOnline?paramGUID={guid}&paramCurrentVersion={versionLocal}");
572+
response.EnsureSuccessStatusCode();
573+
versionPublished = await response.Content.ReadAsStringAsync();
574+
575+
if (ConvertToInteger(versionPublished) > ConvertToInteger(versionLocal))
576+
{
577+
await LogService.WriteToLogAsync($"Update available. Local version: {versionLocal}, Published version: {versionPublished}.");
578+
}
579+
}
580+
}
581+
catch (Exception ex)
582+
{
583+
await LogService.WriteToLogAsync(ex.Message);
584+
}
585+
586+
await base.OnInitializedAsync();
587+
}
588+
561589
// Events
562590
563591
void OnHomeClicked(MenuItemEventArgs args)

RFPResponsePOC/RFPResponsePOC.Client/Pages/Settings.razor

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@using RFPResponseAPP.AI
66
@using RFPResponseAPP.Client.Services
77
@using RFPResponseAPP.Model
8+
@using RFPResponseAPP.Models
89
@using Radzen
910
@using RFPResponseAPP.Client.Pages
1011
@using Microsoft.AspNetCore.Components.Forms
@@ -14,6 +15,8 @@
1415
@inject SettingsService SettingsService
1516
@inject LogService _LogService
1617
@inject NavigationManager Navigation
18+
@inject HttpClient Http
19+
@inject AppMetadata _AppMetadata
1720
@inject IJSRuntime JSRuntime
1821
<RadzenRow AlignItems="AlignItems.Start" Wrap="FlexWrap.Wrap" Gap="1rem" Class="rz-p-sm-12">
1922
<RadzenColumn Size="12" SizeSM="6">

0 commit comments

Comments
 (0)