From 618f8bba97da5be771ebdff1d80feb66a999597d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Sun, 8 Sep 2019 13:09:57 +0200
Subject: [PATCH 1/3] Properly order image sources

---
 .../Assets/js/components/SearchResultItem.vue |  4 +-
 .../Private/Partials/Hotel/TeaserWide.html    | 28 +++++-----
 .../Private/Partials/TeaserImage.html         | 56 +++++++++----------
 .../Private/Partials/TeaserWideImage.html     | 14 ++---
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
index d2951a88..5ab7a32a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
@@ -5,9 +5,9 @@
             <referrer-link :href="item.detailPageUri" :referring-page="referringPage"
                            rel="nofollow" title="Details &amp; Buchen">
                 <picture class="searchresult-item__image">
-                    <source media="(max-width: 768px)" :data-srcset="item.hotel.images.resized.s[0].url + ' 220w'"/>
-                    <source media="(max-width: 1200px)" :data-srcset="item.hotel.images.resized.l[0].url + ' 280w'"/>
                     <source media="(min-width: 1201px)" :data-srcset="item.hotel.images.resized.m[0].url + ' 260w'"/>
+                    <source media="(max-width: 1200px)" :data-srcset="item.hotel.images.resized.l[0].url + ' 280w'"/>
+                    <source media="(max-width: 768px)" :data-srcset="item.hotel.images.resized.s[0].url + ' 220w'"/>
                     <img class="scale lazyload" :data-src="item.hotel.images.resized.s[0].url"
                          :title="item.hotel.images.resized.s[0].title"
                          :alt="item.hotel.images.resized.s[0].alt">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
index e87fd161..bf7515cf 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
@@ -109,15 +109,15 @@
             <f:then>
                 <f:alias map="{image: item.hotel.images.original.0}">
                     <picture class="searchresult-item__image">
-                        <source media="(max-width: 768px)" data-srcset="{f:uri.image(
-                            image: image, width: '220', height: '130c-100'
-                        )}  220w"/>
-                        <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
-                            image: image, width: '280', height: '220c-100'
-                        )}  280w"/>
                         <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
                             image: image, width: '260', height: '200c-100'
                         )}  260w"/>
+                        <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
+                            image: image, width: '280', height: '220c-100'
+                        )}  280w"/>
+                        <source media="(max-width: 768px)" data-srcset="{f:uri.image(
+                        image: image, width: '220', height: '130c-100'
+                        )}  220w"/>
                         <img class="scale lazyload" data-src="{f:uri.image(
                             image: image, width: '260', height: '200c-100'
                         )}" title="{image.title}" alt="{image.alternative}">
@@ -126,18 +126,18 @@
             </f:then>
             <f:else>
                 <picture class="searchresult-item__image">
-                    <source media="(max-width: 768px)" data-srcset="{f:uri.image(
-                        src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                        width: '220', height: '130c-100'
-                    )}  220w"/>
-                    <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
-                        src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                        width: '280', height: '220c-100'
-                    )}  280w"/>
                     <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
                         src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
                         width: '260', height: '200c-100'
                     )}  260w"/>
+                    <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
+                        src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                        width: '280', height: '220c-100'
+                    )}  280w"/>
+                    <source media="(max-width: 768px)" data-srcset="{f:uri.image(
+                        src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                        width: '220', height: '130c-100'
+                    )}  220w"/>
                     <img class="scale lazyload" data-src="{f:uri.image(
                         src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
                         width: '260', height: '200c-100'
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
index 26541bc0..6c6a48fa 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
@@ -1,21 +1,21 @@
 <f:if condition="{image.uid}">
     <f:then>
         <picture>
-            <source media="(max-width: 512px)" data-srcset="{f:uri.image(
-                image: image, width: '350', height: '175c-100'
-            )}  350w"/>
-            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
-                image: image, width: '500', height: '250c-100'
-            )}  500w"/>
-            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
-                image: image, width: '360', height: '200c-100'
-            )}  360w"/>
-            <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
-                image: image, width: '320', height: '160c-100'
-            )}  320w"/>
             <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
                 image: image, width: '370', height: '220c-100'
             )}  370w"/>
+            <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
+                image: image, width: '320', height: '160c-100'
+            )}  320w"/>
+            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
+                image: image, width: '360', height: '200c-100'
+            )}  360w"/>
+            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
+                image: image, width: '500', height: '250c-100'
+            )}  500w"/>
+            <source media="(max-width: 512px)" data-srcset="{f:uri.image(
+                image: image, width: '350', height: '175c-100'
+            )}  350w"/>
             <img class="scale lazyload" data-src="{f:uri.image(
                 image: image, width: '500', height: '250c-100'
             )}" title="{image.title}" alt="{image.alternative}">
@@ -23,26 +23,26 @@
     </f:then>
     <f:else>
         <picture>
-            <source media="(max-width: 512px)" data-srcset="{f:uri.image(
-                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                width: '350', height: '175c-100'
-            )}  320w"/>
-            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
-                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                width: '500', height: '250c-100'
-            )}  500w"/>
-            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
-                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                width: '360', height: '200c-100'
-            )}  360w"/>
-            <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
-                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
-                width: '320', height: '160c-100'
-            )}  420w"/>
             <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
                 src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
                 width: '370', height: '220c-100'
             )}  370w"/>
+            <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
+                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                width: '320', height: '160c-100'
+            )}  420w"/>
+            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
+                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                width: '360', height: '200c-100'
+            )}  360w"/>
+            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
+                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                width: '500', height: '250c-100'
+            )}  500w"/>
+            <source media="(max-width: 512px)" data-srcset="{f:uri.image(
+                src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
+                width: '350', height: '175c-100'
+            )}  320w"/>
             <img class="scale lazyload" data-src="{f:uri.image(
                 src: 'EXT:ep_theme/Resources/Public/images/header-winter.jpg',
                 width: '500', height: '250c-100'
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
index 4d9417ac..f3dffe78 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
@@ -1,17 +1,17 @@
 <f:if condition="{image}">
     <f:then>
         <picture class="product-teaser__image">
-            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
-                image: image, width: '320', height: '140c-100'
+            <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
+                image: image, width: '320', height: '200c-100'
             )}  320w"/>
-            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
-                image: image, width: '260', height: '220c-100'
-            )}  260w"/>
             <source media="(max-width: 1200px)" data-srcset="{f:uri.image(
                 image: image, width: '220', height: '130c-100'
             )}  220w"/>
-            <source media="(min-width: 1201px)" data-srcset="{f:uri.image(
-                image: image, width: '320', height: '200c-100'
+            <source media="(max-width: 991px)" data-srcset="{f:uri.image(
+                image: image, width: '260', height: '220c-100'
+            )}  260w"/>
+            <source media="(max-width: 768px)" data-srcset="{f:uri.image(
+                image: image, width: '320', height: '140c-100'
             )}  320w"/>
             <img class="scale lazyload" data-src="{f:uri.image(
                 image: image, width: '260', height: '160c-100'

From ea2a777de7a9d9950bed85dd4e823a9dd7c32de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Sun, 8 Sep 2019 13:11:24 +0200
Subject: [PATCH 2/3] Modify search result plugin to use redirect, remove
 static search result

---
 config/sites/ep-reisen/config.yaml            | 17 +-----
 .../Classes/Controller/SearchController.php   | 56 +++++++++++--------
 .../StaticSearchParamsMiddleware.php          |  2 +-
 .../TCA/Overrides/tt_content.php              |  6 --
 .../TypoScript/constants.typoscript           |  2 -
 .../Configuration/TypoScript/setup.typoscript |  1 -
 .../ext/ep_products/ext_localconf.php         | 15 +----
 .../Private/Templates/Search/Searchbar.html   |  2 +-
 .../Private/Templates/Search/Searchbox.html   |  2 +-
 9 files changed, 40 insertions(+), 63 deletions(-)

diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml
index 531c26e1..081406f0 100644
--- a/config/sites/ep-reisen/config.yaml
+++ b/config/sites/ep-reisen/config.yaml
@@ -128,22 +128,11 @@ routeEnhancers:
       - 41
     routes:
       -
-        routePath: /ergebnis
+        routePath: '/ergebnis/{filter_settings}'
         _controller: 'Search::searchresult'
-    defaultController: 'Search::searchresult'
-  StaticResultsPlugin:
-    type: Extbase
-    extension: EpProducts
-    plugin: staticresult
-    limitToPages:
-      - 1757
-    routes:
-      -
-        routePath: '/{filter_settings}'
-        _controller: 'Search::staticresult'
         _arguments:
-          filter_settings: encodedFilterSettings
-    defaultController: 'Search::staticresult'
+          filter_settings: filterSettings
+    defaultController: 'Search::searchresult'
     requirements:
       filter_settings: '[A-Z\d%\-]+'
   ResellerPlugin:
diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/SearchController.php b/public/typo3conf/ext/ep_products/Classes/Controller/SearchController.php
index f77572d7..16b003d1 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/SearchController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/SearchController.php
@@ -27,6 +27,7 @@ namespace EP\EpProducts\Controller;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use EP\EpEvents\Domain\Model\Search;
 use EP\EpProducts\Domain\Model\FilterSettings;
 use EP\EpProducts\Domain\Model\SearchParams;
 use EP\EpProducts\Service\FilterService;
@@ -36,7 +37,6 @@ use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
-use TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException;
 
 class SearchController extends ActionController
 {
@@ -82,7 +82,7 @@ class SearchController extends ActionController
 
     public function searchbarAction()
     {
-        $fixed = (bool) $this->settings['fixed'];
+        $fixed = (bool)$this->settings['fixed'];
         $searchParams = new SearchParams($GLOBALS['TSFE']->id);
         $this->view->assignMultiple([
             'filterSettings' => $this->defaultFilterSettings,
@@ -102,24 +102,46 @@ class SearchController extends ActionController
         ]);
     }
 
-    public function initializeSearchresultAction()
+    public function initializeProcessSearchAction()
     {
         $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
         $this->processSearchParamsArgument($forcedConceptUids);
+    }
+
+    /**
+     * @param SearchParams $searchParams
+     * @throws StopActionException
+     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
+     */
+    public function processSearchAction(SearchParams $searchParams)
+    {
+        $filterSettings = FilterSettings::fromSearchParams($searchParams);
+
+        $redirectUri = $this->uriBuilder
+            ->reset()
+            ->setCreateAbsoluteUri(true)
+            ->uriFor(
+                'searchresult',
+                ['filterSettings' => FilterSettingsEncoder::encode($filterSettings)],
+                null,
+                null,
+                'searchresult'
+            );
+
+        $this->redirectToUri($redirectUri);
+    }
+
+    public function initializeSearchresultAction()
+    {
+        $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
         $this->processFilterSettingsArgument($forcedConceptUids);
     }
 
     /**
-     * @param \EP\EpProducts\Domain\Model\SearchParams $searchParams
      * @param \EP\EpProducts\Domain\Model\FilterSettings $filterSettings
      */
-    public function searchresultAction(SearchParams $searchParams = null, FilterSettings $filterSettings = null)
+    public function searchresultAction(FilterSettings $filterSettings)
     {
-        if ($searchParams !== null) {
-            $this->logSearch($searchParams);
-            $filterSettings = FilterSettings::fromSearchParams($searchParams);
-        }
-
         $this->view->assignMultiple([
             'detailPageUid' => $this->settings['detailPageUid'],
             'referringPageUid' => $this->settings['defaultSearchPageUid'],
@@ -127,20 +149,6 @@ class SearchController extends ActionController
         ]);
     }
 
-    /**
-     * @param string $encodedFilterSettings
-     * @throws StopActionException
-     */
-    public function staticresultAction($encodedFilterSettings)
-    {
-        $this->forward(
-            'searchresult',
-            null,
-            null,
-            ['filterSettings' => $encodedFilterSettings]
-        );
-    }
-
     /**
      * @param SearchParams $searchParams
      */
diff --git a/public/typo3conf/ext/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php b/public/typo3conf/ext/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php
index 4d0125f6..46225d9b 100644
--- a/public/typo3conf/ext/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php
+++ b/public/typo3conf/ext/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php
@@ -42,7 +42,7 @@ class StaticSearchParamsMiddleware implements MiddlewareInterface
     use DbConnectionTrait;
 
     const PREFIX_PATH_SEGMENT = 'reiseauswahl';
-    const SEARCH_RESULT_URI = '/skireisen/auswahl/';
+    const SEARCH_RESULT_URI = '/skireisen/suche/ergebnis/';
     const REDIRECT_RESPONSE_CODE = 302;
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
diff --git a/public/typo3conf/ext/ep_products/Configuration/TCA/Overrides/tt_content.php b/public/typo3conf/ext/ep_products/Configuration/TCA/Overrides/tt_content.php
index c69a73b4..32393cbd 100644
--- a/public/typo3conf/ext/ep_products/Configuration/TCA/Overrides/tt_content.php
+++ b/public/typo3conf/ext/ep_products/Configuration/TCA/Overrides/tt_content.php
@@ -17,12 +17,6 @@ call_user_func(function () {
         'Suchergebnis'
     );
 
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpProducts',
-        'staticresult',
-        'statisches Suchergebnis'
-    );
-
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
         'EP.EpProducts',
         'product_detail',
diff --git a/public/typo3conf/ext/ep_products/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_products/Configuration/TypoScript/constants.typoscript
index a3160370..8bb0ae81 100644
--- a/public/typo3conf/ext/ep_products/Configuration/TypoScript/constants.typoscript
+++ b/public/typo3conf/ext/ep_products/Configuration/TypoScript/constants.typoscript
@@ -20,8 +20,6 @@ plugin.tx_epproducts {
         snowReportStoragePid =
         # cat=plugin.tx_epproducts//a; type=string; label=Default search page UID
         defaultSearchPageUid =
-        # cat=plugin.tx_epproducts//a; type=string; label=Default static search page UID
-        defaultStaticSearchPageUid =
         # cat=plugin.tx_epproducts//a; type=string; label=Default product detail page UID
         defaultDetailPageUid =
 		# cat=plugin.tx_epproducts//a; type=string; label=Exclude products with concept UIDs from search result (CSV)
diff --git a/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
index 286ff92e..8b1aebd9 100644
--- a/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
@@ -27,7 +27,6 @@ plugin.tx_epproducts {
         destinationsStoragePid = {$plugin.tx_epproducts.settings.destinationsStoragePid}
         snowReportStoragePid = {$plugin.tx_epproducts.settings.snowReportStoragePid}
         defaultSearchPageUid = {$plugin.tx_epproducts.settings.defaultSearchPageUid}
-        defaultStaticSearchPageUid = {$plugin.tx_epproducts.settings.defaultStaticSearchPageUid}
         defaultDetailPageUid = {$plugin.tx_epproducts.settings.defaultDetailPageUid}
         excludedConceptUids = {$plugin.tx_epproducts.settings.excludedConceptUids}
         excludedRegionUids = {$plugin.tx_epproducts.settings.excludedRegionUids}
diff --git a/public/typo3conf/ext/ep_products/ext_localconf.php b/public/typo3conf/ext/ep_products/ext_localconf.php
index 28e5f408..12ad5e2f 100644
--- a/public/typo3conf/ext/ep_products/ext_localconf.php
+++ b/public/typo3conf/ext/ep_products/ext_localconf.php
@@ -50,21 +50,10 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\T
     'EP.' . $_EXTKEY,
     'searchresult',
     [
-        'Search' => 'searchresult',
+        'Search' => 'searchresult,processSearch',
     ],
     [
-        'Search' => 'searchresult',
-    ]
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
-    'staticresult',
-    [
-        'Search' => 'staticresult',
-    ],
-    [
-        'Search' => 'staticresult',
+        'Search' => 'searchresult,processSearch',
     ]
 );
 
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
index 406765ef..592d9e95 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
@@ -17,7 +17,7 @@
                 inline-template>
                 <div class="container searchbar affix{f:if(condition: fixed, else: '-top')}"{f:if(condition: fixed, else: ' data-spy="affix" data-offset-top="650" data-offset-bottom="200"')}>
                     <div class="container">
-                        <f:form action="searchresult" controller="Search" method="post" name="searchParams"
+                        <f:form action="processSearch" controller="Search" method="post" name="searchParams"
                                 object="{searchParams}" pluginName="searchresult" extensionName="epproducts"
                                 pageUid="{settings.defaultSearchPageUid}" additionalAttributes="{ref: 'form'}">
                             <f:form.hidden property="destinationUid" additionalAttributes="{v-model: 'searchParams.destinationUid', number: 'number'}"/>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
index 21aa2b4c..9ce9bf56 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
@@ -16,7 +16,7 @@
                 :date-presets='{settings.datePickerPresets -> v:format.json.encode()}'
                 inline-template>
                 <div class="container">
-                    <f:form action="searchresult" controller="Search" method="post" name="searchParams"
+                    <f:form action="processSearch" controller="Search" method="post" name="searchParams"
                             object="{searchParams}" pluginName="searchresult" extensionName="epproducts"
                             pageUid="{settings.defaultSearchPageUid}" class="form-horizontal">
                         <f:form.hidden property="destinationUid" additionalAttributes="{v-model: 'searchParams.destinationUid', number: 'number'}"/>

From e828aea16933b46f878769fbcfae83893a71322a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Sun, 8 Sep 2019 13:12:23 +0200
Subject: [PATCH 3/3] Implement dynamic backlink, remove session storage

---
 .../Classes/Controller/ProductController.php  |  1 -
 .../Resources/Private/Assets/js/_app.js       |  4 +-
 .../Private/Assets/js/components/BackLink.vue | 31 +++++++++++++
 .../Assets/js/components/HotelList.vue        |  4 +-
 .../Assets/js/components/ProductDetail.vue    |  4 +-
 .../Assets/js/components/ReferrerLink.vue     | 28 ------------
 .../Assets/js/components/SearchResult.vue     |  3 --
 .../Assets/js/components/SearchResultItem.vue | 35 ++++++---------
 .../Private/Partials/Hotel/TeaserWide.html    | 43 +++++++++++++------
 .../Partials/Product/HeaderDetail.html        |  4 +-
 10 files changed, 82 insertions(+), 75 deletions(-)
 create mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/BackLink.vue
 delete mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ReferrerLink.vue

diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php b/public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
index 7be5cbca..148cf5a5 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
@@ -173,7 +173,6 @@ class ProductController extends ActionController
         $this->view->assignMultiple([
             'hotels' => $hotels,
             'product' => $product,
-            'currentPageUid' => $GLOBALS['TSFE']->id,
             'linkHotel' => true,
         ]);
     }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
index baa96e25..059117b3 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
@@ -30,8 +30,8 @@ import ContactForm from './components/ContactForm.vue'
 import WatchlistToggle from './components/WatchlistToggle.vue'
 import Watchlist from './components/Watchlist.vue'
 import HotelList from './components/HotelList.vue'
-import ReferrerLink from './components/ReferrerLink.vue'
 import FacebookPixel from './components/FacebookPixel.vue'
+import BackLink from './components/BackLink.vue'
 
 // Define global constants
 const $window = $(window);
@@ -64,7 +64,7 @@ new Vue({
         WatchlistToggle,
         Watchlist,
         HotelList,
-        ReferrerLink,
+        BackLink,
         MyEp: () => import('./myep/components/App.vue'),
         FacebookPixel
     },
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/BackLink.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/BackLink.vue
new file mode 100644
index 00000000..d7c482e0
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/BackLink.vue
@@ -0,0 +1,31 @@
+<template>
+    <div class="ep-backlink" v-if="referringUrl" v-cloak>
+        <a :href="referringUrl" class="button button--small">{{ label }}</a>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'BackLink',
+        data () {
+            return {
+                referringUrl: null,
+            }
+        },
+        computed: {
+            label () {
+                if (this.referringUrl.match(/suche/)) {
+                    return 'zurück zum Suchergebnis'
+                }
+
+                return 'zurück'
+            }
+        },
+        mounted () {
+            const urlParams = new URLSearchParams(location.search);
+            if (urlParams.has('ref')) {
+                this.referringUrl = urlParams.get('ref');
+            }
+        }
+    }
+</script>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/HotelList.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/HotelList.vue
index 2667052d..d6dad1a4 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/HotelList.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/HotelList.vue
@@ -1,13 +1,11 @@
 <script>
     import WatchlistToggle from './WatchlistToggle.vue'
-    import ReferrerLink from './ReferrerLink.vue'
 
     import defaultFilterSettings from '../_filtersettings'
 
     export default {
         components: {
-            WatchlistToggle,
-            ReferrerLink
+            WatchlistToggle
         },
         props: {
             referringPageUrl: {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
index 1a5b237b..e485f030 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
@@ -14,6 +14,7 @@
     import FacebookPixel from './FacebookPixel.vue'
     import WatchlistToggle from './WatchlistToggle.vue'
     import OsmMap from './OsmMap.vue'
+    import BackLink from "./BackLink.vue";
     import dayjs from 'dayjs'
     import 'dayjs/locale/de'
 
@@ -29,7 +30,8 @@
             Calendar,
             FacebookPixel,
             WatchlistToggle,
-            OsmMap
+            OsmMap,
+            BackLink
         },
         data () {
             return {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ReferrerLink.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ReferrerLink.vue
deleted file mode 100644
index fbed24df..00000000
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ReferrerLink.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <a @click="storeReferringPage()">
-        <slot></slot>
-    </a>
-</template>
-
-<script>
-    export default {
-        props: {
-            referringPage: {
-                type: Object,
-                default () {
-                    return {
-                        url: null,
-                        label: null
-                    }
-                }
-            }
-        },
-        methods: {
-            storeReferringPage () {
-                if (this.referringPage.url && this.referringPage.label) {
-                    sessionStorage.setItem('referringPage', JSON.stringify(this.referringPage))
-                }
-            }
-        }
-    }
-</script>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
index 900198c0..78731a80 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
@@ -204,14 +204,11 @@
             },
             updateFilterSettings (settings) {
                 this.filterSettings = { ...this.filterSettings, ...settings };
-                sessionStorage.setItem('filterSettings', JSON.stringify(this.filterSettings));
             }
         },
         created () {
             if (!$.isEmptyObject(this.initialFilterSettings)) {
                 this.updateFilterSettings(this.initialFilterSettings)
-            } else if (sessionStorage.getItem('filterSettings')) {
-                this.updateFilterSettings(JSON.parse(sessionStorage.getItem('filterSettings')))
             }
         },
         mounted () {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
index 5ab7a32a..d1817b37 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResultItem.vue
@@ -2,8 +2,7 @@
     <div class="teaserbox teaserbox--landscape teaserbox--searchresult searchresult-item">
         <div class="teaserbox__image">
             <img class="teaserbox__flag" :src="item.country.flag" :alt="item.country.name"/>
-            <referrer-link :href="item.detailPageUri" :referring-page="referringPage"
-                           rel="nofollow" title="Details &amp; Buchen">
+            <a :href="getUrl()" rel="nofollow" title="Details &amp; Buchen">
                 <picture class="searchresult-item__image">
                     <source media="(min-width: 1201px)" :data-srcset="item.hotel.images.resized.m[0].url + ' 260w'"/>
                     <source media="(max-width: 1200px)" :data-srcset="item.hotel.images.resized.l[0].url + ' 280w'"/>
@@ -12,7 +11,7 @@
                          :title="item.hotel.images.resized.s[0].title"
                          :alt="item.hotel.images.resized.s[0].alt">
                 </picture>
-            </referrer-link>
+            </a>
             <div class="concept-badge" :id="section.concept.code"
                  :class=" 'concept-badge--' + section.concept.code">{{ section.concept.name }}</div>
         </div>
@@ -45,21 +44,21 @@
             <div class="teaserbox__aside__top">
                 <span class="searchresult-item__label">{{ item.dates.length > 1 ? 'Zeitraum' : 'Termin' }}</span>
                 <span class="searchresult-item__daterange">{{ dateRange }}</span>
-                <referrer-link :href="item.detailPageUri" :referring-page="referringPage"
-                               rel="nofollow" title="Details &amp; Buchen" v-if="item.dates.length && !item.daytrip">
+                <a :href="getUrl()" rel="nofollow" title="Details &amp; Buchen"
+                   v-if="item.dates.length && !item.daytrip">
                     <span class="searchresult-item__daterange">
                         <i class="fa fa-arrow-circle-right"></i> {{ item.dates.length }} Termin{{ item.dates.length > 1 ? 'e' : '' }}
                     </span>
-                </referrer-link>
+                </a>
                 <hr>
                 <span class="searchresult-item__label">{{ item.daytrip ? 'Tageweise buchbar' : nightsOptions }}</span>
             </div>
             <div class="teaserbox__aside__bottom">
                 <span class="searchresult-item__price">ab {{ item.minPrice }} €</span>
-                <referrer-link :href="item.detailPageUri" :referring-page="referringPage"
-                               class="button button--full searchresult-item__button" rel="nofollow" title="Details &amp; Buchen">
+                <a :href="getUrl()" class="button button--full searchresult-item__button"
+                   rel="nofollow" title="Details &amp; Buchen">
                     Details &amp; Buchen
-                </referrer-link>
+                </a>
             </div>
         </div>
         <watchlist-toggle :uid="item.key" class="teaserbox-watchlist"></watchlist-toggle>
@@ -70,12 +69,10 @@
     import dayjs from 'dayjs'
     import 'dayjs/locale/de'
     import WatchlistToggle from './WatchlistToggle.vue'
-    import ReferrerLink from './ReferrerLink.vue'
 
     export default {
         components: {
-            WatchlistToggle,
-            ReferrerLink
+            WatchlistToggle
         },
         props: {
             item: {
@@ -85,15 +82,11 @@
             section: {
                 type: Object,
                 required: true
-            },
-            referringPage: {
-                type: Object,
-                default () {
-                    return {
-                        url: null,
-                        label: null
-                    }
-                }
+            }
+        },
+        methods: {
+            getUrl () {
+                return this.item.detailPageUri + '?ref=' + window.location.pathname;
             }
         },
         computed: {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
index bf7515cf..d0fac703 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
@@ -10,10 +10,13 @@
                 <img class="teaserbox__flag"
                      src="{item.country.flag}"
                      alt="{item.country.name}"/>
-                <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
-                               :referring-page="{ url: referringPageUrl, label: 'zurück' }" rel="nofollow">
+                <f:link.action action="detail" controller="Product"
+                               pageUid="{detailPage}"
+                               arguments="{product: product.uid, hotel: item.hotel.uid}"
+                               additionalParams="{ref: '{f:uri.page()}'}"
+                >
                     <f:render section="Image" arguments="{_all}"/>
-                </referrer-link>
+                </f:link.action>
                 <f:if condition="{product.concept.code}">
                     <div class="concept-badge concept-badge--{product.concept.code}">{product.concept.name}</div>
                 </f:if>
@@ -70,32 +73,46 @@
                             <span class="searchresult-item__label">{f:if(condition: '{item.dates -> f:count()} > 1', then: 'Zeitraum', else: 'Termin')}</span>
                             <span class="searchresult-item__daterange">{ep:dateRange(dateFrom: item.minDateStart, dateTo: item.maxDateEnd, includeLabel: 0)}</span>
                             <f:if condition="{item.dates -> f:count()} > 1">
-                                <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
-                                               :referring-page="{ url: referringPageUrl, label: 'zurück' }" rel="nofollow">
+                                <f:link.action action="detail" controller="Product"
+                                               pageUid="{detailPage}"
+                                               arguments="{product: product.uid, hotel: item.hotel.uid}"
+                                               additionalParams="{ref: '{f:uri.page()}'}"
+                                               additionalAttributes="{rel: 'nofollow'}"
+                                >
                                     <span class="searchresult-item__daterange">
                                         <i class="fa fa-arrow-circle-right"></i> {item.dates -> f:count()} Termin{f:if(condition: '{item.dates -> f:count()} > 1', then: 'e')}
                                     </span>
-                                </referrer-link>
+                                </f:link.action>
                             </f:if>
                             <hr>
                             <span class="searchresult-item__label">{ep:nightsOptions(options: item.nights)}</span>
                         </div>
                         <div class="teaserbox__aside__bottom">
                             <span class="searchresult-item__price">ab {item.minPrice} €</span>
-                            <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
-                                           :referring-page="{ url: referringPageUrl, label: 'zurück' }"
-                                           class="button button--full searchresult-item__button" rel="nofollow">
+                            <f:link.action action="detail" controller="Product"
+                                           pageUid="{detailPage}"
+                                           arguments="{product: product.uid, hotel: item.hotel.uid}"
+                                           additionalParams="{ref: '{f:uri.page()}'}"
+                                           additionalAttributes="{rel: 'nofollow'}"
+                                           class="button button--full searchresult-item__button"
+                            >
                                 Details &amp; Buchen
-                            </referrer-link>
+                            </f:link.action>
                         </div>
                     </f:then>
                     <f:else>
                         <div class="teaserbox__aside__top">&nbsp;</div>
                         <div class="teaserbox__aside__bottom">
                             <span class="searchresult-item__price">ausgebucht</span>
-                            <referrer-link href="{f:uri.action(pageUid: detailPage, action: 'detail', controller: 'Product', arguments: '{product: product.uid, hotel: item.hotel.uid}')}"
-                                           :referring-page="{ url: referringPageUrl, label: 'zurück' }"
-                                           class="button button--full searchresult-item__button" rel="nofollow">Details</referrer-link>
+                            <f:link.action action="detail" controller="Product"
+                                           pageUid="{detailPage}"
+                                           arguments="{product: product.uid, hotel: item.hotel.uid}"
+                                           additionalParams="{ref: '{f:uri.page()}'}"
+                                           additionalAttributes="{rel: 'nofollow'}"
+                                           class="button button--full searchresult-item__button"
+                            >
+                                Details
+                            </f:link.action>
                         </div>
                     </f:else>
                 </f:if>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
index 2db63d30..5f262b46 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
@@ -60,8 +60,6 @@
             </f:link.typolink>
         </f:if>
     </div>
-    <div class="ep-backlink" v-if="referringPage" v-cloak>
-        <a :href="referringPage.url" class="button button--small">{{ referringPage.label }}</a>
-    </div>
+    <back-link></back-link>
     {v:render.template(file: 'EXT:ep_theme/Resources/Private/Partials/Breadcrumb.html')}
 </div>