github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 15:05:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Allow 'emails disabled' notices to be temporarily dismissed (#24952)

Browse Source 
This makes it much easier to see what a production site will look like before launch. The notices return on the next pageload, so there is minimal risk of this affecting visibility of an email configuration problem.
This commit is contained in:
David Taylor 2023-12-19 12:06:17 +00:00 committed by GitHub
parent 9f4fbd0279
commit 6e259a5f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/components/global-notice.js
View File

@ -121,6 +121,10 @@ export default class GlobalNotice extends Component {
Notice.create({
text: I18n.t("emails_are_disabled"),
id: "alert-emails-disabled",
options: {
dismissable: true,
persistentDismiss: false,
},
})
);
} else if (this.siteSettings.disable_emails === "non-staff") {
@ -128,6 +132,10 @@ export default class GlobalNotice extends Component {
Notice.create({
text: I18n.t("emails_are_disabled_non_staff"),
id: "alert-emails-disabled",
options: {
dismissable: true,
persistentDismiss: false,
},
})
);
}

31
app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js
View File

@ -3,7 +3,6 @@ import { test } from "qunit";
import {
acceptance,
exists,
query,
updateCurrentUser,
} from "discourse/tests/helpers/qunit-helpers";
import I18n from "discourse-i18n";
@ -27,11 +26,9 @@ acceptance("Email Disabled Banner", function (needs) {
exists(".alert-emails-disabled"),
"alert is displayed when email disabled"
);
assert.strictEqual(
query(".alert-emails-disabled").innerText,
I18n.t("emails_are_disabled"),
"alert uses the correct text"
);
assert
.dom(".alert-emails-disabled .text")
.hasText(I18n.t("emails_are_disabled"), "alert uses the correct text");
});
test("when non-staff", async function (assert) {
@ -41,11 +38,12 @@ acceptance("Email Disabled Banner", function (needs) {
exists(".alert-emails-disabled"),
"alert is displayed when email disabled for non-staff"
);
assert.strictEqual(
query(".alert-emails-disabled").innerText,
I18n.t("emails_are_disabled_non_staff"),
"alert uses the correct text"
);
assert
.dom(".alert-emails-disabled .text")
.hasText(
I18n.t("emails_are_disabled_non_staff"),
"alert uses the correct text"
);
updateCurrentUser({ moderator: true });
await visit("/");
@ -53,10 +51,11 @@ acceptance("Email Disabled Banner", function (needs) {
exists(".alert-emails-disabled"),
"alert is displayed to staff when email disabled for non-staff"
);
assert.strictEqual(
query(".alert-emails-disabled").innerText,
I18n.t("emails_are_disabled_non_staff"),
"alert uses the correct text"
);
assert
.dom(".alert-emails-disabled .text")
.hasText(
I18n.t("emails_are_disabled_non_staff"),
"alert uses the correct text"
);
});
});