Skip to content

Commit 94549ff

Browse files
Tom BrewerTom Brewer
authored andcommitted
Update rename to fix .cs bug
1 parent b5eb5ed commit 94549ff

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Apollo.Components/Solutions/RenameFileDialog.razor

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<DialogContent>
77
<MudForm Class="pa-1" @ref="_form">
88
<MudText>@File.Name</MudText>
9-
<MudTextField @ref="_renameField" @bind-Value="_rename" Label="New Name" Error="@_error" ErrorText="@_errorMessage" Validation="Validate()"></MudTextField>
9+
<MudTextField @ref="_renameField" @bind-Value="_rename" Label="New Name" Error="@_error"
10+
ErrorText="@_errorMessage" Validation="Validate()"></MudTextField>
1011
</MudForm>
1112
</DialogContent>
1213
<DialogActions>
@@ -18,10 +19,10 @@
1819
@code {
1920
[CascadingParameter]
2021
private IMudDialogInstance MudDialog { get; set; }
21-
22+
2223
[Inject]
2324
SolutionsState State { get; set; }
24-
25+
2526
[Parameter]
2627
public SolutionFile File { get; set; }
2728

@@ -40,7 +41,7 @@
4041
if (firstRender)
4142
{
4243
_rename = File.Name;
43-
44+
4445
StateHasChanged();
4546

4647
await Task.Delay(100);
@@ -52,21 +53,23 @@
5253
private async Task Submit()
5354
{
5455
await _form.Validate();
55-
56+
5657
if (!_form.IsValid)
5758
{
5859
StateHasChanged();
5960
return;
6061
}
61-
62-
State.RenameItemAsync(File, _rename + File.Extension);
63-
62+
63+
string newName = _rename.IndexOf('.') > 0 ? _rename : _rename + File.Extension;
64+
await State.RenameItemAsync(File, newName);
65+
6466
MudDialog.Close(DialogResult.Ok(true));
6567
}
6668

6769
private bool Validate()
6870
{
69-
bool duplicate = State.Project.Items.Any(x => x.Name.Equals(_rename + File.Extension));
71+
string newName = _rename.IndexOf('.') > 0 ? _rename : _rename + File.Extension;
72+
bool duplicate = State.Project.Items.Any(x => x.Name.Equals(newName));
7073
_error = duplicate;
7174
if (_error)
7275
{

0 commit comments

Comments
 (0)