Skip to content

Commit ee4d70c

Browse files
committed
fix: empty logs due to react batching
1 parent 153cd03 commit ee4d70c

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.22.8-beta-9",
3+
"version": "1.22.8-beta-14",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/CICDHistory/LogsRenderer.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,12 @@ const useCIEventSource = (url: string, maxLength?: number): [string[], EventSour
101101
const [logsNotAvailableError, setLogsNotAvailableError] = useState<boolean>(false)
102102
const [interval, setInterval] = useState(1000)
103103
const buffer = useRef([])
104-
const eventSourceRef = useRef<EventSource>(null)
104+
const eventSourceRef = useRef<EventSource | null>(null)
105105

106106
function populateData() {
107-
setDataVal((data) => [...data, ...buffer.current])
107+
const bufferedData = buffer.current
108108
buffer.current = []
109+
setDataVal((data) => [...data, ...bufferedData])
109110
}
110111

111112
useInterval(populateData, interval)
@@ -131,8 +132,9 @@ const useCIEventSource = (url: string, maxLength?: number): [string[], EventSour
131132

132133
function handleStreamEnd() {
133134
retryCount = LOGS_RETRY_COUNT
134-
setDataVal((data) => [...data, ...buffer.current])
135+
const bufferedData = buffer.current
135136
buffer.current = []
137+
setDataVal((data) => [...data, ...bufferedData])
136138
eventSourceRef.current.close()
137139
setInterval(null)
138140
}
@@ -173,7 +175,7 @@ const useCIEventSource = (url: string, maxLength?: number): [string[], EventSour
173175

174176
const LogsRenderer = ({ triggerDetails, isBlobStorageConfigured, parentType, fullScreenView }: LogsRendererType) => {
175177
const { pipelineId, envId, appId } = useParams<DeploymentHistoryBaseParamsType>()
176-
const logsRendererRef = useRef<HTMLDivElement>(null)
178+
const logsRendererRef = useRef<HTMLDivElement | null>(null)
177179

178180
const logsURL =
179181
parentType === HistoryComponentType.CI

0 commit comments

Comments
 (0)