[GLT-4333] changed external user home page to projects list (#256)

oicr-gsi · Jan 28, 2025 · eaba71c · eaba71c
1 parent 2d4d04b
commit eaba71c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/changes/change_external_home.md b/changes/change_external_home.md
@@ -0,0 +1 @@
+Home page for external users to the Projects list
diff --git a/src/main/java/ca/on/oicr/gsi/dimsum/controller/mvc/CaseController.java b/src/main/java/ca/on/oicr/gsi/dimsum/controller/mvc/CaseController.java
@@ -26,6 +26,11 @@ public class CaseController {
   @Autowired
   private CaseService caseService;
 
+  @GetMapping
+  public String getCaseListPage() {
+    return "case-list";
+  }
+
   @GetMapping("/{caseId}")
   public String getCaseDetailsPage(@PathVariable String caseId, ModelMap model,
       HttpServletRequest request) {

diff --git a/src/main/java/ca/on/oicr/gsi/dimsum/controller/mvc/HomeController.java b/src/main/java/ca/on/oicr/gsi/dimsum/controller/mvc/HomeController.java
@@ -1,5 +1,6 @@
 package ca.on.oicr.gsi.dimsum.controller.mvc;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -9,9 +10,18 @@
 @Controller
 public class HomeController {
 
+  @Autowired
+  private CaseController caseController;
+  @Autowired
+  private ProjectController projectController;
+
   @GetMapping("/")
-  public String getHomePage() {
-    return "index";
+  public String getHomePage(@AuthenticationPrincipal DimsumPrincipal principal) {
+    if (principal.isInternal()) {
+      return caseController.getCaseListPage();
+    } else {
+      return projectController.getProjectListPage();
+    }
   }
 
   @GetMapping("/login")

diff --git a/src/main/resources/templates/index.html → src/main/resources/templates/case-list.html b/src/main/resources/templates/index.html → src/main/resources/templates/case-list.html
@@ -4,7 +4,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <title>Home</title>
+  <title>Cases</title>
 </head>
 
 <body>
@@ -14,7 +14,7 @@ <h1 class="text-green-200 font-sarabun font-light font text-32">QC Dashboard</h1
 
     <div id="casesTableContainer"></div>
 
-    <script src="/js/index.js"></script>
+    <script src="/js/caseList.js"></script>
 
   </div>
 </body>

diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
@@ -52,6 +52,8 @@
       </div>
     </div>
     <nav th:unless="${hideNav}" class="noprint text-right">
+      <a th:href="@{/cases}" class="text-green-200 font-bold hover:underline">Cases</a>
+      <span class="text-grey-200 font-bold"> | </span>
       <a th:href="@{/projects}" class="text-green-200 font-bold hover:underline">Projects</a>
       <div th:if="${internalUser}" class="inline">
         <span class="text-grey-200 font-bold"> | </span>

diff --git a/ts/index.ts → ts/case-list.ts b/ts/index.ts → ts/case-list.ts
diff --git a/webpack.config.js b/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require("webpack");
 module.exports = {
   mode: "production",
   entry: {
-    index: "./ts/index.ts",
+    caseList: "./ts/case-list.ts",
     details: "./ts/details.ts",
     projectDetails: "./ts/project-details.ts",
     notifications: "./ts/notifications.ts",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Home page for external users to the Projects list