Added elastic search queries through elasticsearch json

Author: githubrow

controllers/controller_admin_elasticsearch_edit.erl

@@ -0,0 +1,27 @@
+-module(controller_admin_elasticsearch_edit).
+-author("Driebit <[email protected]>").
+
+%% API
+-export([
+    event/2
+]).
+
+-include("zotonic.hrl").
+
+%% Previewing the results of a elastic query in the admin edit
+event(#postback{message={elastic_query_preview, Opts}}, Context) ->
+    DivId = proplists:get_value(div_id, Opts),
+    Index = proplists:get_value(index, Opts),
+    Id = proplists:get_value(rsc_id, Opts),
+    QueryType = list_to_atom(proplists:get_value(query_type, Opts)),
+
+    Q = z_convert:to_binary(z_context:get_q("triggervalue", Context)),
+
+    case jsx:is_json(Q) of
+        false ->
+            z_render:growl_error("There is an error in your query", Context);
+        true ->
+            S = z_search:search({QueryType, [{elastic_query, Q}, {index, Index}]}, Context),
+            {Html, Context1} = z_template:render_to_iolist({cat, "_admin_query_preview.tpl"}, [{result,S}, {id, Id}], Context),
+            z_render:update(DivId, Html, Context1)
+    end.

support/elasticsearch_search.erl

@@ -136,14 +136,16 @@ map_query({text, Text}, Context) ->
         {query, Text},
         {fields, z_notifier:foldr(#elasticsearch_fields{query = Text}, DefaultFields, Context)}
     ]}]};
-map_query({query_id, Id}, Context) ->
-    ElasticQuery = z_html:unescape(m_rsc:p(Id, <<"elastic_query">>, Context)),
+map_query({elastic_query, ElasticQuery}, _Context) ->
     case jsx:is_json(ElasticQuery) of
         true ->
             {true, jsx:decode(ElasticQuery)};
         false ->
             false
     end;
+map_query({query_id, Id}, Context) ->
+    ElasticQuery = z_html:unescape(m_rsc:p(Id, <<"elastic_query">>, Context)),
+    map_query({elastic_query, ElasticQuery}, Context);
 map_query({match_objects, Id}, Context) ->
     %% Look up all outgoing edges of this resource
     Clauses = lists:map(
@@ -279,7 +281,7 @@ map_must({content_group, Id}, Context) ->
 %% TODO Add support for other filter types
 %% http://docs.zotonic.com/en/latest/developer-guide/search.html#filter
 %% Use regular fields where Zotonic uses pivot_ fields
-%% @see z_pivot_rsc:pivot_resource/2
+%% @see z_pivot_rsc:pivot_resourcesource/2
 map_must({filter, [[Key | _] | _] = Filters}, Context) when is_list(Key); is_binary(Key); is_atom(Key) ->
     %% Multiple filters: OR
     {true, #{<<"bool">> => #{<<"should">> =>

templates/_admin_edit_content.elastic_query.tpl

@@ -13,37 +13,29 @@
 {% with m.rsc[id] as r %}
 <fieldset>
 	<p class="notification notice">
-		{_ Here you can edit the arguments of the elasticsearch query. _}
+		{_ Here you can edit your elasticsearch query. _}
 	</p>
 
     <div class="form-group">
     	<label class="control-label" for="elastic_query">{_ Elasticsearch query _}</label>
     	<div>
-    	    {% with "cat='text'" as placeholder %}
+    	    {% with "[]" as placeholder %}
     	    <textarea class="form-control" id="{{ #elastic_query }}" name="elastic_query" rows="15" placeholder="{{ placeholder }}">{{ r.elastic_query }}</textarea>
     	    {% endwith %}
-    	{#	{% wire id=#elastic_query type="change" postback={query_preview rsc_id=id div_id=#querypreview target_id=#query} delegate="controller_admin_edit" %} #}
+    		{% wire id=#elastic_query type="change" postback={elastic_query_preview query_type="query" rsc_id=id div_id=#elastic_query_preview target_id=#elastic_query index=m.config.mod_elasticsearch.index.value} delegate="controller_admin_elasticsearch_edit" %}
     	</div>
     </div>
-    {#
-    <div class="form-group">
-        <a id="{{ #test_query }}" class="btn btn-default">{_ Test query _}</a>
-        {% wire id=#test_query type="click" action={script script="$('#query').trigger('change')"} %}
-    </div>
 
     <div class="form-group">
-    	<div class="checkbox"><label>
-    	    <input type="checkbox" id="is_query_live" name="is_query_live" {% if r.is_query_live %}checked{% endif %}/>
-    	    {_ Live query, send notifications when matching items are updated or inserted. _}
-    	</label></div>
+        <a id="{{ #test_elastic_query }}" class="btn btn-default">{_ Test query _}</a>
+        {% wire id=#test_elastic_query type="click" action={script script="$('#elastic_query').trigger('change')"} %}
     </div>
 
 	<h4>{_ Query preview _}</h4>
 
-	<div class="query-results" id="{{ #querypreview }}">
-		{% include "_admin_query_preview.tpl" result=m.search[{query query_id=id pagelen=20}] %}
-	</div>
-    #}
+	<div class="elastic-query-results" id="{{ #elastic_query_preview }}">
+		{% catinclude "_admin_query_preview.tpl" id result=m.search[{query query_id=id id=id index=m.config.mod_elasticsearch.index.value pagelen=20}] %}
+    </div>
 </fieldset>
 {% endwith %}
 {% endblock %}

templates/_admin_edit_main_parts.elastic_query.tpl

@@ -4,7 +4,7 @@
 
 {% catinclude "_admin_edit_basics.tpl" id is_editable=is_editable languages=languages show_header %}
 
-{% include "_admin_edit_content.elastic_query.tpl" id=id is_editable=is_editable languages=languages %}
+{% catinclude "_admin_edit_content.tpl" id is_editable=is_editable languages=languages %}
 
 {% if id.category_id.feature_show_address|if_undefined:`true` %}
     {% catinclude "_admin_edit_content_address.tpl" id is_editable=is_editable languages=languages %}