add clearall for badge event

wavetermdev · sawka · Mar 9, 2026 · Feb 19, 2026 · Feb 20, 2026 · Mar 2, 2026
commit f980494cdd8f92f223e2600f6c92c4e03e4f9c15
diff --git a/frontend/app/store/badge.ts b/frontend/app/store/badge.ts
@@ -100,12 +100,16 @@ function clearBadgeInternal(oref: string, persistent: boolean) {
 }
 
 function clearAllBadges(persistent: boolean) {
-    const map = persistent ? PersistentBadgeMap : TransientBadgeMap;
-    for (const oref of map.keys()) {
-        if (globalStore.get(map.get(oref)) != null) {
-            clearBadgeInternal(oref, persistent);
-        }
-    }
+    const eventData: WaveEvent = {
+        event: "badge",
+        scopes: [],
+        data: {
+            oref: "",
+            persistent: persistent,
+            clearall: true,
+        } as BadgeEvent,
+    };
+    fireAndForget(() => RpcApi.EventPublishCommand(TabRpcClient, eventData));
 }
 
 function clearBadgesForTab(tabId: string) {
@@ -259,6 +263,13 @@ function setupBadgesSubscription() {
         eventType: "badge",
         handler: (event) => {
             const data = event.data;
+            if (data?.clearall) {
+                const map = data.persistent ? PersistentBadgeMap : TransientBadgeMap;
+                for (const atom of map.values()) {
+                    globalStore.set(atom, null);
+                }
+                return;
+            }
             if (data?.oref == null) {
                 return;
             }

diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
@@ -121,6 +121,7 @@ declare global {
         oref: string;
         persistent?: boolean;
         clear?: boolean;
+        clearall?: boolean;
         badge?: Badge;
     };
 

diff --git a/pkg/baseds/baseds.go b/pkg/baseds/baseds.go
@@ -24,5 +24,6 @@ type BadgeEvent struct {
 	ORef       string `json:"oref"`
 	Persistent bool   `json:"persistent,omitempty"`
 	Clear      bool   `json:"clear,omitempty"`
+	ClearAll   bool   `json:"clearall,omitempty"`
 	Badge      *Badge `json:"badge,omitempty"`
 }
diff --git a/pkg/wcore/badge.go b/pkg/wcore/badge.go
@@ -91,6 +91,10 @@ func handleBadgeEvent(event *wps.WaveEvent) {
 		log.Printf("badge store: error unmarshaling BadgeEvent: %v\n", err)
 		return
 	}
+	if data.ClearAll {
+		clearAllBadges(data.Persistent)
+		return
+	}
 	if data.ORef == "" {
 		log.Printf("badge store: received badge event with empty oref\n")
 		return
@@ -134,14 +138,40 @@ func setBadge(oref waveobj.ORef, badge *baseds.Badge, persistent bool, clear boo
 	}
 }
 
+// clearAllBadges removes all badges from the given map (persistent or transient).
+// For persistent badges it also clears the DB records.
+func clearAllBadges(persistent bool) {
+	globalBadgeStore.lock.Lock()
+	defer globalBadgeStore.lock.Unlock()
+
+	if persistent {
+		orefs := make([]string, 0, len(globalBadgeStore.persistent))
+		for orefStr := range globalBadgeStore.persistent {
+			orefs = append(orefs, orefStr)
+		}
+		for _, orefStr := range orefs {
+			delete(globalBadgeStore.persistent, orefStr)
+			oref, err := waveobj.ParseORef(orefStr)
+			if err == nil {
+				persistBadge(oref, nil)
+			}
+		}
+		log.Printf("badge store: cleared all %d persistent badges\n", len(orefs))
+	} else {
+		count := len(globalBadgeStore.transient)
+		globalBadgeStore.transient = make(map[string]baseds.Badge)
+		log.Printf("badge store: cleared all %d transient badges\n", count)
+	}
+}
+
 // persistBadge writes the badge (or nil to clear) to the appropriate DB object.
 func persistBadge(oref waveobj.ORef, badge *baseds.Badge) {
 	ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancelFn()
 
 	switch oref.OType {
 	case waveobj.OType_Tab:
-		err := wstore.DBUpdateFn[*waveobj.Tab](ctx, oref.OID, func(tab *waveobj.Tab) {
+		err := wstore.DBUpdateFn(ctx, oref.OID, func(tab *waveobj.Tab) {
 			tab.Badge = badge
 		})
 		if err != nil {
@@ -152,7 +182,7 @@ func persistBadge(oref waveobj.ORef, badge *baseds.Badge) {
 		SendWaveObjUpdate(oref)
 
 	case waveobj.OType_Block:
-		err := wstore.DBUpdateFn[*waveobj.Block](ctx, oref.OID, func(block *waveobj.Block) {
+		err := wstore.DBUpdateFn(ctx, oref.OID, func(block *waveobj.Block) {
 			block.Badge = badge
 		})
 		if err != nil {