avoid passing null values to SeverityHelper

SonarSource · Jan 7, 2019 · ba01aad · ba01aad
1 parent 95118da
commit ba01aad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
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
@@ -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
@@ -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
@@ -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) {