Avoid duplicate code

statisticsnorway · Oct 6, 2023 · 8ff7f58 · 8ff7f58
1 parent ba51db4
commit 8ff7f58
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/src/main/resources/react4xp/_entries/KeyFigure.jsx b/src/main/resources/react4xp/_entries/KeyFigure.jsx
@@ -46,33 +46,25 @@ class KeyFigures extends React.Component {
     if (this.props.showPreviewDraft) {
       if (this.state.fetchUnPublished) {
         return keyFigures.map((keyFigure, i) => {
-          if (this.props.draftExist && keyFigure.number) {
-            return (
-              <Col
-                key={`${keyFigure.number || keyFigure.title}${i}`}
-                className={`col-12${this.props.isInStatisticsPage ? ' p-0' : ''}`}
-              >
+          return (
+            <Col
+              key={`${keyFigure.number || keyFigure.title}${i}`}
+              className={`col-12${this.props.isInStatisticsPage ? ' p-0' : ''}`}
+            >
+              {this.props.draftExist && keyFigure.number ? (
                 <Alert variant='info' className='mb-4'>
                   Tallet i nøkkeltallet nedenfor er upublisert
                 </Alert>
-              </Col>
-            )
-          } else {
-            return (
-              <Col
-                key={`${keyFigure.number || keyFigure.title}${i}`}
-                className={`col-12${this.props.isInStatisticsPage ? ' p-0' : ''}`}
-              >
+              ) : (
                 <Alert variant='warning' className='mb-4'>
                   Finnes ikke upubliserte tall for dette nøkkeltallet
                 </Alert>
-              </Col>
-            )
-          }
+              )}
+            </Col>
+          )
         })
       }
     }
-    return
   }
 
   createRows() {