DEV: introduces prettier for es6 files

This commit is contained in:
Joffrey JAFFEUX
2018-06-15 17:03:24 +02:00
committed by GitHub
parent c7ee70941e
commit 03a7d532cf
1162 changed files with 60667 additions and 29659 deletions

View File

@ -1,25 +1,33 @@
import { iconHTML } from 'discourse-common/lib/icon-library';
import { ajax } from 'discourse/lib/ajax';
import computed from 'ember-addons/ember-computed-decorators';
import { propertyNotEqual } from 'discourse/lib/computed';
import { popupAjaxError } from 'discourse/lib/ajax-error';
import ApiKey from 'admin/models/api-key';
import Group from 'discourse/models/group';
import { userPath } from 'discourse/lib/url';
import { iconHTML } from "discourse-common/lib/icon-library";
import { ajax } from "discourse/lib/ajax";
import computed from "ember-addons/ember-computed-decorators";
import { propertyNotEqual } from "discourse/lib/computed";
import { popupAjaxError } from "discourse/lib/ajax-error";
import ApiKey from "admin/models/api-key";
import Group from "discourse/models/group";
import { userPath } from "discourse/lib/url";
const wrapAdmin = user => user ? AdminUser.create(user) : null;
const wrapAdmin = user => (user ? AdminUser.create(user) : null);
const AdminUser = Discourse.User.extend({
adminUserView: true,
customGroups: Ember.computed.filter("groups", g => !g.automatic && Group.create(g)),
automaticGroups: Ember.computed.filter("groups", g => g.automatic && Group.create(g)),
customGroups: Ember.computed.filter(
"groups",
g => !g.automatic && Group.create(g)
),
automaticGroups: Ember.computed.filter(
"groups",
g => g.automatic && Group.create(g)
),
canViewProfile: Ember.computed.or("active", "staged"),
@computed("bounce_score", "reset_bounce_score_after")
bounceScore(bounce_score, reset_bounce_score_after) {
if (bounce_score > 0) {
return `${bounce_score} - ${moment(reset_bounce_score_after).format('LL')}`;
return `${bounce_score} - ${moment(reset_bounce_score_after).format(
"LL"
)}`;
} else {
return bounce_score;
}
@ -45,70 +53,80 @@ const AdminUser = Discourse.User.extend({
resetBounceScore() {
return ajax(`/admin/users/${this.get("id")}/reset_bounce_score`, {
type: 'POST'
}).then(() => this.setProperties({
"bounce_score": 0,
"reset_bounce_score_after": null
}));
type: "POST"
}).then(() =>
this.setProperties({
bounce_score: 0,
reset_bounce_score_after: null
})
);
},
generateApiKey() {
const self = this;
return ajax("/admin/users/" + this.get('id') + "/generate_api_key", {
type: 'POST'
}).then(function (result) {
return ajax("/admin/users/" + this.get("id") + "/generate_api_key", {
type: "POST"
}).then(function(result) {
const apiKey = ApiKey.create(result.api_key);
self.set('api_key', apiKey);
self.set("api_key", apiKey);
return apiKey;
});
},
groupAdded(added) {
return ajax("/admin/users/" + this.get('id') + "/groups", {
type: 'POST',
return ajax("/admin/users/" + this.get("id") + "/groups", {
type: "POST",
data: { group_id: added.id }
}).then(() => this.get('groups').pushObject(added));
}).then(() => this.get("groups").pushObject(added));
},
groupRemoved(groupId) {
return ajax("/admin/users/" + this.get('id') + "/groups/" + groupId, {
type: 'DELETE'
return ajax("/admin/users/" + this.get("id") + "/groups/" + groupId, {
type: "DELETE"
}).then(() => {
this.set('groups.[]', this.get('groups').rejectBy("id", groupId));
if (this.get('primary_group_id') === groupId) {
this.set('primary_group_id', null);
this.set("groups.[]", this.get("groups").rejectBy("id", groupId));
if (this.get("primary_group_id") === groupId) {
this.set("primary_group_id", null);
}
});
},
revokeApiKey() {
return ajax("/admin/users/" + this.get('id') + "/revoke_api_key", {
type: 'DELETE'
}).then(() => this.set('api_key', null));
return ajax("/admin/users/" + this.get("id") + "/revoke_api_key", {
type: "DELETE"
}).then(() => this.set("api_key", null));
},
deleteAllPosts() {
const user = this,
message = I18n.messageFormat('admin.user.delete_all_posts_confirm_MF', { "POSTS": user.get('post_count'), "TOPICS": user.get('topic_count') }),
buttons = [{
"label": I18n.t("composer.cancel"),
"class": "d-modal-cancel",
"link": true
}, {
"label": `${iconHTML('exclamation-triangle')} ` + I18n.t("admin.user.delete_all_posts"),
"class": "btn btn-danger",
"callback": function() {
ajax("/admin/users/" + user.get('id') + "/delete_all_posts", {
type: 'PUT'
}).then(() => user.set('post_count', 0));
}
}];
bootbox.dialog(message, buttons, { "classes": "delete-all-posts" });
message = I18n.messageFormat("admin.user.delete_all_posts_confirm_MF", {
POSTS: user.get("post_count"),
TOPICS: user.get("topic_count")
}),
buttons = [
{
label: I18n.t("composer.cancel"),
class: "d-modal-cancel",
link: true
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.delete_all_posts"),
class: "btn btn-danger",
callback: function() {
ajax("/admin/users/" + user.get("id") + "/delete_all_posts", {
type: "PUT"
}).then(() => user.set("post_count", 0));
}
}
];
bootbox.dialog(message, buttons, { classes: "delete-all-posts" });
},
revokeAdmin() {
return ajax(`/admin/users/${this.get('id')}/revoke_admin`, {
type: 'PUT'
return ajax(`/admin/users/${this.get("id")}/revoke_admin`, {
type: "PUT"
}).then(() => {
this.setProperties({
admin: false,
@ -119,57 +137,67 @@ const AdminUser = Discourse.User.extend({
},
grantAdmin() {
return ajax(`/admin/users/${this.get('id')}/grant_admin`, {
type: 'PUT'
}).then(() => {
bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
}).catch(popupAjaxError);
return ajax(`/admin/users/${this.get("id")}/grant_admin`, {
type: "PUT"
})
.then(() => {
bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
})
.catch(popupAjaxError);
},
revokeModeration() {
const self = this;
return ajax("/admin/users/" + this.get('id') + "/revoke_moderation", {
type: 'PUT'
}).then(function() {
self.setProperties({
moderator: false,
can_grant_moderation: true,
can_revoke_moderation: false
});
}).catch(popupAjaxError);
return ajax("/admin/users/" + this.get("id") + "/revoke_moderation", {
type: "PUT"
})
.then(function() {
self.setProperties({
moderator: false,
can_grant_moderation: true,
can_revoke_moderation: false
});
})
.catch(popupAjaxError);
},
grantModeration() {
const self = this;
return ajax("/admin/users/" + this.get('id') + "/grant_moderation", {
type: 'PUT'
}).then(function() {
self.setProperties({
moderator: true,
can_grant_moderation: false,
can_revoke_moderation: true
});
}).catch(popupAjaxError);
return ajax("/admin/users/" + this.get("id") + "/grant_moderation", {
type: "PUT"
})
.then(function() {
self.setProperties({
moderator: true,
can_grant_moderation: false,
can_revoke_moderation: true
});
})
.catch(popupAjaxError);
},
disableSecondFactor() {
return ajax(`/admin/users/${this.get('id')}/disable_second_factor`, {
type: 'PUT'
}).then(() => {
this.set('second_factor_enabled', false);
}).catch(popupAjaxError);
return ajax(`/admin/users/${this.get("id")}/disable_second_factor`, {
type: "PUT"
})
.then(() => {
this.set("second_factor_enabled", false);
})
.catch(popupAjaxError);
},
refreshBrowsers() {
return ajax("/admin/users/" + this.get('id') + "/refresh_browsers", {
type: 'POST'
}).finally(() => bootbox.alert(I18n.t("admin.user.refresh_browsers_message")));
return ajax("/admin/users/" + this.get("id") + "/refresh_browsers", {
type: "POST"
}).finally(() =>
bootbox.alert(I18n.t("admin.user.refresh_browsers_message"))
);
},
approve() {
const self = this;
return ajax("/admin/users/" + this.get('id') + "/approve", {
type: 'PUT'
return ajax("/admin/users/" + this.get("id") + "/approve", {
type: "PUT"
}).then(function() {
self.setProperties({
can_approve: false,
@ -180,76 +208,88 @@ const AdminUser = Discourse.User.extend({
},
setOriginalTrustLevel() {
this.set('originalTrustLevel', this.get('trust_level'));
this.set("originalTrustLevel", this.get("trust_level"));
},
dirty: propertyNotEqual('originalTrustLevel', 'trustLevel.id'),
dirty: propertyNotEqual("originalTrustLevel", "trustLevel.id"),
saveTrustLevel() {
return ajax("/admin/users/" + this.id + "/trust_level", {
type: 'PUT',
data: { level: this.get('trustLevel.id') }
}).then(function() {
window.location.reload();
}).catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.errors) {
error = e.responseJSON.errors[0];
}
error = error || I18n.t('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
type: "PUT",
data: { level: this.get("trustLevel.id") }
})
.then(function() {
window.location.reload();
})
.catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.errors) {
error = e.responseJSON.errors[0];
}
error =
error ||
I18n.t("admin.user.trust_level_change_failed", {
error: "http: " + e.status + " - " + e.body
});
bootbox.alert(error);
});
},
restoreTrustLevel() {
this.set('trustLevel.id', this.get('originalTrustLevel'));
this.set("trustLevel.id", this.get("originalTrustLevel"));
},
lockTrustLevel(locked) {
return ajax("/admin/users/" + this.id + "/trust_level_lock", {
type: 'PUT',
type: "PUT",
data: { locked: !!locked }
}).then(function() {
window.location.reload();
}).catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.errors) {
error = e.responseJSON.errors[0];
}
error = error || I18n.t('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
})
.then(function() {
window.location.reload();
})
.catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.errors) {
error = e.responseJSON.errors[0];
}
error =
error ||
I18n.t("admin.user.trust_level_change_failed", {
error: "http: " + e.status + " - " + e.body
});
bootbox.alert(error);
});
},
canLockTrustLevel: function() {
return this.get('trust_level') < 4;
}.property('trust_level'),
return this.get("trust_level") < 4;
}.property("trust_level"),
canSuspend: Em.computed.not('staff'),
canSuspend: Em.computed.not("staff"),
suspendDuration: function() {
const suspended_at = moment(this.suspended_at),
suspended_till = moment(this.suspended_till);
return suspended_at.format('L') + " - " + suspended_till.format('L');
}.property('suspended_till', 'suspended_at'),
suspended_till = moment(this.suspended_till);
return suspended_at.format("L") + " - " + suspended_till.format("L");
}.property("suspended_till", "suspended_at"),
suspend(data) {
return ajax(`/admin/users/${this.id}/suspend`, {
type: 'PUT',
type: "PUT",
data
}).then(result => this.setProperties(result.suspension));
},
unsuspend() {
return ajax(`/admin/users/${this.id}/unsuspend`, {
type: 'PUT'
type: "PUT"
}).then(result => this.setProperties(result.suspension));
},
logOut() {
return ajax("/admin/users/" + this.id + "/log_out", {
type: 'POST',
data: { username_or_email: this.get('username') }
type: "POST",
data: { username_or_email: this.get("username") }
}).then(function() {
bootbox.alert(I18n.t("admin.user.logged_out"));
});
@ -257,130 +297,159 @@ const AdminUser = Discourse.User.extend({
impersonate() {
return ajax("/admin/impersonate", {
type: 'POST',
data: { username_or_email: this.get('username') }
}).then(function() {
document.location = Discourse.getURL("/");
}).catch(function(e) {
if (e.status === 404) {
bootbox.alert(I18n.t('admin.impersonate.not_found'));
} else {
bootbox.alert(I18n.t('admin.impersonate.invalid'));
}
});
type: "POST",
data: { username_or_email: this.get("username") }
})
.then(function() {
document.location = Discourse.getURL("/");
})
.catch(function(e) {
if (e.status === 404) {
bootbox.alert(I18n.t("admin.impersonate.not_found"));
} else {
bootbox.alert(I18n.t("admin.impersonate.invalid"));
}
});
},
activate() {
return ajax('/admin/users/' + this.id + '/activate', {
type: 'PUT'
}).then(function() {
window.location.reload();
}).catch(function(e) {
var error = I18n.t('admin.user.activate_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
return ajax("/admin/users/" + this.id + "/activate", {
type: "PUT"
})
.then(function() {
window.location.reload();
})
.catch(function(e) {
var error = I18n.t("admin.user.activate_failed", {
error: "http: " + e.status + " - " + e.body
});
bootbox.alert(error);
});
},
deactivate() {
return ajax('/admin/users/' + this.id + '/deactivate', {
type: 'PUT',
return ajax("/admin/users/" + this.id + "/deactivate", {
type: "PUT",
data: { context: document.location.pathname }
}).then(function() {
window.location.reload();
}).catch(function(e) {
var error = I18n.t('admin.user.deactivate_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
})
.then(function() {
window.location.reload();
})
.catch(function(e) {
var error = I18n.t("admin.user.deactivate_failed", {
error: "http: " + e.status + " - " + e.body
});
bootbox.alert(error);
});
},
unsilence() {
this.set('silencingUser', true);
this.set("silencingUser", true);
return ajax(`/admin/users/${this.id}/unsilence`, {
type: 'PUT'
}).then(result => {
this.setProperties(result.unsilence);
}).catch(e => {
let error = I18n.t('admin.user.unsilence_failed', {
error: `http: ${e.status} - ${e.body}`
type: "PUT"
})
.then(result => {
this.setProperties(result.unsilence);
})
.catch(e => {
let error = I18n.t("admin.user.unsilence_failed", {
error: `http: ${e.status} - ${e.body}`
});
bootbox.alert(error);
})
.finally(() => {
this.set("silencingUser", false);
});
bootbox.alert(error);
}).finally(() => {
this.set('silencingUser', false);
});
},
silence(data) {
this.set('silencingUser', true);
this.set("silencingUser", true);
return ajax(`/admin/users/${this.id}/silence`, {
type: 'PUT',
type: "PUT",
data
}).then(result => {
this.setProperties(result.silence);
}).catch(e => {
let error = I18n.t('admin.user.silence_failed', {
error: `http: ${e.status} - ${e.body}`
})
.then(result => {
this.setProperties(result.silence);
})
.catch(e => {
let error = I18n.t("admin.user.silence_failed", {
error: `http: ${e.status} - ${e.body}`
});
bootbox.alert(error);
})
.finally(() => {
this.set("silencingUser", false);
});
bootbox.alert(error);
}).finally(() => {
this.set('silencingUser', false);
});
},
sendActivationEmail() {
return ajax(userPath('action/send_activation_email'), {
type: 'POST',
data: { username: this.get('username') }
}).then(function() {
bootbox.alert( I18n.t('admin.user.activation_email_sent') );
}).catch(popupAjaxError);
return ajax(userPath("action/send_activation_email"), {
type: "POST",
data: { username: this.get("username") }
})
.then(function() {
bootbox.alert(I18n.t("admin.user.activation_email_sent"));
})
.catch(popupAjaxError);
},
anonymize() {
const user = this,
message = I18n.t("admin.user.anonymize_confirm");
message = I18n.t("admin.user.anonymize_confirm");
const performAnonymize = function() {
return ajax("/admin/users/" + user.get('id') + '/anonymize.json', {
type: 'PUT'
}).then(function(data) {
if (data.success) {
if (data.username) {
document.location = Discourse.getURL("/admin/users/" + user.get('id') + "/" + data.username);
return ajax("/admin/users/" + user.get("id") + "/anonymize.json", {
type: "PUT"
})
.then(function(data) {
if (data.success) {
if (data.username) {
document.location = Discourse.getURL(
"/admin/users/" + user.get("id") + "/" + data.username
);
} else {
document.location = Discourse.getURL("/admin/users/list/active");
}
} else {
document.location = Discourse.getURL("/admin/users/list/active");
bootbox.alert(I18n.t("admin.user.anonymize_failed"));
if (data.user) {
user.setProperties(data.user);
}
}
} else {
})
.catch(function() {
bootbox.alert(I18n.t("admin.user.anonymize_failed"));
if (data.user) {
user.setProperties(data.user);
}
}
}).catch(function() {
bootbox.alert(I18n.t("admin.user.anonymize_failed"));
});
});
};
const buttons = [{
"label": I18n.t("composer.cancel"),
"class": "cancel",
"link": true
}, {
"label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.anonymize_yes'),
"class": "btn btn-danger",
"callback": function() { performAnonymize(); }
}];
const buttons = [
{
label: I18n.t("composer.cancel"),
class: "cancel",
link: true
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.anonymize_yes"),
class: "btn btn-danger",
callback: function() {
performAnonymize();
}
}
];
bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
},
destroy(opts) {
const user = this,
message = I18n.t("admin.user.delete_confirm"),
location = document.location.pathname;
message = I18n.t("admin.user.delete_confirm"),
location = document.location.pathname;
const performDestroy = function(block) {
bootbox.dialog(I18n.t('admin.user.deleting_user'));
bootbox.dialog(I18n.t("admin.user.deleting_user"));
let formData = { context: location };
if (block) {
formData["block_email"] = true;
@ -390,76 +459,85 @@ const AdminUser = Discourse.User.extend({
if (opts && opts.deletePosts) {
formData["delete_posts"] = true;
}
return ajax("/admin/users/" + user.get('id') + '.json', {
type: 'DELETE',
return ajax("/admin/users/" + user.get("id") + ".json", {
type: "DELETE",
data: formData
}).then(function(data) {
if (data.deleted) {
if (/^\/admin\/users\/list\//.test(location)) {
document.location = location;
})
.then(function(data) {
if (data.deleted) {
if (/^\/admin\/users\/list\//.test(location)) {
document.location = location;
} else {
document.location = Discourse.getURL("/admin/users/list/active");
}
} else {
document.location = Discourse.getURL("/admin/users/list/active");
bootbox.alert(I18n.t("admin.user.delete_failed"));
if (data.user) {
user.setProperties(data.user);
}
}
} else {
})
.catch(function() {
AdminUser.find(user.get("id")).then(u => user.setProperties(u));
bootbox.alert(I18n.t("admin.user.delete_failed"));
if (data.user) {
user.setProperties(data.user);
}
}
}).catch(function() {
AdminUser.find(user.get('id')).then(u => user.setProperties(u));
bootbox.alert(I18n.t("admin.user.delete_failed"));
});
});
};
const buttons = [{
"label": I18n.t("composer.cancel"),
"class": "btn",
"link": true
}, {
"label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.delete_and_block'),
"class": "btn btn-danger",
"callback": function(){ performDestroy(true); }
}, {
"label": I18n.t('admin.user.delete_dont_block'),
"class": "btn btn-primary",
"callback": function(){ performDestroy(false); }
}];
const buttons = [
{
label: I18n.t("composer.cancel"),
class: "btn",
link: true
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.delete_and_block"),
class: "btn btn-danger",
callback: function() {
performDestroy(true);
}
},
{
label: I18n.t("admin.user.delete_dont_block"),
class: "btn btn-primary",
callback: function() {
performDestroy(false);
}
}
];
bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
},
loadDetails() {
const user = this;
if (user.get('loadedDetails')) { return Ember.RSVP.resolve(user); }
if (user.get("loadedDetails")) {
return Ember.RSVP.resolve(user);
}
return AdminUser.find(user.get('id')).then(result => {
return AdminUser.find(user.get("id")).then(result => {
user.setProperties(result);
user.set('loadedDetails', true);
user.set("loadedDetails", true);
});
},
@computed('tl3_requirements')
@computed("tl3_requirements")
tl3Requirements(requirements) {
if (requirements) {
return this.store.createRecord('tl3Requirements', requirements);
return this.store.createRecord("tl3Requirements", requirements);
}
},
@computed('suspended_by')
suspendedBy: wrapAdmin,
@computed("suspended_by") suspendedBy: wrapAdmin,
@computed('silenced_by')
silencedBy: wrapAdmin,
@computed('approved_by')
approvedBy: wrapAdmin,
@computed("silenced_by") silencedBy: wrapAdmin,
@computed("approved_by") approvedBy: wrapAdmin
});
AdminUser.reopenClass({
bulkApprove(users) {
_.each(users, function(user) {
user.setProperties({
@ -470,21 +548,21 @@ AdminUser.reopenClass({
});
return ajax("/admin/users/approve-bulk", {
type: 'PUT',
data: { users: users.map((u) => u.id) }
type: "PUT",
data: { users: users.map(u => u.id) }
}).finally(() => bootbox.alert(I18n.t("admin.user.approve_bulk_success")));
},
bulkReject(users) {
_.each(users, function(user) {
user.set('can_approve', false);
user.set('selected', false);
user.set("can_approve", false);
user.set("selected", false);
});
return ajax("/admin/users/reject-bulk", {
type: 'DELETE',
type: "DELETE",
data: {
users: users.map((u) => u.id),
users: users.map(u => u.id),
context: window.location.pathname
}
});
@ -501,7 +579,7 @@ AdminUser.reopenClass({
return ajax("/admin/users/list/" + query + ".json", {
data: filter
}).then(function(users) {
return users.map((u) => AdminUser.create(u));
return users.map(u => AdminUser.create(u));
});
}
});