Skip to content

Commit

Permalink
fix(ui): DataLoaderDropdown fix input type from promise to function t…
Browse files Browse the repository at this point in the history
…hat (#4655)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
  • Loading branch information
tczhao authored and simster7 committed Dec 10, 2020
1 parent 72ca92c commit 2aaad26
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ui/src/app/reports/components/reports.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,14 @@ export class Reports extends BasePage<RouteComponentProps<any>, State> {
<div className='columns small-4 xlarge-12'>
<p className='wf-filters-container__title'>Workflow Template</p>
<DataLoaderDropdown
load={services.workflowTemplate.list(this.state.namespace).then(list => list.map(x => x.metadata.name))}
load={() => services.workflowTemplate.list(this.state.namespace).then(list => list.map(x => x.metadata.name))}
onChange={value => (this.workflowTemplate = value)}
/>
</div>
<div className='columns small-4 xlarge-12'>
<p className='wf-filters-container__title'>Cron Workflow</p>
<DataLoaderDropdown
load={services.cronWorkflows.list(this.state.namespace).then(list => list.map(x => x.metadata.name))}
load={() => services.cronWorkflows.list(this.state.namespace).then(list => list.map(x => x.metadata.name))}
onChange={value => (this.cronWorkflow = value)}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/shared/components/data-loader-dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {DataLoader, Select, SelectOption} from 'argo-ui';
import * as React from 'react';

export const DataLoaderDropdown = (props: {load: Promise<(string | SelectOption)[]>; onChange: (value: string) => void}) => {
export const DataLoaderDropdown = (props: {load: () => Promise<(string | SelectOption)[]>; onChange: (value: string) => void}) => {
const [selected, setSelected] = React.useState('');

return (
<DataLoader load={() => props.load}>
<DataLoader load={props.load}>
{list => (
<Select
options={list}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ export class WorkflowFilters extends React.Component<WorkflowFilterProps, {}> {
<div className='columns small-3 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))}
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'>
<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))}
load={() => services.cronWorkflows.list(this.props.namespace).then(list => list.map(x => x.metadata.name))}
onChange={value => (this.cronWorkflow = value)}
/>
</div>
Expand Down

0 comments on commit 2aaad26

Please sign in to comment.