Skip to content

Commit 64cefa1

Browse files
.
1 parent 92931bc commit 64cefa1

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@using System.Text.Json
1+
@using System.Text.Json
22
@using FWO.Ui.Data
33
@using FWO.Ui.Pages.NetworkModelling
44

@@ -83,7 +83,7 @@
8383
<div class="form-group row mt-4" data-toggle="tooltip" title="@(userConfig.PureLine("H9055"))">
8484
<label class="col-form-label col-sm-4">@userConfig.GetText("import_app_server"):</label>
8585
<div class="row col-sm-6">
86-
<FileUpload SupportedFileFormats=".csv" AuthorizedRoles="@Roles.Admin" OnImportSuccess="OnAppServerImportSuccess" OnAddAppServerError="OnAddAppServerError" TImportResult="CSVFileUploadErrorModel" OnAfterImportResults="OnAfterImportResults"></FileUpload>
86+
<FileUpload SupportedFileFormats=".csv" AuthorizedRoles="@Roles.Admin" OnAddAppServerError="OnAddAppServerError" TImportResult="CSVFileUploadErrorModel" OnAfterImportResults="OnAfterImportResults"></FileUpload>
8787
</div>
8888
</div>
8989
<hr />
@@ -393,7 +393,7 @@ else
393393
@if(CSVImportSuccess is not null && CSVImportSuccess.Count > 0)
394394
{
395395
<div class="mt-3">
396-
<Collapse StartToggled="true" Style="success" Title="@(userConfig.GetText("success"))">
396+
<Collapse StartToggled="false" Style="success" Title="@(userConfig.GetText("success"))">
397397
<Table PageSize="0" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="string" Items="CSVImportSuccess">
398398
<Column TableItem="string" Title="@(userConfig.GetText("entrydata"))" Type="typeof(string)" Field="@(_ => new string(_))" Sortable="true" Filterable="true" />
399399
</Table>
@@ -411,7 +411,7 @@ else
411411
</Table>
412412
</Collapse>
413413
</div>
414-
}
414+
}
415415
</Body>
416416
<Footer>
417417
<div class="btn-group">

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
[Parameter]
6262
public EventCallback<(Exception, string?)> OnAddAppServerError { get; set; }
6363

64-
[Parameter]
65-
public EventCallback OnImportSuccess { get; set; }
66-
6764
@typeparam TImportResult
6865
[Parameter]
6966
public EventCallback<(List<string>? success, List<TImportResult>? errors)> OnAfterImportResults { get; set; }
@@ -138,16 +135,9 @@
138135
}
139136

140137
(List<string>? success, List<CSVFileUploadErrorModel>? errors) = await fileUploadService.ImportUploadedData<CSVFileUploadErrorModel>(FileUploadCase.ImportAppServerFromCSV, InputFileChangeEventArgs.File.Name ?? "noName");
141-
142-
if(errors is null || errors.Count == 0)
143-
{
144-
await OnImportSuccess.InvokeAsync();
145-
}
146-
else
147-
{
148-
List<TImportResult> importErrors = errors.Cast<TImportResult>().ToList();
149-
await OnAfterImportResults.InvokeAsync((success, importErrors));
150-
}
138+
139+
List<TImportResult> importErrors = errors.Cast<TImportResult>().ToList();
140+
await OnAfterImportResults.InvokeAsync((success, importErrors));
151141

152142
Loading = false;
153143
}

0 commit comments

Comments
 (0)