From cc70eeb4f38bcca4cd90b186ff90e18ebba779d6 Mon Sep 17 00:00:00 2001 From: Gayane Chilingaryan <72468284+chgayane@users.noreply.github.com> Date: Tue, 8 Apr 2025 17:57:57 +0400 Subject: [PATCH 01/31] fix: persist file selection when adding to extraction (#785) (#1010) Co-authored-by: Gayane Chilingaryan --- .../documents-table-connector.tsx | 25 +++++++++---------- .../edit-job-connector/edit-job-connector.tsx | 7 ++++-- .../document-page-sidebar-content.tsx | 5 +++- web/src/pages/jobs/edit-job-page.tsx | 9 ++++++- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/web/src/connectors/documents-table-connector/documents-table-connector.tsx b/web/src/connectors/documents-table-connector/documents-table-connector.tsx index 32c911f64..20615c325 100644 --- a/web/src/connectors/documents-table-connector/documents-table-connector.tsx +++ b/web/src/connectors/documents-table-connector/documents-table-connector.tsx @@ -60,7 +60,6 @@ export const DocumentsTableConnector: React.FC = ( onRowClick, onFilesSelect, fileIds, - checkedValues, isJobPage, handleJobAddClick, withHeader @@ -94,10 +93,10 @@ export const DocumentsTableConnector: React.FC = ( const [jobs, setJobs] = useState(); useEffect(() => { - if (checkedValues) { + if (fileIds) { onTableValueChange({ ...tableValue, - checked: checkedValues + checked: fileIds }); } }, []); @@ -128,20 +127,20 @@ export const DocumentsTableConnector: React.FC = ( filtersToSet = filters.flatMap((item) => { const field = item as keyof FileDocument; const filter = tableValue.filter![field as keyof FileDocument]; - const operator = Object.keys( - tableValue.filter![field as keyof FileDocument]! - )[0] as Operators; const operatorsArray = Object.keys(filter!); if (operatorsArray.length === 1) { - return { - field, - operator: operatorsArray[0] as Operators, - value: filter![operator]! as string[] - }; + const operator = operatorsArray[0] as Operators; + return [ + { + field, + operator, + value: filter![operator]! as string[] + } + ]; } else if ('from' in filter! && 'to' in filter) { return [ - { field, operator: Operators.GE, value: filter['from'] }, - { field, operator: Operators.LE, value: filter['to'] } + { field, operator: Operators.GE, value: filter['from'] as string[] }, + { field, operator: Operators.LE, value: filter['to'] as string[] } ]; } else { return []; diff --git a/web/src/connectors/edit-job-connector/edit-job-connector.tsx b/web/src/connectors/edit-job-connector/edit-job-connector.tsx index 89500e055..6ff127875 100644 --- a/web/src/connectors/edit-job-connector/edit-job-connector.tsx +++ b/web/src/connectors/edit-job-connector/edit-job-connector.tsx @@ -275,8 +275,11 @@ const EditJobConnector: FC = ({ delete jobProps.start_manual_job_automatically; } - if (jobProps.extensive_coverage && validationType !== ValidationType.extensiveCoverage) { - delete jobProps.extensive_coverage + if ( + jobProps.extensive_coverage && + validationType !== ValidationType.extensiveCoverage + ) { + delete jobProps.extensive_coverage; } if (selected_taxonomies) { diff --git a/web/src/pages/document/document-page-sidebar-content/document-page-sidebar-content.tsx b/web/src/pages/document/document-page-sidebar-content/document-page-sidebar-content.tsx index 09f67cb24..4bb923f7a 100644 --- a/web/src/pages/document/document-page-sidebar-content/document-page-sidebar-content.tsx +++ b/web/src/pages/document/document-page-sidebar-content/document-page-sidebar-content.tsx @@ -101,7 +101,10 @@ export const DocumentPageSidebarContent = ({