From dc971709562f43b265feb6200700d8e62a5a3acf Mon Sep 17 00:00:00 2001
From: Anastasia Gradova <anastasia.gradova@gsa.gov>
Date: Mon, 22 Apr 2024 14:00:29 -0600
Subject: [PATCH] Removed canceled users from displaying in dashboard

---
 app/templates/views/manage-users.html | 119 +++++++++++++-------------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 4b938e0d4..de71d0184 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -31,67 +31,70 @@
 
   <div class="user-list">
     {% for user in users %}
-      <div class="user-list-item">
-        <h2 class="user-list-item-heading font-body-lg margin-top-0" title="{{ user.email_address }}">
-          {%- if user.name -%}
-          <span class="heading-small live-search-relevant">{{ user.name }}</span>
-          {%- endif -%}
-          {%- if user.status == 'pending' -%}
-            <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(invited)</span>
-          {%- elif user.status == 'cancelled' -%}
-            <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(cancelled invite)</span>
-          {%- elif user.status == 'expired' -%}
-            <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(expired invite)</span>
-          {%- elif user.id == current_user.id -%}
-            <span class="live-search-relevant"></span><span class="hint">(you)</span>
-          {% else %}
-            <span class="live-search-relevant">{{ user.email_address }}</span>
-          {% endif %}
-        </h2>
-        <h3 class="margin-bottom-0">Permissions</h3>
-        <ul class="tick-cross-list-permissions">
-          {% for permission, label in permissions %}
-            {{ tick_cross(
-              user.has_permission_for_service(current_service.id, permission),
-              label
-            ) }}
-          {% endfor %}
-        </ul>
-        {# only show if the service has folders #}
-        {% if current_service.all_template_folders %}
-          <p class="usa-body tick-cross-list-hint">
-            {% set folder_count = user.template_folders_for_service(current_service) | length %}
-            {% if folder_count == 0 %}
-              Cannot see any folders
-            {% elif folder_count != current_service.all_template_folders | length %}
-              Can see {{ folder_count }} folder{% if folder_count > 1 %}s{% endif %}
+      {% if user.status != 'cancelled' %}
+        <div class="user-list-item">
+          <h2 class="user-list-item-heading font-body-lg margin-top-0" title="{{ user.email_address }}">
+            {%- if user.name -%}
+            <span class="heading-small live-search-relevant">{{ user.name }}</span>
+            {%- endif -%}
+            {%- if user.status == 'pending' -%}
+              <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(invited)</span>
+            {%- elif user.status == 'cancelled' -%}
+              <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(cancelled invite)</span>
+            {%- elif user.status == 'expired' -%}
+              <span class="live-search-relevant">{{ user.email_address }}</span><span class="hint">(expired invite)</span>
+            {%- elif user.id == current_user.id -%}
+              <span class="live-search-relevant"></span><span class="hint">(you)</span>
             {% else %}
-              Can see all folders
-            {% endif%}
-          </p>
-        {% endif %}
-        {% if current_service.has_permission('email_auth') %}
-          <p class="usa-body tick-cross-list-hint">
-            Signs in with
-            {{ user.auth_type | format_auth_type(with_indefinite_article=True) }}
-          </p>
-        {% endif %}
-        {% if current_service.has_permission('email_auth') %}
-          <p class="usa-body tick-cross-list-hint">
-            Signs in with
-            {{ user.auth_type | format_auth_type(with_indefinite_article=True) }}
-          </p>
-          {% endif %}
-            {% if current_user.has_permissions('manage_service') %}
-              {% if user.status == 'pending' %}
-                <a class="user-list-edit-link usa-link" href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
-              {% elif user.status == 'expired' %}
-                <a class="user-list-edit-link usa-link" href="{{ url_for('.resend_invite', service_id=current_service.id, invited_user_id=user.id)}}">Resend invite<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
-              {% elif user.is_editable_by(current_user) %}
-                <a class="user-list-edit-link usa-link" href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Change details<span class="usa-sr-only"> for {{ user.name }} {{ user.email_address }}</span></a>
+              <span class="live-search-relevant">{{ user.email_address }}</span>
             {% endif %}
+          </h2>
+          <h3 class="margin-bottom-0">Permissions</h3>
+          <ul class="tick-cross-list-permissions">
+            {% for permission, label in permissions %}
+              {{ tick_cross(
+                user.has_permission_for_service(current_service.id, permission),
+                label
+              ) }}
+            {% endfor %}
+          </ul>
+          {# only show if the service has folders #}
+          {% if current_service.all_template_folders %}
+            <p class="usa-body tick-cross-list-hint">
+              {% set folder_count = user.template_folders_for_service(current_service) | length %}
+              {% if folder_count == 0 %}
+                Cannot see any folders
+              {% elif folder_count != current_service.all_template_folders | length %}
+                Can see {{ folder_count }} folder{% if folder_count > 1 %}s{% endif %}
+              {% else %}
+                Can see all folders
+              {% endif%}
+            </p>
           {% endif %}
-      </div>
+          {% if current_service.has_permission('email_auth') %}
+            <p class="usa-body tick-cross-list-hint">
+              Signs in with
+              {{ user.auth_type | format_auth_type(with_indefinite_article=True) }}
+            </p>
+          {% endif %}
+          {% if current_service.has_permission('email_auth') %}
+            <p class="usa-body tick-cross-list-hint">
+              Signs in with
+              {{ user.auth_type | format_auth_type(with_indefinite_article=True) }}
+            </p>
+            {% endif %}
+              {% if current_user.has_permissions('manage_service') %}
+                {% if user.status == 'pending' or user.status == 'expired' %}
+                  <a class="user-list-edit-link usa-link" href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
+                {% endif %}
+                {% if user.status == 'expired' %}
+                  <a class="user-list-edit-link usa-link" href="{{ url_for('.resend_invite', service_id=current_service.id, invited_user_id=user.id)}}">Resend invite<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
+                {% elif user.is_editable_by(current_user) %}
+                  <a class="user-list-edit-link usa-link" href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Change details<span class="usa-sr-only"> for {{ user.name }} {{ user.email_address }}</span></a>
+                {% endif %}
+            {% endif %}
+        </div>
+      {% endif %}
     {% endfor %}
   </div>