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

[TASK] Merge EXT:solrfluidgrouping into EXT:solr #3656

Merged
merged 7 commits into from
Jun 7, 2023

Conversation

sfroemkenjw
Copy link
Collaborator

@sfroemkenjw sfroemkenjw commented Jun 1, 2023

What this pr does

Migrate EXT:solrfluidgrouping into EXT:solr

Fixes: #3631


  • Squash this on merge

Copy link
Collaborator

@bmack bmack left a comment

Choose a reason for hiding this comment

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

LGTM

@dkd-friedrich
Copy link
Member

I've pushed some adjustments and bugfixes, but there is still an issue with "allowGetParameterSwitch" and parameter tx_solr[grouping], grouping cannot be disabled as intended. I'll analyze this next week

@dkd-friedrich dkd-friedrich self-assigned this Jun 2, 2023
@dkd-friedrich dkd-friedrich force-pushed the migrateExtSolrfluidgrouping branch 2 times, most recently from d806167 to 589b8d2 Compare June 5, 2023 13:37
@dkd-friedrich
Copy link
Member

I've pushed some adjustments and bugfixes, but there is still an issue with "allowGetParameterSwitch" and parameter tx_solr[grouping], grouping cannot be disabled as intended. I'll analyze this next week

Just pushed the adaptions, this includes additions to persist the tx_solr[grouping] parameter and some minor improvements e.g. adaptions to fit the structure in EXT:solr.

Copy link
Collaborator

@dkd-kaehm dkd-kaehm left a comment

Choose a reason for hiding this comment

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

We want rebase against main.
To many changes overlapped with movements to PSRs

Classes/Query/Modifier/Grouping.php Outdated Show resolved Hide resolved
sfroemkenjw and others added 6 commits June 6, 2023 09:16
- Migrate s:translate to f:translate
- Set request for fluid rendering context
- Add and repair tests for solr fluid grouping feature
- Check array key before use in condition
- Prevent rendering groups with 0 results
- Move grouping component up to the other solr components
- Deactivate variant feature, if grouping feature is active
- Update documentation for grouping feature
- Remove old txt files for TypoScript
- Add a warning about the grouping feature to docs
- Migrate to PSR-14 events

Resolves: TYPO3-Solr#3631
Adds basic grouping configuration to default TypoScript, grouping
is disabled by default.
Fixes the HTML structure of the results template to prevent duplicate
and wrong results with activated grouping.
Grouped suggest is automatically activated if grouping is activated,
as there are examples for grouping and suggest, there is no need for a
separate example.
EXT:solrfluidgrouping is merged in EXT:solr 12, thus older versions
doesn't support grouping feature and still require extension
solrfluidgrouping. This commit adapts the documentation to clearify
the requirements for grouping.
@dkd-friedrich dkd-friedrich force-pushed the migrateExtSolrfluidgrouping branch 2 times, most recently from 45dfd45 to 7acab5a Compare June 6, 2023 07:33
Fix handling of GET parameter tx_solr[grouping]=off, due too basic
grouping support in the core extension disabling the grouping via
GET parameter was not possible.

This commit fixes this issue by refactoring the paramter check and
disabling of the grouping components.
@dkd-friedrich dkd-friedrich requested review from dkd-kaehm and removed request for dkd-friedrich June 6, 2023 08:18
@dkd-friedrich
Copy link
Member

We want rebase against main. To many changes overlapped with movements to PSRs

Adaptions for PSR changes done

Squash this on merge

I squashed all commits containing the initial merge, but I would prefer to keep at least the changes and additional bugfixes separately

@dkd-kaehm dkd-kaehm changed the title Migrate ext solrfluidgrouping [TASK] Merge EXT:solrfluidgrouping into EXT:solr Jun 7, 2023
@dkd-kaehm dkd-kaehm merged commit aee4e44 into TYPO3-Solr:main Jun 7, 2023
@dkd-kaehm dkd-kaehm mentioned this pull request Oct 13, 2023
1 task
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.

[TASK:T12] Merge EXT:solrfluidgrouping into EXT:solr
4 participants