Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d982442
add new wizard
AndrewThien Feb 17, 2026
4a547cb
add new wizard to project controller
AndrewThien Feb 17, 2026
44db6ad
add link to new wizard
AndrewThien Feb 17, 2026
7698e9e
change frame name for the new wizard
AndrewThien Feb 17, 2026
bafd6ee
change name
AndrewThien Feb 17, 2026
310eb3c
change the field ID
AndrewThien Feb 17, 2026
6a0fe6a
add new action for form
AndrewThien Feb 17, 2026
09d1cde
making the first mode working
AndrewThien Feb 17, 2026
d7eabcd
improve default image
AndrewThien Feb 17, 2026
fbe5aa0
update default sql runner image
AndrewThien Feb 20, 2026
02f4898
use the new data model
AndrewThien Feb 20, 2026
4dd58a4
fix action used
AndrewThien Feb 20, 2026
0105b1c
update name
AndrewThien Feb 20, 2026
20f58a6
update naming
AndrewThien Feb 20, 2026
3177f1f
first mode 1/2 working
AndrewThien Feb 20, 2026
364f558
fix bugs
AndrewThien Feb 20, 2026
1f2c9c2
clean up
AndrewThien Feb 20, 2026
7ec1ce3
fix var name
AndrewThien Feb 20, 2026
8987ba7
finish roughly
AndrewThien Feb 20, 2026
a7a7207
clean up
AndrewThien Feb 20, 2026
3786f3e
move badge
AndrewThien Feb 20, 2026
bce850b
add css
AndrewThien Feb 23, 2026
f24d247
clean up
AndrewThien Feb 23, 2026
3e8e622
Merge branch 'main' into fix-wizard
AndrewThien Feb 23, 2026
f5211ac
update type
AndrewThien Feb 23, 2026
7f9cf5d
monaco editor
AndrewThien Feb 23, 2026
25a3d55
add *
AndrewThien Feb 23, 2026
bca34bf
clean up for now, keep todo
AndrewThien Feb 23, 2026
d97a966
add note
AndrewThien Feb 23, 2026
f123cfc
first clean up
AndrewThien Feb 23, 2026
d77d8ae
main refactoring
AndrewThien Feb 23, 2026
629bb91
Merge branch 'main' into fix-wizard
AndrewThien Feb 23, 2026
e4eaf90
fix sonar qube
AndrewThien Feb 23, 2026
e33235d
fix security hotspot
AndrewThien Feb 23, 2026
2c60574
return something make sense
AndrewThien Feb 24, 2026
016d3fe
fix description
AndrewThien Feb 24, 2026
5ef0e09
add input
AndrewThien Feb 24, 2026
7bbe301
fix monaco editor
AndrewThien Feb 24, 2026
0ed8e6f
move the input
AndrewThien Feb 24, 2026
8822245
fix styling
AndrewThien Feb 24, 2026
36364a1
Merge branch 'main' into fix-wizard
AndrewThien Feb 25, 2026
2f1d078
Merge branch 'main' into fix-wizard
AndrewThien Feb 27, 2026
f7bfb36
Merge branch 'main' into fix-wizard
AndrewThien Feb 27, 2026
2bd683e
sonar
AndrewThien Feb 27, 2026
61149e1
sonar 2
AndrewThien Feb 27, 2026
786318d
add info about output
AndrewThien Feb 27, 2026
ba5212d
update version
AndrewThien Feb 27, 2026
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using System.ComponentModel.DataAnnotations;

namespace FiveSafesTes.Core.Models.ViewModels
{
public class SubmissionWizardV2
{
public int ProjectId { get; set; }

[Display(Name = "TES Name")] public string? TESName { get; set; }

[Display(Name = "TES Description")] public string? TESDescription { get; set; }

[Display(Name = "Submitting to Project: ")]
public string? ProjectName { get; set; }

[Display(Name = "Select TREs")] public List<string>? Tres { get; set; }

public List<TreInfo>? TreRadios { get; set; }

public List<string>? SelectTresOptions { get; set; }

[Display(Name = "Select TREs or leave blank for all")]
public string? SelectedTres { get; set; }

public List<ExecutorsV2>? Executors { get; set; }

public string? DataInputType { get; set; } = "";

public string? DataInputPath { get; set; } = "";

public string? DataOutputType { get; set; } = "DIRECTORY";

public string? DataOutputPath { get; set; } = "/outputs";

public string? DataOutputUrl { get; set; } = "s3://";

public string? DataOutputDescription { get; set; } = "Results from the requested query execution";

public string? DataOutputName { get; set; } = "Query Results";

public string? RawInput { get; set; }

public string? Query { get; set; }

public virtual List<Submission>? Submissions { get; set; }

public IEnumerable<SelectListItem>? TreItemList { get; set; }

public IEnumerable<SelectListItem>? UserItemList { get; set; }

public string? JsonData { get; set; } = string.Empty;
}

public class ExecutorsV2
{
public string Image { get; set; } = string.Empty;
public List<string> Command { get; set; } = new();
public List<string> ENV { get; set; } = new();
}
}
28 changes: 28 additions & 0 deletions Submission/Submission.Web/Controllers/ProjectController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,35 @@ public async Task<IActionResult> GetProject(int id)
return View(projectView);
}

public IActionResult SubmissionProjectSqlV2(int id)
{
if (!ModelState.IsValid) // SonarQube security
{
var errors = ModelState
.Where(x => x.Value?.Errors.Count > 0)
.Select(x => new { Field = x.Key, Errors = x.Value?.Errors.Select(e => e.ErrorMessage) })
.ToList();

return BadRequest($"Model validation failed: {string.Join(", ", errors.SelectMany(e => e.Errors))}");
}

var paramlist = new Dictionary<string, string>();
paramlist.Add("projectId", id.ToString());
var project = _clientHelper.CallAPIWithoutModel<SubmissionGetProjectModel>(
"/api/Project/GetProjectUI/", paramlist).Result;


ViewBag.UserCanDoSubmissions = IsUserOnProject(project);

var projectView = new ProjectUserTre()
{
Id = project.Id,
Name = project.Name,
Submissions = project.Submissions.Where(x => x.HasParent == false).ToList(),
};

return View(projectView);
}
public IActionResult SubmissionProjectSQL(int id)
{
if (!ModelState.IsValid) // SonarQube security
Expand Down
Loading
Loading