From ba4821df21aa7292e7cb18a5fe09f5f3d7bf1cdc Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge97@gmail.com>
Date: Sat, 1 Nov 2025 18:19:51 -0700
Subject: [PATCH] working multihost operation history sync

---
 internal/oplog/sqlitestore/sqlitestore.go | 10 +++++++---
 webui/src/views/App.tsx                   |  6 +-----
 webui/src/views/PlanView.tsx              |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/internal/oplog/sqlitestore/sqlitestore.go b/internal/oplog/sqlitestore/sqlitestore.go
index 0b908647..e69fe524 100644
--- a/internal/oplog/sqlitestore/sqlitestore.go
+++ b/internal/oplog/sqlitestore/sqlitestore.go
@@ -135,13 +135,17 @@ func (m *SqliteStore) init() error {
 	if err := applySqliteMigrations(m, m.dbpool); err != nil {
 		return err
 	}
-
-	highestID, highestModno, err := m.GetHighestOpIDAndModno(oplog.Query{}.SetOriginalInstanceKeyid(""))
+	// highestOpID from all instances
+	highestID, _, err := m.GetHighestOpIDAndModno(oplog.Query{})
+	if err != nil {
+		return err
+	}
+	_, highestModno, err := m.GetHighestOpIDAndModno(oplog.Query{}.SetOriginalInstanceKeyid(""))
 	if err != nil {
 		return err
 	}
-	m.highestOpID.Store(highestID)
 	m.highestModno.Store(highestModno)
+	m.highestOpID.Store(highestID)
 	return nil
 }
 
diff --git a/webui/src/views/App.tsx b/webui/src/views/App.tsx
index 4b06cdec..c4d50cfb 100644
--- a/webui/src/views/App.tsx
+++ b/webui/src/views/App.tsx
@@ -351,7 +351,7 @@ const getSidenavItems = (
     },
     ...configPlans.map((plan) => {
       const sel = create(OpSelectorSchema, {
-        instanceId: config.instance,
+        originalInstanceKeyid: "",
         planId: plan.id,
         repoGuid: reposById[plan.repo]?.guid,
       });
@@ -535,10 +535,6 @@ const getSidenavItems = (
 const IconForResource = ({ selector }: { selector: OpSelector }) => {
   const [status, setStatus] = useState(OperationStatus.STATUS_UNKNOWN);
   useEffect(() => {
-    if (!selector || !selector.instanceId || !selector.repoGuid) {
-      return;
-    }
-
     const load = async () => {
       setStatus(await getStatusForSelector(selector));
     };
diff --git a/webui/src/views/PlanView.tsx b/webui/src/views/PlanView.tsx
index a8515ae7..b1a0b227 100644
--- a/webui/src/views/PlanView.tsx
+++ b/webui/src/views/PlanView.tsx
@@ -55,6 +55,7 @@ export const PlanView = ({ plan }: React.PropsWithChildren<{ plan: Plan }>) => {
           selector: {
             planId: plan.id,
             repoGuid: repo!.guid,
+            originalInstanceKeyid: "",
           },
           onlyFailed: true,
         })