From 027d1b486d9467d9c6997fcb6a97ce84ecc29e8e Mon Sep 17 00:00:00 2001
From: yuanzhou <zhy19@pitt.edu>
Date: Tue, 2 Jan 2024 16:17:47 -0500
Subject: [PATCH 1/2] Disable profile matching

---
 app.py                                 |  7 ++-
 templates/individual_registration.html | 76 ++++++++++++--------------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/app.py b/app.py
index a757891..a7b7886 100644
--- a/app.py
+++ b/app.py
@@ -1868,8 +1868,13 @@ def registrations(globus_user_id):
             return show_admin_error("This stage user does not exist!")
         else:
             # Check if there's any matching profiles in the `wp_connections` found
-            matching_profiles = get_matching_profiles(stage_user.last_name, stage_user.first_name, stage_user.email, stage_user.organization)
+            # Disabled by Zhou on 1/2/2024 to prevent decoding issue
+            # No longer need this matching profile feature for new members.
+            # matching_profiles = get_matching_profiles(stage_user.last_name, stage_user.first_name, stage_user.email, stage_user.organization)
             #pprint(vars(list(matching_profiles)[0]))
+
+            # Use an empty list for all new registrations - Zhou 1/2/2024
+            matching_profiles = []
             context = {
                 'isAuthenticated': True,
                 'username': session['name'],
diff --git a/templates/individual_registration.html b/templates/individual_registration.html
index 45afcf8..15bd18a 100644
--- a/templates/individual_registration.html
+++ b/templates/individual_registration.html
@@ -36,7 +36,7 @@ <h5 class="card-header">Registration Detail</h5>
 {% endif %}
 
 <br />
-SenNet service(s) access requested: <br />
+HuBMAP service(s) access requested: <br />
 <ul>
 {% for req in data.access_requests_list %}
 <li>{{ req }} </li>
@@ -45,20 +45,20 @@ <h5 class="card-header">Registration Detail</h5>
 
 <br />
 
-{% if 'SenNet Data Via Globus' in data.stage_user.access_requests %}
-Globus username to be used for SenNet Data group access: {{ data.stage_user.globus_identity }} <br />
+{% if 'HuBMAP Data Via Globus' in data.stage_user.access_requests %}
+Globus username to be used for HuBMAP Data group access: {{ data.stage_user.globus_identity }} <br />
 {% endif %}
 
-{% if 'SenNet Google Drive Share' in data.stage_user.access_requests %}
-Google account for SenNet Google Drive Share: {{ data.stage_user.google_email }} <br />
+{% if 'HuBMAP Google Drive Share' in data.stage_user.access_requests %}
+Google account for HuBMAP Google Drive Share: {{ data.stage_user.google_email }} <br />
 {% endif %}
 
-{% if 'SenNet GitHub Repository' in data.stage_user.access_requests %}
+{% if 'HuBMAP GitHub Repository' in data.stage_user.access_requests %}
 Github username: {{ data.stage_user.github_username }} <br />
 {% endif %}
 
-{% if 'SenNet Slack Workspace' in data.stage_user.access_requests %}
-Email for SenNet Slack Workspace: {{ data.stage_user.slack_username }} <br />
+{% if 'HuBMAP Slack Workspace' in data.stage_user.access_requests %}
+Email for HuBMAP Slack Workspace: {{ data.stage_user.slack_username }} <br />
 {% endif %}
 
 {% if 'protocols.io' in data.stage_user.access_requests %}
@@ -126,17 +126,16 @@ <h5 class="modal-title" id="exampleModalLongTitle">Deny registration</h5>
   </div>
 </div>
 
+<!-- Disabled profile matching by Zhou 10/6/2023 -->
+{% if data.matching_profiles|length > 0 %}
 
 <div class="card mt-4">
   <h5 class="card-header">Possible Existing Matching Profile</h5>
   <div class="card-body">
-    
-
-{% if data.matching_profiles|length > 0 %}
 
 {#
 <div class="alert alert-info" role="alert">
-Matching profiles found and sorted by the total matching score. Scoring:
+Matching profiles found from `wp_connections` table and sorted by the total matching score. Scoring:
 
 <table class="table table-sm">
   <thead>
@@ -170,7 +169,7 @@ <h5 class="card-header">Possible Existing Matching Profile</h5>
       <th scope="col">Last Name</th>
       <th scope="col">Email</th>
       <th scope="col">Organization</th>
-      <th scope="col">SenNet Component</th>
+      <th scope="col">HuBMAP Component</th>
 
       {#<th scope="col">Match Score</th>#}
 
@@ -178,8 +177,8 @@ <h5 class="card-header">Possible Existing Matching Profile</h5>
     </tr>
   </thead>
   <tbody>
-	{% for profile in data.matching_profiles %}
-	<tr>
+  {% for profile in data.matching_profiles %}
+  <tr>
       <th scope="row">{{ loop.index }}</th>
       <td>{{ profile.first_name }}</td>
       <td>{{ profile.last_name }}</td>
@@ -193,35 +192,32 @@ <h5 class="card-header">Possible Existing Matching Profile</h5>
     </tr>
 
     <!-- Approve by match Modal -->
-	<div class="modal fade" id="approve_by_match_modal_{{ loop.index }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
-	  <div class="modal-dialog modal-dialog-centered" role="document">
-	    <div class="modal-content">
-	      <div class="modal-header">
-	        <h5 class="modal-title" id="exampleModalLongTitle">Approve registraiton by using this matched profile</h5>
-	        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-	          <span aria-hidden="true">&times;</span>
-	        </button>
-	      </div>
-	      <div class="modal-body">
-	        Are you sure you want to approve this registration by using the matched profile?
-	      </div>
-	      <div class="modal-footer">
-	        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-	        <a href="{{ config['FLASK_APP_BASE_URI'] }}/match/{{ data.stage_user.globus_user_id }}/{{ profile.id }}" class="btn btn-primary">Yes, approve by using matched profile</a>
-	      </div>
-	    </div>
-	  </div>
-	</div>
-	{% endfor %}
+  <div class="modal fade" id="approve_by_match_modal_{{ loop.index }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="exampleModalLongTitle">Approve registraiton by using this matched profile</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          Are you sure you want to approve this registration by using the matched profile?
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <a href="{{ config['FLASK_APP_BASE_URI'] }}/match/{{ data.stage_user.globus_user_id }}/{{ profile.id }}" class="btn btn-primary">Yes, approve by using matched profile</a>
+        </div>
+      </div>
+    </div>
+  </div>
+  {% endfor %}
   </tbody>
 </table>
-{% else %}
-<div class="alert alert-info" role="alert">
-No matching profiles found.
+    
 </div>
-{% endif %}
-  </div>
 </div>
+{% endif %}
 
 
 

From 5cb03a2f889df392946aa2c24e9b76138d90e2d2 Mon Sep 17 00:00:00 2001
From: yuanzhou <zhy19@pitt.edu>
Date: Tue, 2 Jan 2024 16:25:01 -0500
Subject: [PATCH 2/2] Fix copy/paste issue

---
 templates/individual_registration.html | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/individual_registration.html b/templates/individual_registration.html
index 15bd18a..a66846f 100644
--- a/templates/individual_registration.html
+++ b/templates/individual_registration.html
@@ -36,7 +36,7 @@ <h5 class="card-header">Registration Detail</h5>
 {% endif %}
 
 <br />
-HuBMAP service(s) access requested: <br />
+SenNet service(s) access requested: <br />
 <ul>
 {% for req in data.access_requests_list %}
 <li>{{ req }} </li>
@@ -45,20 +45,20 @@ <h5 class="card-header">Registration Detail</h5>
 
 <br />
 
-{% if 'HuBMAP Data Via Globus' in data.stage_user.access_requests %}
-Globus username to be used for HuBMAP Data group access: {{ data.stage_user.globus_identity }} <br />
+{% if 'SenNet Data Via Globus' in data.stage_user.access_requests %}
+Globus username to be used for SenNet Data group access: {{ data.stage_user.globus_identity }} <br />
 {% endif %}
 
-{% if 'HuBMAP Google Drive Share' in data.stage_user.access_requests %}
-Google account for HuBMAP Google Drive Share: {{ data.stage_user.google_email }} <br />
+{% if 'SenNet Google Drive Share' in data.stage_user.access_requests %}
+Google account for SenNet Google Drive Share: {{ data.stage_user.google_email }} <br />
 {% endif %}
 
-{% if 'HuBMAP GitHub Repository' in data.stage_user.access_requests %}
+{% if 'SenNet GitHub Repository' in data.stage_user.access_requests %}
 Github username: {{ data.stage_user.github_username }} <br />
 {% endif %}
 
-{% if 'HuBMAP Slack Workspace' in data.stage_user.access_requests %}
-Email for HuBMAP Slack Workspace: {{ data.stage_user.slack_username }} <br />
+{% if 'SenNet Slack Workspace' in data.stage_user.access_requests %}
+Email for SenNet Slack Workspace: {{ data.stage_user.slack_username }} <br />
 {% endif %}
 
 {% if 'protocols.io' in data.stage_user.access_requests %}
@@ -126,7 +126,8 @@ <h5 class="modal-title" id="exampleModalLongTitle">Deny registration</h5>
   </div>
 </div>
 
-<!-- Disabled profile matching by Zhou 10/6/2023 -->
+
+<!-- Disabled profile matching by Zhou 1/2/2024 -->
 {% if data.matching_profiles|length > 0 %}
 
 <div class="card mt-4">
@@ -135,7 +136,7 @@ <h5 class="card-header">Possible Existing Matching Profile</h5>
 
 {#
 <div class="alert alert-info" role="alert">
-Matching profiles found from `wp_connections` table and sorted by the total matching score. Scoring:
+Matching profiles found and sorted by the total matching score. Scoring:
 
 <table class="table table-sm">
   <thead>
@@ -169,7 +170,7 @@ <h5 class="card-header">Possible Existing Matching Profile</h5>
       <th scope="col">Last Name</th>
       <th scope="col">Email</th>
       <th scope="col">Organization</th>
-      <th scope="col">HuBMAP Component</th>
+      <th scope="col">SenNet Component</th>
 
       {#<th scope="col">Match Score</th>#}
 
@@ -214,12 +215,11 @@ <h5 class="modal-title" id="exampleModalLongTitle">Approve registraiton by using
   {% endfor %}
   </tbody>
 </table>
-    
-</div>
+
+  </div>
 </div>
 {% endif %}
 
 
 
-
 {% endblock %}
\ No newline at end of file