Update user friendly errors for translations (#15000)
Force msg typing instead of string for user friendly errors
This commit is contained in:
@@ -44,7 +44,10 @@ describe('CustomException', () => {
|
||||
it('should set userFriendlyMessage when provided', () => {
|
||||
const message = 'Test error message';
|
||||
const code = 'TEST_ERROR';
|
||||
const userFriendlyMessage = 'User friendly error message';
|
||||
const userFriendlyMessage = {
|
||||
id: 'test.message',
|
||||
message: 'User friendly error message',
|
||||
};
|
||||
const exception = new TestException(message, code, {
|
||||
userFriendlyMessage,
|
||||
});
|
||||
@@ -81,7 +84,10 @@ describe('UnknownException', () => {
|
||||
it('should set userFriendlyMessage when provided', () => {
|
||||
const message = 'Test error message';
|
||||
const code = 'TEST_ERROR';
|
||||
const userFriendlyMessage = 'User friendly error message';
|
||||
const userFriendlyMessage = {
|
||||
id: 'test.message',
|
||||
message: 'User friendly error message',
|
||||
};
|
||||
const exception = new UnknownException(message, code, {
|
||||
userFriendlyMessage,
|
||||
});
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { type MessageDescriptor } from '@lingui/core';
|
||||
import { CustomError } from 'twenty-shared/utils';
|
||||
|
||||
const CommonExceptionCode = {
|
||||
@@ -19,17 +20,16 @@ export abstract class CustomException<
|
||||
ExceptionCode extends string = string,
|
||||
ForceFriendlyMessage = false,
|
||||
ExceptionMessage extends string = string,
|
||||
ExceptionFriendlyMessage extends string = string,
|
||||
> extends CustomError {
|
||||
code: ExceptionCode;
|
||||
userFriendlyMessage?: ExceptionFriendlyMessage;
|
||||
userFriendlyMessage?: MessageDescriptor;
|
||||
|
||||
constructor(
|
||||
message: ExceptionMessage,
|
||||
code: ExceptionCode,
|
||||
...userFriendlyMessage: ForceFriendlyMessage extends true
|
||||
? [{ userFriendlyMessage: ExceptionFriendlyMessage }]
|
||||
: [{ userFriendlyMessage?: ExceptionFriendlyMessage }?]
|
||||
? [{ userFriendlyMessage: MessageDescriptor }]
|
||||
: [{ userFriendlyMessage?: MessageDescriptor }?]
|
||||
) {
|
||||
super(message);
|
||||
this.code = code;
|
||||
|
||||
Reference in New Issue
Block a user