Skip to content

Dheeraj_CTM_656 #212

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

Open
dgavini wants to merge 5 commits into
base: qa
Choose a base branch
from
Open

Dheeraj_CTM_656 #212

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b0cc42
Added toggle functionality for few fields in matching criteria
Jan 7, 2025
30f845f
Made changes based on code Review
Jan 20, 2025
f6a7585
Code-Review Changes
Jan 22, 2025
bbe647f
Code-Review Changes
Jan 22, 2025
53b93cd
Code-Review Changes
Jan 22, 2025
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
12 changes: 8 additions & 4 deletions libs/ui/src/lib/custom-rjsf-templates/CtimsDropdownWithExcludeToggle.tsx
View file
Open in desktop

@mickey-ng mickey-ng Jan 10, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

If there is not much difference with CtimsDropDown, consider consolidating into 1

@dgavini dgavini Jan 28, 2025

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

There is a multiselect within the Dropdown component, which we don't need in CTIMSDropDownwithExcludeToggle. So its better we have separate components for both.

Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const CtimsDropdownWithExcludeToggle = (props: WidgetProps) => {

useEffect(() => {
if (value) {
setValueState(value?.replace('!', ''));
setIsNegated(value?.startsWith('!'));
setValueState(value.replace('!', ''));
setIsNegated(value.startsWith('!'));
}
}, [value]);

Expand All @@ -59,7 +59,11 @@ const CtimsDropdownWithExcludeToggle = (props: WidgetProps) => {
}, [valueState, isNegated]);

const handleDropdownChange = (e: { value: any }) => {
setValueState(e.value);
const selectedValue = e.value;
setValueState(selectedValue);
if (!selectedValue) {
setIsNegated(false);
}

@mickey-ng mickey-ng Jan 23, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is the same as setIsNegated(selectedValue)? or do you only want to trigger this when selectedValue is false?

@dgavini dgavini Jan 23, 2025

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

There is one case when the selected value is empty, let's say when a user selects an empty value in a dropdown, so this condition makes sure the taggle is disabled.

};

const handleToggleChange = (checked: boolean) => {
Expand Down Expand Up @@ -110,7 +114,7 @@ const CtimsDropdownWithExcludeToggle = (props: WidgetProps) => {
<div className={styles.label}>Exclude this criteria from matches.</div>
<div style={{ marginLeft: 'auto', marginTop: '10px' }}>
<IOSSwitch
disabled={!valueState}
disabled={!valueState}
value={isNegated}
onChange={handleToggleChange}
/>
Expand Down