Skip to content

Commit 41cc3b6

Browse files
committed
#2136 - zoomlink optional broken, wrong date range, prefill time range
1 parent 268cf99 commit 41cc3b6

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/DesignReviewDetailPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ const DesignReviewDetailPage: React.FC<DesignReviewDetailPageProps> = ({ designR
5050
new Date(designReview.dateScheduled.getTime() - designReview.dateScheduled.getTimezoneOffset() * -60000)
5151
);
5252
const [showDeleteModal, setShowDeleteModal] = useState(false);
53-
const [startTime, setStateTime] = useState(0);
54-
const [endTime, setEndTime] = useState(1);
53+
const [startTime, setStateTime] = useState(designReview.meetingTimes[0] % 12);
54+
const [endTime, setEndTime] = useState((designReview.meetingTimes[designReview.meetingTimes.length - 1] % 12) + 1);
5555

5656
const { isLoading: allUsersIsLoading, isError: allUsersIsError, error: allUsersError, data: allUsers } = useAllUsers();
5757
const {

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewDetailsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const schema = yup.object().shape({
1717
zoomLink: yup
1818
.string()
1919
.optional()
20-
.test('zoom-link', 'Must be a valid zoom link', (value) => value!.includes('zoom.us/')),
20+
.test('zoom-link', 'Must be a valid zoom link', (value) => (value ? value.includes('zoom.us/') : true)),
2121
location: yup.string().optional(),
2222
docTemplateLink: yup.string().required('Question Doc is Required')
2323
});

src/frontend/src/utils/pipes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ export const designReviewNamePipe = (designReview: DesignReview) => {
132132
};
133133

134134
export const dateRangePipe = (startDate: Date, endDate: Date) => {
135-
return `${(startDate.getMonth() + 1).toString()}/${endDate.getDate().toString()} - ${(
135+
return `${(startDate.getMonth() + 1).toString()}/${startDate.getDate().toString()} - ${(
136136
endDate.getMonth() + 1
137-
).toString()}/${startDate.getDate().toString()}`;
137+
).toString()}/${endDate.getDate().toString()}`;
138138
};
139139

140140
export const undefinedPipe = (element: any) => {

0 commit comments

Comments
 (0)