From aecec26211716e099ae216e7ea31e491b76da813 Mon Sep 17 00:00:00 2001 From: Kevin Solorio Date: Tue, 16 Nov 2021 15:38:18 -0600 Subject: [PATCH 1/2] quick fix for now --- app/assets/v2/js/grants/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js index 57f80147e31..5030b398068 100644 --- a/app/assets/v2/js/grants/index.js +++ b/app/assets/v2/js/grants/index.js @@ -342,8 +342,13 @@ if (document.getElementById('grants-showcase')) { if (!append_mode) { vm.grants = []; } + + const previouslyLoadedIds = vm.grants.map(grant => grant.id); + getGrants.grants.forEach(function(item) { - vm.grants.push(item); + if (!previouslyLoadedIds.includes(item.id)) { + vm.grants.push(item); + } }); vm.fetchedPages = [ ...vm.fetchedPages, Number(vm.params.page) ]; From 9b69c1def148a9ea8e7a6072a8435de73d1a2f03 Mon Sep 17 00:00:00 2001 From: Kevin Solorio Date: Sun, 21 Nov 2021 17:29:47 -0600 Subject: [PATCH 2/2] update with pr feedback --- app/assets/v2/js/grants/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js index 5030b398068..c391eafb1e4 100644 --- a/app/assets/v2/js/grants/index.js +++ b/app/assets/v2/js/grants/index.js @@ -126,6 +126,8 @@ if (document.getElementById('grants-showcase')) { editingCollection: false, createCollectionRedirect: false, activeTimeout: null, + scrollTriggered: false, + previouslyLoadedGrants: {}, selectOptions: [ {group: 'Discover', label: null}, {label: 'Weighted Shuffle', value: 'weighted_shuffle'}, @@ -341,13 +343,13 @@ if (document.getElementById('grants-showcase')) { if (!append_mode) { vm.grants = []; + vm.prevouslyLoadedGrants = {}; } - const previouslyLoadedIds = vm.grants.map(grant => grant.id); - getGrants.grants.forEach(function(item) { - if (!previouslyLoadedIds.includes(item.id)) { + if (!vm.prevouslyLoadedGrants[item.id]) { vm.grants.push(item); + vm.previouslyLoadedGrants[item.id] = item; } });