Merge commit '46279f740b584ac64398033804d759cc4c64fa97'

src/main/resources/templates/fragments/layout.html

@@ -23,6 +23,7 @@
                 <li><a class="nav-link" th:href="@{/dashboard}" data-tooltip="Overview" th:attr="aria-current=${activeNav == 'dashboard'} ? 'page' : null">
                     <svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#layout-dashboard}"></use></svg><span class="sidebar-label">Overview</span></a></li>
                 <li sec:authorize="hasRole('ADMIN')"><a class="nav-link" th:href="@{/admin/accounts/new}" data-tooltip="Accounts" th:attr="aria-current=${activeNav == 'accounts'} ? 'page' : null"><svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#users}"></use></svg><span class="sidebar-label">Accounts</span></a></li>
+                <li sec:authorize="hasRole('ADMIN')"><a class="nav-link" th:href="@{/admin/smtp}" data-tooltip="SMTP settings" th:attr="aria-current=${activeNav == 'smtp'} ? 'page' : null"><svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#settings}"></use></svg><span class="sidebar-label">SMTP settings</span></a></li>
                 <li sec:authorize="hasRole('ADMIN')"><a class="nav-link" th:href="@{/attendance/calendar}" data-tooltip="Global calendar" th:attr="aria-current=${activeNav == 'calendar'} ? 'page' : null"><svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#calendar-days}"></use></svg><span class="sidebar-label">Global calendar</span></a></li>
                 <li sec:authorize="hasRole('MENTOR')"><a class="nav-link" th:href="@{/projects}" data-tooltip="Owned Projects" th:attr="aria-current=${activeNav == 'projects'} ? 'page' : null"><svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#folder-kanban}"></use></svg><span class="sidebar-label">Owned Projects</span></a></li>
                 <li sec:authorize="hasRole('INTERN')"><a class="nav-link" th:href="@{/attendance}" data-tooltip="My attendance" th:attr="aria-current=${activeNav == 'attendance'} ? 'page' : null"><svg class="nav-icon" aria-hidden="true"><use th:href="@{/assets/icons.svg#clock}"></use></svg><span class="sidebar-label">My attendance</span></a></li>

src/test/java/com/lab/labtimesheet/feature/reporting/controller/DashboardControllerWebTest.java

@@ -44,7 +44,9 @@ class DashboardControllerWebTest {
                 .andExpect(model().attribute("dashboard", dashboard))
                 .andExpect(content().string(org.hamcrest.Matchers.containsString(
                         "This installation remains restricted until tested SMTP is active.")))
-                .andExpect(content().string(org.hamcrest.Matchers.containsString("href=\"/admin/smtp\"")));
+                .andExpect(content().string(org.hamcrest.Matchers.containsString("href=\"/admin/smtp\"")))
+                .andExpect(content().string(org.hamcrest.Matchers.containsString(
+                        "data-tooltip=\"SMTP settings\"")));
 
         verify(dashboards).admin("admin@example.test");
     }
@@ -58,20 +60,25 @@ class DashboardControllerWebTest {
         mvc.perform(get("/dashboard").with(user("admin@example.test").roles("ADMIN")))
                 .andExpect(status().isOk())
                 .andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString(
-                        "This installation remains restricted until tested SMTP is active."))));
+                        "This installation remains restricted until tested SMTP is active."))))
+                .andExpect(content().string(org.hamcrest.Matchers.containsString(
+                        "href=\"/admin/smtp\" data-tooltip=\"SMTP settings\"")));
     }
 
     @Test
     void mentorRendersMentorDashboardForAuthenticatedIdentity() throws Exception {
         var dashboard = new DashboardView.Mentor("Mentor", 2, 4, 1);
         given(dashboards.mentor("mentor@example.test")).willReturn(dashboard);
+        given(smtpConfiguration.hasActiveConfiguration()).willReturn(true);
 
         mvc.perform(get("/dashboard").with(user("mentor@example.test").roles("MENTOR")))
                 .andExpect(status().isOk())
                 .andExpect(view().name("dashboard/mentor"))
                 .andExpect(model().attribute("dashboard", dashboard))
                 .andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString(
-                        "This installation remains restricted until tested SMTP is active."))));
+                        "This installation remains restricted until tested SMTP is active."))))
+                .andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString(
+                        "data-tooltip=\"SMTP settings\""))));
 
         verify(dashboards).mentor("mentor@example.test");
     }
@@ -81,11 +88,14 @@ class DashboardControllerWebTest {
         var dashboard = new DashboardView.Intern(
                 "Intern", DashboardView.AttendanceState.NOT_CHECKED_IN, 1, 0, List.of());
         given(dashboards.intern("intern@example.test")).willReturn(dashboard);
+        given(smtpConfiguration.hasActiveConfiguration()).willReturn(true);
 
         mvc.perform(get("/dashboard").with(user("intern@example.test").roles("INTERN")))
                 .andExpect(status().isOk())
                 .andExpect(view().name("dashboard/intern"))
-                .andExpect(model().attribute("dashboard", dashboard));
+                .andExpect(model().attribute("dashboard", dashboard))
+                .andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString(
+                        "data-tooltip=\"SMTP settings\""))));
 
         verify(dashboards).intern("intern@example.test");
     }

src/test/java/com/lab/labtimesheet/feature/reporting/controller/RoleDashboardWebIntegrationTest.java

@@ -136,12 +136,12 @@ class RoleDashboardWebIntegrationTest {
                 .andExpect(content().string(containsString("BLOCKED")))
                 .andExpect(content().string(containsString("20/08/2026")));
 
-        followEveryVisibleNavigationLink("admin@example.test", "ADMIN");
-        followEveryVisibleNavigationLink("mentor@example.test", "MENTOR");
-        followEveryVisibleNavigationLink("intern@example.test", "INTERN");
+        followEveryVisibleNavigationLink("admin@example.test", "ADMIN", true);
+        followEveryVisibleNavigationLink("mentor@example.test", "MENTOR", false);
+        followEveryVisibleNavigationLink("intern@example.test", "INTERN", false);
     }
 
-    private void followEveryVisibleNavigationLink(String email, String role) throws Exception {
+    private void followEveryVisibleNavigationLink(String email, String role, boolean expectsSmtpSettings) throws Exception {
         String dashboard = mvc.perform(get("/dashboard").with(user(email).roles(role)))
                 .andExpect(status().isOk())
                 .andReturn()
@@ -153,6 +153,11 @@ class RoleDashboardWebIntegrationTest {
             paths.add(matcher.group(1));
         }
         assertThat(paths).isNotEmpty();
+        if (expectsSmtpSettings) {
+            assertThat(paths).contains("/admin/smtp");
+        } else {
+            assertThat(paths).doesNotContain("/admin/smtp");
+        }
         for (String path : paths) {
             mvc.perform(get(path).with(user(email).roles(role)))
                     .andExpect(status().isOk());