Update user friendly errors for translations (#15000)
Force msg typing instead of string for user friendly errors
This commit is contained in:
+9
-3
@@ -109,8 +109,11 @@ describe('ImpersonateGuard', () => {
|
||||
|
||||
await expect(guard.canActivate(mockExecutionContext)).rejects.toMatchObject(
|
||||
{
|
||||
userFriendlyMessage:
|
||||
'You do not have permission to impersonate users. Please contact your workspace administrator for access.',
|
||||
userFriendlyMessage: expect.objectContaining({
|
||||
id: expect.any(String),
|
||||
message:
|
||||
'You do not have permission to impersonate users. Please contact your workspace administrator for access.',
|
||||
}),
|
||||
},
|
||||
);
|
||||
});
|
||||
@@ -137,7 +140,10 @@ describe('ImpersonateGuard', () => {
|
||||
|
||||
await expect(guard.canActivate(mockExecutionContext)).rejects.toMatchObject(
|
||||
{
|
||||
userFriendlyMessage: "Can't impersonate user via api key",
|
||||
userFriendlyMessage: expect.objectContaining({
|
||||
id: expect.any(String),
|
||||
message: "Can't impersonate user via api key",
|
||||
}),
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
} from '@nestjs/common';
|
||||
import { GqlExecutionContext } from '@nestjs/graphql';
|
||||
|
||||
import { msg } from '@lingui/core/macro';
|
||||
import { isDefined } from 'class-validator';
|
||||
|
||||
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
|
||||
@@ -30,7 +31,7 @@ export class ImpersonatePermissionGuard implements CanActivate {
|
||||
PermissionsExceptionMessage.PERMISSION_DENIED,
|
||||
PermissionsExceptionCode.PERMISSION_DENIED,
|
||||
{
|
||||
userFriendlyMessage: "Can't impersonate user via api key",
|
||||
userFriendlyMessage: msg`Can't impersonate user via api key`,
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -50,8 +51,7 @@ export class ImpersonatePermissionGuard implements CanActivate {
|
||||
PermissionsExceptionMessage.PERMISSION_DENIED,
|
||||
PermissionsExceptionCode.PERMISSION_DENIED,
|
||||
{
|
||||
userFriendlyMessage:
|
||||
'You do not have permission to impersonate users. Please contact your workspace administrator for access.',
|
||||
userFriendlyMessage: msg`You do not have permission to impersonate users. Please contact your workspace administrator for access.`,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
} from '@nestjs/common';
|
||||
import { GqlExecutionContext } from '@nestjs/graphql';
|
||||
|
||||
import { msg } from '@lingui/core/macro';
|
||||
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
|
||||
|
||||
import { type PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
|
||||
@@ -56,8 +57,7 @@ export const SettingsPermissionsGuard = (
|
||||
PermissionsExceptionMessage.PERMISSION_DENIED,
|
||||
PermissionsExceptionCode.PERMISSION_DENIED,
|
||||
{
|
||||
userFriendlyMessage:
|
||||
'You do not have permission to access this feature. Please contact your workspace administrator for access.',
|
||||
userFriendlyMessage: msg`You do not have permission to access this feature. Please contact your workspace administrator for access.`,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user