fix(deps): moves Submissions out of modal (#659)

SwanseaUniversityMedical · May 7, 2024 · d7e7cd0 · d7e7cd0
1 parent 371dd53
commit d7e7cd0
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 14 deletions.
diff --git a/src/DARE-FrontEnd/Controllers/ProjectController.cs b/src/DARE-FrontEnd/Controllers/ProjectController.cs
@@ -104,6 +104,67 @@ public IActionResult GetProject(int id)
             return View(projectView);
         }
 
+        public IActionResult SubmissionProjectSQL(int id)
+        {
+
+            var paramlist = new Dictionary<string, string>();
+            paramlist.Add("projectId", id.ToString());
+            var project = _clientHelper.CallAPIWithoutModel<Project?>(
+                "/api/Project/GetProject/", paramlist).Result;
+
+            ViewBag.UserCanDoSubmissions = IsUserOnProject(project);
+
+            var projectView = new ProjectUserTre()
+            {
+                Id = project.Id,
+                Name = project.Name
+            };
+
+            return View(projectView);
+        }
+
+
+        public IActionResult SubmissionProjectGraphQL(int id)
+        {
+
+            var paramlist = new Dictionary<string, string>();
+            paramlist.Add("projectId", id.ToString());
+            var project = _clientHelper.CallAPIWithoutModel<Project?>(
+                "/api/Project/GetProject/", paramlist).Result;
+
+            ViewBag.UserCanDoSubmissions = IsUserOnProject(project);
+
+            var projectView = new ProjectUserTre()
+            {
+                Id = project.Id,
+                Name = project.Name
+            };
+
+            return View(projectView);
+        }
+
+        public IActionResult SubmissionProjectCrate(int id)
+        {
+
+            var paramlist = new Dictionary<string, string>();
+            paramlist.Add("projectId", id.ToString());
+            var project = _clientHelper.CallAPIWithoutModel<Project?>(
+                "/api/Project/GetProject/", paramlist).Result;
+
+            ViewBag.UserCanDoSubmissions = IsUserOnProject(project);
+
+            var projectView = new ProjectUserTre()
+            {
+                Id = project.Id,
+                Name = project.Name
+            };
+
+            return View(projectView);
+        }
+
+
+
+
         [HttpGet]
         [AllowAnonymous]
         public IActionResult GetAllProjects()

diff --git a/src/DARE-FrontEnd/Controllers/SubmissionController.cs b/src/DARE-FrontEnd/Controllers/SubmissionController.cs
@@ -113,7 +113,7 @@ public async Task<IActionResult> SubmissionWizard(SubmissionWizard model)
 
                 var result = await _clientHelper.CallAPI<TesTask, TesTask?>("/v1/tasks", TesTask);
 
-                return RedirectToAction("GetProject", "Project", new { id = model.ProjectId });
+                return Ok();
             }
             catch (Exception ex)
             {
@@ -191,7 +191,7 @@ public async Task<ActionResult> AddiSubmissionWizard(AddiSubmissionWizard model,
             try
             {
 
-
+             
                 var listOfTre = "";
 
                 var paramlist = new Dictionary<string, string>();
@@ -354,7 +354,7 @@ public async Task<ActionResult> AddiSubmissionWizard(AddiSubmissionWizard model,
                 var result = await _clientHelper.CallAPI<TesTask, TesTask?>("/v1/tasks", test);
 
 
-                return RedirectToAction("GetProject", "Project", new { id = model.ProjectId });
+                return Ok();
             }
             catch (Exception e)
             {

diff --git a/src/DARE-FrontEnd/Views/Project/GetProject.cshtml b/src/DARE-FrontEnd/Views/Project/GetProject.cshtml
@@ -114,17 +114,17 @@
                 {
                     <div class="d-flex align-items-center mb-3">
 
-                        <a class="btn btn-primary btn-sm d-flex align-items-center mb-3 text-decoration-none" id="showModalButton">
+                        <a class="btn btn-primary btn-sm d-flex align-items-center mb-3 text-decoration-none" href="@Url.Action("SubmissionProjectCrate", "Project",  new { id = pId })">
                             <i class="fa fa-table-columns align-middle me-2"></i>
-                            <span>Submit with Crate Submission Wizard</span>
+                            <span>Submit with Crate Submission Wizard </span>
                         </a>
 
-                        <a class="btn btn-link btn-sm d-flex align-items-center mb-3 text-decoration-none" id="showModalButton2">
+                        <a class="btn btn-link btn-sm d-flex align-items-center mb-3 text-decoration-none" href="@Url.Action("SubmissionProjectSQL", "Project",  new { id = pId })">
                             <i class="fa fa-table-columns align-middle me-2"></i>
-                            <span>Submit with SQL TES Wizard</span>
+                            <span >Submit with SQL TES Wizard </span>
                         </a>
 
-                        <a class="btn btn-link btn-sm d-flex align-items-center mb-3 text-decoration-none" id="showModalButton3">
+                        <a class="btn btn-link btn-sm d-flex align-items-center mb-3 text-decoration-none" href="@Url.Action("SubmissionProjectGraphQL", "Project",  new { id = pId })">
                             <i class="fa fa-table-columns align-middle me-2"></i>
                             <span>Submit with GraphQL TES Wizard</span>
                         </a>

diff --git a/src/DARE-FrontEnd/Views/Project/SubmissionProjectCrate.cshtml b/src/DARE-FrontEnd/Views/Project/SubmissionProjectCrate.cshtml
@@ -0,0 +1,13 @@
+@using BL.Models.ViewModels
+@model BL.Models.ViewModels.ProjectUserTre
+@{
+    string pageName = Model.Name;
+
+    ViewData["Title"] = @pageName;
+    int pId = Model.Id;
+}
+
+@if (ViewBag.UserCanDoSubmissions)
+{
+    @await Component.InvokeAsync("SubmissionWizerd", new {projectId=pId})
+}
diff --git a/src/DARE-FrontEnd/Views/Project/SubmissionProjectGraphQL.cshtml b/src/DARE-FrontEnd/Views/Project/SubmissionProjectGraphQL.cshtml
@@ -0,0 +1,13 @@
+@using BL.Models.ViewModels
+@model BL.Models.ViewModels.ProjectUserTre
+@{
+    string pageName = Model.Name;
+
+    ViewData["Title"] = @pageName;
+    int pId = Model.Id;
+}
+
+@if (ViewBag.UserCanDoSubmissions)
+{
+    @await Component.InvokeAsync("SubmissionWizardRawGraphQL", new {projectId=pId})
+}
diff --git a/src/DARE-FrontEnd/Views/Project/SubmissionProjectSQL.cshtml b/src/DARE-FrontEnd/Views/Project/SubmissionProjectSQL.cshtml
@@ -0,0 +1,13 @@
+@using BL.Models.ViewModels
+@model BL.Models.ViewModels.ProjectUserTre
+@{
+    string pageName = Model.Name;
+
+    ViewData["Title"] = @pageName;
+    int pId = Model.Id;
+}
+
+@if (ViewBag.UserCanDoSubmissions)
+{
+    @await Component.InvokeAsync("SubmissionWizardRaw", new {projectId=pId})
+}
diff --git a/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizardRaw/Default.cshtml b/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizardRaw/Default.cshtml
@@ -63,6 +63,7 @@
                     <thead>
                         <tr>
                             <th class="col-md-5">Image</th>
+                            <th class="col-md-7">Command</th>
                             <th class="col-md-7">Environment Variables</th>
                         </tr>
                     </thead>
@@ -117,7 +118,7 @@
             <div class="hero-block-1">
 
                 <button type="button" class="btn btn-sm btn-link" data-bs-dismiss="modal">Cancel</button>
-                <button type="submit" class="btn btn-sm btn-primary">Submit</button>
+                <button type="button" class="btn btn-sm btn-primary">Submit</button>
             </div>
         </div>
     }

diff --git a/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizardRawGraphQL/Default.cshtml b/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizardRawGraphQL/Default.cshtml
@@ -64,6 +64,7 @@
                         <tr>
                             <th class="col-md-5">Image</th>
                             <th class="col-md-7">Command</th>
+                            <th class="col-md-7">Environment Variabl</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -117,7 +118,7 @@
             <div class="hero-block-1">
 
                 <button type="button" class="btn btn-sm btn-link" data-bs-dismiss="modal">Cancel</button>
-                <button type="submit" class="btn btn-sm btn-primary">Submit</button>
+                <button type="button" class="btn btn-sm btn-primary">Submit</button>
             </div>
         </div>
     }

diff --git a/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizerd/Default.cshtml b/src/DARE-FrontEnd/Views/Shared/Components/SubmissionWizerd/Default.cshtml
@@ -6,7 +6,7 @@
 }
 
 
-@using (Html.BeginForm("SubmissionWizard", "Submission", FormMethod.Post, new { enctype = "multipart/form-data", id = "frmMain" }))
+@using (Html.BeginForm("GetAllProjects", "Project", FormMethod.Post, new { enctype = "multipart/form-data", id = "frmMain" }))
 {
     @Html.HiddenFor(x => x.ProjectId)
     {
@@ -100,7 +100,7 @@
             <div class="hero-block-1">
 
                 <button type="button" class="btn btn-sm btn-link" data-bs-dismiss="modal">Cancel</button>
-                <button type="submit" class="btn btn-sm btn-primary">Submit</button>
+                <button type="button" class="btn btn-sm btn-primary">Submit</button>
             </div>
         </div>
     }

diff --git a/src/DARE-FrontEnd/Views/Shared/_Layout.cshtml b/src/DARE-FrontEnd/Views/Shared/_Layout.cshtml
@@ -541,7 +541,7 @@
                     contentType: false,
                     processData: false,
                     success: function (result) {
-                        location.reload();
+                        window.location.href = "/Project/GetProject/" + this.data.get("ProjectId");
                         console.log(result);
                     },
                     error: function (error) {
@@ -621,7 +621,7 @@
                     contentType: false,
                     processData: false,
                     success: function (result) {
-                        location.reload();
+                        window.location.href = "/Project/GetProject/" + this.data.get("ProjectId");
                         console.log(result);
                     },
                     error: function (error) {