Merge pull request #52 from OpenConceptLab/issues#2589

snyaggarwal · web-flow · commit 3882b4e18967 · 2026-06-24T19:24:08.000+05:30
OpenConceptLab/ocl_issues#2589 | Auto Match all rows
diff --git a/src/components/map-projects/AutoMatchDialog.jsx b/src/components/map-projects/AutoMatchDialog.jsx
@@ -48,24 +48,50 @@ const AutoMatchDialog = ({
 }) => {
   const { t } = useTranslation()
   const [algos, setAlgos] = React.useState(true)
+  const [confirmAllIncludingApproved, setConfirmAllIncludingApproved] = React.useState(false)
   const allRowsCount = rowStatuses.unmapped.length + rowStatuses.readyForReview.length
+  const totalRows = rowStatuses.unmapped.length + rowStatuses.readyForReview.length + rowStatuses.reviewed.length
   const rowsInSelectedScope = {
     unmapped: rowStatuses.unmapped.length,
     all: allRowsCount,
+    allIncludingApproved: totalRows,
     selected: selectedRowCount
   }
   const rowsToMatchCount = rowsInSelectedScope[autoMatchScope] || 0
-  const totalRows = rowStatuses.unmapped.length + rowStatuses.readyForReview.length + rowStatuses.reviewed.length
   const hasSelectedRows = selectedRowCount > 0
   const hasUnmappedRows = rowStatuses.unmapped.length > 0
+  const hasApprovedRows = rowStatuses.reviewed.length > 0
+  const isAllIncludingApproved = autoMatchScope === 'allIncludingApproved'
 
   React.useEffect(() => {
     if (autoMatchScope === 'unmapped' && !hasUnmappedRows) {
       setAutoMatchScope('all')
     }
-  }, [autoMatchScope, hasUnmappedRows, setAutoMatchScope])
+    if (autoMatchScope === 'allIncludingApproved' && !hasApprovedRows) {
+      setAutoMatchScope('all')
+    }
+  }, [autoMatchScope, hasApprovedRows, hasUnmappedRows, setAutoMatchScope])
+
+  React.useEffect(() => {
+    if(!open || !isAllIncludingApproved)
+      setConfirmAllIncludingApproved(false)
+  }, [isAllIncludingApproved, open])
 
   const scopeOptions = [
+    {
+      value: 'selected',
+      disabled: !hasSelectedRows,
+      label: `${t('map_project.selected_rows')} (${selectedRowCount.toLocaleString()})`,
+      helperText: hasSelectedRows ?
+        t('map_project.auto_match_selected_rows_note', {count: selectedRowCount.toLocaleString()}) :
+        t('map_project.auto_match_selected_rows_note_no_count')
+    },
+    {
+      value: 'unmapped',
+      disabled: !hasUnmappedRows,
+      label: `${t('map_project.unmapped_only')} (${rowStatuses.unmapped.length.toLocaleString()})`,
+      helperText: t('map_project.auto_match_unmapped_only_note')
+    },
     {
       value: 'all',
       disabled: false,
@@ -76,24 +102,21 @@ const AutoMatchDialog = ({
       })
     },
     {
-      value: 'unmapped',
-      disabled: !hasUnmappedRows,
-      label: `${t('map_project.unmapped_only')} (${rowStatuses.unmapped.length.toLocaleString()})`,
-      helperText: rowStatuses.unmapped.length > 0 ?
-        t('map_project.auto_match_unmapped_only_note', {count: rowStatuses.unmapped.length.toLocaleString()}) :
-        t('map_project.auto_match_unmapped_only_note_no_count')
-    },
-    {
-      value: 'selected',
-      disabled: !hasSelectedRows,
-      label: `${t('map_project.selected_rows')} (${selectedRowCount.toLocaleString()})`,
-      helperText: hasSelectedRows ?
-        t('map_project.auto_match_selected_rows_note', {count: selectedRowCount.toLocaleString()}) :
-        t('map_project.auto_match_selected_rows_note_no_count')
+      value: 'allIncludingApproved',
+      disabled: !hasApprovedRows,
+      label: `${t('map_project.all_including_approved')} (${totalRows.toLocaleString()})`,
+      helperText: t('map_project.auto_match_all_including_approved_note', {
+        approvedCount: rowStatuses.reviewed.length.toLocaleString(),
+        proposedCount: rowStatuses.readyForReview.length.toLocaleString()
+      })
     }
   ]
 
-  const isDisabled = !repoVersion?.version_url || rowsToMatchCount === 0 || (!algos && !autoRunAIAnalysis)
+  const isDisabled =
+    !repoVersion?.version_url ||
+    rowsToMatchCount === 0 ||
+    (!algos && !autoRunAIAnalysis) ||
+    (isAllIncludingApproved && !confirmAllIncludingApproved)
 
   return (
     <Dialog
@@ -145,6 +168,21 @@ const AutoMatchDialog = ({
                         {option.helperText}
                       </FormHelperText>
                   }
+                  {
+                    autoMatchScope === option.value && option.value === 'allIncludingApproved' &&
+                      <FormControlLabel
+                        sx={{marginLeft: '24px', marginTop: '4px'}}
+                        control={
+                          <Checkbox
+                            checked={confirmAllIncludingApproved}
+                            onChange={event => setConfirmAllIncludingApproved(event.target.checked)}
+                          />
+                        }
+                        label={t('map_project.auto_match_all_including_approved_confirm', {
+                          approvedCount: rowStatuses.reviewed.length.toLocaleString()
+                        })}
+                      />
+                  }
                 </div>
               ))
             }
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
@@ -1729,6 +1729,7 @@ const MapProject = () => {
     const selectedRowIndexes = getSelectedRowIndexes(rows)
     const isAutoMatchUnmappedOnly = autoMatchScope === 'unmapped'
     const isAutoMatchAllRows = autoMatchScope === 'all'
+    const isAutoMatchAllIncludingApproved = autoMatchScope === 'allIncludingApproved'
     const isAutoMatchSelectedRows = autoMatchScope === 'selected'
     const selectedRowsLogExtras = isAutoMatchSelectedRows ? {
       selected_rows_count: selectedRowIndexes.length,
@@ -1874,6 +1875,8 @@ const MapProject = () => {
     subActions.push('reranker')
     if(isAutoMatchUnmappedOnly)
       subActions.push('unmatched_only')
+    if(isAutoMatchAllIncludingApproved)
+      subActions.push('including_approved')
     if(isAutoMatchSelectedRows)
       subActions.push('selected_rows')
     if(inAIAssistantGroup && autoRunAIAnalysis)
@@ -1895,6 +1898,8 @@ const MapProject = () => {
 
     if(isAutoMatchAllRows)
       setRowStatuses(prev => ({...prev, readyForReview: []}))
+    if(isAutoMatchAllIncludingApproved)
+      setRowStatuses(prev => ({...prev, readyForReview: [], reviewed: []}))
     if(isAutoMatchSelectedRows)
       setRowStatuses(prev => ({
         ...prev,
diff --git a/src/components/map-projects/__tests__/autoMatchRows.test.js b/src/components/map-projects/__tests__/autoMatchRows.test.js
@@ -43,6 +43,17 @@ test('getRowsToProcess: all scope excludes reviewed rows and keeps unmapped plus
   assert.deepEqual(result.map(row => row.__index), [0, 1, 2])
 })
 
+test('getRowsToProcess: allIncludingApproved scope includes every row', () => {
+  const result = getRowsToProcess(
+    rows,
+    { unmapped: [0, 2], readyForReview: [1], reviewed: [3] },
+    'allIncludingApproved',
+    [3]
+  )
+
+  assert.deepEqual(result.map(row => row.__index), [0, 1, 2, 3])
+})
+
 test('getRowsToProcess: selected scope preserves table row order, not selection order', () => {
   const result = getRowsToProcess(
     rows,
diff --git a/src/components/map-projects/autoMatchRows.js b/src/components/map-projects/autoMatchRows.js
@@ -12,5 +12,8 @@ export const getRowsToProcess = (rows, rowStatuses, autoMatchScope, selectedRowI
   if(autoMatchScope === 'selected')
     return rows.filter(row => selectedIndexSet.has(row.__index))
 
+  if(autoMatchScope === 'allIncludingApproved')
+    return rows
+
   return rows.filter(row => !reviewedIndexes.has(row.__index))
 }
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
@@ -515,10 +515,11 @@
     "loading_project": "Loading project...",
     "stopping_gracefully": "Stopping gracefully...",
     "stop_processing": "Stop Processing",
-    "auto_match_unmapped_only_note": "Note: Skip {{count}} input rows that are already proposed",
-    "auto_match_unmapped_only_note_no_count": "Note: Skip input rows that are already proposed",
+    "auto_match_unmapped_only_note": "Note: Only unmapped rows will be matched.",
     "auto_match_note": "Note: This will not affect {{approvedCount}} approved input rows but will override {{proposedCount}} proposed input rows",
     "auto_match_note_no_counts": "Note: This will not affect approved input rows but will override proposed input rows",
+    "auto_match_all_including_approved_note": "Warning: This will re-run every input row from scratch and overwrite {{approvedCount}} approved and {{proposedCount}} proposed decisions.",
+    "auto_match_all_including_approved_confirm": "I understand that {{approvedCount}} approved decisions will be overwritten",
     "auto_match_selected_rows_note": "Note: This will run Auto Match for {{count}} selected input rows",
     "auto_match_selected_rows_note_no_count": "Note: Select rows in the left panel to enable this option",
     "run_ai_analysis": "Run AI Analysis",
@@ -634,6 +635,7 @@
     "full_project_export": "Full Project Export",
     "select_an_algo": "Select an algorithm",
     "selected_rows": "Selected Rows",
+    "all_including_approved": "All (incl. Approved)",
     "unmapped_and_proposed": "Unmapped & Proposed",
     "rows_to_match": "Rows to Match",
     "out_of": "out of",
diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json
@@ -482,10 +482,11 @@
     "loading_project": "Cargando proyecto...",
     "stopping_gracefully": "Deteniendo suavemente...",
     "stop_processing": "Detener Procesamiento",
-    "auto_match_unmapped_only_note": "Nota: Omitir {{count}} filas de entrada que ya están propuestas",
-    "auto_match_unmapped_only_note_no_count": "Nota: Omitir filas de entrada que ya están propuestas",
+    "auto_match_unmapped_only_note": "Nota: Solo se emparejarán las filas no mapeadas.",
     "auto_match_note": "Nota: Esto no afectará {{approvedCount}} filas de entrada aprobadas pero sobrescribirá {{proposedCount}} filas de entrada propuestas",
     "auto_match_note_no_counts": "Nota: Esto no afectará las filas de entrada aprobadas pero sobrescribirá las filas de entrada propuestas",
+    "auto_match_all_including_approved_note": "Advertencia: Esto volverá a ejecutar cada fila de entrada desde cero y sobrescribirá {{approvedCount}} decisiones aprobadas y {{proposedCount}} propuestas.",
+    "auto_match_all_including_approved_confirm": "Entiendo que se sobrescribirán {{approvedCount}} decisiones aprobadas",
     "auto_match_selected_rows_note": "Nota: Esto ejecutará Auto Match para {{count}} fila(s) seleccionada(s)",
     "auto_match_selected_rows_note_no_count": "Nota: Seleccione filas en el panel izquierdo para habilitar esta opción",
     "run_ai_analysis": "Ejecutar Análisis de IA",
@@ -611,6 +612,7 @@
     "full_project_export": "Exportación completa del proyecto",
     "select_an_algo": "Seleccione un algoritmo",
     "selected_rows": "Filas seleccionadas",
+    "all_including_approved": "Todas (incl. aprobadas)",
     "unmapped_and_proposed": "No mapeadas y propuestas",
     "rows_to_match": "Filas para coincidir",
     "out_of": "de",
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
@@ -507,10 +507,11 @@
     "loading_project": "正在加载项目...",
     "stopping_gracefully": "正在优雅地停止...",
     "stop_processing": "停止处理",
-    "auto_match_unmapped_only_note": "注意：跳过 {{count}} 个已提议的输入行",
-    "auto_match_unmapped_only_note_no_count": "注意：跳过已提议的输入行",
+    "auto_match_unmapped_only_note": "注意：只会匹配未映射的输入行。",
     "auto_match_note": "注意：这不会影响 {{approvedCount}} 个已批准的输入行，但会覆盖 {{proposedCount}} 个已提议的输入行",
     "auto_match_note_no_counts": "注意：这不会影响已批准的输入行，但会覆盖已提议的输入行",
+    "auto_match_all_including_approved_note": "警告：这将从头重新运行每一条输入行，并覆盖 {{approvedCount}} 个已批准和 {{proposedCount}} 个已提议的决策。",
+    "auto_match_all_including_approved_confirm": "我明白将覆盖 {{approvedCount}} 个已批准的决策",
     "auto_match_selected_rows_note": "注意：这将对 {{count}} 个已选输入行运行自动匹配",
     "auto_match_selected_rows_note_no_count": "注意：请在左侧面板选择行以启用此选项",
     "run_ai_analysis": "运行 AI 分析",
@@ -636,6 +637,7 @@
     "full_project_export": "完整项目导出",
     "select_an_algo": "选择算法",
     "selected_rows": "已选行",
+    "all_including_approved": "全部（含已批准）",
     "unmapped_and_proposed": "未映射和已提议",
     "rows_to_match": "要匹配的行",
     "out_of": "共",

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,8 @@ export const getRowsToProcess = (rows, rowStatuses, autoMatchScope, selectedRowI`
`12`	`12`	`if(autoMatchScope === 'selected')`
`13`	`13`	`return rows.filter(row => selectedIndexSet.has(row.__index))`
`14`	`14`
	`15`	`+ if(autoMatchScope === 'allIncludingApproved')`
	`16`	`+ return rows`
	`17`	`+`
`15`	`18`	`return rows.filter(row => !reviewedIndexes.has(row.__index))`
`16`	`19`	`}`