work in progress for idaholab#329, improve extracted_files download page

mmguero-dev · Feb 5, 2024 · 51df7de · 51df7de
1 parent 27185b4
commit 51df7de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/arkime/wise/source.zeeklogs.js b/arkime/wise/source.zeeklogs.js
@@ -2221,16 +2221,16 @@ class MalcolmSource extends WISESource {
 
     // add rick-click for opening malcolm agg api
     var apiLabel = "Aggregate %DBFIELD%";
-    var apiURL = "mapi/agg/%DBFIELD%?from=%ISOSTART%&to=%ISOSTOP%";
+    var apiURL = "/mapi/agg/%DBFIELD%?from=%ISOSTART%&to=%ISOSTOP%";
     this.api.addFieldAction("malcolm_mapi_fields_zeek", { name: apiLabel, url: apiURL, all: true });
 
     // add rick-click for extracted-files
     var extractedFilesLabel = "Browse Extracted Files";
-    var extractedFilesURL = "extracted-files";
+    var extractedFilesURL = "/extracted-files/";
     this.api.addFieldAction("malcolm_mapi_field_extracted_files", { name: extractedFilesLabel, url: extractedFilesURL, fields: carvedFieldsStr });
 
     // add right-click for viewing original JSON document
-    this.api.addValueAction("malcolm_json_source", { name: "%DBFIELD% Document(s) JSON", url: "mapi/document?filter={\"%DBFIELD%\":\"%TEXT%\"}", fields: "communityId,event.id,id,network.community_id,rootId,zeek.fuid,zeek.uid" });
+    this.api.addValueAction("malcolm_json_source", { name: "%DBFIELD% Document(s) JSON", url: "/mapi/document?filter={\"%DBFIELD%\":\"%TEXT%\"}", fields: "communityId,event.id,id,network.community_id,rootId,zeek.fuid,zeek.uid" });
 
     this.api.addView("malcolm_common",
       "if (session.event.hash)\n" +

diff --git a/file-monitor/scripts/extracted_files_http_server.py b/file-monitor/scripts/extracted_files_http_server.py
@@ -297,12 +297,18 @@ def do_GET(self):
                         )
 
                     with div(cls="col-lg-6 h-100 text-center text-lg-end my-auto").add(ul(cls="list-inline mb-0")):
-                        li(cls="list-inline-item").add(a(href=f'/readme/')).add(i(cls="bi bi-question-circle fs-3"))
+                        li(cls="list-inline-item").add(a(href=f'/')).add(i(cls="bi bi-house fs-3", title="Malcolm"))
+                        li(cls="list-inline-item").add(a(href=f'/readme/')).add(
+                            i(cls="bi bi-question-circle fs-3", title="Documentation")
+                        )
                         li(cls="list-inline-item").add(
                             a(href=f'/dashboards/app/dashboards#/view/9ee51f94-3316-4fc5-bd89-93a52af69714')
-                        ).add(i(cls="bi bi-bar-chart-line fs-3"))
+                        ).add(i(cls="bi bi-bar-chart-line fs-3", title="Dashboards"))
+                        li(cls="list-inline-item").add(a(href=f'/arkime/sessions/')).add(
+                            i(cls="bi bi-table fs-3", title="Arkime")
+                        )
                         li(cls="list-inline-item").add(a(href=f'https://github.com/idaholab/Malcolm/')).add(
-                            i(cls="bi-github fs-3")
+                            i(cls="bi-github fs-3", title="GitHub")
                         )
 
                 script(type="text/javascript", src=f"{args.assetsDirRespReplacer}js/bootstrap.bundle.min.js")