Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Broken error reporting in modals (and other places) (#23680) 

1. actually call `popupAjaxError`, thanks :P
2. don't close a modal on error
3. use `extractError()` instead of manually joining error messages
4. …or passing just the error object to `this.flash`
This commit is contained in:
Jarek Radosz 2023-09-27 17:11:44 +02:00 committed by GitHub
parent 1ad60b791c
commit 6adc67a7a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/addon/components/modal/install-theme.js
View File

@ -163,8 +163,8 @@ export default class InstallTheme extends Component {
await theme.save({ name: this.name, component: this.component });
this.args.model.addTheme(theme);
this.args.closeModal();
} catch {
popupAjaxError;
} catch (e) {
popupAjaxError(e);
} finally {
this.loading = false;
}

5
app/assets/javascripts/admin/addon/components/modal/reseed.js
View File

@ -44,12 +44,13 @@ export default class Reseed extends Component {
},
type: "POST",
});
this.flash = null;
this.args.closeModal();
} catch {
this.flash = I18n.t("generic_error");
} finally {
this.reseeding = false;
this.flash = null;
this.args.closeModal();
}
}
}

3
app/assets/javascripts/admin/addon/components/theme-upload-add.js
View File

@ -4,6 +4,7 @@ import { tracked } from "@glimmer/tracking";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax";
import { isEmpty } from "@ember/utils";
import { extractError } from "discourse/lib/ajax-error";
const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
const SCSS_VARIABLE_NAMES = [
@ -108,7 +109,7 @@ export default class ThemeUploadAdd extends Component {
this.args.model.addUpload(upload);
this.args.closeModal();
} catch (e) {
this.flash = e.jqXHR.responseJSON.errors.join(". ");
this.flash = extractError(e);
}
}
}

27
app/assets/javascripts/discourse/app/components/modal/activation-edit.js
View File

@ -4,6 +4,7 @@ import { inject as service } from "@ember/service";
import { tracked } from "@glimmer/tracking";
import { changeEmail } from "discourse/lib/user-activation";
import ActivationResent from "./activation-resent";
import { extractError } from "discourse/lib/ajax-error";
export default class ActivationEdit extends Component {
@service login;
@ -17,18 +18,20 @@ export default class ActivationEdit extends Component {
}
@action
changeEmail() {
changeEmail({
username: this.login?.loginName,
password: this.login?.loginPassword,
email: this.args.model.newEmail,
})
.then(() => {
this.modal.show(ActivationResent, {
model: { currentEmail: this.args.model.newEmail },
});
})
.catch((e) => (this.flash = e));
async changeEmail() {
try {
await changeEmail({
username: this.login?.loginName,
password: this.login?.loginPassword,
email: this.args.model.newEmail,
});
this.modal.show(ActivationResent, {
model: { currentEmail: this.args.model.newEmail },
});
} catch (e) {
this.flash = extractError(e);
}
}
@action

3
app/assets/javascripts/discourse/app/components/modal/do-not-disturb.js
View File

@ -2,6 +2,7 @@ import Component from "@glimmer/component";
import { action } from "@ember/object";
import { tracked } from "@glimmer/tracking";
import { inject as service } from "@ember/service";
import { extractError } from "discourse/lib/ajax-error";
export default class DoNotDisturb extends Component {
@service currentUser;
@ -15,7 +16,7 @@ export default class DoNotDisturb extends Component {
await this.currentUser.enterDoNotDisturbFor(duration);
this.args.closeModal();
} catch (e) {
this.flash = e;
this.flash = extractError(e);
}
}

3
app/assets/javascripts/discourse/app/components/modal/edit-slow-mode.js
View File

@ -6,6 +6,7 @@ import I18n from "I18n";
import { timeShortcuts } from "discourse/lib/time-shortcut";
import Topic from "discourse/models/topic";
import { inject as service } from "@ember/service";
import { extractError } from "discourse/lib/ajax-error";
const SLOW_MODE_OPTIONS = [
{
@ -154,7 +155,7 @@ export default class EditSlowMode extends Component {
this.args.model.topic.set("slow_mode_seconds", 0);
this.args.closeModal();
} catch (e) {
this.flash = e;
this.flash = extractError(e);
} finally {
this.saveDisabled = false;
}

4
app/assets/javascripts/discourse/app/components/modal/edit-user-directory-columns.js
View File

@ -27,8 +27,8 @@ export default class EditUserDirectoryColumns extends Component {
this.columns = response.directory_columns
.sort((a, b) => (a.position > b.position ? 1 : -1))
.map((c) => ({ ...c, enabled: Boolean(c.enabled) }));
} catch {
popupAjaxError;
} catch (e) {
popupAjaxError(e);
}
}

32
app/assets/javascripts/discourse/app/components/modal/group-add-members.js
View File

@ -5,6 +5,7 @@ import { tracked } from "@glimmer/tracking";
import { emailValid } from "discourse/lib/utilities";
import I18n from "I18n";
import { inject as service } from "@ember/service";
import { extractError } from "discourse/lib/ajax-error";
export default class GroupAddMembers extends Component {
@service currentUser;
@ -42,28 +43,33 @@ export default class GroupAddMembers extends Component {
}
@action
addMembers() {
async addMembers() {
if (isEmpty(this.usernamesAndEmails)) {
return;
}
this.loading = true;
const promise = this.setOwner
? this.args.model.addOwners(this.usernames, true, this.notifyUsers)
: this.args.model.addMembers(
try {
if (this.setOwner) {
await this.args.model.addOwners(this.usernames, true, this.notifyUsers);
} else {
await this.args.model.addMembers(
this.usernames,
true,
this.notifyUsers,
this.emails
);
}
promise
.then(() => {
this.router.transitionTo("group.members", this.args.model.name, {
queryParams: { ...(this.usernames && { filter: this.usernames }) },
});
this.args.closeModal();
})
.catch((e) => (this.flash = e.jqXHR.responseJSON.errors.join(". ")))
.finally(() => (this.loading = false));
this.router.transitionTo("group.members", this.args.model.name, {
queryParams: { ...(this.usernames && { filter: this.usernames }) },
});
this.args.closeModal();
} catch (e) {
this.flash = extractError(e);
} finally {
this.loading = false;
}
}
}

4
app/assets/javascripts/discourse/app/routes/associate-account.js
View File

@ -35,8 +35,8 @@ export default DiscourseRoute.extend({
`/associate/${encodeURIComponent(params.token)}.json`
);
showModal("associate-account-confirm", { model });
} catch {
popupAjaxError;
} catch (e) {
popupAjaxError(e);
}
},
});

22
plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
View File

@ -9,6 +9,7 @@ import { inject as service } from "@ember/service";
import { isBlank, isPresent } from "@ember/utils";
import { htmlSafe } from "@ember/template";
import { tracked } from "@glimmer/tracking";
import { extractError } from "discourse/lib/ajax-error";
const DEFAULT_HINT = htmlSafe(
I18n.t("chat.create_channel.choose_category.default_hint", {
@ -108,17 +109,16 @@ export default class ChatModalCreateChannel extends Component {
}
}
#createChannel(data) {
return this.chatApi
.createChannel(data)
.then((channel) => {
this.args.closeModal();
this.chatChannelsManager.follow(channel);
this.router.transitionTo("chat.channel", ...channel.routeModels);
})
.catch((e) => {
this.flash = e.jqXHR.responseJSON.errors[0];
});
async #createChannel(data) {
try {
const channel = await this.chatApi.createChannel(data);
this.args.closeModal();
this.chatChannelsManager.follow(channel);
this.router.transitionTo("chat.channel", ...channel.routeModels);
} catch (e) {
this.flash = extractError(e);
}
}
#buildCategorySlug(category) {

21
plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js
View File

@ -2,6 +2,7 @@ import Component from "@glimmer/component";
import { action } from "@ember/object";
import { tracked } from "@glimmer/tracking";
import { inject as service } from "@ember/service";
import { extractError } from "discourse/lib/ajax-error";
const DESCRIPTION_MAX_LENGTH = 280;
@ -27,18 +28,16 @@ export default class ChatModalEditChannelDescription extends Component {
}
@action
onSaveChatChannelDescription() {
return this.chatApi
.updateChannel(this.channel.id, { description: this.editedDescription })
.then((result) => {
this.channel.description = result.channel.description;
this.args.closeModal();
})
.catch((event) => {
if (event.jqXHR?.responseJSON?.errors) {
this.flash = event.jqXHR.responseJSON.errors.join("\n");
}
async onSaveChatChannelDescription() {
try {
const result = await this.chatApi.updateChannel(this.channel.id, {
description: this.editedDescription,
});
this.channel.description = result.channel.description;
this.args.closeModal();
} catch (error) {
this.flash = extractError(error);
}
}
@action