Skip to content

Commit 4ed150e

Browse files
committed
replace ArtistEdit with default form now that Type=tag is supported
1 parent 3e1c712 commit 4ed150e

5 files changed

Lines changed: 16 additions & 196 deletions

File tree

BlazorDiffusion.ServiceModel/Creative.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public class CreateArtist : ICreateDb<Artist>, IReturn<Artist>
124124
[ValidateNotEmpty, Required]
125125
public string LastName { get; set; }
126126
public int? YearDied { get; set; }
127+
[Input(Type = "tag"), FieldCss(Field = "col-span-12")]
127128
public List<string>? Type { get; set; }
128129
}
129130

@@ -134,6 +135,7 @@ public class UpdateArtist : IPatchDb<Artist>, IReturn<Artist>
134135
public string? FirstName { get; set; }
135136
public string? LastName { get; set; }
136137
public int? YearDied { get; set; }
138+
[Input(Type = "tag"), FieldCss(Field = "col-span-12")]
137139
public List<string>? Type { get; set; }
138140
}
139141
[ValidateHasRole(AppRoles.Moderator)]

BlazorDiffusion/Pages/admin/Artists.razor

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,7 @@
1010
</Breadcrumb>
1111
</Breadcrumbs>
1212

13-
<AutoQueryGrid @ref=@grid Model="Artist"
14-
RowSelected="RowSelect"
15-
Apis="Apis.AutoQuery<QueryArtists, CreateArtist, UpdateArtist, DeleteArtist>()">
16-
<EditForm>
17-
@if (SelectedArtist != null)
18-
{
19-
<div class="relative z-10" aria-labelledby="slide-over-title" role="dialog" aria-modal="true">
20-
<div class="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10 sm:pl-16">
21-
<ArtistEdit Artist="SelectedArtist" EditPanelClass="EditPanelClass" OnClose="Close" OnSave="SaveAsync" />
22-
</div>
23-
</div>
24-
}
25-
</EditForm>
13+
<AutoQueryGrid Model="Artist" Apis="Apis.AutoQuery<QueryArtists, CreateArtist, UpdateArtist, DeleteArtist>()">
2614
<Columns>
2715
<Column Field="(Artist x) => x.FirstName"></Column>
2816
<Column Field="(Artist x) => x.LastName"></Column>
@@ -38,23 +26,3 @@
3826
<Column Field="(Artist x) => x.CreatedBy"></Column>
3927
</Columns>
4028
</AutoQueryGrid>
41-
42-
@code {
43-
public Artist? SelectedArtist { get; set; }
44-
AutoQueryGrid<Artist>? grid;
45-
46-
public string EditPanelClass { get; set; } = "show";
47-
48-
void Close()
49-
{
50-
EditPanelClass = "hidden";
51-
SelectedArtist = null;
52-
}
53-
54-
async Task SaveAsync() => await grid!.RefreshAsync();
55-
56-
void RowSelect(Artist artist)
57-
{
58-
SelectedArtist = artist;
59-
}
60-
}

BlazorDiffusion/Shared/ArtifactEdit.razor

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,4 @@
147147
await OnClose.InvokeAsync();
148148
NavigationManager.NavigateTo(NavigationManager.Uri.SetQueryParam("edit", null));
149149
}
150-
151-
}
150+
}

BlazorDiffusion/Shared/CreativeEdit.razor

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
</div>
7070

7171
@code {
72-
[Parameter]
73-
public Creative Creative { get; set; }
72+
[Parameter, EditorRequired]
73+
public Creative Creative { get; set; } = default!;
7474

7575
[Parameter]
7676
public EventCallback OnClose { get; set; }
@@ -82,10 +82,10 @@
8282
public EventCallback OnDelete { get; set; }
8383

8484
[Parameter]
85-
public string EditPanelClass { get; set; }
85+
public string? EditPanelClass { get; set; }
8686

87-
ApiResult<Creative> apiResult = null;
88-
ApiResult<EmptyResponse> deleteResult = null;
87+
ApiResult<Creative>? apiResult = null;
88+
ApiResult<EmptyResponse>? deleteResult = null;
8989
public Artifact? selectedPrimary = null;
9090

9191
protected override async Task OnParametersSetAsync()
@@ -97,7 +97,7 @@
9797
await base.OnParametersSetAsync();
9898
}
9999

100-
async Task UnpinArtifact(EventArgs e)
100+
void UnpinArtifact(EventArgs e)
101101
{
102102
if(selectedPrimary != null)
103103
{
@@ -107,10 +107,9 @@
107107

108108
async Task Save()
109109
{
110-
var request = new UpdateCreative
111-
{
112-
Id = Creative.Id
113-
};
110+
var request = new UpdateCreative {
111+
Id = Creative.Id
112+
};
114113
if (selectedPrimary != null)
115114
request.PrimaryArtifactId = selectedPrimary.Id;
116115
else
@@ -122,15 +121,13 @@
122121
await OnSave.InvokeAsync();
123122
await Close();
124123
}
125-
126124
}
127125

128126
async Task DeleteCreative()
129127
{
130-
var request = new HardDeleteCreative
131-
{
132-
Id = Creative.Id
133-
};
128+
var request = new HardDeleteCreative {
129+
Id = Creative.Id
130+
};
134131

135132
deleteResult = await ApiAsync(request);
136133

BlazorDiffusion/Shared/admin/ArtistEdit.razor

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)