Skip to content

Commit 701b5b5

Browse files
committed
deleted CRs blocking implementing other CRs bug fix
1 parent cb6b79a commit 701b5b5

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/backend/src/services/change-requests.services.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export default class ChangeRequestsService {
178178
dateReviewed: null
179179
},
180180
{
181-
NOT: { scopeChangeRequest: null }
181+
changes: { none: {} }
182182
}
183183
];
184184

@@ -666,9 +666,7 @@ export default class ChangeRequestsService {
666666
include: {
667667
changeRequests: {
668668
where: {
669-
dateDeleted: {
670-
not: null
671-
}
669+
dateDeleted: null
672670
},
673671
include: {
674672
changes: true

src/frontend/src/components/ChangeRequestTab.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { WbsElement } from 'shared';
7-
import { useGetUnreviewedChangeRequests } from '../hooks/change-requests.hooks';
7+
import { useGetApprovedChangeRequests, useGetUnreviewedChangeRequests } from '../hooks/change-requests.hooks';
88
import ErrorPage from '../pages/ErrorPage';
99
import LoadingIndicator from './LoadingIndicator';
1010
import ChangeRequestRow from './ChangeRequestRow';
@@ -21,7 +21,7 @@ const ChangeRequestTab = ({ wbsElement }: { wbsElement: WbsElement }) => {
2121
isError: approvedCRIsError,
2222
isLoading: approvedCRIsLoading,
2323
error: approvedCRError
24-
} = useGetUnreviewedChangeRequests(wbsElement.wbsNum);
24+
} = useGetApprovedChangeRequests(wbsElement.wbsNum);
2525

2626
if (unreviewedCRIsError) return <ErrorPage message={unreviewedCRError?.message} />;
2727
if (approvedCRIsError) return <ErrorPage message={approvedCRError?.message} />;

0 commit comments

Comments
 (0)