Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow up to 8c2fa99f78. 

`/search_logs/term?term` is alittle weird looking but unless we add
proper slug support to term, we're going to have to live with this
first.
This commit is contained in:
Guo Xiang Tan 2019-03-29 10:39:44 +08:00
parent c42df7ddd7
commit 947495e70d
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/routes/admin-route-map.js.es6
View File

@ -133,7 +133,7 @@ export default function() {
{ path: "/search_logs", resetNamespace: true }, { path: "/search_logs", resetNamespace: true },
function() { function() {
this.route("index", { path: "/" }); this.route("index", { path: "/" });
this.route("term", { path: "/term/:term" }); this.route("term", { path: "/term" });
} }
); );
this.route( this.route(

1
app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
View File

@ -4,6 +4,7 @@ import { translateResults } from "discourse/lib/search";
export default Discourse.Route.extend({ export default Discourse.Route.extend({
queryParams: { queryParams: {
term: { refreshModel: true },
period: { refreshModel: true }, period: { refreshModel: true },
searchType: { refreshModel: true } searchType: { refreshModel: true }
}, },

4
app/assets/javascripts/admin/templates/search-logs-index.hbs
View File

@ -16,7 +16,9 @@
{{#each model as |item|}} {{#each model as |item|}}
<tr class="admin-list-item"> <tr class="admin-list-item">
<td class="col term"> <td class="col term">
{{#link-to 'adminSearchLogs.term' item.term}}{{item.term}}{{/link-to}} {{#link-to 'adminSearchLogs.term' (query-params term=item.term) class="test"}}
{{item.term}}
{{/link-to}}
</td> </td>
<td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td> <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
<td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td> <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>

2
test/javascripts/acceptance/admin-search-log-term-test.js.es6
View File

@ -2,7 +2,7 @@ import { acceptance } from "helpers/qunit-helpers";
acceptance("Admin - Search Log Term", { loggedIn: true }); acceptance("Admin - Search Log Term", { loggedIn: true });
QUnit.test("show search log term details", async assert => { QUnit.test("show search log term details", async assert => {
await visit("/admin/logs/search_logs/term/ruby"); await visit("/admin/logs/search_logs/term?term=ruby");
assert.ok($("div.search-logs-filter").length, "has the search type filter"); assert.ok($("div.search-logs-filter").length, "has the search type filter");
assert.ok(exists("canvas.chartjs-render-monitor"), "has graph canvas"); assert.ok(exists("canvas.chartjs-render-monitor"), "has graph canvas");

8
test/javascripts/acceptance/admin-search-logs-test.js.es6
View File

@ -5,8 +5,16 @@ QUnit.test("show search logs", async assert => {
await visit("/admin/logs/search_logs"); await visit("/admin/logs/search_logs");
assert.ok($("table.search-logs-list.grid").length, "has the div class"); assert.ok($("table.search-logs-list.grid").length, "has the div class");
assert.ok( assert.ok(
exists(".search-logs-list .admin-list-item .col"), exists(".search-logs-list .admin-list-item .col"),
"has a list of search logs" "has a list of search logs"
); );
await click(".term a");
assert.ok(
$("div.search-logs-filter").length,
"it should show the search log term page"
);
}); });