From 53403f26e2e5abddb5aad8fce10137a76aac0af4 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Wed, 15 Jan 2020 17:38:11 +0100 Subject: [PATCH] Add optional i18n keys for violations and make path optional --- scm-ui/ui-components/src/BackendErrorNotification.tsx | 3 ++- scm-ui/ui-components/src/errors.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scm-ui/ui-components/src/BackendErrorNotification.tsx b/scm-ui/ui-components/src/BackendErrorNotification.tsx index 5319243f79..0ab184e7c4 100644 --- a/scm-ui/ui-components/src/BackendErrorNotification.tsx +++ b/scm-ui/ui-components/src/BackendErrorNotification.tsx @@ -56,7 +56,8 @@ class BackendErrorNotification extends React.Component { {error.violations.map((violation, index) => { return (
  • - {violation.path}: {violation.message} + {violation.path && {violation.path}:} {violation.message}{" "} + {violation.key && t(violation.key)}
  • ); })} diff --git a/scm-ui/ui-components/src/errors.ts b/scm-ui/ui-components/src/errors.ts index 5171fe07b4..d1a53e52c9 100644 --- a/scm-ui/ui-components/src/errors.ts +++ b/scm-ui/ui-components/src/errors.ts @@ -2,9 +2,10 @@ type Context = { type: string; id: string; }[]; -type Violation = { - path: string; +export type Violation = { + path?: string; message: string; + key?: string; }; export type BackendErrorContent = {