Merge branch 'develop' into bugfix/MAGE-207

Author: rakesh-algolia

view/adminhtml/templates/query/edit/merchandising.phtml

@@ -191,12 +191,6 @@ $isConfig = [
         algoliaAdminBundle.$(function ($) {
         	var config = <?php echo json_encode($isConfig); ?>;
             config.searchFunction = function(helper) {
-                if (helper.state.query !== '') {
-                    algoliaEventsTracking.postEvent('Searched Keyword', {
-                        source: 'magento2.querymerch.edit',
-                        search: helper.state.query
-                    });
-                }
                 helper.search();
             };
 

view/adminhtml/web/js/support.js

@@ -1,12 +1,12 @@
 requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 	algoliaBundle.$(function ($) {
 		handleLatestVersion($);
-		
+
 		if ($('#search_box').length > 0) {
 			initDocSearch();
 			initDiscourseSearch();
 		}
-		
+
 		if ($('.algolia_contact_form #subject').length > 0) {
 			initContactDocSearch();
 		}
@@ -25,18 +25,12 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					hitsPerPage: 10
 				},
 				searchFunction: function(helper) {
-					if (helper.state.query !== '') {
-						algoliaEventsTracking.postEvent('Performed Search', {
-							source: 'magento2.help.search',
-							search: helper.state.query
-						});
-					}
 					helper.search();
 				}
 			});
-			
+
 			documentationSearch.addWidget(getSearchBoxWidget(false));
-			
+
 			documentationSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.hits({
 					container: '.doc.links',
@@ -52,7 +46,7 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			documentationSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.stats({
 					container: '.doc.stats',
@@ -61,13 +55,13 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			documentationSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.stats({
 					container: '.doc.footer',
 					transformData: function(hit) {
 						hit['morePages'] = hit.nbPages > 1;
-						
+
 						return hit;
 					},
 					templates: {
@@ -81,10 +75,10 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			documentationSearch.start();
 		}
-		
+
 		function initDiscourseSearch() {
 			const discourseSearch = algoliaBundle.instantsearch({
 				appId: 'G25OKIW19Q',
@@ -96,9 +90,9 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 				},
 				searchFunction: searchFunction
 			});
-			
+
 			discourseSearch.addWidget(getSearchBoxWidget(true));
-			
+
 			discourseSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.hits({
 					container: '.links.forum',
@@ -117,15 +111,15 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 							hit.content = escapeHighlightedString(
 								hit._snippetResult.content.value
 							);
-							
+
 							hit.tags = hit._highlightResult.topic.tags;
-							
+
 							return hit;
 						}
 					}
 				})
 			);
-			
+
 			discourseSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.stats({
 					container: '.forum.stats',
@@ -134,13 +128,13 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			discourseSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.stats({
 					container: '.forum.footer',
 					transformData: function(hit) {
 						hit['morePages'] = hit.nbPages > 1;
-						
+
 						return hit;
 					},
 					templates: {
@@ -154,16 +148,16 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			discourseSearch.on('render', function() {
 				// Loop over every containers
 				document.querySelectorAll(".ais-hits--item a").forEach(container => {
 					const content = container.querySelector('.content');
-					
+
 					// 186 - 3 lines, each line 62 chars max
 					if (content.textContent.replace(/\s/g, "").length >= 186) {
-						
-						
+
+
 						var style = document.createElement("style");
 						style.innerHTML = `
 							#${container.id} .content:after {
@@ -175,17 +169,17 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 								background:#FFF;
 								padding: 0 0.5ch;
 							}`;
-							
+
 						// And then insert this before the current container
 						container.parentNode.insertAdjacentElement("afterbegin", style);
 					}
 				});
-				
+
 			});
-			
+
 			discourseSearch.start();
 		}
-		
+
 		function initContactDocSearch() {
 			const documentationSearch = algoliaBundle.instantsearch({
 				appId: 'BH4D9OD16A',
@@ -196,7 +190,7 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					hitsPerPage: 3
 				}
 			});
-			
+
 			documentationSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.searchBox({
 					container: '#subject',
@@ -205,7 +199,7 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					magnifier: false
 				})
 			);
-			
+
 			documentationSearch.addWidget(
 				algoliaBundle.instantsearch.widgets.hits({
 					container: '.contact_results',
@@ -215,23 +209,23 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 					}
 				})
 			);
-			
+
 			documentationSearch.start();
 		}
-		
+
 		function searchFunction(helper) {
 			const $results = $('#results');
 			const $landing = $('#landing');
-			
+
 			if (helper.state.query === '') {
 				$results.hide();
 				$landing.show();
-				
+
 				return;
 			}
-			
+
 			helper.search();
-			
+
 			$results.show();
 			$landing.hide();
 		}
@@ -260,23 +254,23 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 			});
 		}
 	});
-	
+
 	function handleLatestVersion($) {
 		$.getJSON('https://api.github.com/repos/algolia/algoliasearch-magento-2/releases/latest', function(payload) {
 			const latestVersion = payload.name;
-			
+
 			if(compareVersions(algoliaSearchExtentionsVersion, latestVersion) > 0) {
 				const ghLink = 'https://github.com/algolia/algoliasearch-magento-2/releases/tag/' + latestVersion;
 				const latestVersionLink = '<a href="' + ghLink + '" target="_blank">' + latestVersion + '</a>';
-				
+
 				$('#current_version').text(algoliaSearchExtentionsVersion);
 				$('.version.latest_version').html(latestVersionLink);
-				
+
 				$('.legacy_version').show();
 			}
 		});
 	}
-	
+
 	function getSearchBoxWidget(showIcons = false) {
 		return algoliaBundle.instantsearch.widgets.searchBox({
 			container: '#search_box',
@@ -285,78 +279,78 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 			magnifier: showIcons
 		});
 	}
-	
+
 	function getDocumentationTemplate() {
 		return `
 			<a href="{{url}}?utm_source=magento&utm_medium=extension&utm_campaign=support-page" target="_blank" id="doc_{{objectID}}">
 				<span class="heading">
 				{{#hierarchy.lvl0}}
 					{{{_highlightResult.hierarchy.lvl0.value}}}
 				{{/hierarchy.lvl0}}
-				
+
 				{{#hierarchy.lvl1}}
 					> {{{_highlightResult.hierarchy.lvl1.value}}}
 				{{/hierarchy.lvl1}}
-				
+
 				{{#hierarchy.lvl2}}
 					 > {{{_highlightResult.hierarchy.lvl2.value}}}
 				{{/hierarchy.lvl2}}
-				
+
 				{{#hierarchy.lvl3}}
 					> {{{_highlightResult.hierarchy.lvl3.value}}}
 				{{/hierarchy.lvl3}}
-				
+
 				{{#hierarchy.lvl4}}
 					> {{{_highlightResult.hierarchy.lvl4.value}}}
 				{{/hierarchy.lvl4}}
 			</span>
-			
+
 			<span class="content">
 				{{{#content}}}
 					{{{_highlightResult.content.value}}}
 				{{{/content}}}
 			</span>
 		</div>`;
 	}
-	
+
 	function getDiscourseTemplate() {
 		return `
 			<a href="https://discourse.algolia.com{{url}}/?utm_source=magento&utm_medium=extension&utm_campaign=support-page" target="_blank" id="disc_{{objectID}}">
 				<span class="heading">
 					{{{ _highlightResult.topic.title.value }}}
 				</span>
-				
+
 				<span class="content">
 					{{{content}}}
 				</span>
 			</a>`;
 	}
-	
+
 	function escapeHighlightedString(str, highlightPreTag, highlightPostTag) {
 		highlightPreTag = highlightPreTag || '<em>';
 		var pre = document.createElement('div');
 		pre.appendChild(document.createTextNode(highlightPreTag));
-		
+
 		highlightPostTag = highlightPostTag || '</em>';
 		var post = document.createElement('div');
 		post.appendChild(document.createTextNode(highlightPostTag));
-		
+
 		var div = document.createElement('div');
 		div.appendChild(document.createTextNode(str));
-		
+
 		return div.innerHTML
 			.replace(RegExp(escapeRegExp(pre.innerHTML), 'g'), highlightPreTag)
 			.replace(RegExp(escapeRegExp(post.innerHTML), 'g'), highlightPostTag)
 	}
-	
+
 	function escapeRegExp(str) {
 		return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
 	}
-	
+
 	function compareVersions(left, right) {
 		left = sanitizeVersion(left);
 		right = sanitizeVersion(right);
-		
+
 		for (var i = 0; i < Math.max(left.length, right.length); i++) {
 			if (left[i] > right[i]) {
 				return -1;
@@ -365,10 +359,10 @@ requirejs(['algoliaAdminBundle'], function(algoliaBundle) {
 				return 1;
 			}
 		}
-		
+
 		return 0;
 	}
-	
+
 	function sanitizeVersion(input) {
 		return input.split('.').map(function (n) {
 			return parseInt(n, 10);