From 68a781aa5cffa05eeadf828e4379cbbce4fbacd6 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 9 Sep 2020 17:10:20 +0300
Subject: [PATCH] Fix Thrive selected cat

---
 src/shared/utils/contentful.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/shared/utils/contentful.js b/src/shared/utils/contentful.js
index a7b4880310..76f1614077 100644
--- a/src/shared/utils/contentful.js
+++ b/src/shared/utils/contentful.js
@@ -122,17 +122,22 @@ export function menuItemBuilder(baseUrl, item) {
 export function tracksTreeBuilder(EDUTaxonomy, query) {
   const tax = _.isArray(query.tax) ? query.tax : [query.tax];
   let id = 0;
-  return _.sortBy(
+  const res = _.sortBy(
     _.map(EDUTaxonomy, (categories, track) => ({
       title: track,
       id: id++,
       items: _.sortBy(_.map(categories, cat => ({
-        title: cat.name, id: id++, items: [], track, selected: _.indexOf(tax, cat.name) !== -1,
+        title: cat.name,
+        id: id++,
+        items: [],
+        track,
+        selected: _.indexOf(tax, cat.name) !== -1 && track === query.track,
       })), ['title']),
       selected: query.track === track,
     })),
     ['title'],
   );
+  return res;
 }
 
 export default undefined;