View Manager: cull archived/deleted view tokens from userPinned list when xhUserState is updated. (#474)

Co-authored-by: lbwexler <[email protected]>

Author: cnrudd

CHANGELOG.md

@@ -3,9 +3,10 @@
 ## 32.0-SNAPSHOT - unreleased
 
 ### ⚙️ Technical
-
+* Cull obsolete ViewManager state for deleted views.
 * Add support for recognizing `Island` browser
 
+
 ## 31.0.3 - 2025-06-27
 
 ### ⚙️ Technical

grails-app/services/io/xh/hoist/jsonblob/JsonBlobService.groovy

@@ -11,6 +11,7 @@ import grails.gorm.transactions.Transactional
 import grails.web.databinding.DataBinder
 import io.xh.hoist.BaseService
 import io.xh.hoist.exception.NotAuthorizedException
+import org.grails.datastore.mapping.query.api.BuildableCriteria
 
 import static io.xh.hoist.json.JSONSerializer.serialize
 import static java.lang.System.currentTimeMillis
@@ -39,6 +40,23 @@ class JsonBlobService extends BaseService implements DataBinder {
                 .findAll { passesAcl(it, username) }
     }
 
+    /** List all tokens for active blobs of a given type. */
+    @ReadOnly
+    List<String> listTokens(String type, String username = username) {
+        BuildableCriteria c = JsonBlob.createCriteria()
+        c {
+            projections {
+                property('token')
+            }
+            eq('type', type)
+            eq('archivedDate', 0L)
+            or {
+                eq('acl', '*')
+                eq('owner', username)
+            }
+        }
+    }
+
     @Transactional
     JsonBlob update(String token, Map data, String username = username) {
         def blob = get(token, username)

grails-app/services/io/xh/hoist/view/ViewService.groovy

@@ -75,6 +75,12 @@ class ViewService extends BaseService {
         if (update.containsKey('userPinned')) (newValue.userPinned as Map).putAll(update.userPinned as Map)
         if (update.containsKey('autoSave')) newValue.autoSave = update.autoSave
 
+        // Ensure that userPinned only contains tokens for views that exist
+        if (newValue.userPinned) {
+            Map userPinned = newValue.userPinned as Map
+            userPinned.keySet().retainAll(jsonBlobService.listTokens(type, username))
+        }
+
         def blob = jsonBlobService.createOrUpdate(type, STATE_BLOB_NAME, [value: newValue], username)
         return getStateFromBlob(blob, viewInstance)
     }