Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Promise finally error for perspectiveSave #43

Merged
merged 1 commit into from Jun 1, 2022
Merged

FIX: Promise finally error for perspectiveSave #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 57 additions & 43 deletions assets/javascripts/initializers/discourse-perspective.js
View file
Open in desktop
Expand Up @@ -11,9 +11,19 @@ function initialize(api) {

perspectiveSave(force) {
this.set("_perspective_checked", true);
this.save(force).finally(() => {
const result = this.save(force);

// it's valid for save() to return null since we do that in core,
// handle that here because sometimes we return a promise
if (result != null && typeof result.then === "function") {
result.finally(() => {
this.set("disableSubmit", false);
this.set("_perspective_checked", false);
});
} else {
this.set("disableSubmit", false);
this.set("_perspective_checked", false);
});
}
},

save(force) {
Expand Down Expand Up @@ -43,53 +53,57 @@ function initialize(api) {
const bypassCheck = bypassPM || bypassSecuredCategories;

if (!bypassCheck && !this._perspective_checked) {
let concat = "";
return this.perspectiveCheckToxicity(composer, force);
} else {
this.set("disableSubmit", false);
return this._super(force);
}
},

["title", "raw", "reply"].forEach((item) => {
const content = composer.get(item);
if (content) {
concat += `${content} `;
}
});
perspectiveCheckToxicity(composer, force) {
let concat = "";

concat.trim();
["title", "raw", "reply"].forEach((item) => {
const content = composer.get(item);
if (content) {
concat += `${content} `;
}
});

ajax("/perspective/post_toxicity", {
type: "POST",
data: { concat },
})
.then((response) => {
if (response && response["score"] !== undefined) {
const message = I18n.t("perspective.perspective_message");
concat.trim();

let buttons = [
{
label: I18n.t("perspective.composer_continue"),
class: "btn",
callback: () => this.perspectiveSave(force),
},
{
label: I18n.t("perspective.composer_edit"),
class: "btn-primary",
callback: () => {
this.set("disableSubmit", false);
},
return ajax("/perspective/post_toxicity", {
type: "POST",
data: { concat },
})
.then((response) => {
if (response && response["score"] !== undefined) {
const message = I18n.t("perspective.perspective_message");

let buttons = [
{
label: I18n.t("perspective.composer_continue"),
class: "btn perspective-continue-post",
callback: () => this.perspectiveSave(force),
},
{
label: I18n.t("perspective.composer_edit"),
class: "btn-primary perspective-edit-post",
callback: () => {
this.set("disableSubmit", false);
},
];
bootbox.dialog(message, buttons);
return;
} else {
this.perspectiveSave(force);
}
})
.catch(() => {
// fail silently
},
];
bootbox.dialog(message, buttons);
return;
} else {
this.perspectiveSave(force);
});
} else {
this.set("disableSubmit", false);
return this._super(force);
}
}
})
.catch(() => {
// fail silently
this.perspectiveSave(force);
});
},
});
}
Expand Down
6 changes: 3 additions & 3 deletions spec/requests/post_toxicity_controller_spec.rb
View file
Open in desktop
Expand Up @@ -19,21 +19,21 @@
describe '.show' do
it 'returns the score if above threshold' do
stub_request(:post, api_endpoint).to_return(status: 200, body: api_response_high_toxicity_body, headers: {})
post '/perspective/post_toxicity.json', params: { concat: 'Fuck. This is outrageous and dumb. Go to hell.' }, headers: headers
post '/perspective/post_toxicity.json', params: { concat: 'everyone is a doo-doo head!' }, headers: headers
json = JSON.parse(response.body)
expect(json['score']).to eq 0.915122943
end

it 'returns nothing if under threshold' do
stub_request(:post, api_endpoint).to_return(status: 200, body: api_response_toxicity_body, headers: {})
post '/perspective/post_toxicity.json', params: { concat: 'Fuck. This is outrageous and dumb. Go to hell.' }, headers: headers
post '/perspective/post_toxicity.json', params: { concat: 'everyone is a doo-doo head!' }, headers: headers
json = JSON.parse(response.body)
expect(json).to eq({})
end

it 'returns nothing if any network errors' do
stub_request(:post, api_endpoint).to_return(status: 403)
post '/perspective/post_toxicity.json', params: { concat: 'Fuck. This is outrageous and dumb. Go to hell.' }, headers: headers
post '/perspective/post_toxicity.json', params: { concat: 'everyone is a doo-doo head!' }, headers: headers
json = JSON.parse(response.body)
expect(json).to eq({})
end
Expand Down
71 changes: 54 additions & 17 deletions test/javascripts/acceptance/perspective-test.js
View file
Open in desktop
Expand Up @@ -2,36 +2,73 @@ import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
import { click, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";

acceptance("Discourse Perspective", function (needs) {
acceptance(
"Discourse Perspective | Enabled | Toxic Post Score",
function (needs) {
needs.user();
needs.settings({
perspective_notify_posting_min_toxicity_enable: true,
perspective_enabled: true,
});

needs.pretender((server, helper) => {
server.post("/perspective/post_toxicity", () => {
return helper.response({ success: "OK", score: 0.99 });
});
});

test("Create a toxic topic and click edit before continuing", async function (assert) {
await visit("/");
await click("#create-topic");

await fillIn("#reply-title", "this is a normal title");
await fillIn(".d-editor-input", "everyone is a doo-doo head!");

await click("#reply-control button.create");

await click(".perspective-edit-post");
assert.notOk(
exists(".cooked"),
"new topic was not created, composer is still open"
);
});

test("Create a toxic topic and click continue with post creation", async function (assert) {
await visit("/");
await click("#create-topic");

await fillIn("#reply-title", "this is a normal title");
await fillIn(".d-editor-input", "everyone is a doo-doo head!");

await click("#reply-control button.create");

await click(".perspective-continue-post");
assert.ok(exists(".cooked"), "new topic created");
});
}
);

acceptance("Discourse Perspective | Enabled | No Post Score", function (needs) {
needs.user();
needs.settings({
perspective_notify_posting_min_toxicity_enable: true,
perspective_enabled: true,
});

test("Create a normal topic", async function (assert) {
await visit("/");
await click("#create-topic");

await fillIn("#reply-title", "this is a normal title");
await fillIn(".d-editor-input", "hello world! This is a normal topic");

await click("#reply-control button.create");

assert.ok(exists(".cooked"), "new topic created");
needs.pretender((server, helper) => {
server.post("/perspective/post_toxicity", () => {
return helper.response({ success: "OK" });
});
});

test("Create a toxic topic without api keys filled", async function (assert) {
test("Create a topic without issues", async function (assert) {
await visit("/");
await click("#create-topic");

await fillIn("#reply-title", "this is a normal title");
await fillIn(
".d-editor-input",
"Fuck. This is outrageous and dumb. Go to hell."
);
await fillIn(".d-editor-input", "everyone is a doo-doo head!");

await click("#reply-control button.create");

assert.ok(exists(".cooked"), "new topic created");
});
});