Skip to content

Commit 157535a

Browse files
cammonrocammonro
authored
Merge pull request #1732 from algolia/feat/MAGE-984-autocomplete-redirect
MAGE-984 Autocomplete redirects with Algolia merch rules
2 parents 263338f + edc6e3d commit 157535a

18 files changed

+361
-582
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGE LOG
22

3+
## 3.16.0-beta.1
4+
5+
### Updates
6+
- `beforecontent.html` is no longer used and has been deprecated. If you're overriding or referencing this file, please update your layout and customizations accordingly.
7+
38
## 3.15.0
49

510
### Features

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ Please check our [Custom Extension](https://github.com/algolia/algoliasearch-cus
7878
7979
Knowing the version of each Algolia JavaScript library will help you understand what is available for you to leverage in terms of customisation. This table will help you determine which documentation to reference when you start working on your customisation.
8080

81-
| Extension Version | autocomplete.js | instantsearch.js | search-insights.js | recommend-js.js |
82-
|-------------------|--------------------------------------------------------------------|------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------|
83-
| v3.x | [0.38.0](https://github.com/algolia/autocomplete.js/tree/v0.38.0)* | [4.15.0](https://github.com/algolia/instantsearch.js/tree/v4.15.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | NA |
84-
| v3.9.1 | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | [1.5.0](https://github.com/algolia/recommend/tree/v1.5.0) |
85-
| v3.10.x | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | [1.8.0](https://github.com/algolia/recommend/tree/v1.8.0) |
86-
| v3.11.0 | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [2.6.0](https://github.com/algolia/search-insights.js/tree/v2.6.0) | [1.8.0](https://github.com/algolia/recommend/tree/v1.8.0) |
81+
| Extension Version | autocomplete.js | instantsearch.js | search-insights.js | recommend-js.js |
82+
|-------------------|--------------------------------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------|
83+
| v3.x | [0.38.0](https://github.com/algolia/autocomplete.js/tree/v0.38.0)* | [4.15.0](https://github.com/algolia/instantsearch.js/tree/v4.15.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | NA |
84+
| v3.9.1 | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | [1.5.0](https://github.com/algolia/recommend/tree/v1.5.0) |
85+
| v3.10.x | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [1.7.1](https://github.com/algolia/search-insights.js/tree/v1.7.1) | [1.8.0](https://github.com/algolia/recommend/tree/v1.8.0) |
86+
| v3.11.0 | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.41.0](https://github.com/algolia/instantsearch.js/tree/v4.41.0)* | [2.6.0](https://github.com/algolia/search-insights.js/tree/v2.6.0) | [1.8.0](https://github.com/algolia/recommend/tree/v1.8.0) |
8787
| v3.13.0 | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.63.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.63.0)* | [2.11.0](https://github.com/algolia/search-insights.js/tree/v2.11.0) | [1.8.0](https://github.com/algolia/recommend/tree/v1.8.0) |
8888
| v3.14.x | [1.6.3](https://github.com/algolia/autocomplete.js/tree/v1.6.3)* | [4.63.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.63.0)* | [2.11.0](https://github.com/algolia/search-insights.js/tree/v2.11.0) | [1.15.0](https://github.com/algolia/recommend/tree/v1.15.0) |
89-
| v3.15.x | [1.17.9](https://github.com/algolia/autocomplete.js/tree/v1.17.9) | [4.77.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.77.0) | [2.17.3](https://github.com/algolia/search-insights.js/tree/v2.17.3) | [1.16.0](https://github.com/algolia/recommend/tree/v1.16.0) |
90-
| v3.16.x | [1.17.9](https://github.com/algolia/autocomplete.js/tree/v1.17.9) | [4.78.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.77.0) | [2.17.3](https://github.com/algolia/search-insights.js/tree/v2.17.3) | [1.16.0](https://github.com/algolia/recommend/tree/v1.16.0) |
89+
| v3.15.x | [1.17.9](https://github.com/algolia/autocomplete.js/tree/v1.17.9) | [4.77.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.77.0) | [2.17.3](https://github.com/algolia/search-insights.js/tree/v2.17.3) | [1.16.0](https://github.com/algolia/recommend/tree/v1.16.0) |
90+
| v3.16.x | [1.18.1](https://github.com/algolia/autocomplete.js/tree/v1.18.1) | [4.78.0](https://github.com/algolia/instantsearch/tree/instantsearch.js%404.78.0) | [2.17.3](https://github.com/algolia/search-insights.js/tree/v2.17.3) | [1.16.0](https://github.com/algolia/recommend/tree/v1.16.0) |
9191

9292
* In earlier versions of the extension, the Autocomplete and InstantSearch libraries were accessible via the `algoliaBundle` global. This bundle was a prepackaged JavaScript file that contained dependencies for the frontend experience. What was included in this bundle can be seen here: https://github.com/algolia/algoliasearch-extensions-bundle/blob/ISv4/package.json
9393

‎view/adminhtml/web/css/common.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -317,23 +317,6 @@
317317
}
318318
}
319319

320-
.aa-dropdown-menu .aa-dataset-products .aa-suggestion {
321-
display: inline-block;
322-
width: 100%;
323-
}
324-
325-
@media (min-width: 768px) {
326-
.aa-dropdown-menu .aa-dataset-products .aa-suggestion {
327-
display: inline-block;
328-
}
329-
}
330-
331-
.aa-dataset-products .aa-suggestions:after {
332-
content:'';
333-
display:block;
334-
clear: both;
335-
}
336-
337320
.aa-dropdown-menu .algoliasearch-autocomplete-hit {
338321
display: block;
339322
position: relative;

‎view/adminhtml/web/css/landing-page.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -346,23 +346,6 @@ input::-ms-clear {
346346
}
347347
}
348348

349-
.aa-dropdown-menu .aa-dataset-products .aa-suggestion {
350-
display: inline-block;
351-
width: 100%;
352-
}
353-
354-
@media (min-width: 768px) {
355-
.aa-dropdown-menu .aa-dataset-products .aa-suggestion {
356-
display: inline-block;
357-
}
358-
}
359-
360-
.aa-dataset-products .aa-suggestions:after {
361-
content:'';
362-
display:block;
363-
clear: both;
364-
}
365-
366349
.aa-dropdown-menu .algoliasearch-autocomplete-hit {
367350
display: block;
368351
position: relative;

‎view/frontend/requirejs-config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ const config = {
2828
'algoliaSearchLib' : 'Algolia_AlgoliaSearch/js/lib/algolia-search.min',
2929
'algoliaSearchHelperLib' : 'Algolia_AlgoliaSearch/js/lib/algolia-search-helper.min',
3030
'algoliaInstantSearchLib': 'Algolia_AlgoliaSearch/js/lib/algolia-instantsearch.min',
31-
'algoliaAutocompleteLib' : 'Algolia_AlgoliaSearch/js/lib/algolia-autocomplete.min',
31+
'algoliaAutocompleteLib' : 'Algolia_AlgoliaSearch/js/lib/autocomplete/algolia-autocomplete.min',
3232
'algoliaAnalyticsLib' : 'Algolia_AlgoliaSearch/js/lib/search-insights.min',
3333
'algoliaRecommendLib' : 'Algolia_AlgoliaSearch/js/lib/recommend.min',
3434
'algoliaRecommendJsLib' : 'Algolia_AlgoliaSearch/js/lib/recommend-js.min',
3535

3636
// Autocomplete plugins
37-
'algoliaQuerySuggestionsPluginLib' : 'Algolia_AlgoliaSearch/js/lib/query-suggestions-plugin.min',
38-
'algoliaInsightsPluginLib' : 'Algolia_AlgoliaSearch/js/lib/insights-plugin.min',
39-
'algoliaRecentSearchesPluginLib' : 'Algolia_AlgoliaSearch/js/lib/recent-searches-plugin.min',
37+
'algoliaQuerySuggestionsPluginLib': 'Algolia_AlgoliaSearch/js/lib/autocomplete/query-suggestions-plugin.min',
38+
'algoliaInsightsPluginLib' : 'Algolia_AlgoliaSearch/js/lib/autocomplete/insights-plugin.min',
39+
'algoliaRecentSearchesPluginLib' : 'Algolia_AlgoliaSearch/js/lib/autocomplete/recent-searches-plugin.min',
40+
'algoliaRedirectUrlPluginLib' : 'Algolia_AlgoliaSearch/js/lib/autocomplete/redirect-url-plugin.min',
4041

4142
// Autocomplete templates
4243
'algoliaAutocompleteProductsHtml' : 'Algolia_AlgoliaSearch/js/template/autocomplete/products',

‎view/frontend/templates/instant/wrapper.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
<!-- Wrapping template -->
44
<script type="text/template" id="instant_wrapper_template">
5-
{{#findAutocomplete}}
6-
<div id="algolia-autocomplete-container"></div>
7-
{{/findAutocomplete}}
5+
86

97
<div id="algolia_instant_selector"
108
class="<?php echo $block->escapeHtml($block->hasFacets() ? ' with-facets' : ''); ?>">

‎view/frontend/templates/internals/beforecontent.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<div id="algolia-autocomplete-container"></div>
1+
<!--
2+
DEPRECATED: This template will be removed in version 3.17
3+
If you're overriding or referencing this file, please update your layout and customizations accordingly.
4+
-->

0 commit comments

Comments
 (0)