fix(KUI-1196): change ternary conditional statement to normal conditi…

…onal state using function
KTH · Jun 24, 2024 · aeccc99 · aeccc99
1 parent 7d8b921
commit aeccc99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/public/js/app/components/statistics/AnalysesSummary.jsx b/public/js/app/components/statistics/AnalysesSummary.jsx
@@ -36,12 +36,17 @@ function Captions({ school, year, seasons }) {
     },
   } = useLanguage()
 
+  function getSchoolName(schoolName) {
+    if (schoolName === 'allSchools') return statisticsLabels[schoolName]
+    return schoolName
+  }
+
   const seasonsStr = seasons.map(season => seasonLib.labelSeason(season, languageIndex)).join(', ')
   return (
     <Row>
       <Col xs="4" style={{ flex: 'none', width: 'auto', paddingBottom: '20px' }}>
         <label>{formSubHeaders.school}</label>
-        {`: ${school === 'allSchools' ? statisticsLabels[school] : school}`}
+        {`: ${getSchoolName(school)}`}
       </Col>
       <Col xs="4" style={{ flex: 'none', width: 'auto', paddingBottom: '20px' }}>
         <label>{formSubHeaders.year}</label>

diff --git a/public/js/app/components/statistics/MemosSummary.jsx b/public/js/app/components/statistics/MemosSummary.jsx
@@ -69,14 +69,19 @@ function Captions({ school, year, periods }) {
     languageIndex,
   } = useLanguage()
 
+  function getSchoolName(schoolName) {
+    if (schoolName === 'allSchools') return statisticsLabels[schoolName]
+    return schoolName
+  }
+
   const periodsLabels = periods.map(period => periodsLib.labelPeriod(period, languageIndex, false))
   const uniqquePeriodsLabels = [...new Set(periodsLabels)]
   const periodsStr = uniqquePeriodsLabels.join(', ')
   return (
     <Row>
       <Col xs="4" style={{ flex: 'none', width: 'auto', paddingBottom: '20px' }}>
         <label>{formSubHeaders.school}</label>
-        {`: ${school === 'allSchools' ? statisticsLabels[school] : school}`}
+        {`: ${getSchoolName(school)}`}
       </Col>
       <Col xs="4" style={{ flex: 'none', width: 'auto', paddingBottom: '20px' }}>
         <label>{formSubHeaders.year}</label>