web-mojo 2.1.827 → 2.1.917

package/dist/admin.es.js

@@ -1,13 +1,13 @@
-import { P as Page } from "./chunks/Page-DaptCfWp.js";
-import { V as View, h as MOJOUtils } from "./chunks/WebApp-Cd21W4Hv.js";
-import { B, b, a, c, e, f, W } from "./chunks/WebApp-Cd21W4Hv.js";
-import Dialog$1 from "./chunks/Dialog-Bup1WdQn.js";
-import { M as MetricsChart, c as MetricsMiniChartWidget, P as PieChart } from "./chunks/MetricsMiniChartWidget-CK6K9Kh6.js";
-import { b as TablePage, k as EmailDomainForms, j as EmailDomainList, E as EmailDomain, n as MailboxForms, m as MailboxList, l as Mailbox, r as EmailTemplate, d as TabView, t as EmailTemplateForms, s as EmailTemplateList, I as IncidentEvent, B as IncidentEventForms, A as IncidentEventList, w as FileManagerForms, v as FileManagerList, x as File, T as TableView, z as FileForms, y as FileList, ap as GeoLocatedIP, aq as GeoLocatedIPList, aa as MemberList, a9 as LogList, as as TicketList, G as IncidentList, Y as IncidentStats, R as IncidentHistoryList, Q as IncidentHistory, D as Incident, C as ChatView, H as IncidentForms, Z as Job, a3 as JobEventList, a1 as JobLogList, $ as JobForms, _ as JobList, a6 as JobRunnerList, a4 as JobsEngineStats, a7 as JobRunnerForms, a5 as JobRunner, a8 as Log, M as Member, ab as MemberForms, ac as MetricsPermission, ae as MetricsForms, ad as MetricsPermissionList, an as PushConfigForms, ak as PushConfigList, am as PushDeliveryList, ag as PushDeviceList, ao as PushTemplateForms, ai as PushTemplateList, U as RuleSet, X as RuleList, V as RuleSetList, i as S3BucketForms, h as S3BucketList, o as SentMessage, p as SentMessageList, au as TicketNoteList, at as TicketNote, ar as Ticket, av as TicketForms, aw as TicketCategories } from "./chunks/ChatView-DJK49g8O.js";
-import DataView from "./chunks/DataView-3iqbZ_4y.js";
-import { b as ContextMenu, C as Collection, a as Group, G as GroupList, c as GroupForms, g as UserDevice, j as UserDeviceLocationList, h as UserDeviceList, U as User, f as UserDataView, e as UserForms, d as UserList } from "./chunks/ContextMenu-CRwv6-gc.js";
-import { L as LightboxGallery, P as PDFViewer } from "./chunks/PDFViewer-DgXB4rR9.js";
-import { a as applyFileDropMixin, F as FormView } from "./chunks/FormView-C4Po3Q3z.js";
+import { P as Page } from "./chunks/Page-CFzSUQLz.js";
+import { V as View, h as MOJOUtils } from "./chunks/WebApp-MzDCFzar.js";
+import { B, b, a, c, e, f, W } from "./chunks/WebApp-MzDCFzar.js";
+import Dialog$1 from "./chunks/Dialog-D9qIh5Jb.js";
+import { M as MetricsChart, c as MetricsMiniChartWidget, P as PieChart } from "./chunks/MetricsMiniChartWidget-CoapKHw0.js";
+import { b as TablePage, k as EmailDomainForms, j as EmailDomainList, E as EmailDomain, n as MailboxForms, m as MailboxList, l as Mailbox, r as EmailTemplate, d as TabView, t as EmailTemplateForms, s as EmailTemplateList, I as IncidentEvent, B as IncidentEventForms, A as IncidentEventList, w as FileManagerForms, v as FileManagerList, x as File, T as TableView, z as FileForms, y as FileList, av as GeoLocatedIP, aw as GeoLocatedIPList, ag as MemberList, af as LogList, ay as TicketList, G as IncidentList, _ as IncidentStats, R as IncidentHistoryList, Q as IncidentHistory, D as Incident, C as ChatView, H as IncidentForms, a3 as Job, a9 as JobEventList, a7 as JobLogList, a5 as JobForms, a4 as JobList, ac as JobRunnerList, aa as JobsEngineStats, ad as JobRunnerForms, ab as JobRunner, ae as Log, M as Member, ah as MemberForms, ai as MetricsPermission, ak as MetricsForms, aj as MetricsPermissionList, at as PushConfigForms, aq as PushConfigList, as as PushDeliveryList, am as PushDeviceList, au as PushTemplateForms, ao as PushTemplateList, U as RuleSet, a0 as MatchByOptions, $ as BundleByOptions, Y as RuleList, V as RuleSetList, i as S3BucketForms, h as S3BucketList, o as SentMessage, p as SentMessageList, aA as TicketNoteList, az as TicketNote, ax as Ticket, aB as TicketForms, aC as TicketCategories } from "./chunks/ChatView-D9hJ2u6c.js";
+import DataView from "./chunks/DataView-BDUCD0q0.js";
+import { b as ContextMenu, C as Collection, a as Group, G as GroupList, c as GroupForms, g as UserDevice, j as UserDeviceLocationList, h as UserDeviceList, U as User, f as UserDataView, e as UserForms, d as UserList } from "./chunks/ContextMenu-BlmrYFlZ.js";
+import { L as LightboxGallery, P as PDFViewer } from "./chunks/PDFViewer-BXcYgXKx.js";
+import { a as applyFileDropMixin, F as FormView } from "./chunks/FormView-Bq74K6dj.js";
 class AdminHeaderView extends View {
   constructor(options = {}) {
     super({
@@ -831,6 +831,129 @@ class EmailTemplateTablePage extends TablePage {
     });
   }
 }
+class StackTraceView extends View {
+  constructor(options = {}) {
+    super({
+      className: "stack-trace-view",
+      ...options
+    });
+    this.stackTrace = options.stackTrace || "";
+    this.template = `
+            <div class="stack-trace-container p-3">
+                <style>
+                    .stack-trace-line {
+                        font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', monospace;
+                        font-size: 13px;
+                        line-height: 1.6;
+                        padding: 4px 8px;
+                        margin: 0;
+                        border-left: 3px solid transparent;
+                    }
+                    .stack-trace-line:hover {
+                        background-color: rgba(0, 0, 0, 0.05);
+                    }
+                    .stack-trace-error {
+                        color: #dc3545;
+                        font-weight: 600;
+                        border-left-color: #dc3545;
+                        background-color: rgba(220, 53, 69, 0.05);
+                    }
+                    .stack-trace-file {
+                        color: #0d6efd;
+                        font-weight: 500;
+                        border-left-color: #0d6efd;
+                    }
+                    .stack-trace-function {
+                        color: #6610f2;
+                        font-weight: 500;
+                    }
+                    .stack-trace-location {
+                        color: #6c757d;
+                        font-size: 12px;
+                    }
+                    .stack-trace-line-number {
+                        color: #fd7e14;
+                        font-weight: 600;
+                    }
+                    .stack-trace-context {
+                        color: #495057;
+                        background-color: rgba(0, 0, 0, 0.02);
+                    }
+                    .stack-trace-container {
+                        background-color: #f8f9fa;
+                        border: 1px solid #dee2e6;
+                        border-radius: 0.375rem;
+                        max-height: 600px;
+                        overflow-y: auto;
+                    }
+                </style>
+                <div class="stack-trace-content">
+                    {{{formattedStackTrace}}}
+                </div>
+            </div>
+        `;
+  }
+  async onBeforeRender() {
+    this.formattedStackTrace = this.formatStackTrace(this.stackTrace);
+  }
+  formatStackTrace(stackTrace) {
+    if (!stackTrace) {
+      return '<div class="text-muted p-3">No stack trace available</div>';
+    }
+    const traceStr = typeof stackTrace === "string" ? stackTrace : JSON.stringify(stackTrace, null, 2);
+    const lines = traceStr.split("\n");
+    let html = "";
+    lines.forEach((line, index) => {
+      if (!line.trim()) {
+        html += '<div class="stack-trace-line">&nbsp;</div>';
+        return;
+      }
+      if (index === 0 && (line.includes("Error:") || line.includes("Exception:"))) {
+        html += `<div class="stack-trace-line stack-trace-error">${this.escapeHtml(line)}</div>`;
+        return;
+      }
+      const filePattern = /(.+?)\s*\(([^:]+):(\d+):(\d+)\)/;
+      const simpleFilePattern = /^\s*at\s+([^:]+):(\d+):(\d+)/;
+      let match = line.match(filePattern);
+      if (match) {
+        const [, funcName, filePath, lineNum, colNum] = match;
+        html += `<div class="stack-trace-line stack-trace-file">
+                    <span class="stack-trace-function">${this.escapeHtml(funcName.trim())}</span>
+                    <span class="stack-trace-location"> (${this.escapeHtml(filePath)}:<span class="stack-trace-line-number">${lineNum}</span>:${colNum})</span>
+                </div>`;
+        return;
+      }
+      match = line.match(simpleFilePattern);
+      if (match) {
+        const [, filePath, lineNum, colNum] = match;
+        html += `<div class="stack-trace-line stack-trace-file">
+                    <span class="stack-trace-location">at ${this.escapeHtml(filePath)}:<span class="stack-trace-line-number">${lineNum}</span>:${colNum}</span>
+                </div>`;
+        return;
+      }
+      const pythonPattern = /File\s+"([^"]+)",\s+line\s+(\d+),\s+in\s+(.+)/;
+      match = line.match(pythonPattern);
+      if (match) {
+        const [, filePath, lineNum, funcName] = match;
+        html += `<div class="stack-trace-line stack-trace-file">
+                    <span class="stack-trace-location">File "${this.escapeHtml(filePath)}", line <span class="stack-trace-line-number">${lineNum}</span>, in </span>
+                    <span class="stack-trace-function">${this.escapeHtml(funcName)}</span>
+                </div>`;
+        return;
+      }
+      if (line.trim().startsWith("at ")) {
+        html += `<div class="stack-trace-line stack-trace-file">${this.escapeHtml(line)}</div>`;
+        return;
+      }
+      html += `<div class="stack-trace-line stack-trace-context">${this.escapeHtml(line)}</div>`;
+    });
+    return html;
+  }
+  updateStackTrace(newStackTrace) {
+    this.stackTrace = newStackTrace;
+    this.render();
+  }
+}
 class EventView extends View {
   constructor(options = {}) {
     super({
@@ -886,20 +1009,20 @@ class EventView extends View {
         { name: "details", label: "Details", columns: 12 }
       ]
     });
-    this.metadataView = new View({
-      model: this.model,
-      template: `<pre class="bg-light p-3 border rounded"><code>{{{model.metadata|json}}}</code></pre>`
-    });
     const tabs = { "Overview": this.overviewView };
-    if (this.model.get("metadata") && Object.keys(this.model.get("metadata")).length > 0) {
-      tabs["Metadata"] = this.metadataView;
+    const metadata = this.model.get("metadata") || {};
+    if (metadata.stack_trace) {
+      this.stackTraceView = new StackTraceView({
+        stackTrace: metadata.stack_trace
+      });
+      tabs["Stack Trace"] = this.stackTraceView;
     }
-    if (this.model.get("metadata.stack_trace")) {
-      this.stackTraceView = new View({
+    if (Object.keys(metadata).length > 0) {
+      this.metadataView = new View({
         model: this.model,
-        template: `<pre class="bg-dark text-white p-3 border rounded">{{{model.metadata.stack_trace}}}</pre>`
+        template: `<pre class="bg-light p-3 border rounded"><code>{{{model.metadata|json}}}</code></pre>`
       });
-      tabs["Stack Trace"] = this.stackTraceView;
+      tabs["Metadata"] = this.metadataView;
     }
     this.tabView = new TabView({
       containerId: "event-tabs",
@@ -1467,7 +1590,7 @@ class FileTablePage extends TablePage {
    */
   async onActionAdd(event, element) {
     event.preventDefault();
-    const Dialog2 = (await import("./chunks/Dialog-Bup1WdQn.js")).default;
+    const Dialog2 = (await import("./chunks/Dialog-D9qIh5Jb.js")).default;
     const formData = await Dialog2.showForm({
       title: "Upload File",
       size: "md",
@@ -1563,6 +1686,185 @@ class FileTablePage extends TablePage {
   }
 }
 applyFileDropMixin(FileTablePage);
+class MapView extends View {
+  constructor(options = {}) {
+    super({
+      className: "map-view",
+      ...options
+    });
+    this.markers = options.markers || [];
+    this.center = options.center || null;
+    this.zoom = options.zoom || 13;
+    this.height = options.height || 400;
+    this.showZoomControl = options.showZoomControl !== false;
+    this.tileLayer = options.tileLayer || "osm";
+    this.map = null;
+    this.leafletMarkers = [];
+    this.template = `
+            <div class="map-container">
+                <div id="map-{{id}}" style="height: {{height}}px; width: 100%; border-radius: 0.375rem; border: 1px solid #dee2e6;"></div>
+            </div>
+        `;
+  }
+  async onAfterRender() {
+    await this.loadLeaflet();
+    await this.initializeMap();
+  }
+  async loadLeaflet() {
+    if (window.L) return;
+    const cssLoaded = new Promise((resolve) => {
+      const link = document.createElement("link");
+      link.rel = "stylesheet";
+      link.href = "https://unpkg.com/leaflet@1.9.4/dist/leaflet.css";
+      link.onload = resolve;
+      link.onerror = resolve;
+      document.head.appendChild(link);
+    });
+    const jsLoaded = new Promise((resolve, reject) => {
+      const script = document.createElement("script");
+      script.src = "https://unpkg.com/leaflet@1.9.4/dist/leaflet.js";
+      script.onload = resolve;
+      script.onerror = reject;
+      document.head.appendChild(script);
+    });
+    await Promise.all([cssLoaded, jsLoaded]);
+  }
+  getTileLayerUrl() {
+    const tileLayers = {
+      // Standard street maps
+      osm: {
+        url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+        attribution: "© OpenStreetMap contributors",
+        maxZoom: 19
+      },
+      // Satellite imagery
+      satellite: {
+        url: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+        attribution: "© Esri",
+        maxZoom: 19
+      },
+      // Terrain and topographic
+      terrain: {
+        url: "https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png",
+        attribution: "© OpenTopoMap contributors",
+        maxZoom: 17
+      },
+      // Dark mode styles
+      dark: {
+        url: "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png",
+        attribution: "© OpenStreetMap contributors © CARTO",
+        maxZoom: 20
+      },
+      // Light/minimal styles
+      light: {
+        url: "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
+        attribution: "© OpenStreetMap contributors © CARTO",
+        maxZoom: 20
+      },
+      // Watercolor artistic style
+      watercolor: {
+        url: "https://tiles.stadiamaps.com/tiles/stamen_watercolor/{z}/{x}/{y}.jpg",
+        attribution: "© Stadia Maps © Stamen Design © OpenStreetMap contributors",
+        maxZoom: 16
+      },
+      // Black and white
+      bw: {
+        url: "https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png",
+        attribution: "© OpenStreetMap contributors © CARTO",
+        maxZoom: 20
+      },
+      // Streets with labels
+      streets: {
+        url: "https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png",
+        attribution: "© OpenStreetMap contributors © CARTO",
+        maxZoom: 20
+      }
+    };
+    return tileLayers[this.tileLayer] || tileLayers.osm;
+  }
+  async initializeMap() {
+    const mapElement = this.element.querySelector(`#map-${this.id}`);
+    if (!mapElement || !window.L) return;
+    let mapCenter = this.center;
+    if (!mapCenter && this.markers.length > 0) {
+      mapCenter = [this.markers[0].lat, this.markers[0].lng];
+    }
+    if (!mapCenter) {
+      mapCenter = [0, 0];
+    }
+    this.map = window.L.map(mapElement, {
+      center: mapCenter,
+      zoom: this.zoom,
+      zoomControl: this.showZoomControl
+    });
+    const tileConfig = this.getTileLayerUrl();
+    window.L.tileLayer(tileConfig.url, {
+      attribution: tileConfig.attribution,
+      maxZoom: tileConfig.maxZoom
+    }).addTo(this.map);
+    this.addMarkers(this.markers);
+    if (this.markers.length > 1) {
+      this.fitBounds();
+    }
+    setTimeout(() => {
+      if (this.map) {
+        this.map.invalidateSize();
+      }
+    }, 300);
+  }
+  addMarkers(markers) {
+    if (!this.map || !Array.isArray(markers)) return;
+    markers.forEach((markerData) => {
+      const { lat, lng, popup, icon } = markerData;
+      if (!lat || !lng) return;
+      const markerOptions = {};
+      if (icon) {
+        markerOptions.icon = window.L.icon(icon);
+      }
+      const marker = window.L.marker([lat, lng], markerOptions).addTo(this.map);
+      if (popup) {
+        marker.bindPopup(popup);
+      }
+      this.leafletMarkers.push(marker);
+    });
+  }
+  fitBounds() {
+    if (!this.map || this.leafletMarkers.length === 0) return;
+    const group = new window.L.featureGroup(this.leafletMarkers);
+    this.map.fitBounds(group.getBounds().pad(0.1));
+  }
+  updateMarkers(newMarkers) {
+    this.clearMarkers();
+    this.markers = newMarkers;
+    this.addMarkers(newMarkers);
+    if (newMarkers.length > 1) {
+      this.fitBounds();
+    } else if (newMarkers.length === 1) {
+      this.map.setView([newMarkers[0].lat, newMarkers[0].lng], this.zoom);
+    }
+  }
+  clearMarkers() {
+    this.leafletMarkers.forEach((marker) => {
+      this.map.removeLayer(marker);
+    });
+    this.leafletMarkers = [];
+  }
+  setView(lat, lng, zoom = null) {
+    if (!this.map) return;
+    this.map.setView([lat, lng], zoom || this.zoom);
+  }
+  setZoom(zoom) {
+    if (!this.map) return;
+    this.map.setZoom(zoom);
+  }
+  async onBeforeDestroy() {
+    if (this.map) {
+      this.map.remove();
+      this.map = null;
+    }
+    await super.onBeforeDestroy();
+  }
+}
 class GeoIPView extends View {
   constructor(options = {}) {
     super({
@@ -1597,36 +1899,99 @@ class GeoIPView extends View {
                     </div>
                 </div>
 
-                <!-- Body -->
-                <div data-container="geoip-data-view"></div>
+                <!-- Tabs -->
+                <div data-container="geoip-tabs"></div>
             </div>
         `;
   }
   async onInit() {
-    this.dataView = new DataView({
-      containerId: "geoip-data-view",
+    this.detailsView = new DataView({
       model: this.model,
-      className: "p-3 border rounded",
+      className: "p-3",
       showEmptyValues: true,
       emptyValueText: "—",
       columns: 2,
       fields: [
-        { name: "id", label: "ID" },
-        { name: "subnet", label: "Subnet" },
-        { name: "country_code", label: "Country Code" },
-        { name: "region", label: "Region" },
-        { name: "city", label: "City" },
-        { name: "postal_code", label: "Postal Code" },
-        { name: "latitude", label: "Latitude" },
-        { name: "longitude", label: "Longitude" },
-        { name: "timezone", label: "Timezone" },
-        { name: "created", label: "Created", format: "datetime" },
-        { name: "modified", label: "Last Modified", format: "datetime" },
-        { name: "expires_at", label: "Expires", format: "datetime" }
+        { name: "ip_address", label: "IP Address", cols: 4 },
+        { name: "subnet", label: "Subnet", cols: 4 },
+        { name: "country_name", label: "Country", cols: 4 },
+        { name: "country_code", label: "Country Code", cols: 4 },
+        { name: "region", label: "Region", cols: 4 },
+        { name: "city", label: "City", cols: 4 },
+        { name: "postal_code", label: "Postal Code", cols: 4 },
+        { name: "timezone", label: "Timezone", cols: 4 },
+        { name: "latitude", label: "Latitude", cols: 4 },
+        { name: "longitude", label: "Longitude", cols: 4 }
       ]
     });
-    this.addChild(this.dataView);
+    this.securityView = new DataView({
+      model: this.model,
+      className: "p-3",
+      showEmptyValues: true,
+      emptyValueText: "—",
+      columns: 2,
+      fields: [
+        { name: "threat_level", label: "Threat Level", cols: 4 },
+        { name: "is_tor", label: "TOR Exit Node", cols: 4 },
+        { name: "is_vpn", label: "VPN", formatter: "yesnoicon", cols: 4 },
+        { name: "is_proxy", label: "Proxy", formatter: "yesnoicon", cols: 4 },
+        { name: "is_cloud", label: "Cloud Provider", formatter: "yesnoicon", cols: 4 },
+        { name: "is_datacenter", label: "Datacenter", formatter: "yesnoicon", cols: 4 },
+        { name: "asn", label: "ASN", cols: 4 },
+        { name: "asn_org", label: "ASN Organization", cols: 4 },
+        { name: "isp", label: "ISP", cols: 4 },
+        { name: "connection_type", label: "Connection Type", cols: 6 }
+      ]
+    });
+    this.metadataView = new DataView({
+      model: this.model,
+      className: "p-3",
+      showEmptyValues: true,
+      emptyValueText: "—",
+      columns: 2,
+      fields: [
+        { name: "id", label: "Record ID", cols: 6 },
+        { name: "provider", label: "Data Provider", formatter: "capitalize", cols: 6 },
+        { name: "created", label: "Created", formatter: "datetime", cols: 6 },
+        { name: "modified", label: "Last Modified", formatter: "datetime", cols: 6 },
+        { name: "expires_at", label: "Expires", formatter: "datetime", cols: 12 }
+      ]
+    });
+    const tabs = {
+      "Location": this.detailsView,
+      "Security": this.securityView,
+      "Metadata": this.metadataView
+    };
+    if (this.hasCoordinates) {
+      const lat = this.model.get("latitude");
+      const lng = this.model.get("longitude");
+      const city = this.model.get("city") || "Unknown";
+      const region = this.model.get("region") || "";
+      const country = this.model.get("country_name") || "";
+      const locationStr = [city, region, country].filter(Boolean).join(", ");
+      this.mapView = new MapView({
+        markers: [{
+          lat,
+          lng,
+          popup: `<strong>${this.model.get("ip_address")}</strong><br>${locationStr}`
+        }],
+        tileLayer: "light",
+        zoom: 4,
+        height: 450
+      });
+      tabs["Map"] = this.mapView;
+    }
+    this.tabView = new TabView({
+      containerId: "geoip-tabs",
+      tabs,
+      activeTab: this.hasCoordinates ? "Map" : "Location"
+    });
+    this.addChild(this.tabView);
     const menuItems = [
+      { label: "Edit Location", action: "edit-location", icon: "bi-geo-alt" },
+      { label: "Edit Security", action: "edit-security", icon: "bi-shield-lock" },
+      { label: "Edit Network", action: "edit-network", icon: "bi-diagram-3" },
+      { type: "divider" },
       { label: "Refresh Geolocation", action: "refresh-geoip", icon: "bi-arrow-clockwise" }
     ];
     if (this.hasCoordinates) {
@@ -1651,8 +2016,41 @@ class GeoIPView extends View {
     });
     this.addChild(geoIPMenu);
   }
+  async onActionEditLocation() {
+    const resp = await Dialog$1.showModelForm({
+      title: `Edit Location - ${this.model.get("ip_address")}`,
+      model: this.model,
+      formConfig: GeoLocatedIP.EDIT_LOCATION_FORM
+    });
+    if (resp) {
+      await this.render();
+      this.getApp()?.toast?.success("Location updated successfully");
+    }
+  }
+  async onActionEditSecurity() {
+    const resp = await Dialog$1.showModelForm({
+      title: `Edit Security - ${this.model.get("ip_address")}`,
+      model: this.model,
+      formConfig: GeoLocatedIP.EDIT_SECURITY_FORM
+    });
+    if (resp) {
+      await this.render();
+      this.getApp()?.toast?.success("Security settings updated successfully");
+    }
+  }
+  async onActionEditNetwork() {
+    const resp = await Dialog$1.showModelForm({
+      title: `Edit Network - ${this.model.get("ip_address")}`,
+      model: this.model,
+      formConfig: GeoLocatedIP.EDIT_NETWORK_FORM
+    });
+    if (resp) {
+      await this.render();
+      this.getApp()?.toast?.success("Network information updated successfully");
+    }
+  }
   async onActionRefreshGeoip() {
-    console.log("Refreshing GeoIP for:", this.model.get("ip_address"));
+    await this.model.save({ refresh: true });
     this.getApp()?.toast?.info("Refresh request sent for " + this.model.get("ip_address"));
   }
   async onActionViewOnMap() {
@@ -1703,20 +2101,19 @@ class GeoLocatedIPTablePage extends TablePage {
       pageName: "GeoIP Cache",
       router: "admin/system/geoip",
       Collection: GeoLocatedIPList,
-      itemViewClass: GeoIPView,
+      itemView: GeoIPView,
       viewDialogOptions: {
         header: false,
-        size: "lg"
+        size: "xl"
       },
       // Column definitions
       columns: [
-        { key: "id", label: "ID", width: "70px", sortable: true, class: "text-muted" },
         { key: "ip_address", label: "IP Address", sortable: true },
         { key: "city", label: "City", sortable: true, formatter: "default('—')" },
         { key: "region", label: "Region", sortable: true, formatter: "default('—')" },
         { key: "country_name", label: "Country", sortable: true, formatter: "default('—')" },
-        { key: "provider", label: "Provider", sortable: true },
-        { key: "is_expired", label: "Expired", formatter: "boolean|badge" }
+        { key: "isp", label: "ISP", sortable: true, formatter: "default('—')" },
+        { key: "threat_level", label: "Threat", formatter: "default('—')" }
       ],
       // Table features
       selectable: true,
@@ -1724,6 +2121,9 @@ class GeoLocatedIPTablePage extends TablePage {
       sortable: true,
       filterable: true,
       paginated: true,
+      // Actions
+      // actions: ['view', 'edit', 'delete'],
+      clickAction: "view",
       // Toolbar
       showRefresh: true,
       showAdd: false,
@@ -2365,13 +2765,39 @@ class IncidentView extends View {
         { name: "details", label: "Details", columns: 12, format: "pre" }
       ]
     });
+    const eventsCollection = new IncidentEventList({
+      params: { incident: this.model.get("id") }
+    });
+    this.eventsView = new TableView({
+      collection: eventsCollection,
+      hideActivePillNames: ["incident"],
+      columns: [
+        { key: "id", label: "ID", width: "70px", sortable: true },
+        { key: "created", label: "Date", formatter: "datetime", sortable: true, width: "180px" },
+        { key: "category", label: "Category", formatter: "badge", sortable: true },
+        { key: "title", label: "Title", sortable: true },
+        { key: "level", label: "Level", sortable: true, width: "80px" }
+      ],
+      showAdd: false,
+      actions: ["view"],
+      paginated: true,
+      size: 10
+    });
     const adapter = new IncidentHistoryAdapter(this.model.get("id"));
     this.historyView = new ChatView({ adapter });
     const tabs = {
       "Overview": this.overviewView,
+      "Events": this.eventsView,
       "History & Comments": this.historyView
     };
-    if (this.model.get("metadata") && Object.keys(this.model.get("metadata")).length > 0) {
+    const metadata = this.model.get("metadata") || {};
+    if (metadata.stack_trace) {
+      this.stackTraceView = new StackTraceView({
+        stackTrace: metadata.stack_trace
+      });
+      tabs["Stack Trace"] = this.stackTraceView;
+    }
+    if (Object.keys(metadata).length > 0) {
       this.metadataView = new View({
         model: this.model,
         template: `<pre class="bg-light p-3 border rounded"><code>{{{model.metadata|json}}}</code></pre>`
@@ -2507,7 +2933,7 @@ class IncidentTablePage extends TablePage {
         { label: "Resolve", icon: "bi bi-check-circle", action: "resolve" },
         { label: "Pause", icon: "bi bi-pause-circle", action: "pause" },
         { label: "Ignore", icon: "bi bi-x-circle", action: "ignore" },
-        { label: "Change Status", icon: "bi bi-arrow-repeat", action: "status" }
+        { label: "Merge", icon: "bi bi-merge", action: "merge" }
       ],
       // Table display options
       tableOptions: {
@@ -2554,6 +2980,29 @@ class IncidentTablePage extends TablePage {
     await Promise.all(selected.map((item) => item.model.save({ status: "ignored" })));
     this.tableView.collection.fetch();
   }
+  async onActionBatchMerge(_event, _element) {
+    const selected = this.tableView.getSelectedItems();
+    if (!selected.length) return;
+    const app = this.getApp();
+    const result = await app.showForm({
+      title: `Merge ${selected.length} incidents`,
+      fields: [
+        {
+          name: "merge",
+          type: "select",
+          label: "Select Parent Incident",
+          options: selected.map((item) => ({ value: item.model.id, label: item.model.id })),
+          required: true
+        }
+      ]
+    });
+    if (!result) return;
+    const parentModel = selected.find((item) => item.model.id == result.merge)?.model;
+    if (!parentModel) return;
+    const mergeIds = selected.map((item) => item.model.id).filter((id) => id != result.merge);
+    await parentModel.save({ merge: mergeIds });
+    this.tableView.collection.fetch();
+  }
 }
 class JobStatsView extends View {
   constructor(options = {}) {
@@ -5013,20 +5462,36 @@ class RuleSetView extends View {
         `;
   }
   async onInit() {
+    const matchByValue = this.model.get("match_by");
+    const matchByOption = MatchByOptions.find((opt) => opt.value === matchByValue);
+    const matchByLabel = matchByOption ? matchByOption.label : String(matchByValue);
+    const bundleByValue = this.model.get("bundle_by");
+    const bundleByOption = BundleByOptions.find((opt) => opt.value === bundleByValue);
+    const bundleByLabel = bundleByOption ? bundleByOption.label : String(bundleByValue);
     this.configView = new DataView({
       model: this.model,
       className: "p-3",
       columns: 2,
       fields: [
-        { name: "id", label: "RuleSet ID" },
-        { name: "name", label: "Name" },
-        { name: "category", label: "Category" },
-        { name: "priority", label: "Priority" },
-        { name: "match_by", label: "Match Logic", format: (v) => v === 0 ? "ALL" : "ANY" },
-        { name: "bundle_by", label: "Bundle By" },
-        { name: "bundle_minutes", label: "Bundle Minutes" },
-        { name: "handler", label: "Handler" },
-        { name: "is_active", label: "Status", format: "boolean" }
+        { name: "id", label: "RuleSet ID", cols: 6 },
+        { name: "priority", label: "Priority", cols: 6 },
+        { name: "name", label: "Name", cols: 12 },
+        { name: "category", label: "Category", formatter: "badge", cols: 6 },
+        { name: "is_active", label: "Status", formatter: "boolean", cols: 6 },
+        {
+          name: "match_by",
+          label: "Match Logic",
+          template: matchByLabel,
+          cols: 12
+        },
+        {
+          name: "bundle_by",
+          label: "Bundle By",
+          template: bundleByLabel,
+          cols: 12
+        },
+        { name: "bundle_minutes", label: "Bundle Minutes", cols: 6 },
+        { name: "handler", label: "Handler", cols: 12 }
       ]
     });
     const rulesCollection = new RuleList({
@@ -5038,12 +5503,23 @@ class RuleSetView extends View {
         { key: "id", label: "ID", width: "70px" },
         { key: "name", label: "Name" },
         { key: "field_name", label: "Field" },
-        { key: "comparator", label: "Comparator" },
+        { key: "comparator", label: "Comparator", width: "120px" },
         { key: "value", label: "Value" },
-        { key: "value_type", label: "Type" }
+        { key: "value_type", label: "Type", width: "100px" }
       ],
       showAdd: true,
-      actions: ["edit", "delete"]
+      clickAction: "edit",
+      actions: ["edit", "delete"],
+      contextMenu: [
+        { label: "Edit Rule", action: "edit", icon: "bi-pencil" },
+        { label: "Duplicate Rule", action: "duplicate", icon: "bi-files" },
+        { divider: true },
+        { label: "Delete Rule", action: "delete", icon: "bi-trash", danger: true }
+      ],
+      // Pass the parent ID so new rules get associated with this ruleset
+      defaultData: {
+        parent: this.model.get("id")
+      }
     });
     this.tabView = new TabView({
       containerId: "ruleset-tabs",
@@ -5069,6 +5545,73 @@ class RuleSetView extends View {
     });
     this.addChild(contextMenu);
   }
+  /**
+   * Action handler: Edit RuleSet
+   */
+  async onActionEditRuleset() {
+    const resp = await Dialog$1.showModelForm({
+      title: `Edit RuleSet - ${this.model.get("name")}`,
+      model: this.model,
+      formConfig: RuleSet.EDIT_FORM
+    });
+    if (resp) {
+      await this.render();
+    }
+  }
+  /**
+   * Action handler: Disable/Enable RuleSet
+   */
+  async onActionDisableRuleset() {
+    const isActive = this.model.get("is_active");
+    const newStatus = !isActive;
+    try {
+      this.model.set("is_active", newStatus);
+      await this.model.save();
+      await this.render();
+      Dialog$1.showToast({
+        message: `RuleSet ${newStatus ? "enabled" : "disabled"} successfully`,
+        type: "success"
+      });
+    } catch (error) {
+      Dialog$1.showToast({
+        message: `Failed to update RuleSet: ${error.message}`,
+        type: "error"
+      });
+    }
+  }
+  /**
+   * Action handler: Delete RuleSet
+   */
+  async onActionDeleteRuleset() {
+    const confirmed = await Dialog$1.confirm({
+      title: "Delete RuleSet",
+      message: `Are you sure you want to delete the ruleset "${this.model.get("name")}"? This action cannot be undone.`,
+      confirmText: "Delete",
+      confirmClass: "btn-danger"
+    });
+    if (confirmed) {
+      try {
+        await this.model.destroy();
+        Dialog$1.showToast({
+          message: "RuleSet deleted successfully",
+          type: "success"
+        });
+        const dialog = this.element?.closest(".modal");
+        if (dialog) {
+          const bsModal = bootstrap.Modal.getInstance(dialog);
+          if (bsModal) {
+            bsModal.hide();
+          }
+        }
+        this.emit("ruleset:deleted", { model: this.model });
+      } catch (error) {
+        Dialog$1.showToast({
+          message: `Failed to delete RuleSet: ${error.message}`,
+          type: "error"
+        });
+      }
+    }
+  }
 }
 RuleSetView.VIEW_CLASS = RuleSetView;
 class RuleSetTablePage extends TablePage {
@@ -5079,7 +5622,7 @@ class RuleSetTablePage extends TablePage {
       pageName: "Rule Engine",
       router: "admin/rulesets",
       Collection: RuleSetList,
-      itemViewClass: RuleSetView,
+      itemView: RuleSetView,
       viewDialogOptions: {
         header: false,
         size: "xl"
@@ -5089,8 +5632,7 @@ class RuleSetTablePage extends TablePage {
         { key: "name", label: "Name", sortable: true },
         { key: "category", label: "Category", sortable: true, formatter: "badge" },
         { key: "priority", label: "Priority", sortable: true },
-        { key: "match_by", label: "Match Logic", formatter: (v) => v === 0 ? "ALL" : "ANY" },
-        { key: "is_active", label: "Status", formatter: "boolean|badge('Active:success,Inactive:secondary')" }
+        { key: "match_by", label: "Match Logic", formatter: (v) => v === 0 ? "ALL" : "ANY" }
       ],
       selectable: true,
       searchable: true,