paul/isn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a better result

Browse Source
This commit is contained in:
Paul Schneider
2023-04-25 22:40:58 +01:00
parent 56e4b6c526
commit d3b96088ab
47 changed files with 268 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/isnd/Controllers/Packages/PackagesController.WebViews.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using isn.abst;
using isnd.Data;
using isnd.Data.Catalog;
using isnd.Helpers;
@ -15,22 +16,22 @@ namespace isnd.Controllers
public partial class PackagesController
{
// Web search
public async Task<IActionResult> Index(RegistrationPageIndexQuery model)
public async Task<IActionResult> Index(PackageRegistrationQuery model)
{
return View(new RegistrationPageIndexQueryAndResult{Query = model,
Result = await packageManager.SearchPackageAsync(model)});
}
public async Task<IActionResult> Details(string pkgid)
public async Task<IActionResult> Details(PackageDetailViewModel model)
{
if (pkgid == null)
if (model.pkgid == null)
{
return NotFound();
}
var packageVersion = dbContext.PackageVersions
.Include(p => p.Package)
.Where(m => m.PackageId == pkgid)
.Where(m => m.PackageId == model.pkgid)
.OrderByDescending(p => p)
;
@ -39,17 +40,11 @@ namespace isnd.Controllers
return NotFound();
}
bool results = await packageVersion.AnyAsync();
var latest = await packageVersion.FirstAsync();
return View("Details", new PackageDetailViewModel
{
ExternalUrl = isndSettings.ExternalUrl,
latest = latest,
pkgid = pkgid,
totalHits = packageVersion.Count(),
data = packageVersion.Take(MAX_PKG_VERSION_LIST).ToArray()
});
model.latest = await packageVersion.FirstAsync();
model.totalHits = packageVersion.Count();
model.data = packageVersion.Take(MAX_PKG_VERSION_LIST).ToArray();
return View("Details", model);
}
const int MAX_PKG_VERSION_LIST = 50;
@ -60,7 +55,6 @@ namespace isnd.Controllers
{
return NotFound();
}
// var report = await packageManager.DeletePackageAsync(id, lower, type);
var packageVersion = await dbContext.PackageVersions.Include(p => p.Package)
.FirstOrDefaultAsync(m => m.PackageId == pkgid