diff --git a/src/i18n/en.json b/src/i18n/en.json
index 935ec2de4..d3b35b6e4 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -712,7 +712,26 @@
"draft_state_note": "This activity was saved as a draft by the submitter and contains missing required fields. To make partial changes (e.g., re-categorize or assign tags) without filling out missing fields, use the Save as Incomplete button below. This preserves the draft status.",
"save_as_incomplete": "Save as Incomplete",
"save_and_mark_complete": "Save & Mark Complete",
- "event_saved_as_draft": "Activity saved as draft successfully."
+ "event_saved_as_draft": "Activity saved as draft successfully.",
+ "reopen_submission": "Reopen submission",
+ "reopen_submission_section": "CFP submission window",
+ "reopen_duration": "Reopen for",
+ "reopen_duration_24": "24 hours",
+ "reopen_duration_48": "48 hours",
+ "reopen_duration_72": "72 hours",
+ "reopen_duration_custom": "Custom",
+ "reopen_custom_hours": "Hours",
+ "reopen_custom_hours_capped": "Hours (1-{max})",
+ "reopen_confirm_title": "Reopen submission for this activity?",
+ "reopen_confirm_text": "This lets the speaker edit this talk until {deadline}.",
+ "reopen_submission_success": "Submission reopened.",
+ "close_submission": "Close now",
+ "close_submission_confirm_title": "Close the submission window now?",
+ "close_submission_confirm_text": "The speaker will immediately lose the ability to edit this talk.",
+ "close_submission_success": "Submission window closed.",
+ "reopened_until": "Reopened until {deadline}",
+ "reopened_by": "by {admin}",
+ "reopen_deep_link_label": "Speaker link"
},
"edit_event_material": {
"material": "Material",
diff --git a/src/pages/events/__tests__/edit-summit-event-page.test.js b/src/pages/events/__tests__/edit-summit-event-page.test.js
new file mode 100644
index 000000000..8a175ff95
--- /dev/null
+++ b/src/pages/events/__tests__/edit-summit-event-page.test.js
@@ -0,0 +1,100 @@
+import React from "react";
+import userEvent from "@testing-library/user-event";
+import { screen } from "@testing-library/react";
+import EditSummitEventPage from "../edit-summit-event-page";
+import { renderWithRedux } from "../../../utils/test-utils";
+
+// The form is stubbed to just the two controls under test. This suite is about how the
+// page forwards its actions, not about anything the form renders.
+jest.mock("../../../components/forms/event-form", () => (props) => (
+
+
+
+
+));
+
+jest.mock("../../../actions/event-actions", () => ({
+ saveEvent: jest.fn(),
+ saveEventAsDraft: jest.fn(),
+ saveEventFieldWithoutRefresh: jest.fn(),
+ attachFile: jest.fn(),
+ getEvents: jest.fn(),
+ removeImage: jest.fn(),
+ getEventFeedback: jest.fn(),
+ deleteEventFeedback: jest.fn(),
+ getEventFeedbackCSV: jest.fn(),
+ changeFlag: jest.fn(),
+ getActionTypes: jest.fn(() => ({ type: "GET_ACTION_TYPES_MOCK" })),
+ getEventComments: jest.fn(),
+ fetchExtraQuestions: jest.fn(),
+ fetchExtraQuestionsAnswers: jest.fn(),
+ cloneEvent: jest.fn(),
+ upgradeEvent: jest.fn(),
+ reopenSubmissionPeriod: jest.fn(() => ({ type: "REOPEN_SUBMISSION_MOCK" })),
+ closeSubmissionPeriod: jest.fn(() => ({ type: "CLOSE_SUBMISSION_MOCK" }))
+}));
+
+const EventActions = jest.requireMock("../../../actions/event-actions");
+
+describe("EditSummitEventPage", () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ const baseState = {
+ currentSummitState: {
+ currentSummit: { id: 12, selection_plans: [] },
+ loading: false
+ },
+ currentSummitEventState: {
+ entity: { id: 42, selection_plan_id: 99 },
+ errors: {},
+ levelOptions: [],
+ feedbackState: { term: "", page: 1, comments: [] },
+ commentState: { filters: {}, comments: [] },
+ actionTypes: []
+ },
+ currentRsvpTemplateListState: { rsvpTemplates: [] },
+ currentEventListState: {},
+ auditLogState: {}
+ };
+
+ const renderPage = () =>
+ renderWithRedux(, {
+ initialState: baseState
+ });
+
+ // These two assert on store.dispatch, NOT on the action creator, and that is the whole
+ // point of the suite. Once the actions module is mocked, the raw module import and the
+ // connect-bound prop are the same jest.fn, so `expect(creator).toHaveBeenCalled()`
+ // passes even when the page forwards the un-dispatched import instead of the prop --
+ // which is exactly the regression these guard (the reopen controls were inert because
+ // the page never destructured the two thunks off props).
+ it("dispatches the reopen thunk rather than forwarding the raw import", async () => {
+ const user = userEvent.setup();
+ const { store } = renderPage();
+
+ await user.click(screen.getByText("reopen"));
+
+ expect(EventActions.reopenSubmissionPeriod).toHaveBeenCalledWith(42, 24);
+ expect(store.dispatch).toHaveBeenCalledWith({
+ type: "REOPEN_SUBMISSION_MOCK"
+ });
+ });
+
+ it("dispatches the close thunk rather than forwarding the raw import", async () => {
+ const user = userEvent.setup();
+ const { store } = renderPage();
+
+ await user.click(screen.getByText("close"));
+
+ expect(EventActions.closeSubmissionPeriod).toHaveBeenCalledWith(42);
+ expect(store.dispatch).toHaveBeenCalledWith({
+ type: "CLOSE_SUBMISSION_MOCK"
+ });
+ });
+});
diff --git a/src/pages/events/edit-summit-event-page.js b/src/pages/events/edit-summit-event-page.js
index 912646db7..716fdbdd6 100644
--- a/src/pages/events/edit-summit-event-page.js
+++ b/src/pages/events/edit-summit-event-page.js
@@ -31,7 +31,9 @@ import {
fetchExtraQuestions,
fetchExtraQuestionsAnswers,
cloneEvent,
- upgradeEvent
+ upgradeEvent,
+ reopenSubmissionPeriod,
+ closeSubmissionPeriod
} from "../../actions/event-actions";
import { unPublishEvent } from "../../actions/summit-builder-actions";
import { deleteEventMaterial } from "../../actions/event-material-actions";
@@ -241,7 +243,9 @@ function EditSummitEventPage(props) {
getEventFeedbackCSV,
changeFlag,
cloneEvent,
- upgradeEvent
+ upgradeEvent,
+ reopenSubmissionPeriod,
+ closeSubmissionPeriod
} = props;
if (loading) return null;
@@ -311,6 +315,8 @@ function EditSummitEventPage(props) {
getEventFeedbackCSV={getEventFeedbackCSV}
onFlagChange={changeFlag}
onClone={cloneEvent}
+ onReopenSubmission={reopenSubmissionPeriod}
+ onCloseSubmission={closeSubmissionPeriod}
/>
)}
@@ -356,5 +362,7 @@ export default connect(mapStateToProps, {
getEventComments,
deleteEventComment,
cloneEvent,
- upgradeEvent
+ upgradeEvent,
+ reopenSubmissionPeriod,
+ closeSubmissionPeriod
})(EditSummitEventPage);
diff --git a/src/reducers/events/__tests__/summit-event-reducer.test.js b/src/reducers/events/__tests__/summit-event-reducer.test.js
new file mode 100644
index 000000000..c5f9c6a84
--- /dev/null
+++ b/src/reducers/events/__tests__/summit-event-reducer.test.js
@@ -0,0 +1,108 @@
+import summitEventReducer from "../summit-event-reducer";
+import {
+ SUBMISSION_PERIOD_REOPENED,
+ SUBMISSION_PERIOD_CLOSED
+} from "../../../actions/event-actions";
+
+describe("summitEventReducer submission period", () => {
+ const stateForEvent = (id, overrides = {}) => ({
+ entity: {
+ id,
+ title: "A TALK",
+ selection_plan_id: 99,
+ submission_reopened_until: "",
+ submission_reopened_by_id: 0,
+ submission_reopened_by: null,
+ ...overrides
+ },
+ errors: {}
+ });
+
+ const reopenedResponse = {
+ submission_reopened_until: 1786550400,
+ submission_reopened_by: {
+ id: 5,
+ first_name: "Ada",
+ last_name: "Lovelace",
+ email: "ada@example.org"
+ }
+ };
+
+ it("applies a reopen response to the activity it was issued for", () => {
+ const next = summitEventReducer(stateForEvent(42), {
+ type: SUBMISSION_PERIOD_REOPENED,
+ payload: { eventId: 42, response: reopenedResponse }
+ });
+
+ expect(next.entity.submission_reopened_until).toBe(1786550400);
+ expect(next.entity.submission_reopened_by.first_name).toBe("Ada");
+ });
+
+ // The admin grants on activity A, navigates to B before the request finishes, B loads,
+ // then A's response lands. Without the eventId guard it merges A's grant onto B.
+ it("ignores a reopen response that arrives after the admin moved to another activity", () => {
+ const stateOnB = stateForEvent(43);
+
+ const next = summitEventReducer(stateOnB, {
+ type: SUBMISSION_PERIOD_REOPENED,
+ payload: { eventId: 42, response: reopenedResponse }
+ });
+
+ expect(next).toBe(stateOnB);
+ expect(next.entity.submission_reopened_until).toBe("");
+ expect(next.entity.submission_reopened_by).toBeNull();
+ });
+
+ it("clears the grant on the activity the close was issued for", () => {
+ const granted = stateForEvent(42, {
+ submission_reopened_until: 1786550400,
+ submission_reopened_by_id: 5,
+ submission_reopened_by: { id: 5 }
+ });
+
+ const next = summitEventReducer(granted, {
+ type: SUBMISSION_PERIOD_CLOSED,
+ payload: { eventId: 42 }
+ });
+
+ expect(next.entity.submission_reopened_until).toBe("");
+ expect(next.entity.submission_reopened_by_id).toBe(0);
+ expect(next.entity.submission_reopened_by).toBeNull();
+ });
+
+ it("ignores a close response that arrives after the admin moved to another activity", () => {
+ const grantedOnB = stateForEvent(43, {
+ submission_reopened_until: 1786550400,
+ submission_reopened_by_id: 5,
+ submission_reopened_by: { id: 5 }
+ });
+
+ const next = summitEventReducer(grantedOnB, {
+ type: SUBMISSION_PERIOD_CLOSED,
+ payload: { eventId: 42 }
+ });
+
+ expect(next).toBe(grantedOnB);
+ expect(next.entity.submission_reopened_until).toBe(1786550400);
+ });
+
+ // The server sends null for an ungranted window, and this response does not pass
+ // through normalizeEventResponse, so the nulls arrive as real nulls rather than "".
+ it("coerces a null reopen response back to the empty-state defaults", () => {
+ const next = summitEventReducer(stateForEvent(42), {
+ type: SUBMISSION_PERIOD_REOPENED,
+ payload: {
+ eventId: 42,
+ response: {
+ submission_reopened_until: null,
+ submission_reopened_by_id: null,
+ submission_reopened_by: null
+ }
+ }
+ });
+
+ expect(next.entity.submission_reopened_until).toBe("");
+ expect(next.entity.submission_reopened_by_id).toBe(0);
+ expect(next.entity.submission_reopened_by).toBeNull();
+ });
+});
diff --git a/src/reducers/events/summit-event-reducer.js b/src/reducers/events/summit-event-reducer.js
index 447ae7a74..b52a6f3b4 100644
--- a/src/reducers/events/summit-event-reducer.js
+++ b/src/reducers/events/summit-event-reducer.js
@@ -28,7 +28,9 @@ import {
RECEIVE_EVENT_FEEDBACK,
REQUEST_EVENT_COMMENTS,
REQUEST_EVENT_FEEDBACK,
- RESET_EVENT_FORM
+ RESET_EVENT_FORM,
+ SUBMISSION_PERIOD_REOPENED,
+ SUBMISSION_PERIOD_CLOSED
} from "../../actions/event-actions";
import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions";
import { UNPUBLISHED_EVENT } from "../../actions/summit-builder-actions";
@@ -78,7 +80,10 @@ export const DEFAULT_ENTITY = {
actions: [],
allowed_ticket_types: [],
submission_source: "Admin",
- rsvp_type: "None"
+ rsvp_type: "None",
+ submission_reopened_until: "",
+ submission_reopened_by_id: 0,
+ submission_reopened_by: null
};
const DEFAULT_STATE_FEEDBACK_STATE = {
@@ -186,6 +191,35 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
const entity = normalizeEventResponse(payload.response);
return { ...state, entity, errors: {} };
}
+ case SUBMISSION_PERIOD_REOPENED: {
+ const { response } = payload;
+ // A response that lands after the admin navigated to another activity would
+ // otherwise merge this grant onto whatever event is now loaded.
+ if (payload.eventId !== state.entity.id) return state;
+ return {
+ ...state,
+ entity: {
+ ...state.entity,
+ submission_reopened_until: response.submission_reopened_until ?? "",
+ submission_reopened_by_id: response.submission_reopened_by_id ?? 0,
+ submission_reopened_by: response.submission_reopened_by ?? null
+ },
+ errors: {}
+ };
+ }
+ case SUBMISSION_PERIOD_CLOSED: {
+ // Same guard as the reopen case above.
+ if (payload.eventId !== state.entity.id) return state;
+ return {
+ ...state,
+ entity: {
+ ...state.entity,
+ submission_reopened_until: "",
+ submission_reopened_by_id: 0,
+ submission_reopened_by: null
+ }
+ };
+ }
case EVENT_MATERIAL_DELETED: {
const { eventMaterialId } = payload;
const materials = state.entity.materials.filter(
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 846f53c8e..19609da15 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -354,3 +354,7 @@ export const IMPORT_SPONSOR_USERS_STATUS = {
SUCCESS: "SUCCESS",
FAILURE: "FAILURE"
};
+
+export const DEFAULT_REOPEN_HOURS = 24;
+export const REOPEN_PRESET_HOURS_48 = 48;
+export const REOPEN_PRESET_HOURS_72 = 72;