Merge pull request #5113 from akvo/4910-invalid-selected-card

[#4910] Fix project card not clickable in the hierarchy tab
akvo · Sep 16, 2022 · 42ce016 · 42ce016
2 parents 3c298ac + 27695d8
commit 42ce016
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/akvo/rsr/spa/app/modules/hierarchy/card.jsx b/akvo/rsr/spa/app/modules/hierarchy/card.jsx
@@ -13,7 +13,7 @@ const Card = ({ project, selected, onClick, filterCountry, countryFilter, level,
     <li
       className={classNames('card', {
         selected,
-        clickable: childrenCount > 0 || (program && canCreateProjects),
+        clickable: canCreateProjects,
         referenced: (referenced && isReff)
       })}
       onClick={onClick}

diff --git a/akvo/rsr/spa/app/modules/hierarchy/hierarchy.jsx b/akvo/rsr/spa/app/modules/hierarchy/hierarchy.jsx
@@ -32,7 +32,8 @@ const Hierarchy = ({ match: { params }, program, userRdr, asProjectTab }) => {
     const itemIndex = selected.findIndex(it => it === item)
     if(itemIndex !== -1){
       setSelected(selected.slice(0, colIndex + 1))
-    } else if((item.children && item.children.length > 0) || (program && canCreateProjects)) {
+    }
+    if(canCreateProjects) {
       setSelected([...(selected[colIndex] ? selected.slice(0, colIndex + 1) : selected), item])
     }
   }