Skip to content

Feature: new filter component #927

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

Open
santipalenque wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Feature: new filter component #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a668908
chore: building ui - WIP
santipalenque May 7, 2026
4001b5a
chore: define contract
santipalenque May 8, 2026
3fa6264
chore: refactor speaker list page
santipalenque May 11, 2026
906fc6b
chore: continue work on filter - WIP
santipalenque May 12, 2026
0fb436b
chore: API integration and tests
santipalenque May 15, 2026
5b8293f
fix: coderabbit review
santipalenque May 15, 2026
66abf6a
chore: bug fixing
santipalenque May 15, 2026
fde5298
chore: move GridFilter to uicore
santipalenque May 18, 2026
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"moment": "^2.29.1",
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.33",
"openstack-uicore-foundation": "5.0.20",
"openstack-uicore-foundation": "5.0.21-beta.1",
"p-limit": "^6.1.0",
"path-browserify": "^1.0.1",
"postcss-loader": "^6.2.1",
Expand All @@ -114,7 +114,7 @@
"react-dropzone": "^4.2.13",
"react-final-form": "^6.5.9",
"react-google-maps": "^9.4.5",
"react-redux": "^5.0.7",
"react-redux": "^7.1.0",
"react-router": "^4.3.1",
Comment on lines 114 to 118
Copy link
Copy Markdown

@smarcet smarcet May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@santipalenque do we need to update redux too ?

"react-router-dom": "^4.3.1",
"react-rte": "^0.16.3",
Expand Down
125 changes: 7 additions & 118 deletions src/actions/speaker-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,136 +772,25 @@ export const removeFeaturedSpeaker =
/* SPEAKERS BY SUMMIT */
/** ************************************************************************************************* */

const parseFilters = (filters) => {
const filter = [];

if (
filters?.selectionPlanFilter &&
Array.isArray(filters.selectionPlanFilter) &&
filters.selectionPlanFilter.length > 0
) {
filter.push(
`presentations_selection_plan_id==${filters.selectionPlanFilter.join(
"||"
)}`
);
}

if (
filters?.trackFilter &&
Array.isArray(filters.trackFilter) &&
filters.trackFilter.length > 0
) {
filter.push(`presentations_track_id==${filters.trackFilter.join("||")}`);
}

if (
filters?.trackGroupFilter &&
Array.isArray(filters.trackGroupFilter) &&
filters.trackGroupFilter.length > 0
) {
filter.push(
`presentations_track_group_id==${filters.trackGroupFilter.join("||")}`
);
}

if (
filters?.activityTypeFilter &&
Array.isArray(filters.activityTypeFilter) &&
filters.activityTypeFilter.length > 0
) {
filter.push(
`presentations_type_id==${filters.activityTypeFilter.join("||")}`
);
}

if (
filters?.selectionStatusFilter &&
Array.isArray(filters.selectionStatusFilter) &&
filters.selectionStatusFilter.length > 0
) {
// exclusive filters
if (filters.selectionStatusFilter.includes("only_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("only_accepted")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("only_alternate")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==true");
} else if (filters.selectionStatusFilter.includes("accepted_alternate")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==true");
} else if (filters.selectionStatusFilter.includes("accepted_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("alternate_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==true");
} else {
filter.push(
filters.selectionStatusFilter.reduce(
(accumulator, at) =>
`${
accumulator + (accumulator !== "" ? "," : "")
}has_${at}_presentations==true`,
""
)
);
}
}

if (
filters?.mediaUploadTypeFilter &&
filters.mediaUploadTypeFilter.operator !== null &&
Array.isArray(filters.mediaUploadTypeFilter.value) &&
filters.mediaUploadTypeFilter.value.length > 0
) {
filter.push(
`${
filters.mediaUploadTypeFilter.operator
}${filters.mediaUploadTypeFilter.value
.map((v) => v.id)
.join(
filters.mediaUploadTypeFilter.operator ===
"has_media_upload_with_type=="
? "||"
: "&&"
)}`
);
}

// return checkOrFilter(filters, filter);
return filter;
};

export const getSpeakersBySummit =
(
term = null,
page = DEFAULT_CURRENT_PAGE,
perPage = DEFAULT_PER_PAGE,
order = "full_name",
orderDir = DEFAULT_ORDER_DIR,
filters = {}
filters = []
) =>
async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;
const filter = parseFilters(filters);
const filter = [...filters];

Comment thread
coderabbitai[bot] marked this conversation as resolved.
dispatch(startLoading());
Comment on lines 787 to 790

if (term) {
const filterTerm = buildTermFilter(term);

filter.push(filterTerm.join(","));
}

Expand Down Expand Up @@ -948,7 +837,7 @@ export const getSpeakersBySummit =
};

export const exportSummitSpeakers =
(term = null, order = "id", orderDir = DEFAULT_ORDER_DIR, filters = {}) =>
(term = null, order = "id", orderDir = DEFAULT_ORDER_DIR, filters = []) =>
async (dispatch, getState) => {
const csvMIME = "text/csv;charset=utf-8";
const pageSize = 500;
Expand All @@ -967,7 +856,7 @@ export const exportSummitSpeakers =

dispatch(startLoading());

const filter = parseFilters(filters);
const filter = [...filters];

if (term) {
const filterTerm = buildTermFilter(term);
Expand Down Expand Up @@ -1018,7 +907,7 @@ export const exportSummitSpeakers =
export const sendSpeakerEmails =
(
term = null,
filters = {},
filters = [],
testRecipient = "",
excerptRecipient = "",
shouldSendCopy2Submitter = false,
Expand Down Expand Up @@ -1047,15 +936,15 @@ export const sendSpeakerEmails =
if (!selectedAll && selectedItems.length > 0) {
// we don't need the filter criteria, we have the ids
filter.push(`id==${selectedItems.join("||")}`);
const originalFilters = parseFilters(filters);
const originalFilters = [...filters];
if (term) {
const filterTerm = buildTermFilter(term);
originalFilters.push(filterTerm.join(","));
}

payload.original_filter = originalFilters;
} else {
filter = parseFilters(filters);
filter = [...filters];

if (term) {
const filterTerm = buildTermFilter(term);
Expand Down
136 changes: 5 additions & 131 deletions src/actions/submitter-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ export const getSubmittersBySummit =
perPage = DEFAULT_PER_PAGE,
order = "full_name",
orderDir = DEFAULT_ORDER_DIR,
filters = {},
filters = [],
source = null
) =>
async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;

const filter = parseFilters(filters);
const filter = [...filters];
Comment thread
coderabbitai[bot] marked this conversation as resolved.

Comment on lines 62 to 66
if (source === sources.submitters_no_speakers) {
filter.push("is_speaker==false");
Expand Down Expand Up @@ -133,7 +133,7 @@ export const exportSummitSubmitters =
access_token: accessToken
};

const filter = parseFilters(filters);
const filter = [...filters];

if (source === sources.submitters_no_speakers) {
filter.push("is_speaker==false");
Expand Down Expand Up @@ -209,7 +209,7 @@ export const sendSubmitterEmails =
if (!selectedAll && selectedItems.length > 0) {
// we don't need the filter criteria, we have the ids
filter.push(`id==${selectedItems.join("||")}`);
const originalFilters = parseFilters(filters);
const originalFilters = [...filters];

Comment on lines 209 to 213
if (source && source === sources.submitters_no_speakers) {
originalFilters.push("is_speaker==false");
Expand All @@ -222,7 +222,7 @@ export const sendSubmitterEmails =

payload.original_filter = originalFilters;
} else {
filter = parseFilters(filters);
filter = [...filters];

Comment on lines 223 to 226
if (source && source === sources.submitters_no_speakers) {
filter.push("is_speaker==false");
Expand Down Expand Up @@ -292,132 +292,6 @@ export const setCurrentSubmitterFlowEvent = (value) => (dispatch) => {
dispatch(createAction(SET_SUBMITTERS_CURRENT_FLOW_EVENT)(value));
};

const parseFilters = (filters) => {
const filter = [];

if (
filters.hasOwnProperty("selectionPlanFilter") &&
Array.isArray(filters.selectionPlanFilter) &&
filters.selectionPlanFilter.length > 0
) {
filter.push(
`presentations_selection_plan_id==${filters.selectionPlanFilter.reduce(
(accumulator, sp) =>
`${accumulator + (accumulator !== "" ? "||" : "")}${sp}`,
""
)}`
);
}

if (
filters.hasOwnProperty("trackFilter") &&
Array.isArray(filters.trackFilter) &&
filters.trackFilter.length > 0
) {
filter.push(
`presentations_track_id==${filters.trackFilter.reduce(
(accumulator, t) =>
`${accumulator + (accumulator !== "" ? "||" : "")}${t}`,
""
)}`
);
}

if (
filters.hasOwnProperty("trackGroupFilter") &&
Array.isArray(filters.trackGroupFilter) &&
filters.trackGroupFilter.length > 0
) {
filter.push(
`presentations_track_group_id==${filters.trackGroupFilter.reduce(
(accumulator, t) =>
`${accumulator + (accumulator !== "" ? "||" : "")}${t}`,
""
)}`
);
}

if (
filters.hasOwnProperty("activityTypeFilter") &&
Array.isArray(filters.activityTypeFilter) &&
filters.activityTypeFilter.length > 0
) {
filter.push(
`presentations_type_id==${filters.activityTypeFilter.reduce(
(accumulator, at) =>
`${accumulator + (accumulator !== "" ? "||" : "")}${at}`,
""
)}`
);
}

if (
filters.hasOwnProperty("selectionStatusFilter") &&
Array.isArray(filters.selectionStatusFilter) &&
filters.selectionStatusFilter.length > 0
) {
// exclusive filters
if (filters.selectionStatusFilter.includes("only_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("only_accepted")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("only_alternate")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==true");
} else if (filters.selectionStatusFilter.includes("accepted_alternate")) {
filter.push("has_rejected_presentations==false");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==true");
} else if (filters.selectionStatusFilter.includes("accepted_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==true");
filter.push("has_alternate_presentations==false");
} else if (filters.selectionStatusFilter.includes("alternate_rejected")) {
filter.push("has_rejected_presentations==true");
filter.push("has_accepted_presentations==false");
filter.push("has_alternate_presentations==true");
} else {
filter.push(
filters.selectionStatusFilter.reduce(
(accumulator, at) =>
`${
accumulator + (accumulator !== "" ? "," : "")
}has_${at}_presentations==true`,
""
)
);
}
}

if (
filters.hasOwnProperty("mediaUploadTypeFilter") &&
filters.mediaUploadTypeFilter.operator !== null &&
Array.isArray(filters.mediaUploadTypeFilter.value) &&
filters.mediaUploadTypeFilter.value.length > 0
) {
filter.push(
`${
filters.mediaUploadTypeFilter.operator
}${filters.mediaUploadTypeFilter.value
.map((v) => v.id)
.join(
filters.mediaUploadTypeFilter.operator ===
"has_media_upload_with_type=="
? "||"
: "&&"
)}`
);
}

// return checkOrFilter(filters, filter);
return filter;
};

const buildTermFilter = (term) => {
const escapedTerm = escapeFilterValue(term);

Expand Down
Loading
Loading