leon.hoppe/HopFrame
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Renamed model repo to provider + provider registration check

Browse Source
This commit is contained in:
Leon Hoppe
2024-11-23 15:29:46 +01:00
parent beac2aa20c
commit f8995ca990
12 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/HopFrame.Web.Admin/Generators/IAdminPageGenerator.cs
View File

@@ -78,11 +78,11 @@ public interface IAdminPageGenerator<TModel> {
IAdminPageGenerator<TModel> DefaultSort<TProperty>(Expression<Func<TModel, TProperty>> propertyExpression, ListSortDirection direction); IAdminPageGenerator<TModel> DefaultSort<TProperty>(Expression<Func<TModel, TProperty>> propertyExpression, ListSortDirection direction);
/// <summary> /// <summary>
/// Specifies the repository for the page /// Specifies the repository provider for the page
/// </summary> /// </summary>
/// <typeparam name="TRepository">The specified repository</typeparam> /// <typeparam name="TRepository">The specified provider</typeparam>
/// <returns></returns> /// <returns></returns>
IAdminPageGenerator<TModel> ConfigureRepository<TRepository>() where TRepository : ModelRepository<TModel>; IAdminPageGenerator<TModel> ConfigureProvider<TRepository>() where TRepository : ModelProvider<TModel>;
/// <summary> /// <summary>

2
src/HopFrame.Web.Admin/Generators/Implementation/AdminPageGenerator.cs
View File

@@ -91,7 +91,7 @@ internal sealed class AdminPageGenerator<TModel> : IAdminPageGenerator<TModel>,
return this; return this;
} }
public IAdminPageGenerator<TModel> ConfigureRepository<TRepository>() where TRepository : ModelRepository<TModel> { public IAdminPageGenerator<TModel> ConfigureProvider<TRepository>() where TRepository : ModelProvider<TModel> {
Page.RepositoryProvider = typeof(TRepository); Page.RepositoryProvider = typeof(TRepository);
return this; return this;
} }

4
src/HopFrame.Web.Admin/ModelRepository.cs → src/HopFrame.Web.Admin/ModelProvider.cs
View File

@@ -1,6 +1,6 @@
namespace HopFrame.Web.Admin; namespace HopFrame.Web.Admin;
public abstract class ModelRepository<TModel> : IModelRepository { public abstract class ModelProvider<TModel> : IModelProvider {
public abstract Task<IEnumerable<TModel>> ReadAll(); public abstract Task<IEnumerable<TModel>> ReadAll();
public abstract Task<TModel> Create(TModel model); public abstract Task<TModel> Create(TModel model);
public abstract Task<TModel> Update(TModel model); public abstract Task<TModel> Update(TModel model);
@@ -25,7 +25,7 @@ public abstract class ModelRepository<TModel> : IModelRepository {
} }
} }
public interface IModelRepository { public interface IModelProvider {
Task<IEnumerable<object>> ReadAllO(); Task<IEnumerable<object>> ReadAllO();
Task<object> CreateO(object model); Task<object> CreateO(object model);
Task<object> UpdateO(object model); Task<object> UpdateO(object model);

6
src/HopFrame.Web.Admin/Models/AdminPage.cs
View File

@@ -24,10 +24,12 @@ public class AdminPage {
public bool ShowDeleteButton { get; set; } = true; public bool ShowDeleteButton { get; set; } = true;
public bool ShowUpdateButton { get; set; } = true; public bool ShowUpdateButton { get; set; } = true;
public IModelRepository LoadModelRepository(IServiceProvider provider) { public IModelProvider LoadModelProvider(IServiceProvider provider) {
if (RepositoryProvider is null) return null; if (RepositoryProvider is null) return null;
var repoProvider = provider.GetService(RepositoryProvider);
if (repoProvider != null) return repoProvider as IModelProvider;
var dependencies = AdminContextGenerator.ResolveDependencies(RepositoryProvider, provider); var dependencies = AdminContextGenerator.ResolveDependencies(RepositoryProvider, provider);
return Activator.CreateInstance(RepositoryProvider, dependencies) as IModelRepository; return Activator.CreateInstance(RepositoryProvider, dependencies) as IModelProvider;
} }
} }

12
src/HopFrame.Web/Components/Administration/AdminPageModal.razor
View File

@@ -128,7 +128,7 @@
private Dictionary<AdminPageProperty, FieldIdentifier> _validationIdentifiers; private Dictionary<AdminPageProperty, FieldIdentifier> _validationIdentifiers;
private IDictionary<AdminPageProperty, object> _values; private IDictionary<AdminPageProperty, object> _values;
private Dictionary<AdminPageProperty, object[]> _selectorValues; private Dictionary<AdminPageProperty, object[]> _selectorValues;
private IModelRepository _repository; private IModelProvider _provider;
private AdminPage _currentPage; private AdminPage _currentPage;
private object _entry; private object _entry;
@@ -143,7 +143,7 @@
_currentPage = page; _currentPage = page;
_entry = entryToEdit; _entry = entryToEdit;
_isEdit = entryToEdit is not null; _isEdit = entryToEdit is not null;
_repository = _currentPage.LoadModelRepository(Provider); _provider = _currentPage.LoadModelProvider(Provider);
_entry ??= Activator.CreateInstance(_currentPage.ModelType); _entry ??= Activator.CreateInstance(_currentPage.ModelType);
_context = new EditContext(_entry); _context = new EditContext(_entry);
@@ -246,7 +246,7 @@
foreach (var value in _values) { foreach (var value in _values) {
if (value.Key.Unique) { if (value.Key.Unique) {
if (value.Value == value.Key.GetValue(_entry)) continue; if (value.Value == value.Key.GetValue(_entry)) continue;
var data = _repository!.ReadAllO().GetAwaiter().GetResult(); var data = _provider!.ReadAllO().GetAwaiter().GetResult();
foreach (var entry in data) { foreach (var entry in data) {
var other = value.Key.GetValue(entry); var other = value.Key.GetValue(entry);
if (!other.Equals(value.Value)) continue; if (!other.Equals(value.Value)) continue;
@@ -293,7 +293,7 @@
throw new ArgumentException($"'{property.Name}' cannot be a selector because a admin page for '{type.Name}' does not exist!"); throw new ArgumentException($"'{property.Name}' cannot be a selector because a admin page for '{type.Name}' does not exist!");
} }
var repo = page.LoadModelRepository(Provider); var repo = page.LoadModelProvider(Provider);
var objects = (await repo!.ReadAllO()).ToArray(); var objects = (await repo!.ReadAllO()).ToArray();
_selectorValues[property] = objects; _selectorValues[property] = objects;
@@ -346,7 +346,7 @@
} }
if (!_isEdit) { if (!_isEdit) {
await _repository.CreateO(_entry); await _provider.CreateO(_entry);
Alerts.FireAsync(new SweetAlertOptions { Alerts.FireAsync(new SweetAlertOptions {
Title = "New entry added!", Title = "New entry added!",
@@ -356,7 +356,7 @@
}); });
} }
else { else {
await _repository.UpdateO(_entry); await _provider.UpdateO(_entry);
Alerts.FireAsync(new SweetAlertOptions { Alerts.FireAsync(new SweetAlertOptions {
Title = "Entry updated!", Title = "Entry updated!",

6
src/HopFrame.Web/HopAdminContext.cs
View File

@@ -5,7 +5,7 @@ using HopFrame.Web.Admin;
using HopFrame.Web.Admin.Attributes; using HopFrame.Web.Admin.Attributes;
using HopFrame.Web.Admin.Generators; using HopFrame.Web.Admin.Generators;
using HopFrame.Web.Admin.Models; using HopFrame.Web.Admin.Models;
using HopFrame.Web.Repositories; using HopFrame.Web.Provider;
namespace HopFrame.Web; namespace HopFrame.Web;
@@ -20,7 +20,7 @@ internal class HopAdminContext : AdminPagesContext {
public override void OnModelCreating(IAdminContextGenerator generator) { public override void OnModelCreating(IAdminContextGenerator generator) {
generator.Page<User>() generator.Page<User>()
.Description("On this page you can manage all user accounts.") .Description("On this page you can manage all user accounts.")
.ConfigureRepository<UserProvider>() .ConfigureProvider<UserProvider>()
.ViewPermission(AdminPermissions.ViewUsers) .ViewPermission(AdminPermissions.ViewUsers)
.CreatePermission(AdminPermissions.AddUser) .CreatePermission(AdminPermissions.AddUser)
.UpdatePermission(AdminPermissions.EditUser) .UpdatePermission(AdminPermissions.EditUser)
@@ -63,7 +63,7 @@ internal class HopAdminContext : AdminPagesContext {
generator.Page<PermissionGroup>() generator.Page<PermissionGroup>()
.Description("On this page you can view, create, edit and delete permission groups.") .Description("On this page you can view, create, edit and delete permission groups.")
.ConfigureRepository<GroupProvider>() .ConfigureProvider<GroupProvider>()
.ViewPermission(AdminPermissions.ViewGroups) .ViewPermission(AdminPermissions.ViewGroups)
.CreatePermission(AdminPermissions.AddGroup) .CreatePermission(AdminPermissions.AddGroup)
.UpdatePermission(AdminPermissions.EditGroup) .UpdatePermission(AdminPermissions.EditGroup)

8
src/HopFrame.Web/Pages/Administration/AdminPageList.razor
View File

@@ -113,7 +113,7 @@
public string Url { get; set; } public string Url { get; set; }
private AdminPage _pageData; private AdminPage _pageData;
private IModelRepository _modelRepository; private IModelProvider _modelProvider;
private IEnumerable<object> _modelBuffer; private IEnumerable<object> _modelBuffer;
private AdminPageModal _modal; private AdminPageModal _modal;
@@ -138,7 +138,7 @@
if (_pageData.RepositoryProvider is null) if (_pageData.RepositoryProvider is null)
throw new ArgumentException($"AdminPage '{_pageData.Title}' does not specify a model repository!'"); throw new ArgumentException($"AdminPage '{_pageData.Title}' does not specify a model repository!'");
_modelRepository = _pageData.LoadModelRepository(Provider); _modelProvider = _pageData.LoadModelProvider(Provider);
_hasEditPermission = _pageData.Permissions.Update is null || await Permissions.HasPermission(Auth.User, _pageData.Permissions.Update); _hasEditPermission = _pageData.Permissions.Update is null || await Permissions.HasPermission(Auth.User, _pageData.Permissions.Update);
_hasDeletePermission = _pageData.Permissions.Delete is null || await Permissions.HasPermission(Auth.User, _pageData.Permissions.Delete); _hasDeletePermission = _pageData.Permissions.Delete is null || await Permissions.HasPermission(Auth.User, _pageData.Permissions.Delete);
@@ -154,7 +154,7 @@
} }
private async Task Reload() { private async Task Reload() {
_modelBuffer = await _modelRepository.ReadAllO(); _modelBuffer = await _modelProvider.ReadAllO();
_displayedModels = _modelBuffer.ToList(); _displayedModels = _modelBuffer.ToList();
_currentSortDirection = _pageData.DefaultSortDirection; _currentSortDirection = _pageData.DefaultSortDirection;
@@ -238,7 +238,7 @@
}); });
if (result.IsConfirmed) { if (result.IsConfirmed) {
await _modelRepository.DeleteO(entry); await _modelProvider.DeleteO(entry);
await Reload(); await Reload();
await Alerts.FireAsync(new SweetAlertOptions { await Alerts.FireAsync(new SweetAlertOptions {

4
src/HopFrame.Web/Repositories/GroupProvider.cs → src/HopFrame.Web/Provider/GroupProvider.cs
View File

@@ -2,9 +2,9 @@ using HopFrame.Database.Models;
using HopFrame.Database.Repositories; using HopFrame.Database.Repositories;
using HopFrame.Web.Admin; using HopFrame.Web.Admin;
namespace HopFrame.Web.Repositories; namespace HopFrame.Web.Provider;
internal sealed class GroupProvider(IGroupRepository repo) : ModelRepository<PermissionGroup> { internal sealed class GroupProvider(IGroupRepository repo) : ModelProvider<PermissionGroup> {
public override async Task<IEnumerable<PermissionGroup>> ReadAll() { public override async Task<IEnumerable<PermissionGroup>> ReadAll() {
return await repo.GetPermissionGroups(); return await repo.GetPermissionGroups();
} }

4
src/HopFrame.Web/Repositories/UserProvider.cs → src/HopFrame.Web/Provider/UserProvider.cs
View File

@@ -2,9 +2,9 @@ using HopFrame.Database.Models;
using HopFrame.Database.Repositories; using HopFrame.Database.Repositories;
using HopFrame.Web.Admin; using HopFrame.Web.Admin;
namespace HopFrame.Web.Repositories; namespace HopFrame.Web.Provider;
internal sealed class UserProvider(IUserRepository repo) : ModelRepository<User> { internal sealed class UserProvider(IUserRepository repo) : ModelProvider<User> {
public override async Task<IEnumerable<User>> ReadAll() { public override async Task<IEnumerable<User>> ReadAll() {
return await repo.GetUsers(); return await repo.GetUsers();
} }

4
test/FrontendTest/AdminContext.cs
View File

@@ -28,11 +28,11 @@ public class AdminContext : AdminPagesContext {
.Parser<Employee>((model, e) => model.AddressId = e.EmployeeId); .Parser<Employee>((model, e) => model.AddressId = e.EmployeeId);
generator.Page<Employee>() generator.Page<Employee>()
.ConfigureRepository<EmployeeProvider>() .ConfigureProvider<EmployeeProvider>()
.ListingProperty(e => e.Name); .ListingProperty(e => e.Name);
generator.Page<Address>() generator.Page<Address>()
.ConfigureRepository<AddressProvider>() .ConfigureProvider<AddressProvider>()
.ListingProperty(a => a.City); .ListingProperty(a => a.City);
} }
} }

2
test/FrontendTest/Providers/AddressProvider.cs
View File

@@ -4,7 +4,7 @@ using RestApiTest.Models;
namespace FrontendTest.Providers; namespace FrontendTest.Providers;
public class AddressProvider(DatabaseContext context) : ModelRepository<Address> { public class AddressProvider(DatabaseContext context) : ModelProvider<Address> {
public override async Task<IEnumerable<Address>> ReadAll() { public override async Task<IEnumerable<Address>> ReadAll() {
return await context.Addresses.ToArrayAsync(); return await context.Addresses.ToArrayAsync();

2
test/FrontendTest/Providers/EmployeeProvider.cs
View File

@@ -4,7 +4,7 @@ using RestApiTest.Models;
namespace FrontendTest.Providers; namespace FrontendTest.Providers;
public class EmployeeProvider(DatabaseContext context) : ModelRepository<Employee> { public class EmployeeProvider(DatabaseContext context) : ModelProvider<Employee> {
public override async Task<IEnumerable<Employee>> ReadAll() { public override async Task<IEnumerable<Employee>> ReadAll() {
return await context.Employees return await context.Employees