From e692a1d7cdc4a9f92cb044b9d7d7ba7ca193e70b Mon Sep 17 00:00:00 2001
From: 2GT-Rich <107219997+2GT-Rich@users.noreply.github.com>
Date: Fri, 15 May 2026 16:39:07 -0700
Subject: [PATCH] fix: syslog coverage count exceeding device total + remove
 decorative live indicator (v0.11.1 Beta)

- aggregateRules/aggregateActions: deduplicate coverage per device using a per-device seenKeys set,
  preventing a device with duplicate topic|action rules from inflating the coverage count above total
- executePush (add path): skip devices that already have an identical rule/action before pushing to
  all devices, preventing duplicate RouterOS logging entries from being created in the first place
- TopBar: remove hardcoded decorative 'live' indicator that had no backend connection logic

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 README.md                                     |  2 +-
 backend/package.json                          |  2 +-
 frontend/package.json                         |  2 +-
 frontend/src/components/layout/TopBar.tsx     | 15 -----------
 .../src/pages/NetworkServicesSyslogPage.tsx   | 27 ++++++++++++++++---
 frontend/src/version.ts                       |  2 +-
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 3ce923b..79ec9e9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A self-hosted, full-stack network management platform for MikroTik devices. Monitor, configure, and manage your entire MikroTik infrastructure — routers, switches, and wireless access points — from a single web interface.
 
-![Version](https://img.shields.io/badge/version-0.11.0_Beta-blue)
+![Version](https://img.shields.io/badge/version-0.11.1_Beta-blue)
 ![License](https://img.shields.io/badge/license-AGPLv3-blue)
 ![Docker](https://img.shields.io/badge/docker-compose-2496ED?logo=docker&logoColor=white)
 ![TypeScript](https://img.shields.io/badge/TypeScript-5.3-3178C6?logo=typescript&logoColor=white)
diff --git a/backend/package.json b/backend/package.json
index 294900d..552980d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mikrotik-manager-backend",
-  "version": "0.11.0-beta",
+  "version": "0.11.1-beta",
   "description": "Mikrotik Network Management Platform - Backend API",
   "main": "dist/index.js",
   "scripts": {
diff --git a/frontend/package.json b/frontend/package.json
index 2c964e8..76cec41 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mikrotik-manager-frontend",
-  "version": "0.11.0-beta",
+  "version": "0.11.1-beta",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/frontend/src/components/layout/TopBar.tsx b/frontend/src/components/layout/TopBar.tsx
index 201f216..ecb98bb 100644
--- a/frontend/src/components/layout/TopBar.tsx
+++ b/frontend/src/components/layout/TopBar.tsx
@@ -41,21 +41,6 @@ export default function TopBar({ onMenuClick }: TopBarProps) {
       </div>
 
       <div className="flex items-center gap-2 flex-shrink-0">
-        {/* Live indicator */}
-        <span
-          className="hidden sm:flex items-center gap-[6px] px-[10px] py-[4px] rounded-full text-[11px] mono"
-          style={{ color: 'var(--ink-3)', border: '1px solid var(--line)' }}
-        >
-          <span
-            className="w-[6px] h-[6px] rounded-full flex-shrink-0"
-            style={{
-              background: 'var(--good)',
-              boxShadow: '0 0 0 2px rgba(141,224,138,0.2), 0 0 6px rgba(141,224,138,0.5)',
-            }}
-          />
-          live
-        </span>
-
         {/* Theme toggle */}
         <button
           onClick={toggleTheme}
diff --git a/frontend/src/pages/NetworkServicesSyslogPage.tsx b/frontend/src/pages/NetworkServicesSyslogPage.tsx
index 5ced0b1..e2303a5 100644
--- a/frontend/src/pages/NetworkServicesSyslogPage.tsx
+++ b/frontend/src/pages/NetworkServicesSyslogPage.tsx
@@ -44,10 +44,14 @@ function aggregateActions(
 ): AggregatedRow[] {
   const map = new Map<string, AggregatedRow>();
   for (const d of deviceData) {
+    const seenKeys = new Set<string>();
     for (const a of d.actions) {
       const key = a['name'] ?? '';
       if (!map.has(key)) map.set(key, { key, sample: a, coverage: [] });
-      map.get(key)!.coverage.push({ deviceId: d.deviceId, deviceName: d.deviceName, rowId: a['.id'] ?? '' });
+      if (!seenKeys.has(key)) {
+        map.get(key)!.coverage.push({ deviceId: d.deviceId, deviceName: d.deviceName, rowId: a['.id'] ?? '' });
+        seenKeys.add(key);
+      }
     }
   }
   return Array.from(map.values());
@@ -58,10 +62,14 @@ function aggregateRules(
 ): AggregatedRow[] {
   const map = new Map<string, AggregatedRow>();
   for (const d of deviceData) {
+    const seenKeys = new Set<string>();
     for (const r of d.rules) {
       const key = `${r['topics'] ?? ''}|${r['action'] ?? ''}`;
       if (!map.has(key)) map.set(key, { key, sample: r, coverage: [] });
-      map.get(key)!.coverage.push({ deviceId: d.deviceId, deviceName: d.deviceName, rowId: r['.id'] ?? '' });
+      if (!seenKeys.has(key)) {
+        map.get(key)!.coverage.push({ deviceId: d.deviceId, deviceName: d.deviceName, rowId: r['.id'] ?? '' });
+        seenKeys.add(key);
+      }
     }
   }
   return Array.from(map.values());
@@ -469,14 +477,25 @@ export default function NetworkServicesSyslogPage() {
       );
       targetNames = coverage.map(c => c.deviceName);
     } else {
+      // Skip devices that already have an identical action/rule to avoid duplicates
+      const devicesToAdd = onlineDevices.filter(d => {
+        const deviceSyslog = allDevicesSyslog.find(ds => ds.deviceId === d.id);
+        if (!deviceSyslog) return true;
+        if (type === 'action') {
+          const newName = data['name'] ?? '';
+          return !deviceSyslog.actions.some(a => (a['name'] ?? '') === newName);
+        }
+        const newKey = `${data['topics'] ?? ''}|${data['action'] ?? ''}`;
+        return !deviceSyslog.rules.some(r => `${r['topics'] ?? ''}|${r['action'] ?? ''}` === newKey);
+      });
       settled = await Promise.allSettled(
-        onlineDevices.map(d =>
+        devicesToAdd.map(d =>
           type === 'action'
             ? networkServicesApi.addSyslogAction(d.id, data)
             : networkServicesApi.addSyslogRule(d.id, data)
         )
       );
-      targetNames = onlineDevices.map(d => d.name);
+      targetNames = devicesToAdd.map(d => d.name);
     }
 
     setIsPushing(false); setPendingPush(null);
diff --git a/frontend/src/version.ts b/frontend/src/version.ts
index 584faeb..ccbd318 100644
--- a/frontend/src/version.ts
+++ b/frontend/src/version.ts
@@ -1 +1 @@
-export const APP_VERSION = 'v0.11.0 Beta';
+export const APP_VERSION = 'v0.11.1 Beta';