Skip to content

Commit 8d1deff

Browse files
committed
feat: clean up SearchProgramSelector componens
1 parent d2be962 commit 8d1deff

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

src/core_modules/capture-core/components/Pages/common/TEIRelationshipsWidget/TeiSearch/SearchProgramSelector/SearchProgramSelector.component.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ const programFieldStyles = {
1010
paddingTop: 12,
1111
flexBasis: 200,
1212
},
13-
inputContainerStyle: {
14-
flexBasis: 150,
15-
},
1613
};
1714

1815
type Props = {
@@ -32,7 +29,7 @@ export class SearchProgramSelectorComponent extends React.Component<Props> {
3229
styles={programFieldStyles}
3330
options={this.props.programOptions}
3431
onChange={this.onSelectProgram}
35-
placeholder={i18n.t('Selected program')}
32+
label={i18n.t('Selected program')}
3633
value={this.props.selectedProgramId}
3734
/>
3835
);

src/core_modules/capture-core/components/TeiSearch/SearchProgramSelector/SearchProgramSelector.component.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,20 @@ const programFieldStyles = {
1010
paddingTop: 12,
1111
flexBasis: 200,
1212
},
13-
inputContainerStyle: {
14-
flexBasis: 150,
15-
},
1613
};
1714

1815
export class SearchProgramSelectorComponent extends React.Component<SearchProgramSelectorProps> {
19-
onSelectProgram = ({ selected }: { selected: string }) => {
20-
this.props.onSetProgram(this.props.searchId, selected);
16+
onSelectProgram = (programId: string | null) => {
17+
this.props.onSetProgram(this.props.searchId, programId ?? undefined);
2118
}
2219
render() {
23-
const { programOptions, selectedProgramId } = this.props;
2420
return (
2521
<SearchProgramField
2622
styles={programFieldStyles}
27-
value={selectedProgramId}
28-
onChange={value => this.onSelectProgram({ selected: value || '' })}
23+
options={this.props.programOptions}
24+
onChange={this.onSelectProgram}
2925
label={i18n.t('Selected program')}
30-
clearable
31-
filterable
32-
options={programOptions}
26+
value={this.props.selectedProgramId}
3327
/>
3428
);
3529
}

0 commit comments

Comments
 (0)