Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CSharpier config #15287

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Format all .cs files
with `dotnet csharpier .`
  • Loading branch information
Skrypt committed Feb 16, 2024
commit df7f7edf098ebde9257a254d8ff68b0b5c68bc4e
4 changes: 1 addition & 3 deletions src/OrchardCore.Cms.Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

builder.Host.UseNLogHost();

builder.Services
.AddOrchardCms()
.AddSetupFeatures("OrchardCore.AutoSetup");
builder.Services.AddOrchardCms().AddSetupFeatures("OrchardCore.AutoSetup");

var app = builder.Build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ public AdminAreaControllerRouteMapper(IOptions<AdminOptions> adminOptions)

public bool TryMapAreaControllerRoute(IEndpointRouteBuilder routes, ControllerActionDescriptor descriptor)
{
if (descriptor.ControllerName == "Admin" ||
descriptor.ControllerTypeInfo.GetCustomAttribute<AdminAttribute>() != null ||
descriptor.MethodInfo.GetCustomAttribute<AdminAttribute>() != null
)
if (
descriptor.ControllerName == "Admin"
|| descriptor.ControllerTypeInfo.GetCustomAttribute<AdminAttribute>() != null
|| descriptor.MethodInfo.GetCustomAttribute<AdminAttribute>() != null
)
{
routes.MapAreaControllerRoute(
name: descriptor.DisplayName,
Expand Down
29 changes: 14 additions & 15 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ namespace OrchardCore.Admin
{
public class AdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", AdminSiteSettingsDisplayDriver.GroupId },
};
private static readonly RouteValueDictionary _routeValues = new() { { "area", "OrchardCore.Settings" }, { "groupId", AdminSiteSettingsDisplayDriver.GroupId }, };

protected readonly IStringLocalizer S;

Expand All @@ -28,17 +24,20 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
return Task.CompletedTask;
}

builder
.Add(S["Configuration"], configuration => configuration
.Add(S["Settings"], settings => settings
.Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
.AddClass("admin").Id("admin")
.Action("Index", "Admin", _routeValues)
.Permission(PermissionsAdminSettings.ManageAdminSettings)
.LocalNav()
)
builder.Add(
S["Configuration"],
configuration =>
configuration.Add(
S["Settings"],
settings =>
settings.Add(
S["Admin"],
S["Admin"].PrefixPosition(),
admin =>
admin.AddClass("admin").Id("admin").Action("Index", "Admin", _routeValues).Permission(PermissionsAdminSettings.ManageAdminSettings).LocalNav()
)
)
);
);

return Task.CompletedTask;
}
Expand Down
10 changes: 2 additions & 8 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public class AdminMenuFilter : IAsyncResultFilter
private readonly ILayoutAccessor _layoutAccessor;
private readonly IShapeFactory _shapeFactory;

public AdminMenuFilter(ILayoutAccessor layoutAccessor,
IShapeFactory shapeFactory)
public AdminMenuFilter(ILayoutAccessor layoutAccessor, IShapeFactory shapeFactory)
{
_layoutAccessor = layoutAccessor;
_shapeFactory = shapeFactory;
Expand Down Expand Up @@ -55,12 +54,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, R
}

// Populate main nav
var menuShape = await _shapeFactory.CreateAsync("Navigation",
Arguments.From(new
{
MenuName = NavigationConstants.AdminId,
filterContext.RouteData,
}));
var menuShape = await _shapeFactory.CreateAsync("Navigation", Arguments.From(new { MenuName = NavigationConstants.AdminId, filterContext.RouteData, }));

var layout = await _layoutAccessor.GetLayoutAsync();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ public void OnProvidersExecuting(PageRouteModelProviderContext context)
}
}

public void OnProvidersExecuted(PageRouteModelProviderContext context)
{
}
public void OnProvidersExecuted(PageRouteModelProviderContext context) { }

private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager)
where T : ViewsFeature, new()
Expand All @@ -94,10 +92,10 @@ private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(Applica
}
}

private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) =>
viewDescriptor.Item?.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;
private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) => viewDescriptor.Item?.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;

private static T GetViewFeature<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
private static T GetViewFeature<T>(ApplicationPartManager applicationManager)
where T : ViewsFeature, new()
{
var viewsFeature = new T();
applicationManager.PopulateFeature(viewsFeature);
Expand Down
11 changes: 2 additions & 9 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeSelector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ public class AdminThemeSelector : IThemeSelector
private readonly IAdminThemeService _adminThemeService;
private readonly IHttpContextAccessor _httpContextAccessor;

public AdminThemeSelector(
IAdminThemeService adminThemeService,
IHttpContextAccessor httpContextAccessor
)
public AdminThemeSelector(IAdminThemeService adminThemeService, IHttpContextAccessor httpContextAccessor)
{
_adminThemeService = adminThemeService;
_httpContextAccessor = httpContextAccessor;
Expand All @@ -34,11 +31,7 @@ public async Task<ThemeSelectorResult> GetThemeAsync()
return null;
}

return new ThemeSelectorResult
{
Priority = 100,
ThemeName = adminThemeName
};
return new ThemeSelectorResult { Priority = 100, ThemeName = adminThemeName };
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ public class AdminThemeService : IAdminThemeService
private readonly ISiteService _siteService;
private readonly IExtensionManager _extensionManager;

public AdminThemeService(
ISiteService siteService,
IExtensionManager extensionManager)
public AdminThemeService(ISiteService siteService, IExtensionManager extensionManager)
{
_siteService = siteService;
_extensionManager = extensionManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ public class AdminSiteSettingsDisplayDriver : SectionDisplayDriver<ISite, AdminS
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IAuthorizationService _authorizationService;

public AdminSiteSettingsDisplayDriver(
IHttpContextAccessor httpContextAccessor,
IAuthorizationService authorizationService)
public AdminSiteSettingsDisplayDriver(IHttpContextAccessor httpContextAccessor, IAuthorizationService authorizationService)
{
_httpContextAccessor = httpContextAccessor;
_authorizationService = authorizationService;
Expand All @@ -34,13 +32,18 @@ public override async Task<IDisplayResult> EditAsync(AdminSettings settings, Bui
return null;
}

return Initialize<AdminSettingsViewModel>("AdminSettings_Edit", model =>
{
model.DisplayThemeToggler = settings.DisplayThemeToggler;
model.DisplayMenuFilter = settings.DisplayMenuFilter;
model.DisplayNewMenu = settings.DisplayNewMenu;
model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
}).Location("Content:3").OnGroup(GroupId);
return Initialize<AdminSettingsViewModel>(
"AdminSettings_Edit",
model =>
{
model.DisplayThemeToggler = settings.DisplayThemeToggler;
model.DisplayMenuFilter = settings.DisplayMenuFilter;
model.DisplayNewMenu = settings.DisplayNewMenu;
model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
}
)
.Location("Content:3")
.OnGroup(GroupId);
}

public override async Task<IDisplayResult> UpdateAsync(AdminSettings settings, BuildEditorContext context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ public class VisitSiteNavbarDisplayDriver : DisplayDriver<Navbar>
{
public override IDisplayResult Display(Navbar model)
{
return View("VisitSiteNavbarItem", model)
.Location("DetailAdmin", "Content:20");
return View("VisitSiteNavbarItem", model).Location("DetailAdmin", "Content:20");
}
}
5 changes: 1 addition & 4 deletions src/OrchardCore.Modules/OrchardCore.Admin/Manifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
Version = ManifestConstants.OrchardCoreVersion,
Description = "Creates an admin section for the site.",
Category = "Infrastructure",
Dependencies =
[
"OrchardCore.Settings"
]
Dependencies = ["OrchardCore.Settings"]
)]
42 changes: 9 additions & 33 deletions src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,16 @@ public class Permissions : IPermissionProvider
{
public static readonly Permission AccessAdminPanel = new("AccessAdminPanel", "Access admin panel");

private readonly IEnumerable<Permission> _allPermissions =
[
AccessAdminPanel,
];
private readonly IEnumerable<Permission> _allPermissions = [AccessAdminPanel,];

public Task<IEnumerable<Permission>> GetPermissionsAsync()
=> Task.FromResult(_allPermissions);
public Task<IEnumerable<Permission>> GetPermissionsAsync() => Task.FromResult(_allPermissions);

public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
[
new PermissionStereotype
{
Name = "Administrator",
Permissions = _allPermissions,
},
new PermissionStereotype
{
Name = "Editor",
Permissions = _allPermissions,
},
new PermissionStereotype
{
Name = "Moderator",
Permissions = _allPermissions,
},
new PermissionStereotype
{
Name = "Author",
Permissions = _allPermissions,
},
new PermissionStereotype
{
Name = "Contributor",
Permissions = _allPermissions,
},
];
[
new PermissionStereotype { Name = "Administrator", Permissions = _allPermissions, },
new PermissionStereotype { Name = "Editor", Permissions = _allPermissions, },
new PermissionStereotype { Name = "Moderator", Permissions = _allPermissions, },
new PermissionStereotype { Name = "Author", Permissions = _allPermissions, },
new PermissionStereotype { Name = "Contributor", Permissions = _allPermissions, },
];
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,9 @@ public class PermissionsAdminSettings : IPermissionProvider
{
public static readonly Permission ManageAdminSettings = new("ManageAdminSettings", "Manage Admin Settings");

private readonly IEnumerable<Permission> _allPermissions =
[
ManageAdminSettings,
];
private readonly IEnumerable<Permission> _allPermissions = [ManageAdminSettings,];

public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
[
new PermissionStereotype
{
Name = "Administrator",
Permissions = _allPermissions,
},
];
public IEnumerable<PermissionStereotype> GetDefaultStereotypes() => [new PermissionStereotype { Name = "Administrator", Permissions = _allPermissions, },];

public Task<IEnumerable<Permission>> GetPermissionsAsync()
=> Task.FromResult(_allPermissions);
public Task<IEnumerable<Permission>> GetPermissionsAsync() => Task.FromResult(_allPermissions);
}
28 changes: 16 additions & 12 deletions src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ public override void ConfigureServices(IServiceCollection services)
{
services.AddNavigation();

services.Configure<MvcOptions>((options) =>
{
options.Filters.Add(typeof(AdminFilter));
options.Filters.Add(typeof(AdminMenuFilter));
services.Configure<MvcOptions>(
(options) =>
{
options.Filters.Add(typeof(AdminFilter));
options.Filters.Add(typeof(AdminMenuFilter));

// Ordered to be called before any global filter.
options.Filters.Add(typeof(AdminZoneFilter), -1000);
});
// Ordered to be called before any global filter.
options.Filters.Add(typeof(AdminZoneFilter), -1000);
}
);

services.AddTransient<IAreaControllerRouteMapper, AdminAreaControllerRouteMapper>();
services.AddScoped<IPermissionProvider, Permissions>();
Expand Down Expand Up @@ -77,11 +79,13 @@ public class AdminPagesStartup : StartupBase

public override void ConfigureServices(IServiceCollection services)
{
services.Configure<RazorPagesOptions>((options) =>
{
var adminOptions = ShellScope.Services.GetRequiredService<IOptions<AdminOptions>>().Value;
options.Conventions.Add(new AdminPageRouteModelConvention(adminOptions.AdminUrlPrefix));
});
services.Configure<RazorPagesOptions>(
(options) =>
{
var adminOptions = ShellScope.Services.GetRequiredService<IOptions<AdminOptions>>().Value;
options.Conventions.Add(new AdminPageRouteModelConvention(adminOptions.AdminUrlPrefix));
}
);
}
}

Expand Down
Loading
Loading