Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
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.22",
"openstack-uicore-foundation": "5.0.30-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 thread
santipalenque marked this conversation as resolved.
"react-router-dom": "^4.3.1",
"react-rte": "^0.16.3",
Expand All @@ -124,7 +124,7 @@
"react-switch": "^6.0.0",
"react-tooltip": "^5.28.0",
"react-window": "^1.8.10",
"redux": "^3.7.2",
"redux": "^4.2.1",
"redux-persist": "^5.10.0",
"redux-thunk": "^2.3.0",
"segmented-control": "0.1.12",
Expand Down
126 changes: 7 additions & 119 deletions src/actions/speaker-actions.js
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 thread
santipalenque marked this conversation as resolved.

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

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

Expand Down Expand Up @@ -939,7 +828,6 @@ export const getSpeakersBySummit =
page,
perPage,
term,
...filters,
currentSummitId: currentSummit.id
}
)(params)(dispatch).then(() => {
Expand All @@ -948,7 +836,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 +855,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 +906,7 @@ export const exportSummitSpeakers =
export const sendSpeakerEmails =
(
term = null,
filters = {},
filters = [],
testRecipient = "",
excerptRecipient = "",
shouldSendCopy2Submitter = false,
Expand Down Expand Up @@ -1047,15 +935,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
Loading
Loading