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(conditionBuilder): release review changes1 #6133

Merged
merged 4 commits into from
Oct 21, 2024
Merged

fix(conditionBuilder): release review changes1 #6133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec89eb3
fix(conditionBuilder): release review changes1
amal-k-joy Sep 27, 2024
02dab57
fix: data correction for sample data
amal-k-joy Oct 3, 2024
fa47b28
Merge branch 'main' into conditionbuilderReleaseReview1
davidmenendez Oct 4, 2024
332d12c
Merge branch 'main' into conditionbuilderReleaseReview1
devadula-nandan Oct 21, 2024
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
4 changes: 4 additions & 0 deletions ...ges/ibm-products-styles/src/components/ConditionBuilder/styles/_conditionBuilderItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ $colors: (
/* stylelint-disable-next-line carbon/motion-easing-use */
transition: transform motion(exit, productive) $duration-fast-02;
}
.#{$block-class}__condition--interacting
.#{$block-class}__close-condition-wrapper {
z-index: 2;
}
}

.#{$block-class}__invalid-input {
Expand Down
3 changes: 2 additions & 1 deletion packages/ibm-products/src/components/ConditionBuilder/ConditionBlock/ConditionBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ const ConditionBlock = (props: ConditionBlockProps) => {
onChange={(op) => onConnectorOperatorChange?.(op)}
/>
) : (
<div role="gridcell" />
''
)}

{isStatement && (
Expand Down Expand Up @@ -344,6 +344,7 @@ const ConditionBlock = (props: ConditionBlockProps) => {
renderIcon={Close}
className={`${blockClass}__close-condition`}
data-name="closeCondition"
wrapperClassName={`${blockClass}__close-condition-wrapper`}
/>
</span>
{/* </div> */}
Expand Down
4 changes: 0 additions & 4 deletions ...products/src/components/ConditionBuilder/ConditionBuilderConnector/ConditionConnector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ const ConditionConnector = ({
<ConditionBuilderButton label={operator} />
</span>
) : (
// <div className={className} {...rest}>

<ConditionBuilderItem
label={operator}
title={connectorText}
Expand All @@ -84,8 +82,6 @@ const ConditionConnector = ({
onChange={onChangeHandler}
/>
</ConditionBuilderItem>

// </div>
);
};

Expand Down
2 changes: 1 addition & 1 deletion ...ducts/src/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const ConditionBuilderContent = ({

const addConditionGroupHandler = () => {
const newGroup: ConditionGroup = {
statement: 'ifAll', // 'if|exclude if',
statement: 'ifAll',
groupOperator: 'and',
id: uuidv4(),
conditions: [
Expand Down
3 changes: 3 additions & 0 deletions ...omponents/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ export const ItemOption = ({
);
};

const preventDefault = (evt) => evt.preventDefault();

if (!allOptions) {
return;
}
Expand All @@ -97,6 +99,7 @@ export const ItemOption = ({
labelText={clearSearchText}
closeButtonLabelText={clearSearchText}
onChange={onSearchChangeHandler}
onKeyDown={preventDefault}
/>
</div>
)}
Expand Down
4 changes: 4 additions & 0 deletions ...ditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const ItemOptionForValueField = ({
: [];

useEffect(() => {
//this commented code is kept as intentional. Alternate approach to pass async options instead of getOptions callback.
// if(rest['data-name'] == 'valueField'){
// const fetchData = async () => {
// const response = await config.options(conditionState);
Expand Down Expand Up @@ -153,6 +154,8 @@ export const ItemOptionForValueField = ({
? conditionState.property
: propertyText;
};
const preventDefault = (evt) => evt.preventDefault();

if (!allOptions) {
return <SelectSkeleton />;
}
Expand All @@ -165,6 +168,7 @@ export const ItemOptionForValueField = ({
labelText={clearSearchText}
closeButtonLabelText={clearSearchText}
onChange={onSearchChangeHandler}
onKeyDown={preventDefault}
/>
</div>
)}
Expand Down
30 changes: 15 additions & 15 deletions packages/ibm-products/src/components/ConditionBuilder/assets/SampleData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ export const sampleDataStructure_Hierarchical = {
{
property: 'region',
operator: 'is',
value: 'IL',
value: { id: 'India', label: 'India' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
//group object repeats
Expand All @@ -48,25 +48,25 @@ export const sampleDataStructure_Hierarchical = {
{
property: 'region',
operator: 'is',
value: 'IL',
value: { id: 'India', label: 'India' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
//group object repeats
Expand All @@ -78,19 +78,19 @@ export const sampleDataStructure_Hierarchical = {
{
property: 'region',
operator: 'is',
value: 'IL',
value: { id: 'India', label: 'India' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
//group object repeats
Expand All @@ -108,13 +108,13 @@ export const sampleDataStructure_Hierarchical = {
{
property: 'continent',
operator: 'is',
value: 'Asia',
value: { id: 'Asia', label: 'Asia' },
id: uuidv4(),
},
{
property: 'region',
operator: 'is',
value: 'India',
value: { id: 'India', label: 'India' },
id: uuidv4(),
},
{
Expand Down Expand Up @@ -144,7 +144,7 @@ export const sampleDataStructure_nonHierarchical = {
id: 'Africa',
},
{
label: 'India',
label: { id: 'India', label: 'India' },
id: 'Ind',
},
],
Expand All @@ -153,7 +153,7 @@ export const sampleDataStructure_nonHierarchical = {
{
property: 'delivery',
operator: 'is',
value: 'processing',
value: { id: 'Processing', label: 'Processing' },
id: uuidv4(),
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/ibm-products/src/components/ConditionBuilder/assets/sampleInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '@carbon/react/icons';
import CustomInput from './CustomInput';

//keeping this , an alternative way to give support for dynamic options.
//keeping this commented code intentionally ,which is an alternative way to give support for dynamic options.
//instead of supplying getOptions callback, we keep option property in inputConfig always as a async method instead to array as below.
// export const inputDataForAsyncOptions = {
// properties: [
Expand Down
Loading
Loading