Merge pull request #668 from hms-dbmi/HYP-302

HYP-302 - Added top-level navigation functionality

Author: b32147

app/hypatio/views.py

@@ -38,7 +38,15 @@ def group_context():
             # Check for group
             active_group = next((g for g in groups if project in g.dataproject_set.all()), None)
 
+        # Pull out top-level groups
+        parent_groups_keys = groups.filter(parent__isnull=False).values_list('parent', flat=True)
+        parent_groups = Group.objects.filter(id__in=parent_groups_keys)
+
+        # Remove groups that will be placed under a parent group
+        groups = groups.filter(parent__isnull=True)
+
         return {
+            "parent_groups": parent_groups,
             "groups": groups,
             "active_group": active_group,
         }

app/projects/migrations/0104_group_parent.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.11 on 2024-04-25 13:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0103_dataproject_commercial_only'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='projects.group'),
+        ),
+    ]

app/projects/models.py

@@ -694,6 +694,7 @@ class Group(models.Model):
     title = models.CharField(max_length=255, blank=False, null=False)
     description = models.TextField(blank=True)
     navigation_title = models.CharField(max_length=20, blank=True, null=True)
+    parent = models.ForeignKey("Group", on_delete=models.PROTECT, blank=True, null=True)
 
     # Meta
     created = models.DateTimeField(auto_now_add=True)

app/templates/base.html

@@ -209,6 +209,19 @@
                         {% url 'index' as index_url %}
                         <li class="nav-item{% if request.path == index_url %} active{% endif %}"><a class="nav-link" href="{{ index_url }}">Home</a></li>
 
+                        {% for group in navigation.parent_groups %}
+                        {% url 'group' group.key as group_url %}
+                        <li class="dropdown">
+                          <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ group.navigation_title|default:group.title }} <span class="caret"></span></a>
+                          <ul class="dropdown-menu" aria-labelledby="{{ group.navigation_title|default:group.title }}">
+                            {% for child in group.group_set.all %}
+                            {% url 'group' child.key as group_url %}
+                            <li class="nav-item{% if request.path == group_url or child.key == navigation.active_group.key %} active{% endif %}"><a class="nav-link" href="{{ group_url }}">{{ child.navigation_title|default:child.title }}</a></li>
+                            {% endfor %}
+                          </ul>
+                        </li>
+                        {% endfor %}
+
                         {% for group in navigation.groups %}
                         {% url 'group' group.key as group_url %}
                         <li class="nav-item{% if request.path == group_url or group.key == navigation.active_group.key %} active{% endif %}"><a class="nav-link" href="{{ group_url }}">{{ group.navigation_title|default:group.title }}</a></li>