@tldiagram/core-ui 2.0.6 → 2.0.7

package/src/utils/watchDiffSummary.test.ts

@@ -0,0 +1,95 @@
+import { describe, expect, it } from 'vitest'
+import type { WatchDiff } from '../api/client'
+import type { ExploreData } from '../types'
+import {
+  buildWatchDiffLocations,
+  changedResourceCount,
+  formatDiagramResourceSummary,
+  formatStatLine,
+  isWatchDiffChange,
+  summarizeWatchDiffs,
+  totalResourceCount,
+} from './watchDiffSummary'
+
+function diff(overrides: Partial<WatchDiff>): WatchDiff {
+  return {
+    id: 1,
+    version_id: 1,
+    owner_type: 'symbol',
+    owner_key: 'go:main.go:function:Main',
+    change_type: 'initialized',
+    resource_type: 'element',
+    resource_id: 101,
+    ...overrides,
+  }
+}
+
+describe('watch diff summary', () => {
+  const data: ExploreData = {
+    tree: [{
+      id: 1,
+      owner_element_id: null,
+      name: 'Root',
+      description: null,
+      level_label: null,
+      level: 1,
+      depth: 0,
+      created_at: '2024-01-01',
+      updated_at: '2024-01-01',
+      parent_view_id: null,
+      children: [],
+    }],
+    navigations: [],
+    views: {
+      1: {
+        placements: [{
+          id: 1,
+          view_id: 1,
+          element_id: 101,
+          position_x: 0,
+          position_y: 0,
+          name: 'Main',
+          description: null,
+          kind: 'service',
+          technology: null,
+          url: null,
+          logo_url: null,
+          technology_connectors: [],
+          tags: [],
+          has_view: false,
+          view_label: null,
+        }],
+        connectors: [],
+      },
+    },
+  }
+
+  it('does not describe clean initial resources as changed', () => {
+    const summary = summarizeWatchDiffs([
+      diff({ id: 1, change_type: 'initialized', resource_type: 'element', resource_id: 101 }),
+      diff({ id: 2, change_type: 'initialized', resource_type: 'element', resource_id: 102 }),
+      diff({ id: 3, change_type: 'initialized', resource_type: 'connector', resource_id: 201 }),
+    ])
+
+    expect(changedResourceCount(summary.elements)).toBe(0)
+    expect(totalResourceCount(summary.elements)).toBe(2)
+    expect(formatDiagramResourceSummary(summary)).toBe('3 initialized resources')
+    expect(formatStatLine('element', summary.elements)).toBe('2 elements initialized')
+    expect(isWatchDiffChange('initialized')).toBe(false)
+    expect(buildWatchDiffLocations(data, [
+      diff({ id: 1, change_type: 'initialized', resource_type: 'element', resource_id: 101 }),
+    ])).toEqual([])
+  })
+
+  it('keeps changed and initialized resources separate in labels', () => {
+    const summary = summarizeWatchDiffs([
+      diff({ id: 1, change_type: 'updated', resource_type: 'element', resource_id: 101 }),
+      diff({ id: 2, change_type: 'deleted', resource_type: 'connector', resource_id: 201 }),
+      diff({ id: 3, change_type: 'initialized', resource_type: 'element', resource_id: 102 }),
+    ])
+
+    expect(formatDiagramResourceSummary(summary)).toBe('2 changed, 1 initialized resources')
+    expect(formatStatLine('connector', summary.connectors)).toBe('1 connector changed')
+    expect(formatStatLine('element', summary.elements)).toBe('1 element changed, 1 element initialized')
+  })
+})

package/src/utils/watchDiffSummary.ts

@@ -31,11 +31,24 @@ export interface WatchDiffSummary {
   connectors: WatchResourceStat
 }
 
+export function changedResourceCount(stat: WatchResourceStat): number {
+  return stat.added + stat.updated + stat.deleted
+}
+
+export function totalResourceCount(stat: WatchResourceStat): number {
+  return changedResourceCount(stat) + stat.initialized
+}
+
 export function normalizeWatchChangeType(value: string): WatchChangeType {
   if (value === 'added' || value === 'updated' || value === 'deleted' || value === 'initialized') return value
   return 'updated'
 }
 
+export function isWatchDiffChange(value: string | null | undefined): boolean {
+  const change = normalizeWatchChangeType(value ?? '')
+  return change === 'added' || change === 'updated' || change === 'deleted'
+}
+
 export function emptyWatchResourceStat(): WatchResourceStat {
   return { added: 0, updated: 0, deleted: 0, initialized: 0, addedLines: 0, removedLines: 0 }
 }
@@ -64,13 +77,32 @@ export function summarizeWatchDiffs(diffs: WatchDiff[] | null | undefined): Watc
 }
 
 export function formatStatLine(label: string, stat: WatchResourceStat): string {
-  const total = stat.added + stat.updated + stat.deleted + stat.initialized
-  const parts = [`${total} ${label}${total === 1 ? '' : 's'} changed`]
+  const changed = changedResourceCount(stat)
+  const initialized = stat.initialized
+  const parts = []
+  if (changed > 0) parts.push(`${changed} ${label}${changed === 1 ? '' : 's'} changed`)
+  if (initialized > 0) parts.push(`${initialized} ${label}${initialized === 1 ? '' : 's'} initialized`)
+  if (parts.length === 0) parts.push(`0 ${label}s changed`)
   if (stat.addedLines > 0) parts.push(`+${stat.addedLines}`)
   if (stat.removedLines > 0) parts.push(`-${stat.removedLines}`)
   return parts.join(', ')
 }
 
+export function formatDiagramResourceSummary(summary: WatchDiffSummary): string {
+  const changed = changedResourceCount(summary.elements) + changedResourceCount(summary.connectors)
+  const initialized = summary.elements.initialized + summary.connectors.initialized
+  if (changed > 0 && initialized > 0) {
+    return `${changed} changed, ${initialized} initialized resources`
+  }
+  if (changed > 0) {
+    return `${changed} changed resource${changed === 1 ? '' : 's'}`
+  }
+  if (initialized > 0) {
+    return `${initialized} initialized resource${initialized === 1 ? '' : 's'}`
+  }
+  return 'No diagram resource changes'
+}
+
 export function formatTldStatLine(summary: WatchDiffSummary): string {
   return [
     formatStatLine('element', summary.elements),
@@ -131,6 +163,7 @@ export function buildWatchDiffLocations(data: ExploreData, diffs: WatchDiff[] |
 
   const locations: WatchDiffLocation[] = []
   ;(Array.isArray(diffs) ? diffs : []).forEach((diff) => {
+    if (!isWatchDiffChange(diff.change_type)) return
     if (!diff.resource_id) return
     const base = {
       changeType: normalizeWatchChangeType(diff.change_type),