DEV: Update params to use previously ran values on reload (#206)
After running a query with a non-default query param (inserting the new param into the url) we want to have the same params available after reloading the page. To do this we need to pass the updated params back up to the parent due to Octane's one direction data stream. I went over this with @pmusaraj and we both agreed this was extremely difficult to test due to needing to reload the page in a test, so we opted to move forward without one. A system test could be helpful in this case... I will investigate in a follow up PR. - Move param-input tests to a dedicated file
This commit is contained in:
Isaac Janzen
GitHub
parent
85c88c5d80
commit
3e7605d8a0
|
|
@ -52,14 +52,20 @@ export default class ParamInput extends Component {
|
|||
if (this.type === "boolean") {
|
||||
if (this.args.info.nullable) {
|
||||
this.nullableBoolValue = initialValue;
|
||||
this.args.updateParams(
|
||||
this.args.info.identifier,
|
||||
this.nullableBoolValue
|
||||
);
|
||||
} else {
|
||||
this.boolValue = initialValue !== "false";
|
||||
this.args.updateParams(this.args.info.identifier, this.boolValue);
|
||||
}
|
||||
} else {
|
||||
this.value =
|
||||
this.args.info.type === "category_id"
|
||||
? this.dasherizeCategoryId(initialValue)
|
||||
: initialValue;
|
||||
this.args.updateParams(this.args.info.identifier, this.value);
|
||||
}
|
||||
} else {
|
||||
// if no parsed params then get and set default values
|
||||
|
|
|
|||
|
|
@ -0,0 +1,247 @@
|
|||
import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
|
||||
import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
|
||||
import { test } from "qunit";
|
||||
|
||||
acceptance("Data Explorer Plugin | Param Input", function (needs) {
|
||||
needs.user();
|
||||
needs.settings({ data_explorer_enabled: true });
|
||||
|
||||
needs.pretender((server, helper) => {
|
||||
server.get("/admin/plugins/explorer/groups.json", () => {
|
||||
return helper.response([
|
||||
{
|
||||
id: 1,
|
||||
name: "admins",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: "moderators",
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
name: "staff",
|
||||
},
|
||||
{
|
||||
id: 0,
|
||||
name: "everyone",
|
||||
},
|
||||
{
|
||||
id: 10,
|
||||
name: "trust_level_0",
|
||||
},
|
||||
{
|
||||
id: 11,
|
||||
name: "trust_level_1",
|
||||
},
|
||||
{
|
||||
id: 12,
|
||||
name: "trust_level_2",
|
||||
},
|
||||
{
|
||||
id: 13,
|
||||
name: "trust_level_3",
|
||||
},
|
||||
{
|
||||
id: 14,
|
||||
name: "trust_level_4",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
server.get("/admin/plugins/explorer/schema.json", () => {
|
||||
return helper.response({
|
||||
anonymous_users: [
|
||||
{
|
||||
column_name: "id",
|
||||
data_type: "serial",
|
||||
primary: true,
|
||||
},
|
||||
{
|
||||
column_name: "user_id",
|
||||
data_type: "integer",
|
||||
fkey_info: "users",
|
||||
},
|
||||
{
|
||||
column_name: "master_user_id",
|
||||
data_type: "integer",
|
||||
fkey_info: "users",
|
||||
},
|
||||
{
|
||||
column_name: "active",
|
||||
data_type: "boolean",
|
||||
},
|
||||
{
|
||||
column_name: "created_at",
|
||||
data_type: "timestamp",
|
||||
},
|
||||
{
|
||||
column_name: "updated_at",
|
||||
data_type: "timestamp",
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
server.get("/admin/plugins/explorer/queries", () => {
|
||||
return helper.response({
|
||||
queries: [
|
||||
{
|
||||
id: -6,
|
||||
sql: "-- [params]\n-- int :months_ago = 1\n\nWITH query_period AS (\n SELECT\n date_trunc('month', CURRENT_DATE) - INTERVAL ':months_ago months' as period_start,\n date_trunc('month', CURRENT_DATE) - INTERVAL ':months_ago months' + INTERVAL '1 month' - INTERVAL '1 second' as period_end\n )\n\n SELECT\n ua.user_id,\n count(1) AS like_count\n FROM user_actions ua\n INNER JOIN query_period qp\n ON ua.created_at >= qp.period_start\n AND ua.created_at <= qp.period_end\n WHERE ua.action_type = 1\n GROUP BY ua.user_id\n ORDER BY like_count DESC\n LIMIT 100\n",
|
||||
name: "Top 100 Likers",
|
||||
description:
|
||||
"returns the top 100 likers for a given monthly period ordered by like_count. It accepts a ‘months_ago’ parameter, defaults to 1 to give results for the last calendar month.",
|
||||
param_info: [
|
||||
{
|
||||
identifier: "months_ago",
|
||||
type: "int",
|
||||
default: "1",
|
||||
nullable: false,
|
||||
},
|
||||
],
|
||||
created_at: "2021-02-02T12:21:11.449Z",
|
||||
username: "system",
|
||||
group_ids: [],
|
||||
last_run_at: "2021-02-11T08:29:59.337Z",
|
||||
hidden: false,
|
||||
user_id: -1,
|
||||
},
|
||||
{
|
||||
id: -7,
|
||||
sql: "-- [params]\n-- user_id :user\n\nSELECT :user_id\n\n",
|
||||
name: "Invalid Query",
|
||||
description: "",
|
||||
param_info: [
|
||||
{
|
||||
identifier: "user",
|
||||
type: "user_id",
|
||||
default: null,
|
||||
nullable: false,
|
||||
},
|
||||
],
|
||||
created_at: "2022-01-14T16:40:05.458Z",
|
||||
username: "bianca",
|
||||
group_ids: [],
|
||||
last_run_at: "2022-01-14T16:47:34.244Z",
|
||||
hidden: false,
|
||||
user_id: 1,
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
server.put("/admin/plugins/explorer/queries/-6", () => {
|
||||
return helper.response({
|
||||
success: true,
|
||||
errors: [],
|
||||
duration: 27.5,
|
||||
result_count: 2,
|
||||
columns: ["user_id", "like_count"],
|
||||
default_limit: 1000,
|
||||
relations: {
|
||||
user: [
|
||||
{
|
||||
id: -2,
|
||||
username: "discobot",
|
||||
name: null,
|
||||
avatar_template: "/user_avatar/localhost/discobot/{size}/2_2.png",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
username: "andrey1",
|
||||
name: null,
|
||||
avatar_template:
|
||||
"/letter_avatar_proxy/v4/letter/a/c0e974/{size}.png",
|
||||
},
|
||||
],
|
||||
},
|
||||
colrender: {
|
||||
0: "user",
|
||||
},
|
||||
rows: [
|
||||
[-2, 2],
|
||||
[2, 2],
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
server.post("/admin/plugins/explorer/queries/-6/run", () => {
|
||||
return helper.response({
|
||||
success: true,
|
||||
errors: [],
|
||||
duration: 27.5,
|
||||
result_count: 2,
|
||||
params: { months_ago: "1" },
|
||||
columns: ["user_id", "like_count"],
|
||||
default_limit: 1000,
|
||||
relations: {
|
||||
user: [
|
||||
{
|
||||
id: -2,
|
||||
username: "discobot",
|
||||
name: null,
|
||||
avatar_template: "/user_avatar/localhost/discobot/{size}/2_2.png",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
username: "andrey1",
|
||||
name: null,
|
||||
avatar_template:
|
||||
"/letter_avatar_proxy/v4/letter/a/c0e974/{size}.png",
|
||||
},
|
||||
],
|
||||
},
|
||||
colrender: {
|
||||
0: "user",
|
||||
},
|
||||
rows: [
|
||||
[-2, 2],
|
||||
[2, 2],
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
server.post("/admin/plugins/explorer/queries/-7/run", () => {
|
||||
return helper.response({
|
||||
success: true,
|
||||
errors: [],
|
||||
duration: 27.5,
|
||||
params: { user_id: "null" },
|
||||
columns: ["user_id"],
|
||||
default_limit: 1000,
|
||||
relations: {
|
||||
user: [
|
||||
{
|
||||
id: 2,
|
||||
username: "andrey1",
|
||||
name: null,
|
||||
avatar_template:
|
||||
"/letter_avatar_proxy/v4/letter/a/c0e974/{size}.png",
|
||||
},
|
||||
],
|
||||
},
|
||||
colrender: {
|
||||
0: "user",
|
||||
},
|
||||
rows: [],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
test("it puts params for the query into the url", async function (assert) {
|
||||
await visit("admin/plugins/explorer?id=-6");
|
||||
const monthsAgoValue = "2";
|
||||
await fillIn(".query-params input", monthsAgoValue);
|
||||
await click("form.query-run button");
|
||||
|
||||
const searchParams = new URLSearchParams(currentURL());
|
||||
const monthsAgoParam = JSON.parse(searchParams.get("params")).months_ago;
|
||||
assert.equal(monthsAgoParam, monthsAgoValue);
|
||||
});
|
||||
|
||||
test("it loads the page if one of the parameter is null", async function (assert) {
|
||||
await visit('admin/plugins/explorer?id=-7¶ms={"user":null}');
|
||||
assert.ok(exists(".query-params .user-chooser"));
|
||||
assert.ok(exists(".query-run .btn.btn-primary"));
|
||||
});
|
||||
});
|
||||
|
|
@ -4,7 +4,7 @@ import {
|
|||
query,
|
||||
queryAll,
|
||||
} from "discourse/tests/helpers/qunit-helpers";
|
||||
import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
|
||||
import { click, visit } from "@ember/test-helpers";
|
||||
import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
|
||||
import I18n from "I18n";
|
||||
import { test } from "qunit";
|
||||
|
|
@ -116,26 +116,6 @@ acceptance("Data Explorer Plugin | Run Query", function (needs) {
|
|||
hidden: false,
|
||||
user_id: -1,
|
||||
},
|
||||
{
|
||||
id: -7,
|
||||
sql: "-- [params]\n-- user_id :user\n\nSELECT :user_id\n\n",
|
||||
name: "Invalid Query",
|
||||
description: "",
|
||||
param_info: [
|
||||
{
|
||||
identifier: "user",
|
||||
type: "user_id",
|
||||
default: null,
|
||||
nullable: false,
|
||||
},
|
||||
],
|
||||
created_at: "2022-01-14T16:40:05.458Z",
|
||||
username: "bianca",
|
||||
group_ids: [],
|
||||
last_run_at: "2022-01-14T16:47:34.244Z",
|
||||
hidden: false,
|
||||
user_id: 1,
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
|
@ -210,21 +190,4 @@ acceptance("Data Explorer Plugin | Run Query", function (needs) {
|
|||
|
||||
assert.ok(exists("canvas"), "the chart was rendered");
|
||||
});
|
||||
|
||||
test("it puts params for the query into the url", async function (assert) {
|
||||
await visit("admin/plugins/explorer?id=-6");
|
||||
const monthsAgoValue = "2";
|
||||
await fillIn(".query-params input", monthsAgoValue);
|
||||
await click("form.query-run button");
|
||||
|
||||
let searchParams = new URLSearchParams(currentURL());
|
||||
let paramsMonthsAgo = JSON.parse(searchParams.get("params")).months_ago;
|
||||
assert.equal(paramsMonthsAgo, monthsAgoValue);
|
||||
});
|
||||
|
||||
test("it loads the page if one of the parameter is null", async function (assert) {
|
||||
await visit('admin/plugins/explorer?id=-7¶ms={"user":null}');
|
||||
assert.ok(exists(".query-params .user-chooser"));
|
||||
assert.ok(exists(".query-run .btn.btn-primary"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue