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/Models/Device/ExportModel.cs
+4 -3
View File
@@ -1,6 +1,7 @@
using Disco.Models.Services.Devices.Exporting;
using Disco.Models.Services.Devices;
using Disco.Models.Services.Exporting;
using Disco.Models.UI.Device;
using System;
using System.Collections.Generic;
namespace Disco.Web.Models.Device
@@ -9,8 +10,8 @@ namespace Disco.Web.Models.Device
{
public DeviceExportOptions Options { get; set; }
public string ExportSessionId { get; set; }
public ExportResult ExportSessionResult { get; set; }
public Guid? ExportId { get; set; }
public ExportResult ExportResult { get; set; }
public IEnumerable<KeyValuePair<int, string>> DeviceBatches { get; set; }
public IEnumerable<KeyValuePair<int, string>> DeviceModels { get; set; }
Disco.Web/Models/Job/ExportModel.cs
+4 -3
View File
@@ -1,7 +1,8 @@
using Disco.Models.Repository;
using Disco.Models.Services.Exporting;
using Disco.Models.Services.Jobs.Exporting;
using Disco.Models.Services.Jobs;
using Disco.Models.UI.Job;
using System;
using System.Collections.Generic;
namespace Disco.Web.Models.Job
@@ -10,8 +11,8 @@ namespace Disco.Web.Models.Job
{
public JobExportOptions Options { get; set; }
public string ExportSessionId { get; set; }
public ExportResult ExportSessionResult { get; set; }
public Guid? ExportId { get; set; }
public ExportResult ExportResult { get; set; }
public List<JobQueue> JobQueues { get; set; }
public List<KeyValuePair<string, string>> JobStatuses { get; set; }