From 8a847a8c40371d57ae769191c7e8a9913c928969 Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 26 Nov 2024 16:07:53 -0300 Subject: [PATCH 1/2] Refactor logic of custom search pointers --- assets/js/ordering/pointers.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/assets/js/ordering/pointers.js b/assets/js/ordering/pointers.js index 94836d34d4..ec83fc0c10 100644 --- a/assets/js/ordering/pointers.js +++ b/assets/js/ordering/pointers.js @@ -113,23 +113,16 @@ export class Pointers extends Component { const { title, defaultResults } = this.state; let merged = defaultResults[title].slice(); - const setIds = {}; - merged.forEach((item) => { - setIds[item.ID] = item; - }); - pointers = pointers.sort((a, b) => { return a.order > b.order ? 1 : -1; }); + const pointersIds = pointers.map((pointer) => pointer.ID); - pointers.forEach((pointer) => { - // Remove the original if a duplicate - if (setIds[pointer.ID]) { - delete merged[merged.indexOf(setIds[pointer.ID])]; - merged = merged.filter((item) => item); - } + // Remove all custom pointers from the default results + merged = merged.filter((item) => pointersIds.indexOf(item.ID) === -1); - // Insert into proper location + // Insert pointers into their proper location + pointers.forEach((pointer) => { merged.splice(parseInt(pointer.order, 10) - 1, 0, pointer); }); @@ -426,7 +419,9 @@ export class Pointers extends Component { CR )} - {title} + + {item.order} {title} +
Date: Tue, 26 Nov 2024 16:42:43 -0300 Subject: [PATCH 2/2] Remove debugging message --- assets/js/ordering/pointers.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/assets/js/ordering/pointers.js b/assets/js/ordering/pointers.js index ec83fc0c10..4f63e98616 100644 --- a/assets/js/ordering/pointers.js +++ b/assets/js/ordering/pointers.js @@ -419,9 +419,7 @@ export class Pointers extends Component { CR )} - - {item.order} {title} - + {title}