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

SearchKit - Fix and add test for scenario where the same display is used twice on a form #27698

Merged
merged 1 commit into from
Oct 3, 2023

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Oct 1, 2023

Overview

Enables the scenario where the same search display is reused with different filters on the same form.

Before

Doesn't work.

After

Works. Test added.

Comments

I originally hit this bug when working on the Contact Relationships Tab. My first draft of that PR used the exact same display twice & passed each a different value for is_current. The current iteration of that PR actually uses different displays because there were a few things about them (styling, links) I wanted to tweak. So I spun off this fix into its own PR as it's no longer on the critical path.

The Afform GUI still doesn't handle this scenario well, but that's another issue. IMO this is fine to merge as-is. It's an improvement and has a test.

@civibot
Copy link

civibot bot commented Oct 1, 2023

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the master label Oct 1, 2023
@colemanw colemanw force-pushed the afformShareFieldset branch from fe02711 to db8a7f7 Compare October 1, 2023 22:29
@colemanw colemanw changed the title SearchKit - Fix and add test for scenario where the same display is used twice on the same form SearchKit - Fix and add test for scenario where the same display is used twice on a form Oct 3, 2023
@aydun
Copy link
Contributor

aydun commented Oct 3, 2023

Looks useful

@aydun aydun merged commit f094880 into civicrm:master Oct 3, 2023
@colemanw colemanw deleted the afformShareFieldset branch October 3, 2023 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants