Merge branch 'main' of https://code.sdsdev.co.kr/SDSRV-IDP/sbt-idp into BE/review_page

This commit is contained in:
dx-tan 2024-05-24 13:30:55 +07:00
commit d0f15040ef

View File

@ -60,7 +60,6 @@ const ReviewPage = () => {
const [selectedFileData, setSelectedFileData] = useState(null); const [selectedFileData, setSelectedFileData] = useState(null);
const [selectedFileDataSource, setSelectedFileDataSource] = useState({}); const [selectedFileDataSource, setSelectedFileDataSource] = useState({});
const [selectedFileName, setSelectedFileName] = useState(null); const [selectedFileName, setSelectedFileName] = useState(null);
const [disableUpdateFileBtn, setDisableUpdateFileBtn] = useState(false);
// Default date range: 1 month ago to today // Default date range: 1 month ago to today
const [filterDateRange, setFilterDateRange] = useState(['', '']); const [filterDateRange, setFilterDateRange] = useState(['', '']);
@ -155,8 +154,6 @@ const ReviewPage = () => {
filterAccuracy, filterAccuracy,
) )
.then((data) => { .then((data) => {
// setRequests(data?.subscription_requests);
// setHasNextRequest(data?.subscription_requests.length > 1);
setTotalPages(data?.page?.total_requests); setTotalPages(data?.page?.total_requests);
setHasNextRequest(requestIndex < data?.page?.total_requests); setHasNextRequest(requestIndex < data?.page?.total_requests);
const requestData = fetchRequest( const requestData = fetchRequest(
@ -206,8 +203,6 @@ const ReviewPage = () => {
filterAccuracy, filterAccuracy,
).then((data) => { ).then((data) => {
setTotalPages(data?.page?.total_requests); setTotalPages(data?.page?.total_requests);
// setRequests(data?.subscription_requests);
// setHasNextRequest(data?.subscription_requests.length > 1);
setHasNextRequest(1 < data?.page?.total_requests); setHasNextRequest(1 < data?.page?.total_requests);
const firstRequest = fetchRequest( const firstRequest = fetchRequest(
data?.subscription_requests[0].RequestID, data?.subscription_requests[0].RequestID,
@ -234,7 +229,6 @@ const ReviewPage = () => {
filterAccuracy, filterAccuracy,
).then((data) => { ).then((data) => {
setTotalPages(data?.page?.total_requests); setTotalPages(data?.page?.total_requests);
// setRequests(data?.subscription_requests);
setHasNextRequest(1 < data?.page?.total_requests); setHasNextRequest(1 < data?.page?.total_requests);
const firstRequest = fetchRequest( const firstRequest = fetchRequest(
data?.subscription_requests[0].RequestID, data?.subscription_requests[0].RequestID,
@ -628,6 +622,7 @@ const ReviewPage = () => {
type='primary' type='primary'
shape='default' shape='default'
size='middle' size='middle'
disabled={currentRequest && currentRequest['Is Reviewed'] }
style={{ minWidth: '120px', alignSelf: 'flex-end' }} style={{ minWidth: '120px', alignSelf: 'flex-end' }}
onClick={handleConfirmReview} onClick={handleConfirmReview}
> >