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

fix: Various UI fixes #5449

Merged
merged 2 commits into from
Mar 18, 2021
Merged

fix: Various UI fixes #5449

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
cdf518d
fix: Various UI fixes
simster7 Mar 18, 2021
f1aa59b
more
simster7 Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class ArchivedWorkflowFilters extends React.Component<ArchivedWorkflowFil
return (
<div className='wf-filters-container'>
<div className='row'>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Namespace</p>
<NamespaceFilter
value={this.props.namespace}
Expand All @@ -34,7 +34,7 @@ export class ArchivedWorkflowFilters extends React.Component<ArchivedWorkflowFil
}}
/>
</div>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Labels</p>
<TagsInput
placeholder=''
Expand All @@ -45,7 +45,7 @@ export class ArchivedWorkflowFilters extends React.Component<ArchivedWorkflowFil
}}
/>
</div>
<div className='columns small-6 xlarge-12'>
<div className='columns small-3 xlarge-12'>
<p className='wf-filters-container__title'>Phases</p>
<CheckboxFilter
selected={this.props.selectedPhases}
Expand All @@ -56,8 +56,8 @@ export class ArchivedWorkflowFilters extends React.Component<ArchivedWorkflowFil
type='phase'
/>
</div>
<div className='columns small-6 xlarge-12'>
<p className='wf-filters-container__title'>Started At</p>
<div className='columns small-5 xlarge-12'>
<p className='wf-filters-container__title'>Started Time</p>
<DatePicker
selected={this.props.minStartedAt}
onChange={date => {
Expand Down
3 changes: 2 additions & 1 deletion ui/src/app/shared/components/checkbox-filter/checkbox-filter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);
overflow-y: auto;
margin-left: 0.2rem;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(100px, 120px));
}

.checkbox-filter li {
list-style: none;
float: left;
}

.checkbox-filter__label {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/workflows/components/workflow-filters/workflow-filters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'node_modules/argo-ui/src/styles/config';

.wf-filters-container {
overflow: hidden;
overflow: visible;
position: relative;
border-radius: 5px;
box-shadow: 1px 1px 3px #8fa4b1;
Expand Down
10 changes: 5 additions & 5 deletions ui/src/app/workflows/components/workflow-filters/workflow-filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class WorkflowFilters extends React.Component<WorkflowFilterProps, {}> {
return (
<div className='wf-filters-container'>
<div className='row'>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Namespace</p>
<NamespaceFilter
value={this.props.namespace}
Expand All @@ -44,7 +44,7 @@ export class WorkflowFilters extends React.Component<WorkflowFilterProps, {}> {
}}
/>
</div>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Labels</p>
<TagsInput
placeholder=''
Expand All @@ -55,21 +55,21 @@ export class WorkflowFilters extends React.Component<WorkflowFilterProps, {}> {
}}
/>
</div>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Workflow Template</p>
<DataLoaderDropdown
load={() => services.workflowTemplate.list(this.props.namespace).then(list => list.map(x => x.metadata.name))}
onChange={value => (this.workflowTemplate = value)}
/>
</div>
<div className='columns small-3 xlarge-12'>
<div className='columns small-2 xlarge-12'>
<p className='wf-filters-container__title'>Cron Workflow</p>
<DataLoaderDropdown
load={() => services.cronWorkflows.list(this.props.namespace).then(list => list.map(x => x.metadata.name))}
onChange={value => (this.cronWorkflow = value)}
/>
</div>
<div className='columns small-12 xlarge-12'>
<div className='columns small-4 xlarge-12'>
<p className='wf-filters-container__title'>Phases</p>
<CheckboxFilter
selected={this.props.selectedPhases}
Expand Down
8 changes: 7 additions & 1 deletion ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ export const WorkflowLogsViewer = ({workflow, nodeId, container, archived}: Work
.map(e => (!podName ? e.podName + ': ' : '') + e.content + '\n')
.publishReplay()
.refCount();
const subscription = source.subscribe(() => setLoaded(true), setError);
const subscription = source.subscribe(
() => setLoaded(true),
setError,
() => setLoaded(true)
);
setLogsObservable(source);
return () => subscription.unsubscribe();
}, [workflow.metadata.namespace, workflow.metadata.name, podName, selectedContainer, archived]);
Expand Down Expand Up @@ -103,6 +107,8 @@ export const WorkflowLogsViewer = ({workflow, nodeId, container, archived}: Work
<a href={services.workflows.getArtifactLogsUrl(workflow, podName, selectedContainer, archived)}>logs from the artifacts</a>.
</>
)}
</p>
<p>
{execSpec(workflow).podGC && (
<>
<WarningIcon /> You pod GC settings will delete pods and their logs immediately on completion.
Expand Down