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.

Sign up for GitHub

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

Jump to bottom

Use ValueTask in INavigationProvider #16650

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Use ValueTask in INavigationProvider #16650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8144767
Use ValueTask in INavigationProvider
MikeAlhayek Sep 1, 2024
d5e4e0a
Update MediaCacheAdminMenu.cs
MikeAlhayek Sep 1, 2024
0395200
Merge branch 'main' into ma/navigation-providers
MikeAlhayek Sep 3, 2024
1701f1e
Remove unnecessary async
sebastienros Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -39,6 +39,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
12 changes: 6 additions & 6 deletions src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ namespace OrchardCore.AdminMenu;

public sealed class AdminMenu : INavigationProvider
{
private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;
private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProviderCoordinator;

internal readonly IStringLocalizer S;

public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProviderCoordinator,
IStringLocalizer<AdminMenu> localizer)
{
_adminMenuNavigationProvider = adminMenuNavigationProvider;
_adminMenuNavigationProviderCoordinator = adminMenuNavigationProviderCoordinator;
S = localizer;
}

public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return;
return ValueTask.CompletedTask;
}

// Configuration and settings menus for the AdminMenu module
Expand All @@ -35,6 +35,6 @@ public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
);

// This is the entry point for the adminMenu: dynamically generated custom admin menus
await _adminMenuNavigationProvider.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder);
return _adminMenuNavigationProviderCoordinator.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder);
}
}
2 changes: 1 addition & 1 deletion ...ardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public AdminMenuNavigationProvidersCoordinator(
_logger = logger;
}

public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
public async ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
// We only add them if the caller uses the string "adminMenu".
if (name != NavigationConstants.AdminMenuId)
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -28,6 +28,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer
S = stringLocalizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -36,6 +36,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
.LocalNav()
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu>
S = stringLocalizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -40,6 +40,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ public sealed class AdminMenu : INavigationProvider

public AdminMenu(IStringLocalizer<AdminMenu> localizer) => S = localizer;

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -27,6 +27,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -55,6 +55,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -39,6 +39,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public AdminMenu(
S = localizer;
}

public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
public async ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
Expand Down
6 changes: 3 additions & 3 deletions ...ts/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer<AdminMenu> loca
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -39,6 +39,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -32,6 +32,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public AdminMenu(
_customSettingsService = customSettingsService;
}

public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
public async ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand Down Expand Up @@ -50,6 +50,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -35,6 +35,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -40,6 +40,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!NavigationHelper.IsAdminMenu(name))
{
return Task.CompletedTask;
return ValueTask.CompletedTask;
}

builder
Expand All @@ -49,6 +49,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
)
);

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
Loading