Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VACMS-16099: Update logic to account for Beneficiary Tags change to a multi select #1821

Merged
merged 11 commits into from
Dec 11, 2023
Merged

VACMS-16099: Update logic to account for Beneficiary Tags change to a multi select #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b312c18
update logic to account for tags change from obj to array
Dec 5, 2023
213c5a1
edit unit test
Dec 5, 2023
8d2b757
update create R&S file
Dec 5, 2023
94761fc
revert changes
Dec 5, 2023
5d6e7eb
update spacing for top pages
Dec 5, 2023
29a21b7
handle r&s groupbytags function
Dec 7, 2023
9ee35cc
revert yarn.lock changes
Dec 8, 2023
93f5dbb
code cleanup
Dec 8, 2023
225bb9e
VACMS-16099: Supports either an array of objects or an object for ben…
dsasser Dec 8, 2023
c6b5faa
Merge branch '16099-update-beneficiary-tags' of github.com:department…
Dec 8, 2023
fd34a76
fix else statement
Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/site/filters/liquid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,10 +810,19 @@ module.exports = function registerFilters() {
categoryLabel: 'Topics',
}));

const audiences = [
fieldAudienceBeneficiares?.entity,
fieldNonBeneficiares?.entity,
]
let beneficiaresAudiences = [];
if (
fieldAudienceBeneficiares &&
!Array.isArray(fieldAudienceBeneficiares)
) {
beneficiaresAudiences = [fieldAudienceBeneficiares?.entity];
} else if (fieldAudienceBeneficiares) {
beneficiaresAudiences = fieldAudienceBeneficiares.map(
audience => audience?.entity,
);
}

const audiences = [fieldNonBeneficiares?.entity, ...beneficiaresAudiences]
.filter(tag => !!tag)
.map(audience => ({
...audience,
Expand Down
10 changes: 6 additions & 4 deletions src/site/filters/liquid.unit.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,11 +935,13 @@ describe('getTagsList', () => {
},
},
],
fieldAudienceBeneficiares: {
entity: {
name: 'C. Example',
fieldAudienceBeneficiares: [
{
entity: {
name: 'C. Example',
},
},
},
],
fieldNonBeneficiares: {
entity: {
name: 'D. Example',
Expand Down
8 changes: 7 additions & 1 deletion src/site/stages/build/plugins/create-resources-and-support-section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ function groupByTags(allArticles) {
const terms = [...fieldTopics];

if (fieldAudienceBeneficiares) {
terms.push(fieldAudienceBeneficiares);
if (!Array.isArray(fieldAudienceBeneficiares)) {
terms.push({ ...fieldAudienceBeneficiares });
} else {
fieldAudienceBeneficiares.forEach(tag => {
terms.push(tag);
});
}
}

if (fieldNonBeneficiares) {
Expand Down
Loading