From 71b4557d3cbacd4b74ea59863b5e81c0579b65b2 Mon Sep 17 00:00:00 2001
From: Umar Hassan <umar.hassan8@gmail.com>
Date: Mon, 11 Nov 2024 18:53:09 +0500
Subject: [PATCH] added condition to include nav item only if url is not empty
 (#1449)

* added condition to include nav item only if url is not empty

* added conditional rendering of parent only if atleast has one child with url

* added missing partial file

* added nested checking for valid children

* fixed false active tag and fixed span condition
---
 course-v2/layouts/partials/nav_item.html      | 13 +++++++++----
 .../layouts/partials/nav_item_has_child.html  | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 course-v2/layouts/partials/nav_item_has_child.html

diff --git a/course-v2/layouts/partials/nav_item.html b/course-v2/layouts/partials/nav_item.html
index 3a0f2848f..37c2ba381 100644
--- a/course-v2/layouts/partials/nav_item.html
+++ b/course-v2/layouts/partials/nav_item.html
@@ -4,6 +4,11 @@
 {{ $hasChildren := .menuItem.HasChildren }}
 {{ $url := partial "nav_url.html" . }}
 {{ $linkedPage := site.GetPage .menuItem.PageRef }}
+{{ $hasOneValidChild := false }}
+
+{{ if $hasChildren }}
+  {{ $hasOneValidChild = partial "nav_item_has_child.html" .menuItem.Children }}
+{{ end }}
 
 <li class="course-nav-list-item">
   <div class="course-nav-parent d-flex flex-direction-row align-items-center justify-content-between">
@@ -17,15 +22,15 @@
             )
           )
         -}}
-      {{ else }}
+      {{ else if or $url $hasOneValidChild }}
         <a class="text-dark nav-link"
           data-uuid="{{ .menuItem.Identifier }}"
-          href="{{ $url }}">
+          {{ if $url }} href="{{ $url }}" {{ else }} href="#" {{ end }}>
           {{ .menuItem.Name }}
         </a>
       {{ end }}
     </span>
-    {{ if .menuItem.HasChildren }}
+    {{ if $hasOneValidChild }}
     <button
       class="course-nav-section-toggle"
       type="button"
@@ -41,7 +46,7 @@
     </button>
     {{ end }}
   </div>
-  {{ if or (not $hasParent) $hasChildren }}
+  {{ if or (and (not $hasParent) $url) $hasOneValidChild }}
   <span class="medium-and-below-only"><hr/></span>
   {{ end }}
   <ul
diff --git a/course-v2/layouts/partials/nav_item_has_child.html b/course-v2/layouts/partials/nav_item_has_child.html
new file mode 100644
index 000000000..4a16011aa
--- /dev/null
+++ b/course-v2/layouts/partials/nav_item_has_child.html
@@ -0,0 +1,19 @@
+{{ $hasOneValidChild := false }}
+
+{{ range . }}
+  {{ $url := partial "nav_url.html" (dict "menuItem" .) }}
+
+  {{ if .HasChildren }}
+    {{ $hasOneValidChild = partial "nav_item_has_child.html" .Children }}
+    {{ if $hasOneValidChild }}
+      {{ break }}
+    {{ end }}
+  {{ else }}
+    {{ if $url }}
+      {{ $hasOneValidChild = true }}
+      {{ break }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{ return $hasOneValidChild }}