Hide untranslated task groups

partio-scout · May 18, 2021 · c81414f · c81414f
1 parent 1fcbed1
commit c81414f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 22 deletions.
diff --git a/src/components/TaskGroupItem/index.js b/src/components/TaskGroupItem/index.js
@@ -2,11 +2,22 @@ import React from 'react'
 import ListItem from 'components/ListItem'
 import taskGroupGraphics from 'graphics/taskGroups'
 
-export const getSubTaskGroupsOrTasksText = (tasksTerm, taskGroup) => {
+const getTranslatedTaskCount = (tasks, lang) => {
+  return tasks.reduce((acc, task) => {
+    if (task.languages.find(language => language.lang === lang)) {
+      acc++
+    }
+    return acc
+  }, 0)
+}
+
+export const getSubTaskGroupsOrTasksText = (tasksTerm, taskGroup, language) => {
   const term = tasksTerm || 'aktiviteettia'
   const tasksExist = taskGroup.tasks.length > 0
   const tasksGroupsExist = taskGroup.taskgroups.length > 0
-  const tasksText = tasksExist ? taskGroup.tasks.length : ''
+  const tasksText = tasksExist
+    ? getTranslatedTaskCount(taskGroup.tasks, language)
+    : ''
   const taskGroupsText = tasksGroupsExist ? taskGroup.taskgroups.length : ''
   return `${tasksText} ${
     tasksExist && tasksGroupsExist ? '+' : ''
@@ -22,16 +33,18 @@ const TaskGroupItem = ({
 }) => {
   const languageInfo = taskGroup.languages.find(x => x.lang === language)
 
-  return (
+  return languageInfo ? (
     <ListItem
       guid={taskGroup.guid}
       ageGroupGuid={ageGroupGuid}
-      title={languageInfo ? languageInfo.title : taskGroup.title}
-      subTitle={subTitle || getSubTaskGroupsOrTasksText(tasksTerm, taskGroup)}
+      title={languageInfo.title}
+      subTitle={
+        subTitle || getSubTaskGroupsOrTasksText(tasksTerm, taskGroup, language)
+      }
       language={language}
       icon={taskGroupGraphics[`Group${taskGroup.guid}`] || null}
     />
-  )
+  ) : null
 }
 
 export default TaskGroupItem
diff --git a/src/views/TaskGroup/index.js b/src/views/TaskGroup/index.js
@@ -95,22 +95,24 @@ const TaskGroup = () => {
           const task_status = status === 'active' ? 'started' : `task_${status}`
 
           return (
-            <ListItem
-              key={task.guid}
-              guid={task.guid}
-              ageGroupGuid={taskGroup.ageGroupGuid}
-              title={taskTranslation ? taskTranslation.title : task.title}
-              subTitle={getTermInLanguage(
-                generalTranslations,
-                `${task_status}`,
-                language
-              )}
-              language={language}
-              itemType={ITEM_TYPES.TASK}
-              showActions
-              showFavourite
-              isFavourite={favourites.includes(task.guid)}
-            />
+            taskTranslation && (
+              <ListItem
+                key={task.guid}
+                guid={task.guid}
+                ageGroupGuid={taskGroup.ageGroupGuid}
+                title={taskTranslation.title}
+                subTitle={getTermInLanguage(
+                  generalTranslations,
+                  `${task_status}`,
+                  language
+                )}
+                language={language}
+                itemType={ITEM_TYPES.TASK}
+                showActions
+                showFavourite
+                isFavourite={favourites.includes(task.guid)}
+              />
+            )
           )
         })}
       </TaskList>