Skip to content

Commit 3f8a0ff

Browse files
author
Jani Giannoudis
committed
fixed default file asset start folder
updated MudBlazor to 8.3.0 updated version to 0.9.0-beta.3
1 parent 9c4a868 commit 3f8a0ff

File tree

8 files changed

+30
-19
lines changed

8 files changed

+30
-19
lines changed

Core/OperatingSystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static T DeserializeJsonFile<T>(string fileName) where T : class
6060
/// <summary>
6161
/// Get the current directory
6262
/// </summary>
63-
public static string GetCurrentDirectory() =>
63+
private static string GetCurrentDirectory() =>
6464
Directory.GetCurrentDirectory();
6565

6666
/// <summary>

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
5-
<Version>0.9.0-beta.2</Version>
5+
<Version>0.9.0-beta.3</Version>
66
<FileVersion>0.9.0</FileVersion>
77
<InformationalVersion></InformationalVersion>
88
<Authors>Jani Giannoudis</Authors>

Presentation/Components/Dialogs/WebServerConnectionDialog.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<MudStack Class="pa-4" Spacing="4">
99
@* base url *@
10-
<MudTextField T="string" @bind-Value="@EditConnection.BaseUrl"
10+
<MudTextField T="string" @bind-Value="@BaseUrl"
1111
Variant="@Globals.InputFieldVariant"
1212
Label="@Localizer.BaseUrl"
1313
Margin="Margin.Dense"

Presentation/Components/Dialogs/WebServerConnectionDialog.razor.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,22 @@ public abstract class WebserverConnectionDialogBase : ComponentBase
2929
[Inject] protected Localizer Localizer { get; set; }
3030
[Inject] private IDialogService DialogService { get; set; }
3131

32+
/// <summary>
33+
/// Connection base url
34+
/// </summary>
35+
protected string BaseUrl
36+
{
37+
get => EditConnection.BaseUrl;
38+
set
39+
{
40+
if (value != null)
41+
{
42+
value = value.TrimEnd('\\', '/');
43+
}
44+
EditConnection.BaseUrl = value;
45+
}
46+
}
47+
3248
/// <summary>
3349
/// Api key input type
3450
/// </summary>

Presentation/PayrollEngine.AdminApp.Presentation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<FrameworkReference Include="Microsoft.AspNetCore.App" />
16-
<PackageReference Include="MudBlazor" Version="8.2.0" />
16+
<PackageReference Include="MudBlazor" Version="8.3.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

Windows/PayrollEngine.AdminApp.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
2424
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
25-
<PackageReference Include="MudBlazor" Version="8.2.0" />
25+
<PackageReference Include="MudBlazor" Version="8.3.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

Windows/ServiceConfigurationService.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,21 @@ int IWebserverConfigurationService.GetConnectionTimeout()
5858
/// <inheritdoc />
5959
string IFileAssetConfigurationService.GetRoot()
6060
{
61-
// configuration
61+
// file assets root folder
6262
var configRoot = Configuration["FileAssetsRoot"];
63-
if (!string.IsNullOrWhiteSpace(configRoot))
63+
if (configRoot == null || !OperatingSystem.DirectoryExists(configRoot))
6464
{
65-
if (OperatingSystem.DirectoryExists(configRoot))
66-
{
67-
return configRoot;
68-
}
69-
throw new AdminException($"Invalid configuration setting 'FileAssetsRoot': {configRoot}");
65+
configRoot = ".";
7066
}
7167

72-
// current directory
73-
var curDirectory = OperatingSystem.GetCurrentDirectory();
68+
// app directory: use parent directory in case of local start
7469
var appDirectory = OperatingSystem.GetAppDirectory();
75-
// use parent directory in case of local start
76-
if (string.Equals(curDirectory, appDirectory))
70+
if (string.Equals(configRoot, appDirectory))
7771
{
78-
curDirectory = OperatingSystem.GetCurrentParentDirectory();
72+
configRoot = OperatingSystem.GetCurrentParentDirectory();
7973
}
80-
return curDirectory;
74+
75+
return configRoot;
8176
}
8277

8378
#endregion

Windows/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//"DarkMode": false,
1111

1212
// file assets root directory (default: working directory, fallback: app-parent-folder)
13-
//"FileAssetsRoot": "..",
13+
//"FileAssetsRoot": ".",
1414

1515
// database collation (default: SQL_Latin1_General_CP1_CS_AS)
1616
//"DatabaseCollation": SQL_Latin1_General_CP1_CS_AS,

0 commit comments

Comments
 (0)