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

Feature/add filter review2

cope2n-fe/src/components/left-menu/index.tsx

@@ -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 { Menu, MenuProps } from 'antd';
 import React from 'react';

cope2n-fe/src/components/spin/index.tsx

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

cope2n-fe/src/pages/reviews2/api.ts

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

cope2n-fe/src/pages/reviews2/index.tsx

@@ -172,7 +172,7 @@ const ReviewPage = () => {
 
   const setAndLoadSelectedFile = async (requestData, index) => {
     setSelectedFileId(index);
-    if (!requestData['Files'][index]) {
+    if (!requestData?.['Files'][index]) {
       setSelectedFileData('FAILED_TO_LOAD_FILE');
       setImageLoading(false);
       return;
@@ -416,18 +416,18 @@ const ReviewPage = () => {
       style={
         fullscreen
           ? {
-              position: 'fixed',
+            position: 'fixed',
-              top: 0,
+            top: 0,
-              left: 0,
+            left: 0,
-              width: '100%',
+            width: '100%',
-              height: '100%',
+            height: '100%',
-              backgroundColor: '#fff',
+            backgroundColor: '#fff',
-              zIndex: 1000,
+            zIndex: 1000,
-            }
+          }
           : {
-              height: '100%',
+            height: '100%',
-              position: 'relative',
+            position: 'relative',
-            }
+          }
       }
     >
       <div
@@ -578,17 +578,17 @@ const ReviewPage = () => {
                 overflow: 'auto',
               }}
             >
-              <Viewer
+              {selectedFileData && <Viewer
                 plugins={[defaultLayoutPluginInstance]}
                 fileUrl={selectedFileData}
                 onDocumentLoad={() => setImageLoading(false)}
-              />
+              />}
             </div>
           ) : (
             <div
               style={{
                 flexGrow: 1,
-                overflow: 'auto',
+                overflowY: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
                 alignItems: 'center',
@@ -756,11 +756,10 @@ const ReviewPage = () => {
           >
             <Input
               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}`}
               readOnly
             />
             <Button
@@ -781,12 +780,12 @@ const ReviewPage = () => {
               let shouldRevised = false;
               try {
                 if (
-                  selectedFileDataSource[data]?.[FEEDBACK_ACCURACY].length > 0
+                  selectedFileDataSource[data]?.[FEEDBACK_ACCURACY]?.length > 0
                 ) {
                   shouldRevised =
                     selectedFileDataSource[data][FEEDBACK_ACCURACY][0] < 1;
                 }
-              } catch (error) {}
+              } catch (error) { }
               return (
                 <div style={{ margin: '0 0 8px' }} className='file-input-group' key={data}>
                   <div
@@ -875,7 +874,7 @@ const ReviewPage = () => {
                 options={SOLUTION_BAD_QUALITY}
                 onChange={setSolution}
                 value={solution}
-                // defaultValue={solution}
+              // defaultValue={solution}
               />
               {solution === 'other' && (
                 <Input
@@ -1103,7 +1102,7 @@ const ReviewPage = () => {
               name='reviewed_result'
               label={t`Review inculdes`}
             >
-             <Input
+              <Input
                 defaultValue={filterReviewedResult}
                 onChange={(e) => setFilterReviewedResult(e.target.value)}
               />