Merge pull request #1038 from sdr-enthusiasts/extra-stats-and-set-FA-…

…as-option

Extra stats and set fa as option

.dockerignore

@@ -33,3 +33,10 @@ rootfs/webapp/data/metadata.json
 rootfs/webapp/data/ground-stations.json
 libseccomp2-checker.sh
 acarshub/node_modules
+.venv
+rootfs/webapp/bin
+rootfs/webapp/lib
+rootfs/webapp/lib64
+rootfs/webapp/include
+rootfs/webapp/__pycache__
+rootfs/webapp/pyvenv.cfg

.gitignore

@@ -134,3 +134,9 @@ rootfs/webapp/static
 acarshub/node_modules
 **/dist/**
 .venv
+rootfs/webapp/bin
+rootfs/webapp/lib
+rootfs/webapp/lib64
+rootfs/webapp/include
+rootfs/webapp/__pycache__
+rootfs/webapp/pyvenv.cfg

Dockerfile

@@ -85,7 +85,7 @@ RUN set -x && \
     mkdir -p /webapp/data/ && \
     # Download the airframes Ground Station and ACARS Label data
     pushd /webapp/data/ && \
-    curl -O https://raw.githubusercontent.com/airframesio/data/master/json/vdl/ground-stations.json&& \
+    curl -O https://raw.githubusercontent.com/airframesio/data/master/json/vdl/ground-stations.json && \
     curl -O https://raw.githubusercontent.com/airframesio/data/master/json/acars/metadata.json && \
     # Clean up
     rm -rf /src/* /tmp/* /var/lib/apt/lists/*

README.md

@@ -136,6 +136,7 @@ There are quite a few configuration options this container can accept.
 | `TAR1090_URL`          | Flights where the container is able to, it will generate a link to a tar1090 instance so that you can see the position of the aircraft that generated the message. By default, it will link to [ADSB Exchange](https://www.adsbexchange.com), but if desired, you can set the URL to be a local tar1090 instance.      | No       | Blank   |
 | `AUTO_VACUUM`          | If you find your database size to be too large you can temporarily enable this and on the next container startup the database will attempt to reduce itself in size. When you do this startup time will take a few minutes. It is recommended to leave this flag disabled and only enable it temporarily.              | No       | `False` |
 | `ALLOW_REMOTE_UPDATES` | If you do not want to allow users to update the alert terms (and potentially other things in the future) via the web interface, set this to `False`                                                                                                                                                                    | No       | `True`  |
+| `FLIGHT_TRACKING_URL`  | If you want to link to a flight tracking site other than Flight Aware, set this to the URL of the site you want to link to. The url should be formatted to accept tail numbers at the end of the URL.                                                                                                                  | No       | Blank   |
 
 Please note that for `TAR1090_URL` the required format is `http[s]://**HOSTNAME**` only. So if your tar1090 instance is at IP address `192.168.31.10` with no SSL, the TAR1090_URL would look like `http://192.168.31.10`
 

acarshub-typescript/package.json

@@ -14,11 +14,11 @@
   "license": "GPL-3.0-only",
   "devDependencies": {
     "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.2",
-    "@types/jquery": "^3.5.25",
+    "@babel/preset-env": "^7.23.3",
+    "@types/jquery": "^3.5.27",
     "@types/js-cookie": "^3.0.6",
     "@types/leaflet": "^1.9.8",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.9.2",
     "@types/showdown": "^2.0.4",
     "@types/webpack-dev-server": "^4.7.2",
     "autoprefixer": "^10.4.16",
@@ -32,7 +32,7 @@
     "postcss-loader": "^7.3.3",
     "script-loader": "^0.7.2",
     "style-loader": "^3.3.3",
-    "ts-loader": "^9.5.0",
+    "ts-loader": "^9.5.1",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "webpack": "^5.89.0",

acarshub-typescript/src/css/site.css

@@ -862,19 +862,31 @@ li.img_box svg {
   letter-spacing: 0;
 }
 
-canvas {
-  max-height: 400px !important;
+/* canvas {
+  width: 100% !important;
+  height: 100% !important;
+} */
+
+/* .canvas_wrapper {
+  position: relative;
+  width: 100%;
   max-width: 1000px !important;
-}
+  display: flex;
+  /* float: left;
+} */
 
-.canvas_wrapper {
+.chart-container {
   position: relative;
-  width: 1000px;
-  float: left;
+  /* min-height: auto; */
+  width: 100%;
+  max-width: 1000px !important;
+  height: 300px;
+  /* overflow: hidden; */
 }
 
-.chart-container {
-  width: 50%;
+#chart_msg_good,
+#chart_msg_empty {
+  height: 150px !important;
 }
 
 /* modal window stuff */

acarshub-typescript/src/helpers/html_functions.ts

@@ -225,6 +225,7 @@ export let html_functions = {
 
   show_footer_and_sidebar_text: function (
     message: acars_msg,
+    flight_tracking_url: string,
     footer: boolean = true
   ): string {
     let html_output = "";
@@ -235,7 +236,7 @@ export let html_functions = {
     html_output += !footer ? '<div class="show_when_small">' : "";
 
     if (typeof message.tail !== "undefined") {
-      html_output += `<span class="tail-tooltip">Tail: <strong><a href=\"https://flightaware.com/live/flight/${
+      html_output += `<span class="tail-tooltip">Tail: <strong><a href=\"${flight_tracking_url}${
         message.tail
       }\" target=\"_blank\">${
         typeof message.matched_tail !== "undefined" &&

acarshub-typescript/src/helpers/html_generator.ts

@@ -20,6 +20,7 @@
 // Input: live_page - default is false. This toggles on the checks for selected tabs
 import { html_functions } from "./html_functions";
 import { acars_msg } from "../interfaces";
+import { get_flight_tracking_url } from "../index";
 
 export function display_messages(
   msgs_to_process: acars_msg[][],
@@ -299,15 +300,22 @@ export function display_message_group(
         : "";
 
     // Table footer row, tail & flight info, displayed in main body if screen is too small
-    html_output += html_functions.show_footer_and_sidebar_text(message, false);
+    html_output += html_functions.show_footer_and_sidebar_text(
+      message,
+      get_flight_tracking_url(),
+      false
+    );
     //html_output += "</td></tr>";
     html_output += html_functions.message_text(message);
 
     // Text field is pre-processed
     // we have a sub-table for the raw text field and if it was decoded, the decoded text as well
 
     // Table footer row, tail & flight info
-    html_output += html_functions.show_footer_and_sidebar_text(message);
+    html_output += html_functions.show_footer_and_sidebar_text(
+      message,
+      get_flight_tracking_url()
+    );
 
     // Finish table html
     html_output += html_functions.end_message_box();

acarshub-typescript/src/index.ts

@@ -82,6 +82,7 @@ let adsb_request_options = {
   method: "GET",
 } as RequestInit;
 let allow_remote_updates = false;
+let flight_tracking_url: string | undefined = undefined;
 
 // @ts-expect-error
 var hidden, visibilityChange;
@@ -257,6 +258,7 @@ $((): void => {
     stats_page.decoders_enabled(msg);
     menu.set_arch(msg.arch);
     allow_remote_updates = msg.allow_remote_updates;
+    flight_tracking_url = msg.adsb.flight_tracking_url;
     if (msg.adsb.enabled === true) {
       adsb_enabled = true;
       menu.set_adsb(true);
@@ -402,6 +404,12 @@ $((): void => {
   }
 });
 
+export function get_flight_tracking_url(): string {
+  return flight_tracking_url
+    ? flight_tracking_url
+    : "https://flightaware.com/live/flight/";
+}
+
 export function get_window_size(): window_size {
   return { width: old_window_width, height: old_window_height } as window_size;
 }

acarshub-typescript/src/interfaces.ts

@@ -78,6 +78,7 @@ export interface decoders {
     url: string;
     bypass: boolean;
     range_rings: boolean;
+    flight_tracking_url: string;
   };
 }