Skip to content

fix: [DHIS2-20665] show correctly filtered option set #4420

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

Merged
ameenhere merged 1 commit into from
Dec 22, 2025
Merged

fix: [DHIS2-20665] show correctly filtered option set #4420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions ...Components/internal/withRulesOptionVisibilityHandler/withRulesOptionVisibilityHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,13 @@ type Props = {
rulesOptionsVisibility: {[key: typeof effectKeys[keyof typeof effectKeys]]: Array<any> },
}

type State = {
filteredOptions: any;
}

const getCreateRulesOptionsVisibilityHandlerHOC =
(InnerComponent: React.ComponentType<any>) =>
(class CreateRulesOptionsVisibilityHandlerHOC extends React.Component<Props> {
(class CreateRulesOptionsVisibilityHandlerHOC extends React.Component<Props, State> {
static getFilteredOptions = (props: Props) => {
const { options, rulesOptionsVisibility, optionGroups } = props;

Expand All @@ -51,18 +55,18 @@ const getCreateRulesOptionsVisibilityHandlerHOC =
return options.filter(option => filters.every(f => f(option)));
}

filteredOptions: any;

constructor(props: Props) {
super(props);

this.filteredOptions = CreateRulesOptionsVisibilityHandlerHOC.getFilteredOptions(props);
this.state = {
filteredOptions: CreateRulesOptionsVisibilityHandlerHOC.getFilteredOptions(this.props),
};
}


componentDidUpdate(prevProps: Props) {
if (this.props.rulesOptionsVisibility !== prevProps.rulesOptionsVisibility) {
this.filteredOptions = CreateRulesOptionsVisibilityHandlerHOC.getFilteredOptions(this.props);
this.setState({
filteredOptions: CreateRulesOptionsVisibilityHandlerHOC.getFilteredOptions(this.props),
});
}
}

Expand All @@ -71,7 +75,7 @@ const getCreateRulesOptionsVisibilityHandlerHOC =

return (
<InnerComponent
options={this.filteredOptions}
options={this.state.filteredOptions}
{...passOnProps}
/>
);
Expand Down
Loading