Merge pull request #380 from UW-GAC/feature/sync-navbar-home

Synchronize navbar links and home page cards
UW-GAC · Jun 23, 2023 · 9c277c9 · 9c277c9
2 parents e4748ac + 9a54f79
commit 9c277c9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Import ManagedGroup membership from AnVIL when importing a ManagedGroup and the members already have records in the app.
 * Sort available workspaces alphabetically in the `WorkspaceImport` view.
+* Synchronize dropdown items in navbar and links in cards on home page.
 
 ## 0.16.4 (2023-06-16)
 

diff --git a/anvil_consortium_manager/__init__.py b/anvil_consortium_manager/__init__.py
@@ -1 +1 @@
-__version__ = "0.17dev2"
+__version__ = "0.17dev3"
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/index.html b/anvil_consortium_manager/templates/anvil_consortium_manager/index.html
@@ -45,6 +45,10 @@ <h5 class="card-header"><span class="fa-solid fa-dollar-sign mx-2"></span>Billin
               <span class="fa-solid fa-angle-right"></span>
             </li>
             {% endif %}
+            <li class ="list-group-item">
+              <a href="{% url 'anvil_consortium_manager:billing_projects:audit' %}" class="icon-link">Audit billing projects</a>
+              <span class="fa-solid fa-angle-right"></span>
+            </li>
           </ul>
         </div>
       </div>
@@ -68,6 +72,10 @@ <h5 class="card-header"><span class="fa-solid fa-user mx-2"></span>Accounts</h5>
               <span class="fa-solid fa-angle-right"></span>
             </li>
             {% endif %}
+            <li class ="list-group-item">
+              <a href="{% url 'anvil_consortium_manager:accounts:audit' %}" class="icon-link">Audit accounts</a>
+              <span class="fa-solid fa-angle-right"></span>
+            </li>
           </ul>
         </div>
       </div>
@@ -86,9 +94,13 @@ <h5 class="card-header"><span class="fa-solid fa-user-group mx-2"></span>Managed
               <a href="{% url 'anvil_consortium_manager:managed_groups:list' %}" class="icon-link">List groups</a>
               <span class="fa-solid fa-angle-right"></span>
             </li>
+            <li class ="list-group-item">
+              <a href="{% url 'anvil_consortium_manager:managed_groups:visualization' %}" class="icon-link">Group visualization</a>
+              <span class="fa-solid fa-angle-right"></span>
+            </li>
             {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
             <li class ="list-group-item">
-              <a href="{% url 'anvil_consortium_manager:managed_groups:new' %}" class="icon-link">Add a group</a>
+              <a href="{% url 'anvil_consortium_manager:managed_groups:new' %}" class="icon-link">Create a new group</a>
               <span class="fa-solid fa-angle-right"></span>
             </li>
             <li class ="list-group-item">
@@ -100,6 +112,10 @@ <h5 class="card-header"><span class="fa-solid fa-user-group mx-2"></span>Managed
               <span class="fa-solid fa-angle-right"></span>
             </li>
             {% endif %}
+            <li class ="list-group-item">
+              <a href="{% url 'anvil_consortium_manager:managed_groups:audit' %}" class="icon-link">Audit groups</a>
+              <span class="fa-solid fa-angle-right"></span>
+            </li>
           </ul>
         </div>
       </div>
@@ -116,16 +132,22 @@ <h5 class="card-header"><span class="fa-solid fa-computer mx-2"></span>Workspace
           </div>
 
           <ul class="list-group list-group-flush">
+            <li class ="list-group-item">
+              <a href="{% url 'anvil_consortium_manager:workspaces:landing_page' %}" class="icon-link">Workspace types</a>
+              <span class="fa-solid fa-angle-right"></span>
+            </li>
             <li class ="list-group-item">
               <a href="{% url 'anvil_consortium_manager:workspaces:list_all' %}" class="icon-link">List all workspaces</a>
               <span class="fa-solid fa-angle-right"></span>
             </li>
+            {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
             <li class ="list-group-item">
-              <a href="{% url 'anvil_consortium_manager:workspaces:landing_page' %}" class="icon-link">Workspace types</a>
+              <a href="{% url 'anvil_consortium_manager:workspace_group_sharing:new' %}" class="icon-link">Share a workspace with a group</a>
               <span class="fa-solid fa-angle-right"></span>
             </li>
+            {% endif %}
             <li class ="list-group-item">
-              <a href="{% url 'anvil_consortium_manager:workspace_group_sharing:list' %}" class="icon-link">Workspace sharing</a>
+              <a href="{% url 'anvil_consortium_manager:workspaces:audit' %}" class="icon-link">Audit workspaces</a>
               <span class="fa-solid fa-angle-right"></span>
             </li>
           </ul>
@@ -142,7 +164,7 @@ <h5 class="card-header"><span class="fa-solid fa-computer mx-2"></span>Workspace
   <footer class="py-5">
 
     <div class="d-flex flex-column flex-sm-row justify-content-between py-4 my-4 border-top">
-      <p class="text-muted">© 2022 Adrienne Stilp</p>
+      <p class="text-muted">© 2023 Adrienne Stilp</p>
       <p class="text-muted">AnVIL Consortium Manager v{{ app_version }}</p>
     </div>
   </footer>

diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html b/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html
@@ -80,14 +80,6 @@
               <li>
                 <a class="dropdown-item" href="{% url 'anvil_consortium_manager:managed_groups:new' %}">Create a new group</a>
               </li>
-              {% endif %}
-              <li>
-                <a class="dropdown-item" href="{% url 'anvil_consortium_manager:group_account_membership:list' %}">Group-account membership</a>
-              </li>
-              <li>
-                <a class="dropdown-item" href="{% url 'anvil_consortium_manager:group_group_membership:list' %}">Group-group membership</a>
-              </li>
-              {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
               <li>
                 <a class="dropdown-item" href="{% url 'anvil_consortium_manager:group_account_membership:new' %}">Add an account to a group</a>
               </li>
@@ -114,9 +106,6 @@
               <li>
                 <a class="dropdown-item" href="{% url 'anvil_consortium_manager:workspaces:list_all' %}">List all workspaces</a>
               </li>
-              <li>
-                <a class="dropdown-item" href="{% url 'anvil_consortium_manager:workspace_group_sharing:list' %}">Workspace sharing</a>
-              </li>
               {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
               <li>
                 <a class="dropdown-item" href="{% url 'anvil_consortium_manager:workspace_group_sharing:new' %}">Share a workspace with a group</a>

diff --git a/anvil_consortium_manager/tests/test_views.py b/anvil_consortium_manager/tests/test_views.py
@@ -97,16 +97,14 @@ class ViewEditUrlTest(TestCase):
 
     view_urls = (
         reverse("anvil_consortium_manager:index"),
+        reverse("anvil_consortium_manager:status"),
         reverse("anvil_consortium_manager:accounts:list"),
         reverse("anvil_consortium_manager:accounts:audit"),
         reverse("anvil_consortium_manager:billing_projects:list"),
         reverse("anvil_consortium_manager:billing_projects:audit"),
-        reverse("anvil_consortium_manager:group_account_membership:list"),
-        reverse("anvil_consortium_manager:group_group_membership:list"),
         reverse("anvil_consortium_manager:managed_groups:list"),
+        reverse("anvil_consortium_manager:managed_groups:visualization"),
         reverse("anvil_consortium_manager:managed_groups:audit"),
-        reverse("anvil_consortium_manager:status"),
-        reverse("anvil_consortium_manager:workspace_group_sharing:list"),
         reverse("anvil_consortium_manager:workspaces:landing_page"),
         reverse("anvil_consortium_manager:workspaces:list_all"),
         reverse("anvil_consortium_manager:workspaces:audit"),