Skip to content

refactor(edit-project): Standardize MUI & Fix Modal Ripples (#1703) #1965

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
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

refactor(edit-project): Standardize MUI & Fix Modal Ripples (#1703) #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7537b7d
refactor(project-edit): Standardize MUI & fix modal ripples (#1703)
abuna1985 Jun 17, 2025
59fe214
style(modal): Remove redundant titles from dialog headers
abuna1985 Jun 18, 2025
a937673
Merge branch 'development' into 1703-migrate-editproject-mui
bconti123 Aug 26, 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
11 changes: 0 additions & 11 deletions client/src/components/manageProjects/createNewEvent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,6 @@ const CreateNewEvent = ({
};
return (
<div>
<button
type="button"
className="meeting-cancel-button"
onClick={() => {
setFormValues(initialFormValues);
setFormErrors(null);
setIsCreateNew(false);
}}
>
X
</button>
<EventForm
handleInputChange={handleInputChange}
formValues={formValues}
Expand Down
116 changes: 51 additions & 65 deletions client/src/components/manageProjects/editMeetingTimes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,92 +17,78 @@ const EditMeetingTimes = ({
}) => {
const [formErrors, setFormErrors] = useState({});
const { showSnackbar } = useSnackbar();
const handleEventUpdate = (
eventID,
values,
startTimeOriginal,
durationOriginal
) => async () => {
const errors = validateEventForm(values, projectToEdit);
if (!errors) {
let theUpdatedEvent = {};
const handleEventUpdate =
(eventID, values, startTimeOriginal, durationOriginal) => async () => {
const errors = validateEventForm(values, projectToEdit);
if (!errors) {
let theUpdatedEvent = {};

if (values.name) {
theUpdatedEvent = {
...theUpdatedEvent,
name: values.name,
};
}
if (values.name) {
theUpdatedEvent = {
...theUpdatedEvent,
name: values.name,
};
}

if (values.eventType) {
theUpdatedEvent = {
...theUpdatedEvent,
eventType: values.eventType,
};
}

if (values.eventType) {
theUpdatedEvent = {
...theUpdatedEvent,
eventType: values.eventType,
description: values.description,
};
}

theUpdatedEvent = {
...theUpdatedEvent,
description: values.description,
};
if (values.videoConferenceLink) {
theUpdatedEvent = {
...theUpdatedEvent,
videoConferenceLink: values.videoConferenceLink,
};
}

if (values.videoConferenceLink) {
// Set updated date to today and add it to the object
const updatedDate = new Date().toISOString();
theUpdatedEvent = {
...theUpdatedEvent,
videoConferenceLink: values.videoConferenceLink,
updatedDate,
};
}

// Set updated date to today and add it to the object
const updatedDate = new Date().toISOString();
theUpdatedEvent = {
...theUpdatedEvent,
updatedDate,
};
// Find next occurance of Day in the future
// Assign new start time and end time
const date = findNextOccuranceOfDay(values.day);
const startTimeDate = timeConvertFromForm(date, values.startTime);
const endTime = addDurationToTime(startTimeDate, values.duration);

// Find next occurance of Day in the future
// Assign new start time and end time
const date = findNextOccuranceOfDay(values.day);
const startTimeDate = timeConvertFromForm(date, values.startTime);
const endTime = addDurationToTime(startTimeDate, values.duration);
// Revert timestamps to GMT
const startDateTimeGMT = new Date(startTimeDate).toISOString();
const endTimeGMT = new Date(endTime).toISOString();

// Revert timestamps to GMT
const startDateTimeGMT = new Date(startTimeDate).toISOString();
const endTimeGMT = new Date(endTime).toISOString();

theUpdatedEvent = {
...theUpdatedEvent,
date: startDateTimeGMT,
startTime: startDateTimeGMT,
endTime: endTimeGMT,
duration: values.duration
};
theUpdatedEvent = {
...theUpdatedEvent,
date: startDateTimeGMT,
startTime: startDateTimeGMT,
endTime: endTimeGMT,
duration: values.duration,
};

updateRecurringEvent(theUpdatedEvent, eventID);
showSnackbar("Recurring event updated", 'info')
setSelectedEvent(null);
}
setFormErrors(errors);
};
updateRecurringEvent(theUpdatedEvent, eventID);
showSnackbar('Recurring event updated', 'info');
setSelectedEvent(null);
}
setFormErrors(errors);
};

const handleEventDelete = (eventID) => async () => {
deleteRecurringEvent(eventID);
setSelectedEvent(null);
showSnackbar("Recurring event deleted", 'info');
showSnackbar('Recurring event deleted', 'info');
};

return (
<div>
<button
type="button"
className="meeting-cancel-button"
onClick={() => {
setFormErrors(null);
setSelectedEvent(null);
}}
>
X
</button>
{selectedEvent && (
<EditableMeeting
key={selectedEvent.event_id}
Expand All @@ -123,4 +109,4 @@ const EditMeetingTimes = ({
</div>
);
};
export default EditMeetingTimes;
export default EditMeetingTimes;
Loading
Loading