jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: make exporting consistent

Browse Source
This commit is contained in:
Gary Sharp
2025-02-06 19:14:36 +11:00
parent f946f3250c
commit 67f1c2a5d1
69 changed files with 908 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Controllers/JobController.cs
+5 -13
View File
@@ -1,6 +1,5 @@
using Disco.Models.Repository;
using Disco.Models.Services.Jobs;
using Disco.Models.Services.Jobs.Exporting;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Job;
using Disco.Services;
@@ -24,7 +23,6 @@ using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Web;
using System.Web.Mvc;
namespace Disco.Web.Controllers
@@ -1084,7 +1082,7 @@ namespace Disco.Web.Controllers
#region Export
[DiscoAuthorizeAny(Claims.Job.Actions.Export), HttpGet]
public virtual ActionResult Export(string downloadId)
public virtual ActionResult Export(Guid? exportId)
{
var m = new Models.Job.ExportModel()
{
@@ -1100,20 +1098,14 @@ namespace Disco.Web.Controllers
m.Options.FilterEndDate = null;
}
if (!string.IsNullOrWhiteSpace(downloadId))
if (ExportTask.TryFromCache(exportId, out var context))
{
string key = string.Format(Areas.API.Controllers.JobController.ExportSessionCacheKey, downloadId);
var context = HttpRuntime.Cache.Get(key) as ExportTaskContext<JobExportOptions>;
if (context != null)
{
m.ExportSessionResult = context.Result;
m.ExportSessionId = downloadId;
}
m.ExportId = context.Id;
m.ExportResult = context.Result;
}
// UI Extensions
UIExtensions.ExecuteExtensions<JobExportModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<JobExportModel>(ControllerContext, m);
return View(m);
}