Skip to content

Commit 0b58c21

Browse files
committed
Merge branch 'feat/react-18' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/react-19
2 parents 212ba31 + 90caa7d commit 0b58c21

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

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)