fix(workflow): prevent duplicate lock notifications, no-op guard, fix orphaned JSDoc

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection-utils.ts

@@ -58,16 +58,32 @@ export function isEdgeProtected(
  * @param blocks - Record of all blocks in the workflow
  * @returns Result containing deletable IDs, protected IDs, and whether all are protected
  */
+export function filterProtectedBlocks(
+  blockIds: string[],
+  blocks: Record<string, BlockState>
+): FilterProtectedBlocksResult {
+  const protectedIds = blockIds.filter((id) => isBlockProtected(id, blocks))
+  const deletableIds = blockIds.filter((id) => !protectedIds.includes(id))
+
+  return {
+    deletableIds,
+    protectedIds,
+    allProtected: protectedIds.length === blockIds.length && blockIds.length > 0,
+  }
+}
+
 /**
  * Returns block IDs ordered so that `batchToggleLocked` will target the desired state.
  *
  * `batchToggleLocked` determines its target locked state from `!firstBlock.locked`.
  * When `targetLocked` is true (lock all), an unlocked block must come first.
  * When `targetLocked` is false (unlock all), a locked block must come first.
  *
+ * Returns an empty array when there are no blocks or all blocks already match `targetLocked`.
+ *
  * @param blocks - Record of all blocks in the workflow
  * @param targetLocked - The desired locked state for all blocks
- * @returns Sorted block IDs, or empty array if there are no blocks
+ * @returns Sorted block IDs, or empty array if no toggle is needed
  */
 export function getWorkflowLockToggleIds(
   blocks: Record<string, BlockState>,
@@ -76,6 +92,10 @@ export function getWorkflowLockToggleIds(
   const ids = Object.keys(blocks)
   if (ids.length === 0) return []
 
+  // No-op if all blocks already match the desired state
+  const allMatch = Object.values(blocks).every((b) => Boolean(b.locked) === targetLocked)
+  if (allMatch) return []
+
   ids.sort((a, b) => {
     const aVal = blocks[a].locked ? 1 : 0
     const bVal = blocks[b].locked ? 1 : 0
@@ -86,17 +106,3 @@ export function getWorkflowLockToggleIds(
 
   return ids
 }
-
-export function filterProtectedBlocks(
-  blockIds: string[],
-  blocks: Record<string, BlockState>
-): FilterProtectedBlocksResult {
-  const protectedIds = blockIds.filter((id) => isBlockProtected(id, blocks))
-  const deletableIds = blockIds.filter((id) => !protectedIds.includes(id))
-
-  return {
-    deletableIds,
-    protectedIds,
-    allProtected: protectedIds.length === blockIds.length && blockIds.length > 0,
-  }
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx

@@ -1200,19 +1200,32 @@ const WorkflowContent = React.memo(() => {
     }
   }, [])
 
-  // Reset notification when switching workflows so it recreates for the new workflow
-  const prevWorkflowIdRef = useRef(activeWorkflowId)
+  // Clear persisted lock notifications on mount/workflow change (prevents duplicates after reload)
+  useEffect(() => {
+    // Reset ref so the main effect creates a fresh notification for the new workflow
+    clearLockNotification()
+
+    if (!activeWorkflowId) return
+    const store = useNotificationStore.getState()
+    const stale = store.notifications.filter(
+      (n) =>
+        n.workflowId === activeWorkflowId &&
+        (n.action?.type === 'unlock-workflow' || n.message.startsWith('This workflow is locked'))
+    )
+    for (const n of stale) {
+      store.removeNotification(n.id)
+    }
+  }, [activeWorkflowId, clearLockNotification])
+
   const prevCanAdminRef = useRef(effectivePermissions.canAdmin)
   useEffect(() => {
     if (!isWorkflowReady) return
 
-    const workflowChanged = prevWorkflowIdRef.current !== activeWorkflowId
     const canAdminChanged = prevCanAdminRef.current !== effectivePermissions.canAdmin
-    prevWorkflowIdRef.current = activeWorkflowId
     prevCanAdminRef.current = effectivePermissions.canAdmin
 
-    // Clear stale notification when workflow or admin status changes
-    if ((workflowChanged || canAdminChanged) && lockNotificationIdRef.current) {
+    // Clear stale notification when admin status changes so it recreates with correct message
+    if (canAdminChanged) {
       clearLockNotification()
     }