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

MWPW-155425: [CAAS Authoring] ability to add multiple event states #3503

Merged
merged 20 commits into from
Feb 4, 2025
+8 −9
Merged

MWPW-155425: [CAAS Authoring] ability to add multiple event states #3503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e51a18c
[Release] Stage to Main (#3315)
milo-pr-merge[bot] Dec 9, 2024
41ef7a9
[Release] Stage to Main (#3331)
milo-pr-merge[bot] Dec 10, 2024
badc68d
[Release] Stage to Main (#3345)
milo-pr-merge[bot] Dec 11, 2024
58ae324
Revert "MWPW-140452 - Icon authoring in milo using the federal repo a…
mokimo Dec 11, 2024
fa0dbb1
[Release] Stage to Main (#3355)
milo-pr-merge[bot] Jan 2, 2025
55c4a2d
[Release] Stage to Main (#3411)
milo-pr-merge[bot] Jan 7, 2025
d8fb2eb
[Release] Stage to Main (#3422)
milo-pr-merge[bot] Jan 9, 2025
7f147b6
[Release] Stage to Main (#3442)
milo-pr-merge[bot] Jan 13, 2025
3cda648
[Release] Stage to Main (#3468)
milo-pr-merge[bot] Jan 14, 2025
a61dc66
[Release] Stage to Main (#3478)
milo-pr-merge[bot] Jan 15, 2025
409ed68
[Release] Stage to Main (#3487)
milo-pr-merge[bot] Jan 16, 2025
c56840d
[Release] Stage to Main (#3497)
milo-pr-merge[bot] Jan 16, 2025
b02a573
[Release] Stage to Main (#3500)
milo-pr-merge[bot] Jan 20, 2025
f3ab5ac
[Release] Stage to Main (#3512)
milo-pr-merge[bot] Jan 23, 2025
36827bd
[Release] Stage to Main (#3531)
milo-pr-merge[bot] Jan 27, 2025
6afa5dd
[Release] Stage to Main (#3545)
milo-pr-merge[bot] Jan 28, 2025
7097c97
[Release] Stage to Main (#3570)
milo-pr-merge[bot] Jan 29, 2025
c06e88b
MWPW-155425: ability to add multiple event states
Jan 16, 2025
395364b
MWPW-155425: adjusting the order of the filter messages
Jan 17, 2025
eaff2f2
MWPW-155425: unit tests
Jan 29, 2025
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
3 changes: 1 addition & 2 deletions libs/blocks/caas-config/caas-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ const defaultOptions = {
custom: 'Custom',
},
filterEvent: {
'': 'All',
live: 'Live',
upcoming: 'Upcoming',
'on-demand': 'On Demand',
Expand Down Expand Up @@ -585,7 +584,6 @@ const FilterPanel = ({ tagsData }) => {
<${Input} label="Show Empty Filters" prop="filtersShowEmpty" type="checkbox" />
<${Select} label="Filter Location" prop="filterLocation" options=${defaultOptions.filterLocation} />
<${Select} label="Filter logic within each tag panel" prop="filterLogic" options=${defaultOptions.filterLogic} />
<${Select} label="Event Filter" prop="filterEvent" options=${defaultOptions.filterEvent} />
<${Select} label="Automatic or Custom Panel" prop="filterBuildPanel" options=${defaultOptions.filterBuildPanel} />
`;

Expand Down Expand Up @@ -642,6 +640,7 @@ const FilterPanel = ({ tagsData }) => {
&& (state.filterBuildPanel === 'custom'
? FilterCustomBuildPanel
: FilterBuildPanel)}
<${DropdownSelect} id="filterEvent" options=${defaultOptions.filterEvent} prop="filterEvent" label="Event Filters" />
`;
};

Expand Down
4 changes: 2 additions & 2 deletions libs/blocks/caas/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ export const getConfig = async (originalState, strs = {}) => {
featuredCards: featuredCards.split(URL_ENCODED_COMMA),
filterPanel: {
enabled: state.showFilters,
eventFilter: state.filterEvent,
eventFilter: state.filterEvent || [],
type: state.showFilters ? state.filterLocation : 'left',
showEmptyFilters: state.filtersShowEmpty,
filters: await getFilterArray(state, country, language, strs),
Expand Down Expand Up @@ -824,7 +824,7 @@ export const defaultState = {
excludeTags: [],
fallbackEndpoint: '',
featuredCards: [],
filterEvent: '',
filterEvent: [],
filterBuildPanel: 'automatic',
filterLocation: 'left',
filterLogic: 'or',
Expand Down
2 changes: 1 addition & 1 deletion test/blocks/caas-config/caas-config.test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
showFiltersCb.dispatchEvent(new Event('change'));
await delay(50);

expect(findByLabel('Event Filter')).to.not.be.null;
expect(findByLabel('Show Empty Filters')).to.not.be.null;

// Verify adding of filter tag
const addBtn = configPanelEl.querySelector('.filters.multifield-add');
Expand Down
2 changes: 1 addition & 1 deletion test/blocks/caas-config/expectedConfigs/defaultConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const defaultConfig = {
},
],
enabled: false,
eventFilter: '',
eventFilter: [],
type: 'left',
showEmptyFilters: false,
filters: [],
Expand Down
6 changes: 3 additions & 3 deletions test/blocks/caas/utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ describe('getConfig', () => {
hideCtaTags: [],
filterPanel: {
enabled: true,
eventFilter: '',
eventFilter: [],
type: 'left',
showEmptyFilters: false,
categories: [
Expand Down Expand Up @@ -481,7 +481,7 @@ describe('getConfig', () => {
hideCtaTags: [],
filterPanel: {
enabled: true,
eventFilter: '',
eventFilter: [],
type: 'left',
showEmptyFilters: false,
categories: [
Expand Down Expand Up @@ -846,7 +846,7 @@ describe('getFloodgateCaasConfig', () => {
hideCtaTags: [],
filterPanel: {
enabled: true,
eventFilter: '',
eventFilter: [],
type: 'left',
showEmptyFilters: false,
categories: [
Expand Down
Loading