Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Multiple UI fixes #5140

Merged
merged 2 commits into from
Feb 18, 2021
Merged

fix: Multiple UI fixes #5140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4bba4e
fix: Multiple UI fixes
simster7 Feb 18, 2021
846877d
minor
simster7 Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/filter-drop-down.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const FilterDropDown = (props: FilterDropDownProps) => {
<DropDown
isMenu={true}
anchor={() => (
<div className={classNames('top-bar__filter', {'top-bar__filter--selected': true})} title='Filter'>
<div className={classNames('top-bar__filter')} title='Filter'>
<i className='argo-icon-filter' aria-hidden='true' />
<i className='fa fa-angle-down' aria-hidden='true' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/workflows/components/workflows-list/workflows-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ export class WorkflowsList extends BasePage<RouteComponentProps<any>, State> {
)}
<div className='argo-table-list'>
<div className='row argo-table-list__head'>
<div className='columns workflows-list__status small-1' />
<div className='columns small-1 workflows-list__status' />
<div className='row small-11'>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small-11 ??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct. It's completed by a small-1 right above

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was actually incorrect, but for a different reason. Good catch :)

<div className='columns small-3'>NAME</div>
<div className='columns small-2'>NAMESPACE</div>
Expand Down
62 changes: 31 additions & 31 deletions ui/src/app/workflows/components/workflows-row/workflows-row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@ export class WorkflowsRow extends React.Component<WorkflowsRowProps, WorkflowRow
public render() {
const wf = this.props.workflow;
return (
<div className='workflows-list__row-container'>
<div className='row argo-table-list__row'>
<div className='columns small-1 workflows-list__status'>
<input
type='checkbox'
className='workflows-list__status--checkbox'
checked={this.props.checked}
onClick={e => {
e.stopPropagation();
}}
onChange={e => {
this.props.select(this.props.workflow);
}}
/>
<PhaseIcon value={wf.status.phase} />
</div>
<Link to={uiUrl(`workflows/${wf.metadata.namespace}/${wf.metadata.name}`)} className='row small-11'>
<div className='columns small-3'>{wf.metadata.name}</div>
<Link to={uiUrl(`workflows/${wf.metadata.namespace}/${wf.metadata.name}`)}>
<div className='workflows-list__row-container'>
<div className='row argo-table-list__row'>
<div className='columns small-1 workflows-list__status'>
<input
type='checkbox'
className='workflows-list__status--checkbox'
checked={this.props.checked}
onClick={e => {
e.stopPropagation();
}}
onChange={e => {
this.props.select(this.props.workflow);
}}
/>
<PhaseIcon value={wf.status.phase} />
</div>
<div className='columns small-2'>{wf.metadata.name}</div>
<div className='columns small-2'>{wf.metadata.namespace}</div>
<div className='columns small-1'>
<Timestamp date={wf.status.startedAt} />
Expand Down Expand Up @@ -81,20 +81,20 @@ export class WorkflowsRow extends React.Component<WorkflowsRowProps, WorkflowRow
</div>
</div>
</div>
</Link>
{this.state.hideDrawer ? (
<span />
) : (
<WorkflowDrawer
name={wf.metadata.name}
namespace={wf.metadata.namespace}
onChange={key => {
this.props.onChange(key);
}}
/>
)}
{this.state.hideDrawer ? (
<span />
) : (
<WorkflowDrawer
name={wf.metadata.name}
namespace={wf.metadata.namespace}
onChange={key => {
this.props.onChange(key);
}}
/>
)}
</div>
</div>
</div>
</Link>
);
}
}