Skip to content

Commit e2fb17e

Browse files
[+] Display error in UI CactuseSecurity#2696
1 parent ec887f0 commit e2fb17e

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

roles/ui/files/FWO.UI/Pages/Settings/SettingsDefaults.razor

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<div class="form-group row" data-toggle="tooltip" title="">
6666
<label class="col-form-label col-sm-4">asdasdasd:</label>
6767
<div class="col-sm-4">
68-
<FileUpload UploadCase="FileUploadCase.CustomLogoUpload" TUploadResult="ErrorBaseModel" SupportedFileFormats=".png|.jpg" AuthorizedRoles="@Roles.Admin"></FileUpload>
68+
<FileUpload UploadCase="FileUploadCase.CustomLogoUpload" TUploadResult="ErrorBaseModel" SupportedFileFormats=".png|.jpg" AuthorizedRoles="@Roles.Admin" OnError="OnLogoUploadError"></FileUpload>
6969
</div>
7070
</div>
7171
<hr />
@@ -204,6 +204,11 @@ else
204204
private DateTime autoDiscStartDate = DateTime.Today;
205205
private DateTime autoDiscStartTime = DateTime.Now.AddSeconds(-DateTime.Now.Second);
206206

207+
private void OnLogoUploadError((Exception Exception, string Message) error)
208+
{
209+
DisplayMessageInUi(error.Exception, userConfig.GetText("change_default"), error.Message, false);
210+
}
211+
207212
protected override async Task OnInitializedAsync()
208213
{
209214
try

roles/ui/files/FWO.UI/Shared/FileUpload.razor

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@
4949
<label class="btn btn-sm @(UploadDisabled ? "btn-primary" : "btn-success")" for="fileUpload">
5050
@(ModellingHandlerBase.DisplayButton(userConfig, "select_file", Icons.Add, "select_file"))
5151
</label>
52-
<InputFile id="fileUpload" hidden accept="@SupportedFileFormats" OnChange="@(async () => await UploadCustomLogo())" />
53-
@if(InputFileChangeEventArgs is not null && !string.IsNullOrEmpty(InputFileChangeEventArgs.File.Name))
54-
{
55-
<label class="d-inline">@InputFileChangeEventArgs.File.Name</label>
56-
}
52+
<InputFile id="fileUpload" hidden accept="@SupportedFileFormats" OnChange="@(async (InputFileChangeEventArgs e) => await UploadCustomLogo(e))" />
5753
</Authorized>
5854
<NotAuthorized>
5955
</NotAuthorized>
@@ -167,8 +163,10 @@
167163
Loading = false;
168164
}
169165

170-
private async Task UploadCustomLogo()
166+
private async Task UploadCustomLogo(InputFileChangeEventArgs e)
171167
{
168+
SingleUpload(e);
169+
172170
if(InputFileChangeEventArgs is null)
173171
return;
174172

@@ -190,7 +188,14 @@
190188
return;
191189
}
192190

193-
var bla = await fileUploadService.ImportCustomLogo<ErrorBaseModel>(UploadCase, InputFileChangeEventArgs.File.Name);
191+
(bool success, ErrorBaseModel? error) = await fileUploadService.ImportCustomLogo<ErrorBaseModel>(UploadCase, InputFileChangeEventArgs.File.Name);
192+
193+
if(!success && error is not null)
194+
{
195+
Exception exception = new(error.Message, error.InternalException);
196+
197+
await OnError.InvokeAsync();
198+
}
194199

195200
Loading = false;
196201
}

0 commit comments

Comments
 (0)