CodeCow/clients
1
0
Fork 0
mirror of https://github.com/bitwarden/clients.git synced 2026-07-21 21:17:06 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[PM-38357] Surface more descriptive error messages from server on Send edit failure (#21067)

Browse Source 
* [PM-38357] Surface more descriptive error messages from server on Send edit failure

* Address AI review comments

* Re-add guard and adjust abstract method documentation
This commit is contained in:
Mike Amirault 2026-06-11 09:53:08 -04:00 committed by GitHub
parent 0e9b1b2cfd
commit 0e3634d2d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/_locales/en/messages.json
View File

@ -6667,10 +6667,6 @@
"message": "Progress bar",
"description": "This is the name of a page component that displays progress to the user. This string will be used to label the progress bar for a screenreader when multiple progress bars are on a page, like 'Progress bar 1' and 'Progress bar 2'."
},
"saveSendEditsFailed": {
"message": "Saving Send edits failed",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"hideEmailPolicyInEffect": {
"message": "Your organization requires email visibility. Uncheck \"Hide your email from viewers\" to save."
},

4
apps/desktop/src/locales/en/messages.json
View File

@ -5259,10 +5259,6 @@
"message": "Send has unsaved edits. Are you sure you want to leave?",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"saveSendEditsFailed": {
"message": "Saving Send edits failed",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"viewTextSendHeader": {
"message": "View text"
},

4
apps/web/src/locales/en/messages.json
View File

@ -14233,10 +14233,6 @@
"message": "Send has unsaved edits. Are you sure you want to leave?",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"saveSendEditsFailed": {
"message": "Saving Send edits failed",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"hideMyEmail": {
"message": "Hide my email address from recipients."
},

4
libs/tools/send/send-ui/src/send-form/abstractions/send-form.service.ts
View File

@ -58,8 +58,8 @@ export abstract class SendFormService {
abstract initializeSendForm(sendFormConfig: SendFormConfig): Promise<void>;
/**
* Submits the Send form. Returns `undefined` if the form has an
* error or the service encounters a network error on submission
* Submits the Send form. This will return `undefined` if the Send form had errors preventing
* its submission, and throw any errors it receives from encryption, decryption, or the API call
*/
abstract submitSendForm(): Promise<SendView>;

2
libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
View File

@ -135,7 +135,7 @@ export class SendFormComponent implements AfterViewInit {
submit = async () => {
const sendView = await this.sendFormService.submitSendForm();
// Send form had errors or otherwise failed to submit
// Send form had errors
if (!sendView) {
return;
}

24
libs/tools/send/send-ui/src/send-form/services/default-send-form.service.ts
View File

@ -13,7 +13,6 @@ import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
import { DialogService, ToastService } from "@bitwarden/components";
import { LogService } from "@bitwarden/logging";
import { SendItemDialogResult } from "../../add-edit/send-add-edit-dialog.component";
import { SendPolicyService } from "../../services/send-policy.service";
@ -29,7 +28,6 @@ import { SendForm } from "../send-form-container";
export class DefaultSendFormService implements SendFormService {
private dialogService = inject(DialogService);
private toastService = inject(ToastService);
private logService = inject(LogService);
private formBuilder = inject(FormBuilder);
private accountService = inject(AccountService);
private sendApiService = inject(SendApiService);
@ -112,6 +110,7 @@ export class DefaultSendFormService implements SendFormService {
}
}
let sendView: SendView;
try {
const sendData = await this.sendService.encrypt(
this.updatedSendView,
@ -120,20 +119,19 @@ export class DefaultSendFormService implements SendFormService {
null,
);
const newSend = await this.sendApiService.save(sendData);
const sendView = await this.decryptSend(newSend);
this._originalSendView.set(null);
this.updatedSendView = null;
this._submitting.set(false);
return sendView;
sendView = await this.decryptSend(newSend);
} catch (err) {
this.logService.error(err);
this.toastService.showToast({
message: this.i18nService.t("saveSendEditsFailed"),
variant: "error",
});
// We surface any errors but make sure that the submitting
// status signal is set to false before we do
this._submitting.set(false);
return;
throw err;
}
this._originalSendView.set(null);
this.updatedSendView = null;
this._submitting.set(false);
return sendView;
}
sendFormHasEdits() {