Dark Mode & UI Overhauls

src/main/java/org/ngafid/SendEmail.java

@@ -32,8 +32,9 @@ public class SendEmail {
 
     private static final Logger LOG = Logger.getLogger(SendEmail.class.getName());
 
-    private static final String baseURL = "https://ngafid.org";
-    //private static final String baseURL = "https://ngafidbeta.rit.edu";
+    private static final String baseURLFallback = "https://ngafid.org";
+    private static final String baseURLEnvironment = System.getenv("NGAFID_BASE_URL");
+    private static final String baseURL = Objects.requireNonNullElse(baseURLEnvironment, baseURLFallback);
     private static final String unsubscribeURLTemplate = (baseURL + "/email_unsubscribe?id=__ID__&token=__TOKEN__");
     private static final java.sql.Date lastTokenFree = new java.sql.Date(0);
     private static final int EMAIL_UNSUBSCRIBE_TOKEN_EXPIRATION_MONTHS = 3;
@@ -45,6 +46,7 @@ public class SendEmail {
     static {
 
         String enabled = System.getenv("NGAFID_EMAIL_ENABLED");
+        LOG.info("Email base URL: " + baseURL);
 
         if (enabled != null && enabled.toLowerCase().equals("false")) {
             LOG.info("Emailing has been disabled");
@@ -69,9 +71,9 @@ public class SendEmail {
 
         String NGAFID_ADMIN_EMAILS = System.getenv("NGAFID_ADMIN_EMAILS");
         adminEmails = new ArrayList<String>(Arrays.asList(NGAFID_ADMIN_EMAILS.split(";")));
-        System.out.println("import emails will always also be sent to the following admin emails:");
+        LOG.info("import emails will always also be sent to the following admin emails:");
         for (String adminEmail : adminEmails) {
-            System.out.println("\t'" + adminEmail + "'");
+            LOG.info("\t'" + adminEmail + "'");
         }
 
         try {
@@ -139,16 +141,16 @@ private static class SMTPAuthenticator extends javax.mail.Authenticator {
         public SMTPAuthenticator(String username, String password) {
             this.username = username;
             this.password = password;
-            System.out.println("Created authenticator with username: '" + this.username + "' and password: '" + this.password + "'");
+            LOG.info("Created authenticator with username: '" + this.username + "' and password: '" + this.password + "'");
         }
 
         public PasswordAuthentication getPasswordAuthentication() {
-            System.out.println("Attempting to authenticate with username: '" + this.username + "' and password: '" + this.password + "'");
+            LOG.info("Attempting to authenticate with username: '" + this.username + "' and password: '" + this.password + "'");
             return new PasswordAuthentication(this.username, this.password);
         }
 
         public boolean isValid() {
-            System.out.println("Checking if valid with username: '" + this.username + "' and password: '" + this.password + "'");
+            LOG.info("Checking if valid with username: '" + this.username + "' and password: '" + this.password + "'");
             return !(this.username == null || this.password == null);
         }
 
@@ -259,7 +261,7 @@ public static void sendEmail(ArrayList<String> toRecipients, ArrayList<String> b
         SMTPAuthenticator auth = new SMTPAuthenticator(username, password);
 
         if (!emailEnabled) {
-            System.out.println("Emailing has been disabled, not sending email");
+            LOG.info("Emailing has been disabled, not sending email");
             return;
         }
 
@@ -270,10 +272,10 @@ public static void sendEmail(ArrayList<String> toRecipients, ArrayList<String> b
 
         if (auth.isValid()) {
 
-            System.out.println("emailing to " + String.join(", ", toRecipients));
-            System.out.println("BCCing to " + String.join(", ", bccRecipients));
-            System.out.println("subject: '" + subject);
-            System.out.println("body: '" + body);
+            LOG.info("emailing to " + String.join(", ", toRecipients));
+            LOG.info("BCCing to " + String.join(", ", bccRecipients));
+            LOG.info("subject: '" + subject);
+            LOG.info("body: '" + body);
 
 
             // Sender's email ID needs to be mentioned
@@ -318,7 +320,7 @@ public static void sendEmail(ArrayList<String> toRecipients, ArrayList<String> b
                     boolean embedUnsubscribeURL = true;
                     if (EmailType.isForced(emailType)) {
 
-                        System.out.println("Delivering FORCED email type: " + emailType);
+                        LOG.info("Delivering FORCED email type: " + emailType);
                         embedUnsubscribeURL = false;
 
                     } else if (!UserEmailPreferences.getEmailTypeUserState(toRecipient, emailType)) {   //Check whether or not the emailType is enabled for the user
@@ -354,7 +356,7 @@ public static void sendEmail(ArrayList<String> toRecipients, ArrayList<String> b
                     message.setRecipient(Message.RecipientType.TO, new InternetAddress(toRecipient));   
 
                     // Send the message to the current recipient
-                    System.out.println("sending message!");
+                    LOG.info("Sending email message!");
                     Transport.send(message);
 
                 }
@@ -377,12 +379,12 @@ public static void sendEmail(ArrayList<String> toRecipients, ArrayList<String> b
                     message.setContent(body, "text/html; charset=utf-8");
 
                     // Send the message to the current BCC recipients
-                    System.out.println("sending message (BCC)!");
+                    LOG.info("Sending email message (BCC)!");
                     Transport.send(message);
 
                 }
 
-                System.out.println("Sent messages successfully....");
+                LOG.info("Sent email messages successfully...");
 
             } catch (MessagingException mex) {
                 mex.printStackTrace();

src/main/java/org/ngafid/WebServer.java

@@ -250,6 +250,7 @@ public static void main(String[] args) {
         Spark.post("/protected/monthly_event_counts", new PostMonthlyEventCounts(gson));
         Spark.get("/protected/severities", new GetSeverities(gson));
         Spark.post("/protected/severities", new PostSeverities(gson));
+        Spark.post("/protected/all_severities", new PostAllSeverities(gson));
 
         Spark.get("/protected/event_statistics", new GetEventStatistics(gson));
         Spark.get("/protected/waiting", new GetWaiting(gson));

src/main/java/org/ngafid/accounts/UserEmailPreferences.java

@@ -21,15 +21,17 @@
 
 public class UserEmailPreferences {
 
-    private int userId;
-    private HashMap<String, Boolean> emailTypesUser;
-    private String[] emailTypesKeys;
+
+    private static final Logger LOG = Logger.getLogger(UserEmailPreferences.class.getName());
 
     private static HashMap<Integer, User> users = new HashMap<>();
     private static HashMap<String, Integer> userIDs = new HashMap<>();
     private static HashMap<String, HashMap<String, Boolean>> emailTypesUsers = new HashMap<>();
 
-    private static final Logger LOG = Logger.getLogger(UserEmailPreferences.class.getName());
+
+    private int userId;
+    private HashMap<String, Boolean> emailTypesUser;
+    private String[] emailTypesKeys;
 
 
     public UserEmailPreferences(int userId, HashMap<String, Boolean> emailTypesUser) {
@@ -47,31 +49,30 @@ public UserEmailPreferences(int userId, HashMap<String, Boolean> emailTypesUser)
         this.emailTypesKeys = keysRecent;
     }
 
-    public static void addUser(Connection connection, User user) throws SQLException {
+    public static void addUser(Connection connection, User userTarget) throws SQLException {
 
-        int userID = user.getId();
-        String userEmail = user.getEmail();
+        int userTargetID = userTarget.getId();
+        String userEmail = userTarget.getEmail();
 
         //user email --> userId
-        userIDs.put(userEmail, userID);
+        userIDs.put(userEmail, userTargetID);
 
         //userId --> User
-        users.put(userID, user);
-
-        emailTypesUsers.put( user.getEmail(), user.getUserEmailPreferences(connection).getEmailTypesUser() );
+        users.put(userTargetID, userTarget);
 
-    }
+        emailTypesUsers.put(
+            userTarget.getEmail(),
+            userTarget.getUserEmailPreferences(connection).getEmailTypesUser()
+        );
 
-    public static User getUser(int userId) {
-        return users.get(userId);
     }
 
-    public static int getUserIDFromEmail(String userEmail) {
-        return userIDs.get(userEmail);
+    public static User getUser(int userTargetID) {
+        return users.get(userTargetID);
     }
 
-    public HashMap<String, Boolean> getEmailTypesUser() {
-        return emailTypesUser;
+    public static int getUserIDFromEmail(String userTargetEmail) {
+        return userIDs.get(userTargetEmail);
     }
 
     public static boolean getEmailTypeUserState(String email, EmailType emailType) {
@@ -96,4 +97,8 @@ public static boolean getEmailTypeUserState(String email, EmailType emailType) {
 
     }
 
+    public HashMap<String, Boolean> getEmailTypesUser() {
+        return emailTypesUser;
+    }
+
 }

src/main/java/org/ngafid/events/Event.java

@@ -369,11 +369,24 @@ public static HashMap<String, ArrayList<Event>> getEvents(Connection connection,
             eventsByAirframe.put(airframe, new ArrayList<Event>());
         }
 
-        String query = "SELECT id FROM event_definitions WHERE (fleet_id = 0 OR fleet_id = ?) AND name LIKE ? ORDER BY name";
+        String query;
+        PreparedStatement preparedStatement;
+
+        if (eventName.equals("ANY Event")) {
+
+            LOG.info("[EX] Getting ALL events for fleet with ID: " + fleetId);
+
+            query = "SELECT id FROM event_definitions WHERE fleet_id = 0 OR fleet_id = ? ORDER BY name";
+            preparedStatement = connection.prepareStatement(query);
+            preparedStatement.setInt(1, fleetId);
+
+        } else {
+            query = "SELECT id FROM event_definitions WHERE (fleet_id = 0 OR fleet_id = ?) AND name LIKE ? ORDER BY name";
+            preparedStatement = connection.prepareStatement(query);
+            preparedStatement.setInt(1, fleetId);
+            preparedStatement.setString(2, eventName);
+        }
 
-        PreparedStatement preparedStatement = connection.prepareStatement(query);
-        preparedStatement.setInt(1, fleetId);
-        preparedStatement.setString(2, eventName);
 
         LOG.info(preparedStatement.toString());
         ResultSet resultSet = preparedStatement.executeQuery();

src/main/java/org/ngafid/routes/GetUpload.java

@@ -44,9 +44,10 @@ public Object handle(Request request, Response response) throws SQLException {
             return "Upload not found";
         }
 
-        if (!user.hasUploadAccess(upload.getFleetId())) {
-            LOG.severe("INVALID ACCESS: user did not have upload or manager access this fleet.");
-            Spark.halt(401, "User did not have access to delete this upload.");
+        //Verify that a user has access to the download the uploaded file (requires View Access)
+        if (!user.hasViewAccess(upload.getFleetId())) {
+            LOG.severe("INVALID ACCESS: user did not have view, upload, or manager access this fleet.");
+            Spark.halt(401, "User did not have access to download the uploaded file.");
             return null;
         }
 

src/main/java/org/ngafid/routes/GetUploads.java

@@ -125,6 +125,8 @@ public Object handle(Request request, Response response) {
 
             scopes.put("uploads_js", "var uploads = JSON.parse('" + gson.toJson(other_uploads) + "'); var pending_uploads = JSON.parse('" + gson.toJson(pending_uploads) + "');");
 
+            scopes.put("user_js", "var user = JSON.parse('" + gson.toJson(user)  + "');");
+
             StringWriter stringOut = new StringWriter();
             mustache.execute(new PrintWriter(stringOut), scopes).flush();
             resultString = stringOut.toString();

src/main/java/org/ngafid/routes/Navbar.java

@@ -63,6 +63,7 @@ public static String getJavascript(Request request) {
             +   "var modifyTailsAccess = " + modifyTailsAccess + ";" 
             +   "var unconfirmedTailsCount = " + unconfirmedTailsCount + ";" 
             +   "var airSyncEnabled = " + airSyncEnabled + ";"
-            +   "var uploader = " + hasUploadAccess + ";";
+            +   "var isUploader = " + hasUploadAccess + ";";
+
     }
 }

src/main/java/org/ngafid/routes/PostAllSeverities.java

@@ -0,0 +1,89 @@
+package org.ngafid.routes;
+
+import java.time.LocalDate;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.logging.Logger;
+import java.util.HashMap;
+
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import com.google.gson.Gson;
+
+import spark.Route;
+import spark.Request;
+import spark.Response;
+import spark.Session;
+import spark.Spark;
+
+import org.ngafid.Database;
+import org.ngafid.WebServer;
+import org.ngafid.accounts.User;
+import org.ngafid.events.Event;
+import org.ngafid.events.EventStatistics;
+import org.ngafid.common.*;
+
+public class PostAllSeverities implements Route {
+    private static final Logger LOG = Logger.getLogger(PostAllSeverities.class.getName());
+    private Gson gson;
+
+    public PostAllSeverities(Gson gson) {
+        this.gson = gson;
+        LOG.info("post " + this.getClass().getName() + " initalized");
+    }
+
+
+    @Override
+    public Object handle(Request request, Response response) {
+        LOG.info("handling " + this.getClass().getName() + " route");
+
+        String startDate = request.queryParams("startDate");
+        String endDate = request.queryParams("endDate");
+        String eventNames = request.queryParams("eventNames");
+        String tagName = request.queryParams("tagName");
+        final Session session = request.session();
+        User user = session.attribute("user");
+        int fleetId = user.getFleetId();
+
+        //check to see if the user has upload access for this fleet.
+        if (!user.hasViewAccess(fleetId)) {
+            LOG.severe("INVALID ACCESS: user did not have access view imports for this fleet.");
+            Spark.halt(401, "User did not have access to view imports for this fleet.");
+            return null;
+        }
+
+        try {
+
+            Connection connection = Database.getConnection();
+            String[] eventNamesArray = eventNames.split(",");
+            HashMap<String, HashMap<String, ArrayList<Event>> > eventMap = new HashMap<>();
+
+            for (String eventName : eventNamesArray) {
+
+                //Remove leading and trailing quotes
+                eventName = eventName.replace("\"", "");
+
+                //Remove brackets
+                eventName = eventName.replace("[", "");
+                eventName = eventName.replace("]", "");
+
+                //Remove trailing spaces
+                eventName = eventName.trim();
+
+                if (eventName.equals("ANY Event"))
+                    continue;
+
+                HashMap<String, ArrayList<Event>> events = Event.getEvents(connection, fleetId, eventName, LocalDate.parse(startDate), LocalDate.parse(endDate), tagName);
+                eventMap.put(eventName, events);
+            }
+
+            return gson.toJson(eventMap);
+
+        } catch (SQLException e) {
+            return gson.toJson(new ErrorResponse(e));
+        }
+    }
+}

src/main/java/org/ngafid/routes/PostUploads.java

@@ -73,4 +73,4 @@ public Object handle(Request request, Response response) {
             return gson.toJson(new ErrorResponse(e));
         }
     }
-}
+}

src/main/javascript/cesium_buttons.js

@@ -70,7 +70,8 @@ class CesiumButtons extends React.Component {
             <div className="col form-row input-group m-0 p-0" style={{
                 position: "center", display: 'flex',
                 justifyContent: 'center',
-                alignItems: 'center',
+                alignItems: 'flex-start',
+                margin: "0"
             }}>
                 <div className="input-group-prepend p-0">
                     <button id={"cesiumViewButton" + this.props.location} className="btn btn-sm btn-primary"

src/main/javascript/confirm_modal.js

@@ -14,7 +14,8 @@ class ConfirmModal extends React.Component {
 
         this.state = {
             title : "",
-            message : ""
+            message : "",
+            submitMethod : null
         };
     }
 
@@ -29,7 +30,9 @@ class ConfirmModal extends React.Component {
 
     modalClicked() {
         console.log("modal submit clicked!");
-        this.state.submitMethod();
+
+        if (this.state.submitMethod != null)
+            this.state.submitMethod();
     }
 
     render() {