tannedcung/sbt-idp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #162 from SDSRV-IDP/feature/add_filter_review2

Browse Source 
Feature/add filter review2
This commit is contained in:
Đỗ Xuân Tân 2024-12-04 15:35:20 +07:00 committed by GitHub Enterprise
commit 5fb227b2f2
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cope2n-fe/src/components/left-menu/index.tsx
View File

@ -1,4 +1,4 @@
import { AppstoreOutlined, BarChartOutlined, RotateRightOutlined, FileSearchOutlined } from '@ant-design/icons'; import { AppstoreOutlined, BarChartOutlined, RotateRightOutlined } from '@ant-design/icons';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Menu, MenuProps } from 'antd'; import { Menu, MenuProps } from 'antd';
import React from 'react'; import React from 'react';

1
cope2n-fe/src/components/spin/index.tsx
View File

@ -4,7 +4,6 @@ export function GlobalSpin() {
return ( return (
<Spin <Spin
size='large' size='large'
tip='Loading ...'
style={{ style={{
position: 'fixed', position: 'fixed',
top: '50%', top: '50%',

2
cope2n-fe/src/pages/reviews2/api.ts
View File

@ -105,7 +105,7 @@ export const fetchRequest = async (id: string) => {
}); });
return await ( return await (
await response.json() await response.json()
).subscription_requests[0]; ).subscription_requests?.[0] || null;
}; };
export const addRecentRequest = ( export const addRecentRequest = (

13
cope2n-fe/src/pages/reviews2/index.tsx
View File

@ -172,7 +172,7 @@ const ReviewPage = () => {
const setAndLoadSelectedFile = async (requestData, index) => { const setAndLoadSelectedFile = async (requestData, index) => {
setSelectedFileId(index); setSelectedFileId(index);
if (!requestData['Files'][index]) { if (!requestData?.['Files'][index]) {
setSelectedFileData('FAILED_TO_LOAD_FILE'); setSelectedFileData('FAILED_TO_LOAD_FILE');
setImageLoading(false); setImageLoading(false);
return; return;
@ -578,17 +578,17 @@ const ReviewPage = () => {
overflow: 'auto', overflow: 'auto',
}} }}
> >
<Viewer {selectedFileData && <Viewer
plugins={[defaultLayoutPluginInstance]} plugins={[defaultLayoutPluginInstance]}
fileUrl={selectedFileData} fileUrl={selectedFileData}
onDocumentLoad={() => setImageLoading(false)} onDocumentLoad={() => setImageLoading(false)}
/> />}
</div> </div>
) : ( ) : (
<div <div
style={{ style={{
flexGrow: 1, flexGrow: 1,
overflow: 'auto', overflowY: 'auto',
display: 'flex', display: 'flex',
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
@ -756,8 +756,7 @@ const ReviewPage = () => {
> >
<Input <Input
size='middle' size='middle'
value={`Sub: ${filterSubsidiaries}, Date:${ value={`Sub: ${filterSubsidiaries}, Date:${filterDateRange[0]
filterDateRange[0]
? filterDateRange[0] + ' to ' + filterDateRange[1] ? filterDateRange[0] + ' to ' + filterDateRange[1]
: 'All' : 'All'
}, Reviewed: ${filterReviewState}, Tests: ${filterIncludeTests}`} }, Reviewed: ${filterReviewState}, Tests: ${filterIncludeTests}`}
@ -781,7 +780,7 @@ const ReviewPage = () => {
let shouldRevised = false; let shouldRevised = false;
try { try {
if ( if (
selectedFileDataSource[data]?.[FEEDBACK_ACCURACY].length > 0 selectedFileDataSource[data]?.[FEEDBACK_ACCURACY]?.length > 0
) { ) {
shouldRevised = shouldRevised =
selectedFileDataSource[data][FEEDBACK_ACCURACY][0] < 1; selectedFileDataSource[data][FEEDBACK_ACCURACY][0] < 1;