Skip to content

Commit ddc4bbf

Browse files
mythzmythz
committed
Admin page fixes
1 parent 6de72fb commit ddc4bbf

9 files changed

Lines changed: 204 additions & 249 deletions

File tree

‎BlazorDiffusion/Pages/admin/Albums.razor‎

Lines changed: 72 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -23,74 +23,74 @@
2323
break;
2424
case "AlbumContents":
2525
<AutoQueryGrid @ref="addToAlbumGrid" Model="Album" Apis="Apis.AutoQuery<QueryAlbums>()"
26-
RowSelected="AddAlbumRowSelected">
26+
RowSelected="AddAlbumRowSelected">
2727
</AutoQueryGrid>
2828
break;
2929
}
3030

3131
<ModalDialog Id="addModal" Show=@showAddDiaglog Close="CloseModal">
3232
<ErrorSummary Status="api?.Error" />
33-
@if(addArtifactsToggle)
33+
@if (addArtifactsToggle)
3434
{
35-
<AutoQueryGrid Model="Artifact"
35+
<AutoQueryGrid Model="Artifact"
3636
@ref="allArtifactsGrid"
37-
Apis="Apis.AutoQuery<QueryArtifacts>()"
38-
ShowCopyApiUrl="false"
39-
ShowDownloadCsv="false"
40-
ShowPreferences="false"
41-
RowSelected="SelectAddRow">
42-
<ToolbarButtons>
43-
<div class="flex items-center justify-between">
44-
<span class="px-2">Remove</span>
45-
<Toggle @bind-Value="addArtifactsToggle"></Toggle>
46-
<span class="px-2">Add</span>
47-
</div>
48-
</ToolbarButtons>
49-
<Columns>
50-
<Column Field="(Artifact x) => x.FilePath">
51-
<Template>
52-
<img src="https://cdn.diffusion.works@(context.FilePath)"
53-
class="m-auto h-48 @(IsInAlbum(context) == true ? "rounded-xl border-2 border-fuchsia-700" : "rounded-xl border-2 border-transparent")"
54-
alt=@context.Prompt />
55-
</Template>
56-
</Column>
57-
</Columns>
58-
</AutoQueryGrid>
37+
Apis="Apis.AutoQuery<QueryArtifacts>()"
38+
ShowCopyApiUrl="false"
39+
ShowDownloadCsv="false"
40+
ShowPreferences="false"
41+
RowSelected="SelectAddRow">
42+
<ToolbarButtons>
43+
<div class="flex items-center justify-between">
44+
<span class="px-2">Remove</span>
45+
<Toggle @bind-Value="addArtifactsToggle"></Toggle>
46+
<span class="px-2">Add</span>
47+
</div>
48+
</ToolbarButtons>
49+
<Columns>
50+
<Column Field="(Artifact x) => x.FilePath">
51+
<Template>
52+
<img src="https://cdn.diffusion.works@(context.FilePath)"
53+
class="m-auto h-48 @(IsInAlbum(context) == true ? "rounded-xl border-2 border-fuchsia-700" : "rounded-xl border-2 border-transparent")"
54+
alt=@context.Prompt />
55+
</Template>
56+
</Column>
57+
</Columns>
58+
</AutoQueryGrid>
5959
}
6060
else
6161
{
62-
<AutoQueryGrid Model="AlbumArtifact"
63-
@ref="albumArtifactsGrid"
64-
Apis="Apis.AutoQuery<QueryAlbumArtifacts>()"
65-
ConfigureQuery="ConfigureQuery"
66-
RowSelected="SelectRemoveFromAlbum"
67-
ShowCopyApiUrl="false"
68-
ShowDownloadCsv="false"
69-
ShowPreferences="false">
70-
<ToolbarButtons>
71-
<div class="flex items-center justify-between">
72-
<span class="px-2">Remove</span>
73-
<Toggle @bind-Value="addArtifactsToggle"></Toggle>
74-
<span class="px-2">Add</span>
75-
</div>
76-
</ToolbarButtons>
77-
<Columns>
78-
<Column Field="(AlbumArtifact x) => x.Artifact">
79-
<Template>
80-
<img src="https://cdn.diffusion.works@(context.Artifact?.FilePath)"
81-
class="m-auto h-48 @(IsInAlbum(context.Artifact) == true ? "rounded-xl border-2 border-transparent" : "rounded-xl border-2 border-fuchsia-700")"
82-
alt=@context.Artifact?.Prompt />
83-
</Template>
84-
</Column>
85-
</Columns>
86-
</AutoQueryGrid>
62+
<AutoQueryGrid Model="AlbumArtifact"
63+
@ref="albumArtifactsGrid"
64+
Apis="Apis.AutoQuery<QueryAlbumArtifacts>()"
65+
ConfigureQuery="ConfigureQuery"
66+
RowSelected="SelectRemoveFromAlbum"
67+
ShowCopyApiUrl="false"
68+
ShowDownloadCsv="false"
69+
ShowPreferences="false">
70+
<ToolbarButtons>
71+
<div class="flex items-center justify-between">
72+
<span class="px-2">Remove</span>
73+
<Toggle @bind-Value="addArtifactsToggle"></Toggle>
74+
<span class="px-2">Add</span>
75+
</div>
76+
</ToolbarButtons>
77+
<Columns>
78+
<Column Field="(AlbumArtifact x) => x.Artifact">
79+
<Template>
80+
<img src="https://cdn.diffusion.works@(context.Artifact?.FilePath)"
81+
class="m-auto h-48 @(IsInAlbum(context.Artifact!) == true ? "rounded-xl border-2 border-transparent" : "rounded-xl border-2 border-fuchsia-700")"
82+
alt=@context.Artifact?.Prompt />
83+
</Template>
84+
</Column>
85+
</Columns>
86+
</AutoQueryGrid>
8787
}
88-
<div class="mt-4 px-4 py-3 bg-gray-50 dark:bg-gray-900 text-right sm:px-6">
89-
<div class="flex justify-end items-center">
90-
<SecondaryButton class="mr-2" @onclick="CloseModal">Cancel</SecondaryButton>
91-
<PrimaryButton @onclick="SaveChanges">Save</PrimaryButton>
88+
<div class="mt-4 px-4 py-3 bg-gray-50 dark:bg-gray-900 text-right sm:px-6">
89+
<div class="flex justify-end items-center">
90+
<SecondaryButton class="mr-2" @onclick="CloseModal">Cancel</SecondaryButton>
91+
<PrimaryButton @onclick="SaveChanges">Save</PrimaryButton>
92+
</div>
9293
</div>
93-
</div>
9494
</ModalDialog>
9595

9696

@@ -107,19 +107,19 @@
107107
string editPanelRemove = "show";
108108
bool showAddDiaglog = false;
109109
bool addArtifactsToggle = false;
110-
AutoQueryGrid<Album> addToAlbumGrid;
111-
AutoQueryGrid<Album> removeFromAlbumGrid;
110+
AutoQueryGrid<Album>? addToAlbumGrid;
111+
AutoQueryGrid<Album>? removeFromAlbumGrid;
112112

113-
AutoQueryGrid<Artifact> allArtifactsGrid;
114-
AutoQueryGrid<AlbumArtifact> albumArtifactsGrid;
113+
AutoQueryGrid<Artifact>? allArtifactsGrid;
114+
AutoQueryGrid<AlbumArtifact>? albumArtifactsGrid;
115115
Album? managedAlbum;
116116

117117
List<Artifact> addToAlbum = new();
118118
List<Artifact> removeFromAlbum = new();
119119

120-
ApiResult<Album> api;
120+
ApiResult<Album>? api;
121121

122-
async Task CloseModal()
122+
void CloseModal()
123123
{
124124
showAddDiaglog = false;
125125
var url = NavigationManager.Uri.SetQueryParam("skip", null).SetQueryParam("edit", null);
@@ -129,52 +129,50 @@
129129

130130
async Task SaveChanges()
131131
{
132-
var request = new UpdateAlbum
133-
{
134-
Id = managedAlbum.Id
135-
};
132+
var request = new UpdateAlbum {
133+
Id = managedAlbum!.Id
134+
};
136135
request.AddArtifactIds = addToAlbum.Select(x => x.Id).ToList();
137136
request.RemoveArtifactIds = removeFromAlbum.Select(x => x.Id).ToList();
138137
api = await ApiAsync(request);
139138

140139
if (api.Succeeded)
141140
{
142141
managedAlbum = null;
143-
await CloseModal();
142+
CloseModal();
144143
}
145-
146144
}
147145

148146
async Task ToggleManageAlbumGrids(MouseEventArgs args)
149147
{
150148
addArtifactsToggle = !addArtifactsToggle;
151-
if(albumArtifactsGrid != null)
149+
if (albumArtifactsGrid != null)
152150
await albumArtifactsGrid.RefreshAsync();
153151
}
154152

155153
void ConfigureQuery(QueryBase query)
156154
{
157-
if(managedAlbum == null)
155+
if (managedAlbum == null)
158156
return;
159157
query.AddQueryParam("ArtifactIds", managedAlbum.Artifacts.Select(x => x.ArtifactId).Join(","));
160158
}
161159

162160
bool IsInAlbum(Artifact artifact)
163161
{
164-
if(managedAlbum == null)
162+
if (managedAlbum == null)
165163
return false;
166-
return (managedAlbum.Artifacts.Any(x => x.ArtifactId == artifact.Id) &&
167-
removeFromAlbum.All(x => x.Id != artifact.Id)) ||
164+
return (managedAlbum.Artifacts.Any(x => x.ArtifactId == artifact.Id) &&
165+
removeFromAlbum.All(x => x.Id != artifact.Id)) ||
168166
addToAlbum.Any(x => x.Id == artifact.Id);
169167
}
170168

171169
async Task AddAlbumRowSelected(Album album)
172170
{
173171
showAddDiaglog = true;
174172
managedAlbum = album;
175-
if(albumArtifactsGrid != null)
173+
if (albumArtifactsGrid != null)
176174
await albumArtifactsGrid.RefreshAsync();
177-
if(allArtifactsGrid != null)
175+
if (allArtifactsGrid != null)
178176
await allArtifactsGrid.RefreshAsync();
179177
}
180178

‎BlazorDiffusion/Pages/admin/Artifacts.razor‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
@attribute [Authorize(Roles = "Admin")]
33
@using BlazorDiffusion.Shared.admin;
44

5-
@*@inject NavigationManager NavigationManager*@
6-
75
<Breadcrumbs class="mb-8" HomeHref="/admin">
86
<Breadcrumb>
97
Creative Artifacts
@@ -12,11 +10,11 @@
1210

1311
<Tabs TabOptions="TabOptions" @bind-Tab=Tab></Tabs>
1412

15-
@if(Tab == "Reported")
13+
@if (Tab == "Reported")
1614
{
1715
<ArtifactReportsAutoQueryGrid></ArtifactReportsAutoQueryGrid>
18-
}
19-
else if(Tab == "Stats")
16+
}
17+
else if (Tab == "Stats")
2018
{
2119
<AutoQueryGrid Model="ArtifactStat" Apis="Apis.AutoQuery<QueryArtifactStats>()" />
2220
}

‎BlazorDiffusion/Pages/admin/Artists.razor‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,18 @@
1010
</Breadcrumb>
1111
</Breadcrumbs>
1212

13-
<AutoQueryGrid Model="Artist"
13+
<AutoQueryGrid @ref=@grid Model="Artist"
1414
RowSelected="RowSelect"
1515
Apis="Apis.AutoQuery<QueryArtists, CreateArtist, UpdateArtist, DeleteArtist>()">
1616
<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="">
21-
<div class="">
22-
<div class="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10 sm:pl-16">
23-
<ArtistEdit Artist="SelectedArtist" EditPanelCss="EditPanelCss" OnClose="Close"></ArtistEdit>
24-
</div>
25-
</div>
26-
</div>
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" />
2722
</div>
28-
}
23+
</div>
24+
}
2925
</EditForm>
3026
<Columns>
3127
<Column Field="(Artist x) => x.FirstName"></Column>
@@ -45,18 +41,20 @@
4541

4642
@code {
4743
public Artist? SelectedArtist { get; set; }
44+
AutoQueryGrid<Artist>? grid;
4845

49-
public string EditPanelCss { get; set; } = "show";
46+
public string EditPanelClass { get; set; } = "show";
5047

51-
async Task Close()
48+
void Close()
5249
{
53-
EditPanelCss = "hidden";
50+
EditPanelClass = "hidden";
5451
SelectedArtist = null;
5552
}
5653

57-
async Task RowSelect(Artist artist)
54+
async Task SaveAsync() => await grid!.RefreshAsync();
55+
56+
void RowSelect(Artist artist)
5857
{
5958
SelectedArtist = artist;
6059
}
61-
6260
}

0 commit comments

Comments
 (0)