Initial progress of new design, the theme isnt decided yet

Author: lilstiffy

pom.xml

@@ -65,6 +65,13 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.19.2</version>
         </dependency>
+
+        <!-- FlatLaf dependency for modern UI look and feel -->
+        <dependency>
+            <groupId>com.formdev</groupId>
+            <artifactId>flatlaf</artifactId>
+            <version>3.6</version>
+        </dependency>
     </dependencies>
 
     <!-- Build configuration for the project -->

src/main/java/org/pwss/Start.java

@@ -1,8 +1,12 @@
 package org.pwss;
 
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 
+import com.formdev.flatlaf.FlatDarculaLaf;
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatIntelliJLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.themes.FlatMacDarkLaf;
 import org.pwss.navigation.NavigationEvents;
 import org.pwss.navigation.NavigationHandler;
 import org.pwss.navigation.Screen;
@@ -11,27 +15,36 @@
 
 public class Start {
     public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            // Create the main frame
-            JFrame frame = new JFrame("Scan Integrity Scanner");
-            frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-            frame.setSize(350, 250);
-            frame.setLocationRelativeTo(null); // center on screen
+        try {
+            // Set FlatLaf Look and Feel
+            UIManager.setLookAndFeel(new FlatDarkLaf());
 
-            // Create presenter factory
-            PresenterFactory factory = new AppPresenterFactory();
+            // Create Main UI of the application on the Event Dispatch Thread
+            SwingUtilities.invokeLater(() -> {
+                // Create the main frame
+                JFrame frame = new JFrame("File Integrity Scanner");
+                frame.setResizable(false);
+                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                frame.setLocationRelativeTo(null); // center on screen
 
-            // Create navigation handler
-            NavigationHandler navigator = new NavigationHandler(frame, factory);
+                // Create presenter factory
+                PresenterFactory factory = new AppPresenterFactory();
 
-            // Hook navigation listener so presenters can signal navigation
-            NavigationEvents.setListener(navigator::navigateTo);
+                // Create navigation handler
+                NavigationHandler navigator = new NavigationHandler(frame, factory);
 
-            // Start with Login screen
-            navigator.navigateTo(Screen.LOGIN);
+                // Hook navigation listener so presenters can signal navigation
+                NavigationEvents.setListener(navigator::navigateTo);
+
+                // Start with Login screen
+                navigator.navigateTo(Screen.LOGIN);
+
+                // Finally, show the main frame hosting the screens :)
+                frame.setVisible(true);
+            });
+        } catch( Exception ex ) {
+            System.err.println( "Failed to initialize LaF" );
+        }
 
-            // Finally, show the main frame hosting the screens :)
-            frame.setVisible(true);
-        });
     }
 }

src/main/java/org/pwss/model/entity/MonitoredDirectory.java

@@ -2,18 +2,7 @@
 
 import java.util.Date;
 
-/**
- * Represents a directory that is being monitored for changes.
- *
- * @param id                    Unique identifier for the monitored directory.
- * @param path                  Filesystem path of the monitored directory.
- * @param isActive              Indicates if monitoring is currently active for this directory.
- * @param addedAt               Timestamp when the directory was added for monitoring.
- * @param lastScanned           Timestamp of the last scan performed on this directory.
- * @param notes                 Additional notes or comments about the monitored directory.
- * @param baselineEstablished   Indicates if a baseline has been established for change detection.
- * @param includeSubdirectories Indicates if subdirectories should be included in monitoring.
- */
-public record MonitoredDirectory(long id, String path, boolean isActive, Date addedAt, Date lastScanned, String notes,
+
+public record MonitoredDirectory(long id, String path, boolean isActive, Time addedAt, Date lastScanned, Notes notes,
                                  boolean baselineEstablished, boolean includeSubdirectories) {
 }

src/main/java/org/pwss/model/entity/Notes.java

@@ -0,0 +1,4 @@
+package org.pwss.model.entity;
+
+public record Notes(long id, String notes, String prevNotes, String prevPrevNotes, Time time) {
+}

src/main/java/org/pwss/model/entity/Scan.java

@@ -10,6 +10,8 @@
  * @param status            Status of the scan (e.g., "COMPLETED", "FAILED").
  * @param notes             Additional notes or comments about the scan.
  * @param monitoredDirectory The monitored directory associated with this scan.
+ * @param isBaselineScan    Indicates if this scan is a baseline scan.
  */
-public record Scan(long id, Date scanTime, String status, String notes, MonitoredDirectory monitoredDirectory) {
+public record Scan(long id, Time scanTime, String status, Notes notes, MonitoredDirectory monitoredDirectory,
+                   boolean isBaselineScan) {
 }

src/main/java/org/pwss/model/entity/Time.java

@@ -0,0 +1,6 @@
+package org.pwss.model.entity;
+
+import java.util.Date;
+
+public record Time(long id, Date created, Date updated) {
+}

src/main/java/org/pwss/model/service/ScanService.java

@@ -6,11 +6,14 @@
 import org.pwss.exception.scan.StartScanAllException;
 import org.pwss.exception.scan.StartScanByIdException;
 import org.pwss.exception.scan.StopScanException;
+import org.pwss.model.entity.Scan;
 import org.pwss.model.service.network.Endpoint;
 import org.pwss.model.service.network.PwssHttpClient;
 import org.pwss.model.service.request.scan.StartSingleScanRequest;
 
 import java.net.http.HttpResponse;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -119,4 +122,15 @@ public boolean scanRunning() throws ScanStatusException, ExecutionException, Int
             default -> false;
         };
     }
+
+    public List<Scan> getMostRecentScans() throws ExecutionException, InterruptedException, JsonProcessingException {
+        HttpResponse<String> response = PwssHttpClient.getInstance().request(Endpoint.MOST_RECENT_SCANS, null);
+
+        return switch (response.statusCode()) {
+            case 200 -> List.of(objectMapper.readValue(response.body(), Scan[].class));
+            case 401 -> throw new RuntimeException("Failed to fetch most recent scans: User not authorized to perform this action.");
+            case 500 -> throw new RuntimeException("Failed to fetch most recent scans: Server error");
+            default -> Collections.emptyList();
+        };
+    }
 }

src/main/java/org/pwss/model/service/network/Endpoint.java

@@ -38,6 +38,10 @@ public enum Endpoint {
      * Endpoint for retrieving the status of a file integrity scan.
      */
     SCAN_STATUS(HTTP_Method.GET, A.BASE_URL + A.SCAN + "status"),
+    /**
+     * Endpoint most recent scans for all active monitored directories.
+     */
+    MOST_RECENT_SCANS(HTTP_Method.GET, A.BASE_URL + A.SCAN + "active-directory/most-recent"),
 
     // Directory Endpoints
     /**

src/main/java/org/pwss/model/table/MonitoredDirectoryTableModel.java

@@ -0,0 +1,63 @@
+package org.pwss.model.table;
+
+import org.pwss.model.entity.MonitoredDirectory;
+import org.pwss.model.entity.Time;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.Date;
+import java.util.List;
+
+public class MonitoredDirectoryTableModel extends AbstractTableModel {
+    private final List<MonitoredDirectory> directories;
+    private final String[] columnNames = {
+            "ID", "Path", "Active", "Added At", "Last Scanned",
+            "Notes", "Baseline Established", "Include Subdirectories"
+    };
+
+    public MonitoredDirectoryTableModel(List<MonitoredDirectory> directories) {
+        this.directories = directories;
+    }
+
+    @Override
+    public int getRowCount() {
+        return directories.size();
+    }
+
+    @Override
+    public int getColumnCount() {
+        return columnNames.length;
+    }
+
+    @Override
+    public String getColumnName(int column) {
+        return columnNames[column];
+    }
+
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+        return switch (columnIndex) {
+            case 0 -> Long.class;
+            case 2, 6, 7 -> Boolean.class;
+            case 3 -> Time.class;
+            case 4 -> Date.class;
+            default -> String.class;
+        };
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        MonitoredDirectory dir = directories.get(rowIndex);
+        return switch (columnIndex) {
+            case 0 -> dir.id();
+            case 1 -> dir.path();
+            case 2 -> dir.isActive();
+            case 3 -> dir.addedAt().created();
+            case 4 -> dir.lastScanned();
+            case 5 -> dir.notes() != null ? dir.notes().notes() : "";
+            case 6 -> dir.baselineEstablished();
+            case 7 -> dir.includeSubdirectories();
+            default -> null;
+        };
+    }
+}
+

src/main/java/org/pwss/model/table/ScanTableModel.java

@@ -0,0 +1,46 @@
+package org.pwss.model.table;
+
+import org.pwss.model.entity.Scan;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.List;
+
+public class ScanTableModel extends AbstractTableModel {
+    private final List<Scan> scans;
+    private final String[] columnNames = {
+            "ID", "Scan Time", "Status", "Notes", "Directory", "Baseline"
+    };
+
+    public ScanTableModel(List<Scan> scans) {
+        this.scans = scans;
+    }
+
+    @Override
+    public int getRowCount() {
+        return scans.size();
+    }
+
+    @Override
+    public int getColumnCount() {
+        return columnNames.length;
+    }
+
+    @Override
+    public String getColumnName(int column) {
+        return columnNames[column];
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        Scan scan = scans.get(rowIndex);
+        return switch (columnIndex) {
+            case 0 -> scan.id();
+            case 1 -> scan.scanTime().created();
+            case 2 -> scan.status();
+            case 3 -> scan.notes() != null ? scan.notes().notes() : "";
+            case 4 -> scan.monitoredDirectory() != null ? scan.monitoredDirectory().path() : "";
+            case 5 -> scan.isBaselineScan();
+            default -> null;
+        };
+    }
+}