From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Wed, 2 Jan 2019 14:54:58 +0000 (+0100)
Subject: avoid passing null values to SeverityHelper
X-Git-Tag: 7.6~181
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba01aadcb02629042d8378473a9726d13679a938;p=sonarqube.git

avoid passing null values to SeverityHelper
---

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangesList.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangesList.tsx
index 629c8bf6c1f..acbb45c981d 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangesList.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangesList.tsx
@@ -26,12 +26,17 @@ interface Props {
 }
 
 export default function ChangesList({ changes }: Props) {
+  const renderSeverity = (key: string) => {
+    const severity = changes[key];
+    return severity ? <SeverityChange severity={severity} /> : null;
+  };
+
   return (
     <ul>
       {Object.keys(changes).map(key => (
         <li key={key}>
           {key === 'severity' ? (
-            <SeverityChange severity={changes[key]} />
+            renderSeverity(key)
           ) : (
             <ParameterChange name={key} value={changes[key]} />
           )}
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx
index 8a843689a60..815224e48a3 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx
@@ -22,7 +22,7 @@ import SeverityHelper from '../../../components/shared/SeverityHelper';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
-  severity: string | null;
+  severity: string;
 }
 
 export default function SeverityChange({ severity }: Props) {
diff --git a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx
index cec03cf7014..7d9e0c42cb8 100644
--- a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx
+++ b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx
@@ -23,8 +23,7 @@ import { translate } from '../../helpers/l10n';
 
 interface Props {
   className?: string;
-  // TODO avoid passing nil values
-  severity: string | undefined | null;
+  severity: string;
 }
 
 export default function SeverityHelper({ className, severity }: Props) {