-
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
index 7711ca8d3d..1c4ad1caa3 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-chart.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
@@ -5,6 +5,7 @@ import loadScript from "discourse/lib/load-script";
import { makeArray } from "discourse-common/lib/helpers";
import { number } from "discourse/lib/formatter";
import { schedule } from "@ember/runloop";
+import { bind } from "discourse-common/utils/decorators";
export default Component.extend({
classNames: ["admin-report-chart"],
@@ -12,23 +13,16 @@ export default Component.extend({
total: 0,
options: null,
- init() {
- this._super(...arguments);
-
- this.resizeHandler = () =>
- discourseDebounce(this, this._scheduleChartRendering, 500);
- },
-
didInsertElement() {
this._super(...arguments);
- $(window).on("resize.chart", this.resizeHandler);
+ window.addEventListener("resize", this._resizeHandler);
},
willDestroyElement() {
this._super(...arguments);
- $(window).off("resize.chart", this.resizeHandler);
+ window.removeEventListener("resize", this._resizeHandler);
this._resetChart();
},
@@ -179,4 +173,9 @@ export default Component.extend({
_applyChartGrouping(model, data, options) {
return Report.collapse(model, data, options.chartGrouping);
},
+
+ @bind
+ _resizeHandler() {
+ discourseDebounce(this, this._scheduleChartRendering, 500);
+ },
});
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js
index a0f546227b..328ad06e1e 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.js
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js
@@ -12,9 +12,20 @@ export default Component.extend(bufferedProperty("host"), {
editToggled: false,
tagName: "tr",
categoryId: null,
+ category: null,
editing: or("host.isNew", "editToggled"),
+ init() {
+ this._super(...arguments);
+
+ const host = this.host;
+ const categoryId = host.category_id || this.site.uncategorized_category_id;
+ const category = Category.findById(categoryId);
+
+ host.set("category", category);
+ },
+
@discourseComputed("buffered.host", "host.isSaving")
cantSave(host, isSaving) {
return isSaving || isEmpty(host);
diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
index 5636c302db..95ed9edfe8 100644
--- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
+++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
@@ -17,7 +17,7 @@ import { schedule } from "@ember/runloop";
**/
export default Component.extend({
- classNames: ["screened-ip-address-form"],
+ classNames: ["screened-ip-address-form", "inline-form"],
formSubmitted: false,
actionName: "block",
diff --git a/app/assets/javascripts/admin/addon/components/site-settings-image-uploader.js b/app/assets/javascripts/admin/addon/components/site-settings-image-uploader.js
deleted file mode 100644
index 3e19fa8f03..0000000000
--- a/app/assets/javascripts/admin/addon/components/site-settings-image-uploader.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import ImageUploader from "discourse/components/image-uploader";
-
-export default ImageUploader.extend({
- layoutName: "components/image-uploader",
- uploadUrlParams: "&for_site_setting=true",
-});
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
index c90316369a..961c1a5c4b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
@@ -3,70 +3,83 @@ import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { isBlank } from "@ember/utils";
import { popupAjaxError } from "discourse/lib/ajax-error";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
+import { equal } from "@ember/object/computed";
import showModal from "discourse/lib/show-modal";
+import { ajax } from "discourse/lib/ajax";
export default Controller.extend({
- userModes: [
- { id: "all", name: I18n.t("admin.api.all_users") },
- { id: "single", name: I18n.t("admin.api.single_user") },
- ],
+ userModes: null,
useGlobalKey: false,
scopes: null,
- @discourseComputed("userMode")
- showUserSelector(mode) {
- return mode === "single";
+ init() {
+ this._super(...arguments);
+
+ this.set("userModes", [
+ { id: "all", name: I18n.t("admin.api.all_users") },
+ { id: "single", name: I18n.t("admin.api.single_user") },
+ ]);
+ this._loadScopes();
},
- @discourseComputed("model.description", "model.username", "userMode")
- saveDisabled(description, username, userMode) {
- if (isBlank(description)) {
+ showUserSelector: equal("userMode", "single"),
+
+ @discourseComputed("model.{description,username}", "showUserSelector")
+ saveDisabled(model, showUserSelector) {
+ if (isBlank(model.description)) {
return true;
}
- if (userMode === "single" && isBlank(username)) {
+ if (showUserSelector && isBlank(model.username)) {
return true;
}
return false;
},
- actions: {
- updateUsername(selected) {
- this.set("model.username", get(selected, "firstObject"));
- },
+ @action
+ updateUsername(selected) {
+ this.set("model.username", get(selected, "firstObject"));
+ },
- changeUserMode(value) {
- if (value === "all") {
- this.model.set("username", null);
- }
- this.set("userMode", value);
- },
+ @action
+ changeUserMode(userMode) {
+ if (userMode === "all") {
+ this.model.set("username", null);
+ }
+ this.set("userMode", userMode);
+ },
- save() {
- if (!this.useGlobalKey) {
- const selectedScopes = Object.values(this.scopes)
- .flat()
- .filter((action) => {
- return action.selected;
- });
+ @action
+ save() {
+ if (!this.useGlobalKey) {
+ const selectedScopes = Object.values(this.scopes)
+ .flat()
+ .filterBy("selected");
- this.model.set("scopes", selectedScopes);
- }
+ this.model.set("scopes", selectedScopes);
+ }
- this.model.save().catch(popupAjaxError);
- },
+ return this.model.save().catch(popupAjaxError);
+ },
- continue() {
- this.transitionToRoute("adminApiKeys.show", this.model.id);
- },
+ @action
+ continue() {
+ this.transitionToRoute("adminApiKeys.show", this.model.id);
+ },
- showURLs(urls) {
- return showModal("admin-api-key-urls", {
- admin: true,
- model: {
- urls,
- },
- });
- },
+ @action
+ showURLs(urls) {
+ return showModal("admin-api-key-urls", {
+ admin: true,
+ model: { urls },
+ });
+ },
+
+ _loadScopes() {
+ return ajax("/admin/api/keys/scopes.json")
+ .then((data) => {
+ this.set("scopes", data.scopes);
+ })
+ .catch(popupAjaxError);
},
});
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
index 000e1d3fc8..959151d96e 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
@@ -146,7 +146,9 @@ export default Controller.extend({
@discourseComputed("model.translations")
translations(translations) {
- return translations.map((setting) => ThemeSettings.create(setting));
+ return translations.map((setting) =>
+ ThemeSettings.create({ ...setting, textarea: true })
+ );
},
hasTranslations: notEmpty("translations"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
index 93ed9c306f..22345e8b82 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
@@ -218,8 +218,15 @@ export default Controller.extend(CanCheckEmails, {
grantAdmin() {
return this.model
.grantAdmin()
- .then(() => {
- bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
+ .then((result) => {
+ if (result.email_confirmation_required) {
+ bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
+ } else {
+ const controller = showModal("grant-admin-second-factor", {
+ model: this.model,
+ });
+ controller.setResult(result);
+ }
})
.catch(popupAjaxError);
},
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index b55c045593..9585168210 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -1,14 +1,18 @@
+import { isNone } from "@ember/utils";
+import { fmt, propertyNotEqual } from "discourse/lib/computed";
import { alias, oneWay } from "@ember/object/computed";
import I18n from "I18n";
import Mixin from "@ember/object/mixin";
import { Promise } from "rsvp";
import { ajax } from "discourse/lib/ajax";
import { categoryLinkHTML } from "discourse/helpers/category-link";
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { bind } from "discourse-common/utils/decorators";
import { htmlSafe } from "@ember/template";
import { on } from "@ember/object/evented";
import showModal from "discourse/lib/show-modal";
import { warn } from "@ember/debug";
+import { action } from "@ember/object";
+import { splitString } from "discourse/lib/utilities";
const CUSTOM_TYPES = [
"bool",
@@ -32,26 +36,20 @@ const CUSTOM_TYPES = [
const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
-function splitPipes(str) {
- if (typeof str === "string") {
- return str.split("|").filter(Boolean);
- } else {
- return [];
- }
-}
-
export default Mixin.create({
classNameBindings: [":row", ":setting", "overridden", "typeClass"],
content: alias("setting"),
validationMessage: null,
isSecret: oneWay("setting.secret"),
+ setting: null,
@discourseComputed("buffered.value", "setting.value")
dirty(bufferVal, settingVal) {
- if (bufferVal === null || bufferVal === undefined) {
+ if (isNone(bufferVal)) {
bufferVal = "";
}
- if (settingVal === null || settingVal === undefined) {
+
+ if (isNone(settingVal)) {
settingVal = "";
}
@@ -61,21 +59,17 @@ export default Mixin.create({
@discourseComputed("setting", "buffered.value")
preview(setting, value) {
// A bit hacky, but allows us to use helpers
- if (setting.get("setting") === "category_style") {
- let category = this.site.get("categories.firstObject");
+ if (setting.setting === "category_style") {
+ const category = this.site.get("categories.firstObject");
if (category) {
- return categoryLinkHTML(category, {
- categoryStyle: value,
- });
+ return categoryLinkHTML(category, { categoryStyle: value });
}
}
- let preview = setting.get("preview");
+
+ const preview = setting.preview;
if (preview) {
- return htmlSafe(
- "