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.

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

Support groups inside rule-group #1111

Merged
merged 20 commits into from
Nov 22, 2024
Merged

Conversation

ukrbublik
Copy link
Owner

@ukrbublik ukrbublik commented Aug 29, 2024

Resolves #1108

Copy link

codesandbox bot commented Aug 29, 2024

Review or Edit in CodeSandbox

Open the branch in Web EditorVS CodeInsiders

Open Preview

Copy link

vercel bot commented Aug 29, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
react-awesome-query-builder-examples ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 22, 2024 1:32pm
react-awesome-query-builder-sandbox ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 22, 2024 1:32pm
react-awesome-query-builder-sandbox-next ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 22, 2024 1:32pm

Copy link

codesandbox-ci bot commented Aug 29, 2024

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 7caa0e5:

Sandbox Source
@react-awesome-query-builder/examples Configuration
@react-awesome-query-builder/sandbox Configuration
@react-awesome-query-builder/sandbox-simple Configuration
@react-awesome-query-builder/sandbox-next Configuration

Copy link

codecov bot commented Aug 29, 2024

Codecov Report

Attention: Patch coverage is 81.57895% with 35 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@f36d4f9). Learn more about missing BASE report.
Report is 10 commits behind head on master.

Files with missing lines Patch % Lines
...odules/components/containers/SortableContainer.jsx 45.00% 1 Missing and 10 partials ⚠️
packages/ui/modules/components/item/Group.jsx 87.80% 2 Missing and 3 partials ⚠️
packages/core/modules/stores/tree.js 78.94% 4 Missing ⚠️
packages/core/modules/utils/defaultUtils.js 85.00% 3 Missing ⚠️
...ckages/ui/modules/components/item/RuleGroupExt.jsx 85.71% 1 Missing and 2 partials ⚠️
packages/core/modules/utils/configUtils.js 33.33% 2 Missing ⚠️
packages/mui/modules/widgets/core/MuiConjs.jsx 0.00% 1 Missing and 1 partial ⚠️
...i/modules/components/containers/GroupContainer.jsx 89.47% 0 Missing and 2 partials ⚠️
...ckages/ui/modules/components/item/GroupActions.jsx 0.00% 0 Missing and 2 partials ⚠️
...ackages/ui/modules/components/item/SwitchGroup.jsx 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master    #1111   +/-   ##
=========================================
  Coverage          ?   82.04%           
=========================================
  Files             ?      212           
  Lines             ?    11287           
  Branches          ?     1374           
=========================================
  Hits              ?     9260           
  Misses            ?     1387           
  Partials          ?      640           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

@ukrbublik
Copy link
Owner Author

@schiller-manuel I plan to merge this PR soon. Related core and UI changes are complete, I'm just working on improving drag-n-drop logic to respect nesting inside rule-group.
Sorry if it causes conflicts with your work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ability to add sub-group under array type so we can have nested AND and OR conditionals
2 participants