diff --git a/src/i18n/en.json b/src/i18n/en.json index a171f9b09..223ba217d 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1025,7 +1025,7 @@ "review_status": "Review Status", "review_status_accepted": "Accepted", "review_status_in_review": "In Review", - "review_status_no_submitted": "No Submitted", + "review_status_no_submitted": "Not Submitted", "review_status_published": "Published", "review_status_received": "Received", "review_status_rejected": "Rejected", diff --git a/src/pages/events/summit-event-list-page.js b/src/pages/events/summit-event-list-page.js index b91c25f05..6393af189 100644 --- a/src/pages/events/summit-event-list-page.js +++ b/src/pages/events/summit-event-list-page.js @@ -16,15 +16,15 @@ import { connect } from 'react-redux'; import T from 'i18n-react/dist/i18n-react'; import Swal from "sweetalert2"; import { Modal, Pagination } from 'react-bootstrap'; -import { - FreeTextSearch, - Table, - UploadInput, - Input, - TagInput, - SpeakerInput, - Dropdown, - DateTimePicker, +import { + FreeTextSearch, + Table, + UploadInput, + Input, + TagInput, + SpeakerInput, + Dropdown, + DateTimePicker, OperatorInput, MemberInput, CompanyInput } from 'openstack-uicore-foundation/lib/components'; @@ -134,9 +134,9 @@ class SummitEventListPage extends React.Component { this.handleImportEvents = this.handleImportEvents.bind(this); this.handleMUXImport = this.handleMUXImport.bind(this); this.handleChangeMUXModal = this.handleChangeMUXModal.bind(this); - this.handleImportAssetsFromMUX = this.handleImportAssetsFromMUX.bind(this); + this.handleImportAssetsFromMUX = this.handleImportAssetsFromMUX.bind(this); this.handleExtraFilterChange = this.handleExtraFilterChange.bind(this); - this.handleTagOrSpeakerFilterChange = this.handleTagOrSpeakerFilterChange.bind(this); + this.handleTagOrSpeakerFilterChange = this.handleTagOrSpeakerFilterChange.bind(this); this.handleSetPublishedFilter = this.handleSetPublishedFilter.bind(this); this.handleChangeStartDate = this.handleChangeStartDate.bind(this); this.handleChangeEndDate = this.handleChangeEndDate.bind(this); @@ -173,7 +173,7 @@ class SummitEventListPage extends React.Component { this.extraFilters = { allows_attendee_vote_filter: false, allows_location_filter: false, - allows_publishing_dates_filter: false + allows_publishing_dates_filter: false } } @@ -218,7 +218,7 @@ class SummitEventListPage extends React.Component { const enabledFilters = Object.keys(filters).filter(e => Array.isArray(filters[e]) ? filters[e]?.some(e => e !== null) : filters[e]?.length > 0); this.setState({ - ...this.state, + ...this.state, selectedColumns: extraColumns, enabledFilters: enabledFilters, eventFilters: {...eventFilters, ...filters} @@ -331,7 +331,7 @@ class SummitEventListPage extends React.Component { value = { operator: ev.target.operator, value: ev.target.value - } + } } this.setState({...this.state, eventFilters: {...this.state.eventFilters, [id]: value}, selectedFilterCriteria: null}); } @@ -343,7 +343,7 @@ class SummitEventListPage extends React.Component { handleTagOrSpeakerFilterChange(ev) { let {value, id} = ev.target; this.setState({...this.state, eventFilters: {...this.state.eventFilters, [id]: value}}); - } + } handleSetPublishedFilter(ev) { this.extraFilters.published_filter = ev; @@ -356,9 +356,9 @@ class SummitEventListPage extends React.Component { if(value.length === 0) { this.setState({...this.state, enabledFilters: value, eventFilters: defaultFilters, selectedFilterCriteria: null}); } else { - const removedFilter = this.state.enabledFilters.filter(e => !value.includes(e))[0]; + const removedFilter = this.state.enabledFilters.filter(e => !value.includes(e))[0]; const defaultValue = removedFilter === 'published_filter' ? null : Array.isArray(this.state.eventFilters[removedFilter]) ? [] : ''; - let newEventFilters = {...this.state.eventFilters, [removedFilter]: defaultValue}; + let newEventFilters = {...this.state.eventFilters, [removedFilter]: defaultValue}; this.setState({...this.state, enabledFilters: value, eventFilters: newEventFilters, selectedFilterCriteria: null}); } } else { @@ -371,7 +371,7 @@ class SummitEventListPage extends React.Component { const {start_date_filter} = this.state.eventFilters; this.setState({...this.state, eventFilters: { - ...this.state.eventFilters, + ...this.state.eventFilters, start_date_filter: lastDate ? [start_date_filter[0], value.unix()] : [value.unix(), start_date_filter[1]] }}); } @@ -381,7 +381,7 @@ class SummitEventListPage extends React.Component { const {end_date_filter} = this.state.eventFilters; this.setState({...this.state, eventFilters: { - ...this.state.eventFilters, + ...this.state.eventFilters, end_date_filter: lastDate ? [end_date_filter[0], value.unix()] : [value.unix(), end_date_filter[1]] }}); } @@ -391,7 +391,7 @@ class SummitEventListPage extends React.Component { const {selectedColumns} = this.state; let newColumns = value; const all_companies = ['submitter_company', 'speaker_company', 'sponsor']; - + if(selectedColumns.includes('all_companies') && !newColumns.includes('all_companies')) { newColumns = [...newColumns.filter(e => !all_companies.includes(e))]; } @@ -405,7 +405,7 @@ class SummitEventListPage extends React.Component { } else if (newCompanies < selectedCompanies) { newColumns = [...newColumns.filter(c => c !== 'all_companies')]; } - } + } this.setState({...this.state, selectedColumns: newColumns}) } @@ -434,22 +434,22 @@ class SummitEventListPage extends React.Component { let newEventFilters = {} if(filterCriteria) { Object.entries(filterCriteria.criteria).map(([key, values]) => { - newEventFilters = {...newEventFilters, [key]: values}; + newEventFilters = {...newEventFilters, [key]: values}; }) } - + this.setState({ - ...this.state, - eventFilters: {...defaultFilters, ...newEventFilters}, - enabledFilters: filterCriteria ? filterCriteria.enabled_filters : [], + ...this.state, + eventFilters: {...defaultFilters, ...newEventFilters}, + enabledFilters: filterCriteria ? filterCriteria.enabled_filters : [], selectedFilterCriteria: filterCriteria ? filterCriteria : null }, () => this.props.getEvents(term, 1, 10, order, orderDir, this.state.eventFilters, extraColumns)); } handleFilterCriteriaDelete(filterCriteriaId) { const {extraColumns, term, order, orderDir} = this.props; - this.props.deleteFilterCriteria(filterCriteriaId).then(() => - this.setState({...this.state, + this.props.deleteFilterCriteria(filterCriteriaId).then(() => + this.setState({...this.state, eventFilters: {...defaultFilters, orAndFilter: ALL_FILTER}, enabledFilters: [], selectedFilterCriteria: null @@ -508,7 +508,7 @@ class SummitEventListPage extends React.Component { {label: 'Activity Type', value: 'event_type_id_filter'}, {label: 'Activity Category', value: 'track_id_filter'}, {label: 'Level', value: 'level_filter'}, - {label: 'Etherpad URL', value: 'etherpad_link'}, + {label: 'Etherpad URL', value: 'etherpad_link'}, {label: 'Location', value: 'location_id_filter'}, {label: 'Meeting URL', value: 'meeting_url'}, {label: 'Progress Flag', value: 'progress_flag'}, @@ -528,8 +528,8 @@ class SummitEventListPage extends React.Component { {label: 'Sponsors', value: 'sponsor'}, {label: 'All Companies', value: 'all_companies'}, {label: T.translate("event_list.submission_status"), value: 'submission_status_filter' }, - {label: T.translate("event_list.media_upload_with_type"), value: 'media_upload_with_type' }, - {label: 'Review Status', value: 'review_status_filter'}, + {label: T.translate("event_list.media_upload_with_type"), value: 'media_upload_with_type' }, + {label: 'Review Status', value: 'review_status_filter'}, ] const ddl_columns = [ @@ -575,7 +575,7 @@ class SummitEventListPage extends React.Component { const review_status_ddl = [ {label: T.translate("event_list.review_status_accepted"), value: 'Accepted'}, {label: T.translate("event_list.review_status_in_review"), value: 'InReview'}, - {label: T.translate("event_list.review_status_no_submitted"), value: 'NoSubmitted'}, + {label: T.translate("event_list.review_status_no_submitted"), value: 'NotSubmitted'}, {label: T.translate("event_list.review_status_published"), value: 'Published'}, {label: T.translate("event_list.review_status_received"), value: 'Received'}, {label: T.translate("event_list.review_status_rejected"), value: 'Rejected'} @@ -639,7 +639,7 @@ class SummitEventListPage extends React.Component { this.handleOrAndFilter(filter)}/>
-
- +
{enabledFilters.includes('event_type_capacity_filter') && @@ -681,7 +681,7 @@ class SummitEventListPage extends React.Component {
} {enabledFilters.includes('selection_plan_id_filter') && -
+
} {enabledFilters.includes('selection_status_filter') && -
+
-
+
} {enabledFilters.includes('published_filter') &&
@@ -730,7 +730,7 @@ class SummitEventListPage extends React.Component { ]} setValue={newValue => this.handleSetPublishedFilter(newValue)} style={{ width: "100%", height:40, color: '#337ab7', fontSize: '10px' }} - /> + />
} {enabledFilters.includes('progress_flag') && @@ -747,7 +747,7 @@ class SummitEventListPage extends React.Component {
} {enabledFilters.includes('track_id_filter') && -
+
- } + } {enabledFilters.includes('event_type_id_filter') &&
} {enabledFilters.includes('speaker_id_filter') && -
+
} {enabledFilters.includes('speaker_company') && -
+
} {enabledFilters.includes('tags_filter') && -
+
} {enabledFilters.includes('sponsor') && -
+
} - {enabledFilters.includes('submitters') && -
+ {enabledFilters.includes('submitters') && +
} {enabledFilters.includes('submitter_company') && -
+
} - {enabledFilters.includes('streaming_url') && -
+ {enabledFilters.includes('streaming_url') && +
} - {enabledFilters.includes('meeting_url') && -
+ {enabledFilters.includes('meeting_url') && +
} - {enabledFilters.includes('etherpad_link') && -
+ {enabledFilters.includes('etherpad_link') && +
} - {enabledFilters.includes('streaming_type') && -
+ {enabledFilters.includes('streaming_type') && +
- } + } {enabledFilters.includes('duration_filter') && -
- +
} {enabledFilters.includes('speakers_count_filter') && -
- +
} {enabledFilters.includes('submission_status_filter') && -
+
-
+
} {enabledFilters.includes('review_status_filter') && -
+
-
+
} {enabledFilters.includes('media_upload_with_type') && -
- +
- } -
+ } +

@@ -1063,7 +1063,7 @@ class SummitEventListPage extends React.Component { />
- + {events.length === 0 &&
{T.translate("event_list.no_events")}
}