From 1447d191c7d05fe14fb3bf1048e400c64eba378a Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Tue, 7 Jan 2025 17:23:58 -0600
Subject: [PATCH 01/10] Add 'Reindexing Curator' column (non-functioning)

---
 .../static/js/collection_list.js              | 14 ++++--
 .../sde_collections/collection_list.html      | 45 +++++++++++++++++--
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 7500bad1..660e1299 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -204,27 +204,35 @@ let table = $("#collection_table").DataTable({
   ],
 });
 
-$("#collection-dropdown-4").on("change", function () {
+$("#workflow-status-selector").on("change", function () {
   table
     .columns(COLUMNS.WORKFLOW_STATUS_RAW)
     .search(this.value ? "^" + this.value + "$" : "", true, false)
     .draw();
 });
 
-$("#collection-dropdown-5").on("change", function () {
+$("#curator-selector").on("change", function () {
   table
     .columns(COLUMNS.CURATOR_ID)
     .search(this.value ? "^" + this.value + "$" : "", true, false)
     .draw();
 });
 
-$("#collection-dropdown-6").on("change", function () {
+$("#reindexing-status-selector").on("change", function () {
   table
     .columns(COLUMNS.REINDEXING_STATUS_RAW)
     .search(this.value ? "^" + this.value + "$" : "", true, false)
     .draw();
 });
 
+// Need to change this to reflect REINDEXING CURATOR CHANGE
+$("#reindexing-curator-selector").on("change", function () {
+  table
+    .columns(COLUMNS.CURATOR_ID)
+    .search(this.value ? "^" + this.value + "$" : "", true, false)
+    .draw();
+});
+
 $("#nameFilter").on("keyup", function () {
   table.columns(COLUMNS.NAME).search(this.value).draw();
 });
diff --git a/sde_indexing_helper/templates/sde_collections/collection_list.html b/sde_indexing_helper/templates/sde_collections/collection_list.html
index beae81d1..ed899e63 100644
--- a/sde_indexing_helper/templates/sde_collections/collection_list.html
+++ b/sde_indexing_helper/templates/sde_collections/collection_list.html
@@ -28,6 +28,7 @@ <h2 class="title">Welcome back!</h2>
             <th class="text-center noBorder" style="padding-right:25px !important">Curator</th>
             <th class="text-center noBorder" style="padding-right:25px !important">Connector Type</th>
             <th class="text-center noBorder" style="padding-right:25px !important">Reindexing Status</th>
+            <th class="text-center noBorder" style="padding-right:25px !important">Reindexing Curator</th>
 
             <!-- Hidden Columns - Used for internal data storage -->
             <th class="hideDisplay"></th>
@@ -66,7 +67,7 @@ <h2 class="title">Welcome back!</h2>
 
             <!-- Dropdown filter for Workflow Status -->
             <td class="filterRowBottom">
-                <select id="collection-dropdown-4" class="select-dropdown selectStyling">
+                <select id="workflow-status-selector" class="select-dropdown selectStyling">
                     <option value="">SELECT</option>
                     {% for choice in workflow_status_choices %}
                         <option value="{{ choice }}"
@@ -77,7 +78,7 @@ <h2 class="title">Welcome back!</h2>
 
             <!-- Dropdown filter for Curator -->
             <td class="filterRowBottom">
-                <select id="collection-dropdown-5" class="select-dropdown selectStyling">
+                <select id="curator-selector" class="select-dropdown selectStyling">
                     <option value="">SELECT</option>
                     {% for curator in curators %}
                         <option value="{{ curator.pk }}"
@@ -96,7 +97,7 @@ <h2 class="title">Welcome back!</h2>
 
             <!-- Dropdown filter for Reindexing Status -->
             <td class="filterRowBottom">
-                <select id="collection-dropdown-6" class="select-dropdown selectStyling">
+                <select id="reindexing-status-selector" class="select-dropdown selectStyling">
                     <option value="">SELECT</option>
                     {% for choice in reindexing_status_choices %}
                         <option value="{{ choice }}"
@@ -105,6 +106,17 @@ <h2 class="title">Welcome back!</h2>
                 </select>
             </td>
 
+            <!-- Dropdown filter for Reindexing Curator -->
+            <td class="filterRowBottom">
+                <select id="reindexing-curator-selector" class="select-dropdown selectStyling">
+                    <option value="">SELECT</option>
+                    {% for curator in curators %}
+                        <option value="{{ curator.pk }}"
+                                data-collection-id={{ collection.id }}>{{ curator.username }}</option>
+                    {% endfor %}
+                </select>
+            </td>
+
             <!-- Hidden cells corresponding to hidden columns -->
             <td class="hideDisplay"></td>  <!-- Stores raw workflow_status value (number) -->
             <td class="hideDisplay"></td>  <!-- Stores raw curated_by_id value -->
@@ -235,6 +247,33 @@ <h2 class="title">Welcome back!</h2>
                         </div>
                     </td>
 
+                    <!-- Reindexing Curator Dropdown -->
+                    <td class="noBorder">
+                        <div class="dropdown curator_dropdown"
+                             data-match-pattern
+                             remove_protocol
+                             row
+                             url>
+                            <!-- Curator button - green if assigned, dark if not -->
+                            <button class="btn {% if collection.curated_by %} btn-success {% else %} btn-dark {% endif %} btn-sm dropdown-toggle"
+                                    type="button"
+                                    id="curator-button-{{ collection.id }}"
+                                    data-toggle="dropdown"
+                                    aria-haspopup="true"
+                                    aria-expanded="false">{{ collection.curated_by }}</button>
+                            <!-- Dropdown menu with all possible curators -->
+                            <div class="dropdown-menu"
+                                 aria-labelledby="curator-button-{{ collection.id }}">
+                                {% for curator in curators %}
+                                    <a key="{{ curator.pk }}"
+                                       class="dropdown-item curator_select"
+                                       value="{{ curator.pk }}"
+                                       data-collection-id={{ collection.id }}>{{ curator.username }}</a>
+                                {% endfor %}
+                            </div>
+                        </div>
+                    </td>
+
                     <!-- Hidden columns for internal use -->
                     <td class="hideDisplay">{{ collection.workflow_status }}</td>
                     <td class="hideDisplay">{{ collection.curated_by_id }}</td>

From 4ff58d7586fd0a880992b57d9fe06e913d963921 Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Wed, 8 Jan 2025 18:52:11 -0600
Subject: [PATCH 02/10] Fixed DataTable to work with new changes

---
 .../static/js/collection_list.js              | 36 +++++++++++--------
 .../sde_collections/collection_list.html      |  3 ++
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 660e1299..0a89c1fa 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -8,9 +8,11 @@ const COLUMNS = {
   CURATOR: 5,
   CONNECTOR_TYPE: 6,
   REINDEXING_STATUS: 7,
-  WORKFLOW_STATUS_RAW: 8,
-  CURATOR_ID: 9,
-  REINDEXING_STATUS_RAW: 10
+  REINDEXING_CURATOR: 8,
+  WORKFLOW_STATUS_RAW: 9,
+  CURATOR_ID: 10,
+  REINDEXING_STATUS_RAW: 11,
+  REINDEXING_CURATOR_ID: 12
 };
 
 var uniqueId; //used for logic related to contents on column customization modal
@@ -121,11 +123,24 @@ let table = $("#collection_table").DataTable({
       },
     },
   ],
+    searchPanes: {
+      controls: true,
+      layout: 'columns-6',
+      columns: [
+        COLUMNS.DIVISION,
+        COLUMNS.DELTA_URLS,
+        COLUMNS.WORKFLOW_STATUS,
+        COLUMNS.CURATOR,
+        COLUMNS.CONNECTOR_TYPE,
+        COLUMNS.REINDEXING_STATUS
+      ]
+    },
+  
   columnDefs: [
     // hide the data columns
     {
-      targets: [COLUMNS.WORKFLOW_STATUS_RAW, COLUMNS.CURATOR_ID, COLUMNS.REINDEXING_STATUS_RAW],
-      visible: false,
+      targets: [COLUMNS.WORKFLOW_STATUS_RAW, COLUMNS.CURATOR_ID, COLUMNS.REINDEXING_STATUS_RAW, COLUMNS.REINDEXING_CURATOR_ID],
+      visible: false, width: "0px", responsivePriority: -1
     },
     { width: "200px", targets: COLUMNS.URL },
     {
@@ -178,13 +193,6 @@ let table = $("#collection_table").DataTable({
       targets: [COLUMNS.DELTA_URLS],
       type: "num-fmt",
     },
-    // hide the data panes
-    {
-      searchPanes: {
-        show: false,
-      },
-      targets: [COLUMNS.WORKFLOW_STATUS_RAW, COLUMNS.CURATOR_ID, COLUMNS.REINDEXING_STATUS_RAW],
-    },
     {
       searchPanes: {
         dtOpts: {
@@ -202,6 +210,7 @@ let table = $("#collection_table").DataTable({
       targets: [COLUMNS.CONNECTOR_TYPE],
     },
   ],
+  autoWidth: false,
 });
 
 $("#workflow-status-selector").on("change", function () {
@@ -446,8 +455,6 @@ $(document).ready(function () {
 
   // Remove the search input and add custom titles
   var paneTitles = [
-    null,
-    null,
     "Division",
     "Delta URLs",
     "Workflow Status",
@@ -486,6 +493,7 @@ $(document).ready(function () {
     }
     // Check if the pane title exists for the current index
     else {
+      console.log(index, paneTitles[index])
       if (paneTitles[index]) {
         $(this)
           .find(".dtsp-topRow .dtsp-subRow1")
diff --git a/sde_indexing_helper/templates/sde_collections/collection_list.html b/sde_indexing_helper/templates/sde_collections/collection_list.html
index ed899e63..e7602d01 100644
--- a/sde_indexing_helper/templates/sde_collections/collection_list.html
+++ b/sde_indexing_helper/templates/sde_collections/collection_list.html
@@ -34,6 +34,7 @@ <h2 class="title">Welcome back!</h2>
             <th class="hideDisplay"></th>
             <th class="hideDisplay"></th>
             <th class="hideDisplay"></th>
+            <th class="hideDisplay"></th>
         </tr>
 
         <!-- Filter Row - Contains inputs and dropdowns for filtering table data -->
@@ -121,6 +122,7 @@ <h2 class="title">Welcome back!</h2>
             <td class="hideDisplay"></td>  <!-- Stores raw workflow_status value (number) -->
             <td class="hideDisplay"></td>  <!-- Stores raw curated_by_id value -->
             <td class="hideDisplay"></td>  <!-- Stores raw reindexing_status value (number) -->
+            <td class="hideDisplay"></td>  <!-- Stores raw reindexing_curated_by_id value -->
         </tr>
     </thead>
         <tbody>
@@ -278,6 +280,7 @@ <h2 class="title">Welcome back!</h2>
                     <td class="hideDisplay">{{ collection.workflow_status }}</td>
                     <td class="hideDisplay">{{ collection.curated_by_id }}</td>
                     <td class="hideDisplay">{{ collection.reindexing_status }}</td>
+                    <td class="hideDisplay">{{ collection.curated_by_id }}</td>
                 </tr>
             {% endfor %}
         </tbody>

From 11dfed81a800d05b0cfb1b9d499d617f309e4e7b Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Thu, 9 Jan 2025 01:17:54 -0600
Subject: [PATCH 03/10] Add "reindexing_curated_by" field to track Reindexing
 Curator

---
 .../0076_collection_reindexing_curated_by.py  | 27 ++++++++
 ..._alter_collection_reindexing_curated_by.py | 28 ++++++++
 sde_collections/models/collection.py          |  2 +
 sde_collections/serializers.py                |  8 +++
 .../static/js/collection_list.js              | 64 ++++++++++++++++++-
 .../sde_collections/collection_list.html      | 16 ++---
 6 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100644 sde_collections/migrations/0076_collection_reindexing_curated_by.py
 create mode 100644 sde_collections/migrations/0077_alter_collection_reindexing_curated_by.py

diff --git a/sde_collections/migrations/0076_collection_reindexing_curated_by.py b/sde_collections/migrations/0076_collection_reindexing_curated_by.py
new file mode 100644
index 00000000..33853d07
--- /dev/null
+++ b/sde_collections/migrations/0076_collection_reindexing_curated_by.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.9 on 2025-01-09 05:07
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("sde_collections", "0075_alter_collection_reindexing_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="collection",
+            name="reindexing_curated_by",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="reindexing_curated_by",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/sde_collections/migrations/0077_alter_collection_reindexing_curated_by.py b/sde_collections/migrations/0077_alter_collection_reindexing_curated_by.py
new file mode 100644
index 00000000..9bd59f6b
--- /dev/null
+++ b/sde_collections/migrations/0077_alter_collection_reindexing_curated_by.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.9 on 2025-01-09 05:12
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("sde_collections", "0076_collection_reindexing_curated_by"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="collection",
+            name="reindexing_curated_by",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="reindexing_curated_by",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 0f1162e1..4b51fe1f 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -85,6 +85,7 @@ class Collection(models.Model):
     tracker = FieldTracker(fields=["workflow_status", "reindexing_status"])
 
     curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True)
+    reindexing_curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True, default=None, related_name="reindexing_curated_by")
     curation_started = models.DateTimeField("Curation Started", null=True, blank=True)
 
     class Meta:
@@ -550,6 +551,7 @@ def _create_from_json(cls, json_results):
         for collection in json_results:
             print("Creating collection: ", collection["name"])
             collection.pop("curated_by")
+            collection.pop("reindexing_curated_by")
             cls.objects.create(**collection)
 
     @classmethod
diff --git a/sde_collections/serializers.py b/sde_collections/serializers.py
index 1a4ac099..b1c2fc67 100644
--- a/sde_collections/serializers.py
+++ b/sde_collections/serializers.py
@@ -28,6 +28,7 @@ class Meta:
             "workflow_status_display",
             "reindexing_status_display",
             "curated_by",
+            "reindexing_curated_by",
             "division",
             "document_type",
             "name",
@@ -45,6 +46,13 @@ class Meta:
         #     "division": {"required": False},
         # }
 
+    def update(self, instance, validated_data):
+        # If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
+        if validated_data.get('reindexing_status') == 1:
+            validated_data['reindexing_curated_by'] = None
+            
+        return super().update(instance, validated_data)
+
 
 class CollectionReadSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 0a89c1fa..3b188808 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -234,10 +234,9 @@ $("#reindexing-status-selector").on("change", function () {
     .draw();
 });
 
-// Need to change this to reflect REINDEXING CURATOR CHANGE
 $("#reindexing-curator-selector").on("change", function () {
   table
-    .columns(COLUMNS.CURATOR_ID)
+    .columns(COLUMNS.REINDEXING_CURATOR_ID)
     .search(this.value ? "^" + this.value + "$" : "", true, false)
     .draw();
 });
@@ -392,6 +391,37 @@ function handleCuratorSelect() {
   });
 }
 
+function handleReindexingCuratorSelect() {
+  $("body").on("click", ".reindexing_curator_select", function () {
+    const collection_id = $(this).data("collection-id");
+    const reindexing_curator_id = $(this).attr("value");
+    const reindexing_curator_text = $(this).text();
+    
+    // Update button text and style
+    const $button = $(`#reindexing-curator-button-${collection_id}`).last();
+    $button
+      .text(reindexing_curator_text)
+      .removeClass("btn-light btn-danger btn-warning btn-info btn-success btn-primary btn-dark")
+      .addClass("btn-success");
+
+    // Update DataTable
+    const rowIndex = table.row("#" + collection_id).index();
+    table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton(reindexing_curator_text);
+    // table.searchPanes.rebuildPane(COLUMNS.REINDEXING_CURATOR);
+
+    // Send update to server
+    postReindexingCurator(collection_id, reindexing_curator_id);
+  });
+}
+
+// Helper function to create reindexing curator button HTML
+function createReindexingCuratorButton(reindexing_curator_text) {
+  const buttonClass = reindexing_curator_text === "NONE" ? "btn-dark" : "btn-success";
+  return `<div class="dropdown reindexing_curator_dropdown">
+    <button class="btn ${buttonClass} btn-sm dropdown-toggle">${reindexing_curator_text}</button>
+  </div>`;
+}
+
 function postReindexingStatus(collection_id, reindexing_status) {
   var url = `/api/collections/${collection_id}/`;
   $.ajax({
@@ -406,6 +436,16 @@ function postReindexingStatus(collection_id, reindexing_status) {
     },
     success: function (data) {
       toastr.success("Reindexing Status Updated!");
+
+      // If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
+      if (reindexing_status == 1) {
+        const $button = $(`#reindexing-curator-button-${collection_id}`).last();
+        $button.text("NONE").removeClass("btn-success").addClass("btn-dark");
+        // Update DataTable
+        const rowIndex = table.row("#" + collection_id).index();
+        table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton("NONE");
+        // table.searchPanes.rebuildPane(COLUMNS.REINDEXING_CURATOR);
+      }
     },
   });
 }
@@ -447,6 +487,24 @@ function postCurator(collection_id, curator_id) {
   });
 }
 
+function postReindexingCurator(collection_id, reindexing_curator_id) {
+  var url = `/api/collections/${collection_id}/`;
+  $.ajax({
+    url: url,
+    type: "PUT",
+    data: {
+      reindexing_curated_by: reindexing_curator_id,
+      csrfmiddlewaretoken: csrftoken,
+    },
+    headers: {
+      "X-CSRFToken": csrftoken,
+    },
+    success: function (data) {
+      toastr.success("Reindexing Curator Updated!");
+    },
+  });
+}
+
 $(document).ready(function () {
   setupClickHandlers();
 
@@ -493,7 +551,6 @@ $(document).ready(function () {
     }
     // Check if the pane title exists for the current index
     else {
-      console.log(index, paneTitles[index])
       if (paneTitles[index]) {
         $(this)
           .find(".dtsp-topRow .dtsp-subRow1")
@@ -509,6 +566,7 @@ function setupClickHandlers() {
   handleWorkflowStatusSelect();
   handleReindexingStatusSelect();
   handleCuratorSelect();
+  handleReindexingCuratorSelect();
 }
 
 function clearSearchValues() {
diff --git a/sde_indexing_helper/templates/sde_collections/collection_list.html b/sde_indexing_helper/templates/sde_collections/collection_list.html
index e7602d01..28c566a4 100644
--- a/sde_indexing_helper/templates/sde_collections/collection_list.html
+++ b/sde_indexing_helper/templates/sde_collections/collection_list.html
@@ -251,24 +251,24 @@ <h2 class="title">Welcome back!</h2>
 
                     <!-- Reindexing Curator Dropdown -->
                     <td class="noBorder">
-                        <div class="dropdown curator_dropdown"
+                        <div class="dropdown reindexing_curator_dropdown"
                              data-match-pattern
                              remove_protocol
                              row
                              url>
-                            <!-- Curator button - green if assigned, dark if not -->
-                            <button class="btn {% if collection.curated_by %} btn-success {% else %} btn-dark {% endif %} btn-sm dropdown-toggle"
+                            <!-- Reindexing Curator button - green if assigned, dark if not -->
+                            <button class="btn {% if collection.reindexing_curated_by %} btn-success {% else %} btn-dark {% endif %} btn-sm dropdown-toggle"
                                     type="button"
-                                    id="curator-button-{{ collection.id }}"
+                                    id="reindexing-curator-button-{{ collection.id }}"
                                     data-toggle="dropdown"
                                     aria-haspopup="true"
-                                    aria-expanded="false">{{ collection.curated_by }}</button>
+                                    aria-expanded="false">{{ collection.reindexing_curated_by }}</button>
                             <!-- Dropdown menu with all possible curators -->
                             <div class="dropdown-menu"
-                                 aria-labelledby="curator-button-{{ collection.id }}">
+                                 aria-labelledby="reindexing-curator-button-{{ collection.id }}">
                                 {% for curator in curators %}
                                     <a key="{{ curator.pk }}"
-                                       class="dropdown-item curator_select"
+                                       class="dropdown-item reindexing_curator_select"
                                        value="{{ curator.pk }}"
                                        data-collection-id={{ collection.id }}>{{ curator.username }}</a>
                                 {% endfor %}
@@ -280,7 +280,7 @@ <h2 class="title">Welcome back!</h2>
                     <td class="hideDisplay">{{ collection.workflow_status }}</td>
                     <td class="hideDisplay">{{ collection.curated_by_id }}</td>
                     <td class="hideDisplay">{{ collection.reindexing_status }}</td>
-                    <td class="hideDisplay">{{ collection.curated_by_id }}</td>
+                    <td class="hideDisplay">{{ collection.reindexing_curated_by_id }}</td>
                 </tr>
             {% endfor %}
         </tbody>

From 0bb0ccb5d22cf933ab342bc2fe16f0981fb31029 Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Thu, 9 Jan 2025 14:31:39 -0600
Subject: [PATCH 04/10] Changed NONE to None

---
 sde_indexing_helper/static/js/collection_list.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 3b188808..78600eaa 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -416,7 +416,7 @@ function handleReindexingCuratorSelect() {
 
 // Helper function to create reindexing curator button HTML
 function createReindexingCuratorButton(reindexing_curator_text) {
-  const buttonClass = reindexing_curator_text === "NONE" ? "btn-dark" : "btn-success";
+  const buttonClass = reindexing_curator_text === "None" ? "btn-dark" : "btn-success";
   return `<div class="dropdown reindexing_curator_dropdown">
     <button class="btn ${buttonClass} btn-sm dropdown-toggle">${reindexing_curator_text}</button>
   </div>`;
@@ -440,10 +440,10 @@ function postReindexingStatus(collection_id, reindexing_status) {
       // If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
       if (reindexing_status == 1) {
         const $button = $(`#reindexing-curator-button-${collection_id}`).last();
-        $button.text("NONE").removeClass("btn-success").addClass("btn-dark");
+        $button.text("None").removeClass("btn-success").addClass("btn-dark");
         // Update DataTable
         const rowIndex = table.row("#" + collection_id).index();
-        table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton("NONE");
+        table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton("None");
         // table.searchPanes.rebuildPane(COLUMNS.REINDEXING_CURATOR);
       }
     },

From cf7d1f84647d81c439d9eec107d0db438e7bd8d4 Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Fri, 10 Jan 2025 17:43:00 -0600
Subject: [PATCH 05/10] Removed hardcoded layout for SearchPanes

---
 sde_indexing_helper/static/js/collection_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 78600eaa..f41865ef 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -125,7 +125,7 @@ let table = $("#collection_table").DataTable({
   ],
     searchPanes: {
       controls: true,
-      layout: 'columns-6',
+      // layout: 'columns-6',
       columns: [
         COLUMNS.DIVISION,
         COLUMNS.DELTA_URLS,

From ad4364b26160a5f6c7088a9b7a66fe18207ed4e6 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:22:28 +0000
Subject: [PATCH 06/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 sde_collections/models/collection.py             | 4 +++-
 sde_collections/serializers.py                   | 6 +++---
 sde_indexing_helper/static/js/collection_list.js | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 4b51fe1f..2d0a7a12 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -85,7 +85,9 @@ class Collection(models.Model):
     tracker = FieldTracker(fields=["workflow_status", "reindexing_status"])
 
     curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True)
-    reindexing_curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True, default=None, related_name="reindexing_curated_by")
+    reindexing_curated_by = models.ForeignKey(
+        User, on_delete=models.DO_NOTHING, null=True, blank=True, default=None, related_name="reindexing_curated_by"
+    )
     curation_started = models.DateTimeField("Curation Started", null=True, blank=True)
 
     class Meta:
diff --git a/sde_collections/serializers.py b/sde_collections/serializers.py
index 7b4789f9..c49cdd21 100644
--- a/sde_collections/serializers.py
+++ b/sde_collections/serializers.py
@@ -48,9 +48,9 @@ class Meta:
 
     def update(self, instance, validated_data):
         # If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
-        if validated_data.get('reindexing_status') == 1:
-            validated_data['reindexing_curated_by'] = None
-            
+        if validated_data.get("reindexing_status") == 1:
+            validated_data["reindexing_curated_by"] = None
+
         return super().update(instance, validated_data)
 
 
diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 8428aa08..40469cc1 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -9,7 +9,7 @@ const COLUMNS = {
   CURATOR: 6,
   CONNECTOR_TYPE: 7,
   REINDEXING_STATUS: 8,
-  REINDEXING_CURATOR: 9, 
+  REINDEXING_CURATOR: 9,
   WORKFLOW_STATUS_RAW: 10,
   CURATOR_ID: 11,
   REINDEXING_STATUS_RAW: 12,
@@ -137,7 +137,7 @@ let table = $("#collection_table").DataTable({
         COLUMNS.REINDEXING_STATUS
       ]
     },
-  
+
   columnDefs: [
     // hide the data columns
     {
@@ -448,7 +448,7 @@ function handleReindexingCuratorSelect() {
     const collection_id = $(this).data("collection-id");
     const reindexing_curator_id = $(this).attr("value");
     const reindexing_curator_text = $(this).text();
-    
+
     // Update button text and style
     const $button = $(`#reindexing-curator-button-${collection_id}`).last();
     $button

From 386ddaf67f84ef885bac0dc73d8bcf0e98b4298e Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Tue, 28 Jan 2025 23:20:28 -0600
Subject: [PATCH 07/10] Maintain Reindexing History while Reindexing Curator is
 changed

---
 sde_collections/models/collection.py             |  8 ++++++--
 sde_collections/serializers.py                   |  7 -------
 sde_indexing_helper/static/js/collection_list.js | 11 -----------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 2d0a7a12..3d90daa1 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -666,6 +666,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.old_workflow_status = self.workflow_status
         self.old_reindexing_status = self.reindexing_status
+        self.old_reindexing_curated_by = self.reindexing_curated_by
 
 
 class RequiredUrls(models.Model):
@@ -746,11 +747,14 @@ def log_workflow_history(sender, instance, created, **kwargs):
             old_status=instance.old_workflow_status,
         )
 
-    if instance.reindexing_status != instance.old_reindexing_status:
+    if (
+        instance.reindexing_status != instance.old_reindexing_status
+        or instance.reindexing_curated_by != instance.old_reindexing_curated_by
+    ):
         ReindexingHistory.objects.create(
             collection=instance,
             reindexing_status=instance.reindexing_status,
-            curated_by=instance.curated_by,
+            curated_by=instance.reindexing_curated_by,
             old_status=instance.old_reindexing_status,
         )
 
diff --git a/sde_collections/serializers.py b/sde_collections/serializers.py
index c49cdd21..4326b039 100644
--- a/sde_collections/serializers.py
+++ b/sde_collections/serializers.py
@@ -46,13 +46,6 @@ class Meta:
         #     "division": {"required": False},
         # }
 
-    def update(self, instance, validated_data):
-        # If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
-        if validated_data.get("reindexing_status") == 1:
-            validated_data["reindexing_curated_by"] = None
-
-        return super().update(instance, validated_data)
-
 
 class CollectionReadSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js
index 40469cc1..a9904271 100644
--- a/sde_indexing_helper/static/js/collection_list.js
+++ b/sde_indexing_helper/static/js/collection_list.js
@@ -459,7 +459,6 @@ function handleReindexingCuratorSelect() {
     // Update DataTable
     const rowIndex = table.row("#" + collection_id).index();
     table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton(reindexing_curator_text);
-    // table.searchPanes.rebuildPane(COLUMNS.REINDEXING_CURATOR);
 
     // Send update to server
     postReindexingCurator(collection_id, reindexing_curator_id);
@@ -488,16 +487,6 @@ function postReindexingStatus(collection_id, reindexing_status) {
     },
     success: function (data) {
       toastr.success("Reindexing Status Updated!");
-
-      // If reindexing_status is REINDEXING_NOT_NEEDED, set Reindexing Curator field to None (reset to default)
-      if (reindexing_status == 1) {
-        const $button = $(`#reindexing-curator-button-${collection_id}`).last();
-        $button.text("None").removeClass("btn-success").addClass("btn-dark");
-        // Update DataTable
-        const rowIndex = table.row("#" + collection_id).index();
-        table.data()[rowIndex][COLUMNS.REINDEXING_CURATOR] = createReindexingCuratorButton("None");
-        // table.searchPanes.rebuildPane(COLUMNS.REINDEXING_CURATOR);
-      }
     },
   });
 }

From e0a93678cf8389efc94a6120f608b8f4b5f6c659 Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Wed, 29 Jan 2025 00:29:00 -0600
Subject: [PATCH 08/10] Track old reindexing curator

---
 .../0078_reindexinghistory_old_curator.py     | 27 +++++++++++++++++++
 sde_collections/models/collection.py          |  4 +++
 2 files changed, 31 insertions(+)
 create mode 100644 sde_collections/migrations/0078_reindexinghistory_old_curator.py

diff --git a/sde_collections/migrations/0078_reindexinghistory_old_curator.py b/sde_collections/migrations/0078_reindexinghistory_old_curator.py
new file mode 100644
index 00000000..2cac0895
--- /dev/null
+++ b/sde_collections/migrations/0078_reindexinghistory_old_curator.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.9 on 2025-01-29 05:28
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("sde_collections", "0077_alter_collection_reindexing_curated_by"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="reindexinghistory",
+            name="old_curator",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="old_curator",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 3d90daa1..3c40e28a 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -756,6 +756,7 @@ def log_workflow_history(sender, instance, created, **kwargs):
             reindexing_status=instance.reindexing_status,
             curated_by=instance.reindexing_curated_by,
             old_status=instance.old_reindexing_status,
+            old_curator=instance.old_reindexing_curated_by,
         )
 
 
@@ -767,6 +768,9 @@ class ReindexingHistory(models.Model):
     )
     old_status = models.IntegerField(choices=ReindexingStatusChoices.choices, null=True)
     curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True)
+    old_curator = models.ForeignKey(
+        User, on_delete=models.DO_NOTHING, null=True, blank=True, related_name="old_curator"
+    )
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):

From 9ec2e45c41b89bda7aea1a35c5833584e9dcdbec Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Wed, 29 Jan 2025 01:53:06 -0600
Subject: [PATCH 09/10] Add ReindexingHistory model tests

---
 sde_collections/models/collection.py          |  3 +
 .../tests/test_reindexing_history.py          | 82 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 sde_collections/tests/test_reindexing_history.py

diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 3c40e28a..6e5d30a0 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -758,6 +758,9 @@ def log_workflow_history(sender, instance, created, **kwargs):
             old_status=instance.old_reindexing_status,
             old_curator=instance.old_reindexing_curated_by,
         )
+        # Update the old values after creating the history entry
+        instance.old_reindexing_status = instance.reindexing_status
+        instance.old_reindexing_curated_by = instance.reindexing_curated_by
 
 
 class ReindexingHistory(models.Model):
diff --git a/sde_collections/tests/test_reindexing_history.py b/sde_collections/tests/test_reindexing_history.py
new file mode 100644
index 00000000..fd3baf44
--- /dev/null
+++ b/sde_collections/tests/test_reindexing_history.py
@@ -0,0 +1,82 @@
+# docker-compose -f local.yml run --rm django pytest -s sde_collections/tests/test_reindexing_history.py
+
+import pytest
+from django.contrib.auth import get_user_model
+
+from sde_collections.models.collection import ReindexingHistory
+from sde_collections.models.collection_choice_fields import ReindexingStatusChoices
+from sde_collections.tests.factories import CollectionFactory, UserFactory
+
+User = get_user_model()
+
+
+@pytest.mark.django_db
+class TestReindexingHistory:
+    """Test suite for ReindexingHistory functionality"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.collection = CollectionFactory()
+        self.user1 = UserFactory()
+        self.user2 = UserFactory()
+
+    def test_reindexing_history_status_change(self):
+        """Should create history entry when reindexing status changes"""
+        self.collection.reindexing_status = ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        self.collection.save()
+
+        history = ReindexingHistory.objects.filter(collection=self.collection)
+        assert history.count() == 1
+        assert history.first().reindexing_status == ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        assert history.first().old_status == ReindexingStatusChoices.REINDEXING_NOT_NEEDED
+
+    def test_reindexing_history_curator_change(self):
+        """Should create history entry when curator changes"""
+        self.collection.reindexing_curated_by = self.user1
+        self.collection.save()
+
+        history = ReindexingHistory.objects.filter(collection=self.collection)
+        assert history.count() == 1
+        assert history.first().curated_by == self.user1
+        assert history.first().old_curator is None
+
+    def test_reindexing_history_both_changes(self):
+        """Should create history entry when both status and curator change"""
+        self.collection.reindexing_status = ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        self.collection.reindexing_curated_by = self.user1
+        self.collection.save()
+
+        history = ReindexingHistory.objects.filter(collection=self.collection)
+        assert history.count() == 1
+        entry = history.first()
+        assert entry.reindexing_status == ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        assert entry.old_status == ReindexingStatusChoices.REINDEXING_NOT_NEEDED
+        assert entry.curated_by == self.user1
+        assert entry.old_curator is None
+
+    def test_reindexing_history_multiple_changes(self):
+        """Should create multiple history entries for sequential changes"""
+        # First change
+        self.collection.reindexing_status = ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        self.collection.reindexing_curated_by = self.user1
+        self.collection.save()
+
+        # Second change
+        self.collection.reindexing_status = ReindexingStatusChoices.REINDEXING_FINISHED_ON_DEV
+        self.collection.reindexing_curated_by = self.user2
+        self.collection.save()
+
+        history = ReindexingHistory.objects.filter(collection=self.collection).order_by("created_at")
+        assert history.count() == 2
+
+        first_entry = history[0]
+        assert first_entry.reindexing_status == ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        assert first_entry.old_status == ReindexingStatusChoices.REINDEXING_NOT_NEEDED
+        assert first_entry.curated_by == self.user1
+        assert first_entry.old_curator is None
+
+        second_entry = history[1]
+        assert second_entry.reindexing_status == ReindexingStatusChoices.REINDEXING_FINISHED_ON_DEV
+        assert second_entry.old_status == ReindexingStatusChoices.REINDEXING_NEEDED_ON_DEV
+        assert second_entry.curated_by == self.user2
+        assert second_entry.old_curator == self.user1

From 150dfb70809328efb01bbb89bc82f864e3ddc650 Mon Sep 17 00:00:00 2001
From: Kiran Dawadi <kirandawadi11@gmail.com>
Date: Wed, 29 Jan 2025 10:19:38 -0600
Subject: [PATCH 10/10] Fix tests

---
 sde_collections/models/collection.py             | 3 ---
 sde_collections/tests/test_reindexing_history.py | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py
index 6e5d30a0..3c40e28a 100644
--- a/sde_collections/models/collection.py
+++ b/sde_collections/models/collection.py
@@ -758,9 +758,6 @@ def log_workflow_history(sender, instance, created, **kwargs):
             old_status=instance.old_reindexing_status,
             old_curator=instance.old_reindexing_curated_by,
         )
-        # Update the old values after creating the history entry
-        instance.old_reindexing_status = instance.reindexing_status
-        instance.old_reindexing_curated_by = instance.reindexing_curated_by
 
 
 class ReindexingHistory(models.Model):
diff --git a/sde_collections/tests/test_reindexing_history.py b/sde_collections/tests/test_reindexing_history.py
index fd3baf44..3fc1b4d5 100644
--- a/sde_collections/tests/test_reindexing_history.py
+++ b/sde_collections/tests/test_reindexing_history.py
@@ -3,7 +3,7 @@
 import pytest
 from django.contrib.auth import get_user_model
 
-from sde_collections.models.collection import ReindexingHistory
+from sde_collections.models.collection import Collection, ReindexingHistory
 from sde_collections.models.collection_choice_fields import ReindexingStatusChoices
 from sde_collections.tests.factories import CollectionFactory, UserFactory
 
@@ -61,6 +61,9 @@ def test_reindexing_history_multiple_changes(self):
         self.collection.reindexing_curated_by = self.user1
         self.collection.save()
 
+        # Re-fetch the object
+        self.collection = Collection.objects.get(id=self.collection.id)
+
         # Second change
         self.collection.reindexing_status = ReindexingStatusChoices.REINDEXING_FINISHED_ON_DEV
         self.collection.reindexing_curated_by = self.user2