Merge branch 'main' into B-22115

transcom · Jan 3, 2025 · 80d6b1d · 80d6b1d
2 parents d210850 + 11a8642
commit 80d6b1d
Show file tree

Hide file tree

Showing 8 changed files with 13,671 additions and 4 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1052,4 +1052,8 @@
 20241204155919_update_ordering_proc.up.sql
 20241204210208_retroactive_update_of_ppm_max_and_estimated_incentives_prd.up.sql
 20241217163231_update_duty_locations_bad_zips.up.sql
+20241217180136_add_AK_zips_to_zip3_distances.up.sql
+20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql
 20241227153723_remove_empty_string_emplid_values.up.sql
+20241230190638_remove_AK_zips_from_zip3.up.sql
+20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
diff --git a/migrations/app/schema/20241217180136_add_AK_zips_to_zip3_distances.up.sql b/migrations/app/schema/20241217180136_add_AK_zips_to_zip3_distances.up.sql
diff --git a/migrations/app/schema/20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql b/migrations/app/schema/20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql
diff --git a/migrations/app/schema/20241230190638_remove_AK_zips_from_zip3.up.sql b/migrations/app/schema/20241230190638_remove_AK_zips_from_zip3.up.sql
@@ -0,0 +1 @@
+DELETE FROM zip3_distances WHERE to_zip3 IN ('995','996','997','998','999');
diff --git a/migrations/app/schema/20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql b/migrations/app/schema/20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx
@@ -158,7 +158,7 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter
               {row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}
             </div>
           ) : (
-            <div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol}>
+            <div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol} key={row.id}>
               <Dropdown
                 defaultValue={row.assignedTo?.officeUserId}
                 onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.TOO)}

diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx
@@ -157,7 +157,7 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter
               {row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}
             </div>
           ) : (
-            <div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol}>
+            <div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol} key={row.id}>
               <Dropdown
                 defaultValue={row.assignedTo?.officeUserId}
                 onChange={(e) => {

diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx
@@ -202,7 +202,7 @@ export const counselingColumns = (moveLockFlag, originLocationList, supervisor,
           return !row?.assignable ? (
             <div>{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}</div>
           ) : (
-            <div data-label="assignedSelect" className={styles.assignedToCol}>
+            <div data-label="assignedSelect" className={styles.assignedToCol} key={row.id}>
               <Dropdown
                 defaultValue={row.assignedTo?.officeUserId}
                 onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)}
@@ -396,7 +396,7 @@ export const closeoutColumns = (
           return !row?.assignable ? (
             <div>{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}</div>
           ) : (
-            <div data-label="assignedSelect" className={styles.assignedToCol}>
+            <div data-label="assignedSelect" className={styles.assignedToCol} key={row.id}>
               <Dropdown
                 defaultValue={row.assignedTo?.officeUserId}
                 onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DELETE FROM zip3_distances WHERE to_zip3 IN ('995','996','997','998','999');