cleanup

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: paulr34

src/store/zap/actions.js

@@ -292,39 +292,22 @@ export function updateSelectedEvents(context, selectionContext) {
 export function updateSelectedComponent(context, payload) {
   let op = payload.added ? restApi.uc.componentAdd : restApi.uc.componentRemove
   return axiosRequests.$serverPost(op, payload).then((response) => {
-    // ZAP owns the install/remove decision locally. Studio's follow-up "tree"
-    // WS messages can spuriously mark just-installed components as
-    // isSelected:false during settle, which used to make the missing-component
-    // warning flicker back. We trust two things:
-    //   1. The component ids Studio returned 2xx (or its "fake-ok" 4xx with
-    //      componentAdded/componentRemoved) for, mirrored into
-    //      selectedUcComponents.
-    //   2. The cluster id we just acted on -- recorded here directly so the
-    //      missing-component check can short-circuit regardless of any
-    //      id-format mismatches between POST responses and Studio's tree.
+    // Record the cluster as install-requested so the missing-component warning
+    // gate short-circuits regardless of any contradictory Studio WS updates.
     const list = Array.isArray(response?.data) ? response.data : []
-    const successIds = list
-      .filter((r) => {
-        const s = Number(r?.status)
-        const ok = s >= 200 && s < 300
-        const fakeOk =
-          (payload.added === true && r?.data?.componentAdded === true) ||
-          (payload.added !== true && r?.data?.componentRemoved === true)
-        return ok || fakeOk
-      })
-      .map((r) => r?.id)
-      .filter((id) => id != null && String(id).length > 0)
-    if (successIds.length) {
-      context.commit('locallyMarkUcComponents', {
-        added: payload.added === true,
-        ids: successIds
+    const anySuccess = list.some((r) => {
+      const s = Number(r?.status)
+      return (
+        (s >= 200 && s < 300) ||
+        (payload.added && r?.data?.componentAdded === true) ||
+        (!payload.added && r?.data?.componentRemoved === true)
+      )
+    })
+    if (anySuccess && payload?.clusterId != null) {
+      context.commit('markClusterInstallRequested', {
+        clusterId: payload.clusterId,
+        added: payload.added === true
       })
-      if (payload?.clusterId != null) {
-        context.commit('markClusterInstallRequested', {
-          clusterId: payload.clusterId,
-          added: payload.added === true
-        })
-      }
     }
     return response
   })

src/store/zap/mutations.js

@@ -1000,9 +1000,8 @@ export function updateSelectedUcComponentState(state, data) {
  *   - leaves with isSelected:false -> ignored  (Studio cannot remove)
  *   - leaves not mentioned at all  -> left alone (no wipe)
  *
- * Removals happen only via locallyMarkUcComponents when ZAP itself issues a
- * remove POST and Studio responds 2xx. ucComponents (the catalog used for
- * labels / metadata) is always merged so we keep accumulating entries.
+ * ucComponents (the catalog used for labels / metadata) is always merged so
+ * we keep accumulating entries.
  *
  * @param {*} state
  * @param {any[]} treeLeaves Flattened list of leaf nodes from Studio's tree.
@@ -1037,52 +1036,6 @@ export function applyUcComponentUpdate(state, treeLeaves) {
   vue3Set(state.studio, 'ucComponents', [...allById.values()])
 }
 
-/**
- * Apply the result of a locally-issued component install/uninstall POST.
- *
- * ZAP is the local source of truth for what it has asked Studio to install or
- * remove. A 2xx response from the POST means Studio acknowledged the change,
- * so we mirror that result into selectedUcComponents immediately. Any later
- * Studio WebSocket tree that contradicts this (see applyUcComponentUpdate)
- * is ignored for the unselect direction.
- *
- * @param {*} state
- * @param {{ ids: string[], added: boolean }} payload
- */
-export function applyLocalUcComponentChange(state, payload) {
-  if (!payload || !Array.isArray(payload.ids) || payload.ids.length === 0)
-    return
-  const added = payload.added === true
-  const prevSelected = Array.isArray(state.studio.selectedUcComponents)
-    ? state.studio.selectedUcComponents
-    : []
-  const selectedById = new Map(
-    prevSelected.filter((x) => x && x.id != null).map((x) => [String(x.id), x])
-  )
-  for (const rawId of payload.ids) {
-    if (rawId == null) continue
-    const key = String(rawId)
-    if (added) {
-      if (!selectedById.has(key)) {
-        selectedById.set(key, { id: key, isSelected: true })
-      }
-    } else {
-      selectedById.delete(key)
-    }
-  }
-  vue3Set(state.studio, 'selectedUcComponents', [...selectedById.values()])
-}
-
-/**
- * Backward-compat alias for the action's commit name. Kept thin so call sites
- * can use either name interchangeably.
- * @param {*} state
- * @param {*} payload
- */
-export function locallyMarkUcComponents(state, payload) {
-  applyLocalUcComponentChange(state, payload)
-}
-
 /**
  * Track which cluster ids ZAP has successfully asked Studio to install (or
  * uninstall) components for. The missing-component warning is gated by this