[TASK] fix search result rendering

Author: skurfuerst

Classes/Flowpack/SearchPlugin/TypoScriptObjects/CanRenderImplementation.php

@@ -0,0 +1,40 @@
+<?php
+namespace Flowpack\SearchPlugin\TypoScriptObjects;
+
+
+/*                                                                                                  *
+ * This script belongs to the TYPO3 Flow package "Flowpack.SearchPlugin.TypoScriptObjects".         *
+ *                                                                                                  *
+ * It is free software; you can redistribute it and/or modify it under                              *
+ * the terms of the GNU Lesser General Public License, either version 3                             *
+ *  of the License, or (at your option) any later version.                                          *
+ *                                                                                                  *
+ * The TYPO3 project - inspiring people to share!                                                   *
+ *                                                                                                  */
+
+use TYPO3\Flow\Annotations as Flow;
+use TYPO3\TypoScript\TypoScriptObjects\AbstractTypoScriptObject;
+
+/**
+ * Class CanRenderImplementation
+ *
+ */
+class CanRenderImplementation extends AbstractTypoScriptObject {
+
+	/**
+	 * TypoScript Type which shall be rendered
+	 * @return string
+	 */
+	public function getType() {
+		return $this->tsValue('type');
+	}
+
+	/**
+	 * Evaluate this TypoScript object and return the result
+	 *
+	 * @return mixed
+	 */
+	public function evaluate() {
+		return $this->tsRuntime->canRender('/type<' . $this->getType() . '>');
+	}
+}

Resources/Private/Templates/NodeTypes/Search.Form.html

@@ -0,0 +1,4 @@
+<form action="" method="GET">
+	<input type="text" name="search" value="{searchWord}" />
+	<button type="submit">Send</button>
+</form>

Resources/Private/Templates/NodeTypes/Search.html

@@ -1,21 +1,8 @@
 {namespace neos=TYPO3\Neos\ViewHelpers}
 {namespace ts=TYPO3\TypoScript\ViewHelpers}
-SEARCs {searchWord}
-<div class="search-results">
-	<f:if condition="{searchResults -> f:count()}">
-		<dl>
-			<f:for each="{searchResults}" as="searchResult">
-				<f:alias map="{documentNode: '{ts:render(path: \'searchResultDocument\', context: {searchResult: \'{searchResult}\'})}'}">
-					<f:if condition="{documentNode}">
-						<dt>
-							<neos:link.node node="{documentNode}">{documentNode.fullLabel}</neos:link.node>
-						</dt>
-						<dd>
-							<ts:render path="searchResultContentRenderer" context="{node: searchResult}" />
-						</dd>
-					</f:if>
-				</f:alias>
-			</f:for>
-		</dl>
-	</f:if>
-</div>
+
+{searchForm -> f:format.raw()}
+
+Showing {searchResults -> f:count()} of {totalSearchResults} results
+
+{searchResultRenderer -> f:format.raw()}

Resources/Private/Templates/SearchResult/DocumentSearchResult.html

@@ -0,0 +1,9 @@
+{namespace neos=TYPO3\Neos\ViewHelpers}
+
+<b><neos:link.node node="{node}">
+	{title}
+</neos:link.node></b><br />
+
+<f:if condition="{description}">
+	{description}
+</f:if>

Resources/Private/TypoScript/ResultRendering.ts2

@@ -0,0 +1,29 @@
+prototype(Flowpack.SearchPlugin:SingleResult) < prototype(TYPO3.TypoScript:Case) {
+	default {
+		condition = Flowpack.SearchPlugin:CanRender {
+			type = ${node.nodeType.name + 'SearchResult'}
+		}
+		condition = TRUE
+		type = ${node.nodeType.name + 'SearchResult'}
+	}
+
+	fallback {
+		condition = TRUE
+		type = 'TYPO3.Neos:DocumentSearchResult'
+	}
+}
+
+prototype(TYPO3.Neos:DocumentSearchResult) < prototype(TYPO3.TypoScript:Template) {
+	templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/SearchResult/DocumentSearchResult.html'
+	node = ${node}
+
+	title = ${q(node).property('title')}
+	description = ''
+}
+
+prototype(TYPO3.Neos.NodeTypes:PageSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult)
+
+
+prototype(TYPO3.NeosDemoTypo3Org:ChapterSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult) {
+	description = ${q(node).property('chapterDescription')}
+}

Resources/Private/TypoScript/Root.ts2

@@ -1,15 +1,4 @@
-prototype(Flowpack.Search:Search) {
-	searchResults = ${Search.query(site).fulltext(request.arguments.search).execute()}
-	searchWord = "foo"
+prototype(Flowpack.SearchPlugin:CanRender).@class = 'Flowpack\\SearchPlugin\\TypoScriptObjects\\CanRenderImplementation'
 
-	searchResultDocument = ${searchResult ? q(searchResult).closest('[instanceof TYPO3.Neos:Document]').get(0) : null}
-
-	searchResultContentRenderer = ${String.crop(String.stripTags(q(node).property('title') + q(node).property('text')), 300) + '...'}
-
-	@cache {
-		mode = 'uncached'
-		context {
-			1 = 'site'
-		}
-	}
-}
+include: SearchPlugin.ts2
+include: ResultRendering.ts2

Resources/Private/TypoScript/SearchPlugin.ts2

@@ -0,0 +1,38 @@
+
+prototype(Flowpack.SearchPlugin:Search) {
+
+	// we store the search results in the TypoScript context, so that they bubble through the nested elements like the searchResultRenderer
+	@override.searchResults = ${this.searchQuery.execute()}
+
+
+	searchQuery = ${Search.query(site).fulltext(request.arguments.search)}
+
+	totalSearchResults = ${this.searchQuery.count()}
+	searchResults = ${searchResults}
+
+	searchForm = Flowpack.SearchPlugin:Search.Form
+
+	searchResultRenderer = TYPO3.TypoScript:Collection {
+		collection = ${searchResults}
+		itemRenderer = Flowpack.SearchPlugin:SingleResult
+		itemName = 'node'
+	}
+
+	searchResultRenderer.@process.wrap = ${'<ul>' + value + '</ul>'}
+	prototype(Flowpack.SearchPlugin:SingleResult).@process.wrap = ${'<li>' + value + '</li>'}
+
+	@cache {
+		mode = 'uncached'
+		context {
+			1 = 'site'
+			2 = 'node'
+		}
+	}
+}
+
+
+prototype(Flowpack.SearchPlugin:Search.Form) < prototype(TYPO3.TypoScript:Template) {
+	templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.Html'
+	searchWord = ${request.arguments.search}
+}
+