External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Move loading spinner inside output panel

Browse Source
This commit is contained in:
mabashian
2021-02-08 15:50:35 -05:00
parent 8e0a22c766
commit f65839ec8f
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
View File

@@ -705,10 +705,6 @@ function JobOutput({
/> />
); );
if (hasContentLoading) {
return <ContentLoading />;
}
if (contentError) { if (contentError) {
return <ContentError error={contentError} />; return <ContentError error={contentError} />;
} }
@@ -779,21 +775,29 @@ function JobOutput({
<AutoSizer nonce={window.NONCE_ID} onResize={handleResize}> <AutoSizer nonce={window.NONCE_ID} onResize={handleResize}>
{({ width, height }) => { {({ width, height }) => {
return ( return (
<List <>
ref={ref => { {hasContentLoading ? (
registerChild(ref); <div style={{ width }}>
listRef.current = ref; <ContentLoading />
}} </div>
deferredMeasurementCache={cache} ) : (
height={height || 1} <List
onRowsRendered={onRowsRendered} ref={ref => {
rowCount={remoteRowCount} registerChild(ref);
rowHeight={cache.rowHeight} listRef.current = ref;
rowRenderer={rowRenderer} }}
scrollToAlignment="start" deferredMeasurementCache={cache}
width={width || 1} height={height || 1}
overscanRowCount={20} onRowsRendered={onRowsRendered}
/> rowCount={remoteRowCount}
rowHeight={cache.rowHeight}
rowRenderer={rowRenderer}
scrollToAlignment="start"
width={width || 1}
overscanRowCount={20}
/>
)}
</>
); );
}} }}
</AutoSizer> </AutoSizer>