Skip to content

Commit 20a24c4

Browse files
committed
Properly records the GUID
1 parent a130ec5 commit 20a24c4

3 files changed

Lines changed: 59 additions & 70 deletions

File tree

RFPResponsePOC/RFPResponsePOC.Client/Layout/MainLayout.razor

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@inject SettingsService SettingsService
1313
@inject LogService _LogService
1414
@inject AppMetadata _AppMetadata
15+
@inject HttpClient Http
1516
<RadzenDialog />
1617
<RadzenNotification />
1718
<RadzenTooltip />
@@ -61,6 +62,8 @@
6162
ZipService objZipService = new ZipService();
6263
private IJSObjectReference _browserModule;
6364
private bool isSaving;
65+
private string versionLocal = string.Empty;
66+
private string versionPublished = string.Empty;
6467

6568
protected override async Task OnAfterRenderAsync(bool firstRender)
6669
{
@@ -71,6 +74,31 @@
7174

7275
objZipService = new ZipService(JSRuntime, localStorage, SettingsService, _LogService, DialogService);
7376
_browserModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/browserInterop.js");
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+
88+
versionPublished = await response.Content.ReadAsStringAsync();
89+
90+
await _LogService.WriteToLogAsync($"[{DateTime.Now}] Local version: {versionLocal}, Detected BlazorData.net Published version: {versionPublished}. Current GUID: {guid}");
91+
92+
if (ConvertToInteger(versionPublished) > ConvertToInteger(versionLocal))
93+
{
94+
await _LogService.WriteToLogAsync($"[{DateTime.Now}] Update available. Local version: {versionLocal}, Published version: {versionPublished}.");
95+
}
96+
}
97+
}
98+
catch (Exception ex)
99+
{
100+
await _LogService.WriteToLogAsync(ex.Message);
101+
}
74102
}
75103
}
76104

@@ -93,6 +121,30 @@
93121
}
94122
}
95123

124+
#region private int ConvertToInteger(string strParamVersion)
125+
private int ConvertToInteger(string strParamVersion)
126+
{
127+
int intVersionNumber = 0;
128+
string strVersion = strParamVersion;
129+
130+
// Split into parts separated by periods
131+
char[] splitchar = { '.' };
132+
var strSegments = strVersion.Split(splitchar);
133+
134+
// Process the segments
135+
int i = 0;
136+
List<int> colMultipliers = new List<int> { 10000, 100, 1 };
137+
foreach (var strSegment in strSegments)
138+
{
139+
int intSegmentNumber = Convert.ToInt32(strSegment);
140+
intVersionNumber = intVersionNumber + (intSegmentNumber * colMultipliers[i]);
141+
i++;
142+
}
143+
144+
return intVersionNumber;
145+
}
146+
#endregion
147+
96148
public async ValueTask DisposeAsync()
97149
{
98150
// Remove the beforeunload callback when component is disposed

RFPResponsePOC/RFPResponsePOC.Client/Pages/Home.razor

Lines changed: 7 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
@inject DialogService DialogService
1515
@inject Blazored.LocalStorage.ILocalStorageService localStorage
1616
@inject SettingsService _SettingsService
17-
@inject AppMetadata _AppMetadata
18-
@inject HttpClient Http
1917
@inject NavigationManager Navigation
2018
@inject IJSRuntime JsRuntime
2119
<style>
@@ -53,6 +51,7 @@
5351
}
5452
else
5553
{
54+
<RadzenMenuItem Click="OnHomeClicked" Text="Home" Icon="home" Style="@GetMenuItemStyle("Home")"></RadzenMenuItem>
5655
<RadzenMenuItem Click="OnSettingsClicked" Text="Settings" Icon="line_style" Style="@GetMenuItemStyle("Settings")"></RadzenMenuItem>
5756
}
5857
</RadzenMenu>
@@ -440,8 +439,6 @@ else
440439
bool ResponseVisible = false;
441440
bool KnowledgebaseVisible = false;
442441
bool KnowledgebaseFileExists = false;
443-
private string versionLocal = string.Empty;
444-
private string versionPublished = string.Empty;
445442
int selectedTabIndex = 0;
446443
int selectedWorkflowTabIndex = 0;
447444
int selectedAccordionIndex = -1; // -1 means no item is expanded by default
@@ -494,10 +491,9 @@ else
494491
}
495492
}
496493

497-
// Switch to the Settings page
498-
ActiveMenuItem = "Settings";
499-
HomeVisible = false;
500-
SettingsVisible = true;
494+
ActiveMenuItem = "Home";
495+
HomeVisible = true;
496+
SettingsVisible = false;
501497
LogsVisible = false;
502498
ResponseVisible = false;
503499
KnowledgebaseVisible = false;
@@ -525,10 +521,9 @@ else
525521
{
526522
ShowMainMenu = false;
527523

528-
// Switch to the Settings page
529-
ActiveMenuItem = "Settings";
530-
HomeVisible = false;
531-
SettingsVisible = true;
524+
ActiveMenuItem = "Home";
525+
HomeVisible = true;
526+
SettingsVisible = false;
532527
LogsVisible = false;
533528
ResponseVisible = false;
534529
KnowledgebaseVisible = false;
@@ -559,33 +554,6 @@ else
559554
}
560555
}
561556

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-
589557
// Events
590558
591559
void OnHomeClicked(MenuItemEventArgs args)
@@ -715,30 +683,6 @@ else
715683
}
716684
#endregion
717685

718-
#region private int ConvertToInteger(string strParamVersion)
719-
private int ConvertToInteger(string strParamVersion)
720-
{
721-
int intVersionNumber = 0;
722-
string strVersion = strParamVersion;
723-
724-
// Split into parts separated by periods
725-
char[] splitchar = { '.' };
726-
var strSegments = strVersion.Split(splitchar);
727-
728-
// Process the segments
729-
int i = 0;
730-
List<int> colMultipliers = new List<int> { 10000, 100, 1 };
731-
foreach (var strSegment in strSegments)
732-
{
733-
int intSegmentNumber = Convert.ToInt32(strSegment);
734-
intVersionNumber = intVersionNumber + (intSegmentNumber * colMultipliers[i]);
735-
i++;
736-
}
737-
738-
return intVersionNumber;
739-
}
740-
#endregion
741-
742686
public void Dispose()
743687
{
744688
// Remove the beforeunload callback when component is disposed

RFPResponsePOC/RFPResponsePOC.Client/Services/SettingsService.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@ public async void LoadSettings()
107107
{
108108
Settings.ConnectionSettings = new List<ConnectionSettings>();
109109
}
110-
111-
// Ensure a GUID exists
112-
if (string.IsNullOrEmpty(Settings.ApplicationSettings.GUID))
113-
{
114-
Settings.ApplicationSettings.GUID = Guid.NewGuid().ToString();
115-
await SaveSettingsAsync();
116-
}
117110
}
118111
catch (Exception ex)
119112
{

0 commit comments

Comments
 (0)