From dbd92108557f5d818715d6fd203e23d089695502 Mon Sep 17 00:00:00 2001
From: Chandra Y <cyemparala@tacc.utexas.edu>
Date: Thu, 5 Dec 2024 21:37:04 -0600
Subject: [PATCH] WP-796 - registration list needs to update on modal edits
 (#391)

---
 .../templates/create_submitter_error.html     |  18 ---
 .../templates/create_submitter_modal.html     |  76 ------------
 .../templates/create_submitter_success.html   |  13 --
 .../templates/edit_registration_error.html    |  16 ---
 .../templates/edit_registration_modal.html    |  26 ----
 .../templates/edit_registration_success.html  |  13 --
 .../templates/view_registration_modal.html    | 117 ------------------
 apcd_cms/src/apps/admin_regis_table/views.py  |   2 -
 apcd_cms/src/apps/utils/apcd_database.py      |   4 +-
 .../client/src/hooks/registrations/useForm.ts |  11 +-
 10 files changed, 12 insertions(+), 284 deletions(-)
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html
 delete mode 100644 apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html

diff --git a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html
deleted file mode 100644
index 086f44f3..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "standard.html" %}
-{% block content %}
-
-{# TUP-175: Move to Core, Remove from Here #}
-{% include 'snippets/tup-175-css-alerts-messages-ui-pattern.html' %}
-
-<div class="container">
-    {% include "nav_cms_breadcrumbs.html" %}
-
-    <h1>Create Submitter</h1>
-    <hr />
-    <p class="c-message c-message--error">
-        An error occurred during submission. For help, <a href="/workbench/dashboard">submit a ticket</a>.
-    </p>
-    <a class="c-button c-button--primary" href="/administration/list-registration-requests/">Back to List Registrations</a>
-</div>
-
-{% endblock %}
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
deleted file mode 100644
index b6c0be35..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<div id="createSubmitterModal_{{r.reg_id}}" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Create New Submitter</h4>
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&#xe912;</span>
-        </button>
-      </div>
-      <div class="modal-body" style="height: auto;">
-
-        <div class="readonly-form-data  o-grid o-grid--image-fill o-grid--col-auto-count">
-          <article>
-            <h4>Organization</h4>
-            <address>{{r.view_modal_content.type}}</dd>
-
-            <address>
-              {{r.view_modal_content.biz_name}}<br />
-              {{r.view_modal_content.address}}<br />
-              {{r.view_modal_content.city}},
-              {{r.view_modal_content.state}}<br />
-              {{r.view_modal_content.zip}}
-            </address>
-
-            <span>{{r.reg_status}}</span>
-
-          </article>
-          <article>
-            <h4>File Submission</h4>
-
-            <dl class="c-data-list--is-vert c-data-list--is-wide">
-              <dt class="c-data-list__key">Types of Files</dt>
-              {% for file_type in r.view_modal_content.files_type %}
-              {% if file_type != None %}
-              <dd class="c-data-list__value">{{file_type}}</dd>
-              {% endif %}
-              {% endfor %}
-            </dl>
-          </article>
-        </div>
-
-        <form method="POST" action="" class="c-form" name="create-submitter-form">
-          <h4>Submitter Data</h4>
-
-          {% csrf_token %}
-          <input type="hidden" name="create-submitter-form" value>
-          <input type="hidden" name="reg_id" value="{{r.reg_id}}">
-
-          <div class="field-wrapper required">
-            <label>
-              Payor Code<span class="asterisk">*</span>
-            </label>
-            <input type="number" name="payor_code" autofocus required inputmode="numeric">
-          </div>
-          <div class="field-wrapper required">
-            <label>
-              Submitter Code<span class="asterisk">*</span>
-            </label>
-            <input type="text" name="submit_code" maxlength="8" required>
-          </div>
-          <div class="field-wrapper required">
-            <label>
-              Encryption Key<span class="asterisk">*</span>
-            </label>
-            <input type="text" name="encryption_key" maxlength="30" required>
-          </div>
-
-          <div class="button-wrapper submit">
-            <button type="submit" class="c-form__button">Submit</button>
-          </div>
-        </form>
-
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html
deleted file mode 100644
index 02ddfb0a..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "standard.html" %}
-{% block content %}
-<div class="container">
-    {% include "nav_cms_breadcrumbs.html" %}
-
-    <h1>Create Submitter</h1>
-    <hr />
-    <p>
-        Creation of this submitter was successful.
-    </p>
-    <a class="c-button c-button--primary" href="/administration/list-registration-requests/">Back to List Registrations</a>
-</div>
-{% endblock %}
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html
deleted file mode 100644
index a1ca78d4..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "standard.html" %}
-{% block content %}
-
-{% include 'snippets/tup-175-css-alerts-messages-ui-pattern.html' %}
-
-<div class="container">
-    {% include "nav_cms_breadcrumbs.html" %}
-
-    <h1>Edit Registration</h1>
-    <hr />
-    <p class="c-message c-message--error">
-        An error occurred while updating this registration. For help, <a href="/workbench/dashboard">submit a ticket</a>.
-    </p>
-    <a class="c-button c-button--primary" href="/administration/list-registration-requests/">Back to List Registrations</a>
-</div>
-{% endblock %}
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
deleted file mode 100644
index 743efe82..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load static %}
-<link rel="stylesheet" href="{% static 'registrations/css/submission_form.css' %}">
-
-
-<div id="editRegistrationModal_{{r.reg_id}}" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-lg">
-
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Edit Registration</h4>
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&#xe912;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <div>
-          <h4>Organization</h4>
-          {% include "submission_form/registration_form_body.html" %}
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-{% include "submission_form/registration_form_scripts.html" %}
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html
deleted file mode 100644
index 803596bb..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "standard.html" %}
-{% block content %}
-<div class="container">
-    {% include "nav_cms_breadcrumbs.html" %}
-
-    <h1>Edit Registration</h1>
-    <hr />
-    <p>
-        Updating this registration was successful.
-    </p>
-    <a class="c-button c-button--primary" href="/administration/list-registration-requests/">Back to List Registrations</a>
-</div>
-{% endblock %}
diff --git a/apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html
deleted file mode 100644
index cfbbc04c..00000000
--- a/apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<div id="viewRegistrationModal_{{r.reg_id}}" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-lg">
-
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">View Registration</h4>
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&#xe912;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <!-- <p>{{modal_content}}</p> -->
-        <div>
-          <dl>
-            <h4>Organization</h4>
-            <dd>          
-              <dl class="c-data-list--is-vert c-data-list--is-wide">
-                <dt class="c-data-list__key">On behalf of</dt>
-                <dd class="c-data-list__value">
-                  {% if r.view_modal_content.for_self %} 
-                    Self
-                  {% else %}
-                    Other
-                  {% endif %}
-                </dd>
-                <dt class="c-data-list__key">Registration Year</dt>
-                <dd class="c-data-list__value">{{r.view_modal_content.year}}</dd>                       
-                <dt class="c-data-list__key">Type</dt>
-                <dd class="c-data-list__value">{{r.view_modal_content.type}}</dd>                       
-                <dt class="c-data-list__key">Business Name</dt>                
-                <dd class="c-data-list__value">{{r.view_modal_content.biz_name}}</dd>
-                <dt class="c-data-list__key">Mailing Address</dt>                
-                <dd class="c-data-list__value">{{r.view_modal_content.address}}</dd>
-                <dd class="c-data-list__value">{{r.view_modal_content.city}}, {{r.view_modal_content.state}}</dd>
-                <dd class="c-data-list__value">{{r.view_modal_content.zip}}</dd>
-              </dl>
-            </dd>
-            <hr>
-            <h4>Entity/Entities Being Registered</h4>
-            <dd>
-              {% for entity in r.view_modal_content.entities%}
-                <h5>Entity {{forloop.counter}}</h5>
-                <dl class="c-data-list--is-vert c-data-list--is-wide">
-                  <dt class="c-data-list__key">Name</dt>
-                  <dd class="c-data-list__value">{{entity.ent_name}}</dd>                                 
-                  <dt class="c-data-list__key">FEIN</dt>
-                  <dd class="c-data-list__value">{{entity.fein}}</dd>
-                  <dt class="c-data-list__key">License Number</dt>
-                  <dd class="c-data-list__value">{{entity.license}}</dd>
-                  <dt class="c-data-list__key">NAIC Company Code</dt>
-                  <dd class="c-data-list__value">{{entity.naic}}</dd>
-                  <h6>Type of Plan</h6>
-                  <dd>
-                    <dl class="c-data-list--is-vert c-data-list--is-wide">
-                      <dt class="c-data-list__key">Types of Plans</dt>
-                      {% for plan_type, plan_type_selected in entity.plans_type.items %}
-                        {% if plan_type_selected %}
-                          <dd class="c-data-list__value">{{plan_type}}</dd>
-                        {% endif %}
-                      {% endfor %}
-                    </dl>
-                  </dd>
-                  <h6>File Submission</h6>
-                  <dd>
-                    <dl class="c-data-list--is-vert c-data-list--is-wide">
-                      <dt class="c-data-list__key">Types of Files</dt>
-                      {% for file_type, file_type_selected in entity.files_type.items %}
-                        {% if file_type_selected %}
-                          <dd class="c-data-list__value">{{file_type}}</dd>
-                        {% endif %}
-                      {% endfor %}
-                    </dl>
-                  </dd>
-      
-                  <h6>Coverage Estimates <small>(Inclusive of all claims as of December 31 of previous year.)</small></h6>
-                  <dt class="c-data-list__key">Total Covered Lives</dt>
-                  <dd class="c-data-list__value">{{entity.no_covered}}</dd>
-                  <dt class="c-data-list__key">Claims and Encounters Volume</dt>
-                  <dd class="c-data-list__value">{{entity.claim_and_enc_vol}}</dd>
-                  <dt class="c-data-list__key">Total Claims Value (USD)</dt>
-                  <dd class="c-data-list__value">{{entity.claim_val}}</dd>
-                </dl>
-              {% endfor %}
-            </dd>             
-            <hr>
-            <h4>Contact Information</h4>
-            <dd>
-            {% for contact in r.view_modal_content.contacts %}
-              <h5>Contact {{forloop.counter}}</h5>
-              <dl class="c-data-list--is-vert c-data-list--is-wide">
-                <dt class="c-data-list__key">Role</dt>
-                <dd class="c-data-list__value">{{contact.role}}</dd>
-                <dt class="c-data-list__key">Name<dt>
-                <dd class="c-data-list__value">{{contact.name}}</dd>
-                <dt class="c-data-list__key">Phone</dt>
-                <dd class="c-data-list__value">{{contact.phone}}</dd>
-                <dt class="c-data-list__key">Email</dt>
-                <dd class="c-data-list__value">{{contact.email}}</dd>
-                <dt> 
-                  <i>
-                    Should
-                    {% if not contact.notif %}
-                      <strong>not</strong>
-                    {% endif %}
-                    receive system notifications
-                  </i>
-                </dt>
-              </dl>
-            {% endfor %}
-            </dd>
-          </dl>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/apcd_cms/src/apps/admin_regis_table/views.py b/apcd_cms/src/apps/admin_regis_table/views.py
index 7834264e..65784685 100644
--- a/apcd_cms/src/apps/admin_regis_table/views.py
+++ b/apcd_cms/src/apps/admin_regis_table/views.py
@@ -44,8 +44,6 @@ def post(self, request, reg_id):
         updated_entity_ids = {reg['entity_id'] for reg in reg_entities if 'entity_id' in reg and reg['entity_id'] >= 0}
         updated_contact_ids = {con['contact_id'] for con in reg_contacts if 'contact_id' in con and con['contact_id'] >= 0}
         # Retrieve existing IDs
-        for reg in get_registration_entities(reg_id):
-            logger.error(reg)
         existing_entity_ids = {reg[3] for reg in get_registration_entities(reg_id)}
         existing_contact_ids = {contact[0] for contact in get_registration_contacts(reg_id)}
         # Find the deleted ones.
diff --git a/apcd_cms/src/apps/utils/apcd_database.py b/apcd_cms/src/apps/utils/apcd_database.py
index 2beab80e..924a3532 100644
--- a/apcd_cms/src/apps/utils/apcd_database.py
+++ b/apcd_cms/src/apps/utils/apcd_database.py
@@ -179,7 +179,9 @@ def get_registrations(reg_id=None, submitter_code=None):
                 registrations.registration_year
                 FROM registrations
                 {f"WHERE registration_id = {str(reg_id)}" if reg_id is not None else ''}
-                {f"LEFT JOIN registration_submitters on registrations.registration_id = registration_submitters.registration_id LEFT JOIN submitters ON registration_submitters.submitter_id = submitters.submitter_id WHERE submitter_code = ANY(%s) ORDER BY registrations.registration_id" if submitter_code is not None else ''}"""
+                {f"LEFT JOIN registration_submitters on registrations.registration_id = registration_submitters.registration_id LEFT JOIN submitters ON registration_submitters.submitter_id = submitters.submitter_id WHERE submitter_code = ANY(%s) ORDER BY registrations.registration_id" if submitter_code is not None else ''}
+                ORDER BY registrations.registration_id desc"""
+
         cur = conn.cursor()
         if submitter_code:
             cur.execute(query, (submitter_code,))
diff --git a/apcd_cms/src/client/src/hooks/registrations/useForm.ts b/apcd_cms/src/client/src/hooks/registrations/useForm.ts
index bbc653e9..187f6e55 100644
--- a/apcd_cms/src/client/src/hooks/registrations/useForm.ts
+++ b/apcd_cms/src/client/src/hooks/registrations/useForm.ts
@@ -50,8 +50,15 @@ export function usePostRegistration() {
       console.log(err);
     },
     onSuccess: () => {
-      queryClient.invalidateQueries({
-        queryKey: ['submitter-registrations', 'admin-registrations'],
+      const keysToInvalidate = [
+        'admin-registrations',
+        'submitter-registrations',
+      ];
+      keysToInvalidate.forEach((key) => {
+        queryClient.invalidateQueries({
+          queryKey: [key],
+          exact: false, // we do not know the parameters, so all keys are invalidated
+        });
       });
     },
   });