Skip to content

Commit

Permalink
fix(ui): Fix workflow summary page unscrollable issue (#5743)
Browse files Browse the repository at this point in the history
Signed-off-by: Peixuan Ding <dingpeixuan911@gmail.com>
  • Loading branch information
dinever authored and sarabala1979 committed May 14, 2021
1 parent d3ed51e commit 06744da
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,20 @@ export class ArchivedWorkflowDetails extends BasePage<RouteComponentProps<any>,
return (
<>
{this.tab === 'summary' ? (
<div className='argo-container'>
<div className='workflow-details__content'>
<WorkflowSummaryPanel workflow={this.state.workflow} />
{execSpec(this.state.workflow).arguments && execSpec(this.state.workflow).arguments.parameters && (
<React.Fragment>
<h6>Parameters</h6>
<WorkflowParametersPanel parameters={execSpec(this.state.workflow).arguments.parameters} />
</React.Fragment>
)}
<h6>Artifacts</h6>
<WorkflowArtifacts workflow={this.state.workflow} archived={true} />
<WorkflowResourcePanel workflow={this.state.workflow} />
<div className='workflow-details__container'>
<div className='argo-container'>
<div className='workflow-details__content'>
<WorkflowSummaryPanel workflow={this.state.workflow} />
{execSpec(this.state.workflow).arguments && execSpec(this.state.workflow).arguments.parameters && (
<React.Fragment>
<h6>Parameters</h6>
<WorkflowParametersPanel parameters={execSpec(this.state.workflow).arguments.parameters} />
</React.Fragment>
)}
<h6>Artifacts</h6>
<WorkflowArtifacts workflow={this.state.workflow} archived={true} />
<WorkflowResourcePanel workflow={this.state.workflow} />
</div>
</div>
</div>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
}
}

&__container {
height: calc(100vh - 2 * #{$top-bar-height});
max-width: 100%;
overflow: auto;
}

&__graph-container {
position: relative;
height: calc(100vh - 2 * #{$top-bar-height});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,20 +162,22 @@ export const WorkflowDetails = ({history, location, match}: RouteComponentProps<
{!workflow ? (
<Loading />
) : (
<div className='argo-container'>
<div className='workflow-details__content'>
<WorkflowSummaryPanel workflow={workflow} />
{renderSecurityNudge()}
{renderCostOptimisations()}
{workflow.spec.arguments && workflow.spec.arguments.parameters && (
<React.Fragment>
<h6>Parameters</h6>
<WorkflowParametersPanel parameters={workflow.spec.arguments.parameters} />
</React.Fragment>
)}
<h5>Artifacts</h5>
<WorkflowArtifacts workflow={workflow} archived={false} />
<WorkflowResourcePanel workflow={workflow} />
<div className='workflow-details__container'>
<div className='argo-container'>
<div className='workflow-details__content'>
<WorkflowSummaryPanel workflow={workflow} />
{renderSecurityNudge()}
{renderCostOptimisations()}
{workflow.spec.arguments && workflow.spec.arguments.parameters && (
<React.Fragment>
<h6>Parameters</h6>
<WorkflowParametersPanel parameters={workflow.spec.arguments.parameters} />
</React.Fragment>
)}
<h5>Artifacts</h5>
<WorkflowArtifacts workflow={workflow} archived={false} />
<WorkflowResourcePanel workflow={workflow} />
</div>
</div>
</div>
)}
Expand Down

0 comments on commit 06744da

Please sign in to comment.