diff --git a/changes/change_external_home.md b/changes/change_external_home.md new file mode 100644 index 00000000..7781ba70 --- /dev/null +++ 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 index 664d2371..a284c7e2 100644 --- 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 index 69c0627b..7242ce4c 100644 --- 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 b/src/main/resources/templates/case-list.html similarity index 85% rename from src/main/resources/templates/index.html rename to src/main/resources/templates/case-list.html index a948fe78..2d9fce4b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/case-list.html @@ -4,7 +4,7 @@ - Home + Cases @@ -14,7 +14,7 @@

QC Dashboard

- + diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html index 05a6496c..0ad85391 100644 --- a/src/main/resources/templates/layout.html +++ b/src/main/resources/templates/layout.html @@ -52,6 +52,8 @@