Skip to content

Commit 0646af6

Browse files
committed
Remove automatic and manual package curation (#6483)
Remove curated feed search UI (OData is still supported) Address #6469
1 parent db22bca commit 0646af6

46 files changed

Lines changed: 3 additions & 2854 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/Bootstrap/dist/css/bootstrap-theme.css

Lines changed: 0 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/less/theme/all.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
@import "page-forgot-password.less";
1717
@import "page-home.less";
1818
@import "page-list-packages.less";
19-
@import "page-manage-curated-feed.less";
2019
@import "page-manage-organizations.less";
2120
@import "page-manage-owners.less";
2221
@import "page-manage-packages.less";

src/Bootstrap/less/theme/page-manage-curated-feed.less

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

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -405,23 +405,6 @@ protected override void Load(ContainerBuilder builder)
405405
.AsSelf()
406406
.InstancePerLifetimeScope();
407407

408-
// todo: bind all package curators by convention
409-
builder.RegisterType<WebMatrixPackageCurator>()
410-
.AsSelf()
411-
.As<IAutomaticPackageCurator>()
412-
.InstancePerLifetimeScope();
413-
414-
builder.RegisterType<Windows8PackageCurator>()
415-
.AsSelf()
416-
.As<IAutomaticPackageCurator>()
417-
.InstancePerLifetimeScope();
418-
419-
// todo: bind all commands by convention
420-
builder.RegisterType<AutomaticallyCuratePackageCommand>()
421-
.AsSelf()
422-
.As<IAutomaticallyCuratePackageCommand>()
423-
.InstancePerLifetimeScope();
424-
425408
if (configuration.Current.Environment == Constants.DevelopmentEnvironment)
426409
{
427410
builder.RegisterType<AllowLocalHttpRedirectPolicy>()

src/NuGetGallery/App_Start/Routes.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -533,31 +533,6 @@ public static void RegisterUIRoutes(RouteCollection routes)
533533
new { controller = "Organizations", action = "ChangeEmailSubscription" },
534534
new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));
535535

536-
routes.MapRoute(
537-
RouteName.CuratedFeed,
538-
"curated-feeds/{name}",
539-
new { controller = "CuratedFeeds", action = "CuratedFeed" });
540-
541-
routes.MapRoute(
542-
RouteName.CuratedFeedListPackages,
543-
"curated-feeds/{curatedFeedName}/packages",
544-
new { controller = "CuratedFeeds", action = "ListPackages" });
545-
546-
routes.MapRoute(
547-
RouteName.CreateCuratedPackageForm,
548-
"forms/add-package-to-curated-feed",
549-
new { controller = "CuratedPackages", action = "CreateCuratedPackageForm" });
550-
551-
routes.MapRoute(
552-
RouteName.CuratedPackage,
553-
"curated-feeds/{curatedFeedName}/curated-packages/{curatedPackageId}",
554-
new { controller = "CuratedPackages", action = "CuratedPackage" });
555-
556-
routes.MapRoute(
557-
RouteName.CuratedPackages,
558-
"curated-feeds/{curatedFeedName}/curated-packages",
559-
new { controller = "CuratedPackages", action = "CuratedPackages" });
560-
561536
routes.MapRoute(
562537
RouteName.Downloads,
563538
"downloads",

src/NuGetGallery/Commands/AppCommand.cs

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

src/NuGetGallery/Commands/AutomaticallyCuratePackageCommand.cs

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

src/NuGetGallery/Controllers/AccountsController.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public class ViewMessages
2929

3030
public AuthenticationService AuthenticationService { get; }
3131

32-
public ICuratedFeedService CuratedFeedService { get; }
33-
3432
public IPackageService PackageService { get; }
3533

3634
public IMessageService MessageService { get; }
@@ -47,7 +45,6 @@ public class ViewMessages
4745

4846
public AccountsController(
4947
AuthenticationService authenticationService,
50-
ICuratedFeedService curatedFeedService,
5148
IPackageService packageService,
5249
IMessageService messageService,
5350
IUserService userService,
@@ -57,7 +54,6 @@ public AccountsController(
5754
IContentObjectService contentObjectService)
5855
{
5956
AuthenticationService = authenticationService ?? throw new ArgumentNullException(nameof(authenticationService));
60-
CuratedFeedService = curatedFeedService ?? throw new ArgumentNullException(nameof(curatedFeedService));
6157
PackageService = packageService ?? throw new ArgumentNullException(nameof(packageService));
6258
MessageService = messageService ?? throw new ArgumentNullException(nameof(messageService));
6359
UserService = userService ?? throw new ArgumentNullException(nameof(userService));
@@ -344,11 +340,6 @@ protected virtual void UpdateAccountViewModel(TUser account, TAccountViewModel m
344340
model.IsCertificatesUIEnabled = ContentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;
345341
model.WasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();
346342

347-
model.CuratedFeeds = CuratedFeedService
348-
.GetFeedsForManager(account.Key)
349-
.Select(f => f.Name)
350-
.ToList();
351-
352343
model.HasPassword = account.Credentials.Any(c => c.IsPassword());
353344
model.CurrentEmailAddress = account.UnconfirmedEmailAddress ?? account.EmailAddress;
354345
model.HasConfirmedEmailAddress = !string.IsNullOrEmpty(account.EmailAddress);

src/NuGetGallery/Controllers/ApiController.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public partial class ApiController
4343
public IContentService ContentService { get; set; }
4444
public ISearchService SearchService { get; set; }
4545
public IIndexingService IndexingService { get; set; }
46-
public IAutomaticallyCuratePackageCommand AutoCuratePackage { get; set; }
4746
public IStatusService StatusService { get; set; }
4847
public IMessageService MessageService { get; set; }
4948
public IAuditingService AuditingService { get; set; }
@@ -72,7 +71,6 @@ public ApiController(
7271
IContentService contentService,
7372
IIndexingService indexingService,
7473
ISearchService searchService,
75-
IAutomaticallyCuratePackageCommand autoCuratePackage,
7674
IStatusService statusService,
7775
IMessageService messageService,
7876
IAuditingService auditingService,
@@ -95,7 +93,6 @@ public ApiController(
9593
ContentService = contentService;
9694
IndexingService = indexingService;
9795
SearchService = searchService;
98-
AutoCuratePackage = autoCuratePackage;
9996
StatusService = statusService;
10097
MessageService = messageService;
10198
AuditingService = auditingService;
@@ -120,7 +117,6 @@ public ApiController(
120117
IContentService contentService,
121118
IIndexingService indexingService,
122119
ISearchService searchService,
123-
IAutomaticallyCuratePackageCommand autoCuratePackage,
124120
IStatusService statusService,
125121
IStatisticsService statisticsService,
126122
IMessageService messageService,
@@ -136,7 +132,7 @@ public ApiController(
136132
ISymbolPackageFileService symbolPackageFileService,
137133
ISymbolPackageUploadService symbolPackageUploadServivce)
138134
: this(apiScopeEvaluator, entitiesContext, packageService, packageFileService, userService, contentService,
139-
indexingService, searchService, autoCuratePackage, statusService, messageService, auditingService,
135+
indexingService, searchService, statusService, messageService, auditingService,
140136
configurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies,
141137
reservedNamespaceService, packageUploadService, packageDeleteService, symbolPackageFileService,
142138
symbolPackageUploadServivce)
@@ -656,8 +652,6 @@ await PackageDeleteService.HardDeletePackagesAsync(
656652
return afterValidationActionResult;
657653
}
658654

659-
await AutoCuratePackage.ExecuteAsync(package, packageToPush, commitChanges: false);
660-
661655
PackageCommitResult commitResult;
662656
using (Stream uploadStream = packageStream)
663657
{

src/NuGetGallery/Controllers/CuratedFeedsController.cs

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

0 commit comments

Comments
 (0)