Skip to content

[UXUI-70] Improve logic display for segment rows #14741

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

Jump to bottom
Merged
merged 5 commits into from
Mar 19, 2025
Merged

[UXUI-70] Improve logic display for segment rows #14741

merged 5 commits into from
Mar 19, 2025

Conversation

andersonjeccel
Copy link
Contributor

Q A
Bug fix? (use the a.b branch) ❌
New feature/enhancement? (use the a.x branch) ✔️
Deprecations? ❌
BC breaks? (use the c.x branch) ❌
Automated tests included? ❌
Related user documentation PR URL mautic/user-documentation#...
Related developer documentation PR URL mautic/developer-documentation-new#...
Issue(s) addressed Fixes #...

Description

This PR improves how segment filters are displayed

Dependency:

Before After
image Screenshot From 2025-03-14 08-14-46

📋 Steps to test this PR:

  1. Open this PR on Gitpod or pull down for testing locally (see docs on testing PRs here)
  2. Open Segments > New
  3. Open the filters tab
  4. Place some filters
  5. Clone filters
  6. Play with operators

@andersonjeccel andersonjeccel self-assigned this Mar 14, 2025
@andersonjeccel andersonjeccel added T1 Low difficulty to fix (issue) or test (PR) user-interface Anything related to appearance, layout, and interactivity ready-to-test PR's that are ready to test code-review-needed PR's that require a code review before merging enhancement Any improvement to an existing feature or functionality segments Anything related to segments javascript Pull requests that update Javascript code twig labels Mar 14, 2025
@andersonjeccel andersonjeccel moved this to 🦸🏻 Needs 2 tests in Open Source Fridays Mar 14, 2025
@andersonjeccel andersonjeccel moved this to In Progress in UX/UI Tiger Team Mar 14, 2025
@andersonjeccel andersonjeccel added the blocked Something blocks this PR/issue (e.g. waiting for another PR to be merged) label Mar 14, 2025
@codecov Codecov
Copy link

codecov bot commented Mar 14, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.85%. Comparing base (186f212) to head (be592bf).
Report is 6 commits behind head on 7.x.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##                7.x   #14741   +/-   ##
=========================================
  Coverage     64.85%   64.85%           
  Complexity    34791    34791           
=========================================
  Files          2288     2288           
  Lines        103777   103777           
=========================================
  Hits          67303    67303           
  Misses        36474    36474
Files with missing lines Coverage Δ
app/bundles/LeadBundle/Form/Type/FilterType.php 97.72% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

kingsedem
kingsedem approved these changes Mar 16, 2025
View reviewed changes
Copy link

@kingsedem kingsedem left a comment

Choose a reason for hiding this comment

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

PR Tested and works as expected.
See below display of the segment filters.

image

@kingsedem kingsedem added pending-test-confirmation PR's that require one test before they can be merged and removed ready-to-test PR's that are ready to test labels Mar 16, 2025
shinde-rahul
shinde-rahul reviewed Mar 17, 2025
View reviewed changes
Copy link
Contributor

@shinde-rahul shinde-rahul left a comment

Choose a reason for hiding this comment

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

The code changes look good.

Note: The coverage needs improvement.

@andersonjeccel andersonjeccel mentioned this pull request Mar 17, 2025
Merged
@andersonjeccel andersonjeccel force-pushed the UXUI-70-improve-logic-display-per-row branch from 25cdbb2 to 0c2ef28 Compare March 17, 2025 11:59
@andersonjeccel
Copy link
Contributor Author

There was a commit from 6.x included when this branch was rebased, just removed the unrelated commit (responsible for the missing patch coverage)

@andersonjeccel andersonjeccel added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed code-review-needed PR's that require a code review before merging pending-test-confirmation PR's that require one test before they can be merged blocked Something blocks this PR/issue (e.g. waiting for another PR to be merged) labels Mar 17, 2025
@andersonjeccel andersonjeccel added code-review-passed PRs which have passed code review user-testing-passed PRs which have been successfully tested by the required number of people. labels Mar 17, 2025
@escopecz escopecz added this to the 7.0.0-alpha milestone Mar 19, 2025
@escopecz escopecz merged commit b3d5e04 into mautic:7.x Mar 19, 2025
15 checks passed
@github-project-automation github-project-automation bot moved this from 🦸🏻 Needs 2 tests to 🥳 Done in Open Source Fridays Mar 19, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in UX/UI Tiger Team Mar 19, 2025
@andersonjeccel andersonjeccel deleted the UXUI-70-improve-logic-display-per-row branch March 20, 2025 07:25
@escopecz
Copy link
Member

@andersonjeccel there is a bug in this when you choose some slow operator that has a warning message:
Screenshot 2025-04-29 at 15 37 49
I can see this was merged last year in #13860 so it existed before this PR was created. Could you please fix that?

@escopecz escopecz mentioned this pull request Apr 29, 2025
Merged
@andersonjeccel
Copy link
Contributor Author

@escopecz There's also a bug when inserting a multi select field, height gets buggy
Still planning how to solve, thank you for raising the remark

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
2 more reviewers

@shinde-rahul shinde-rahul shinde-rahul left review comments

@kingsedem kingsedem kingsedem approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@andersonjeccel andersonjeccel

Labels
code-review-passed PRs which have passed code review enhancement Any improvement to an existing feature or functionality javascript Pull requests that update Javascript code ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged segments Anything related to segments T1 Low difficulty to fix (issue) or test (PR) twig user-interface Anything related to appearance, layout, and interactivity user-testing-passed PRs which have been successfully tested by the required number of people.
Projects
Open Source Fridays
Status: 🥳 Done
UX/UI Tiger Team
Status: Done
Milestone
7.0.0-alpha
Development

Successfully merging this pull request may close these issues.
4 participants
@andersonjeccel @escopecz @shinde-rahul @kingsedem