Skip to content

TASK: Replace removed fusion prototypes #49

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

Merged
ahaeslich merged 1 commit into from
Nov 1, 2023
Merged

TASK: Replace removed fusion prototypes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Configuration/Routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
'@action': 'show'
routeParts:
node:
handler: Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface
handler: Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface
appendExceedingArguments: TRUE
4 changes: 2 additions & 2 deletions Resources/Private/Fusion/Collection.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
prototype(Flowpack.Listable:Collection) < prototype(Neos.Fusion:Collection) {
prototype(Flowpack.Listable:Collection) < prototype(Neos.Fusion:Loop) {
listClass = ''
itemClass = ''
@context.itemClass = ${this.itemClass}
@process.tmpl = ${'<ul class="' + this.listClass + '">' + value + '</ul>'}

collection = 'must-be-set'
items = 'must-be-set'
itemName = 'node'
iterationName = 'iteration'
itemRenderer = Flowpack.Listable:ContentCaseShort
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Fusion/List.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ prototype(Flowpack.Listable:List) < prototype(Neos.Fusion:Component) {
@if.listNotEmpty = ${props.list != null}

attributes.class = ${props.wrapClass}
content = Neos.Fusion:Array {
content = Neos.Fusion:Join {
listTitleTag = Neos.Fusion:Tag {
tagName = 'h2'
attributes.class = ${props.listTitleClass}
Expand Down
8 changes: 4 additions & 4 deletions Resources/Private/Fusion/PaginatedCollection.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone
showPreviousNextLinks = false
listRenderer = 'Flowpack.Listable:Collection'

renderer = Neos.Fusion:Array {
@context.data = Neos.Fusion:RawArray {
renderer = Neos.Fusion:Join {
@context.data = Neos.Fusion:DataStructure {
collection = Neos.Fusion:Case {
@context.limit = ${props.currentPage * props.itemsPerPage}
@context.offset = ${(props.currentPage - 1) * props.itemsPerPage}
Expand All @@ -33,7 +33,7 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone

list = Neos.Fusion:Renderer {
type = ${props.listRenderer}
element.collection = ${data.collection}
element.items = ${data.collection}
}
pagination = Flowpack.Listable:Pagination {
currentPage = ${props.currentPage}
Expand All @@ -47,7 +47,7 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone
@cache {
mode = 'dynamic'
entryIdentifier {
node = ${node}
node = ${Neos.Caching.entryIdentifierForNode(node)}
}
entryDiscriminator = ${request.arguments.currentPage}
context {
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Fusion/Pagination.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ prototype(Flowpack.Listable:PaginationArray) {
showPreviousNextLinks = false
}

prototype(Flowpack.Listable:PaginationParameters) < prototype(Neos.Fusion:RawArray)
prototype(Flowpack.Listable:PaginationParameters) < prototype(Neos.Fusion:DataStructure)

prototype(Flowpack.Listable:Pagination) < prototype(Neos.Fusion:Component) {
totalCount = 'to-be-set'
Expand All @@ -20,7 +20,7 @@ prototype(Flowpack.Listable:Pagination) < prototype(Neos.Fusion:Component) {
currentItemClass = 'isCurrent'
currentPage = ${request.arguments.currentPage || 1}

renderer = Neos.Fusion:Collection {
renderer = Neos.Fusion:Loop {
@if.paginationNeeded = ${(props.totalCount/props.itemsPerPage) > 1}
@process.tmpl = ${'<ul class="' + props.class + '">' + value + '</ul>'}
collection = Flowpack.Listable:PaginationArray {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description": "Tiny extension for listing things",
"license": "MIT",
"require": {
"neos/neos": "^3.3 || ^4.0 || ^5.0 || ^7.0 || ^8.0 || dev-master"
"neos/neos": "^9.0"
},
"autoload": {
"psr-4": {
Expand Down