OpenConceptLab/ocl_issues#2322 | Auto match dialog | rows count and radio button

snyaggarwal · snyaggarwal · commit 3a29c60dfc1f · 2026-02-23T12:00:46.000+05:30
diff --git a/src/components/common/BaseEntityChip.jsx b/src/components/common/BaseEntityChip.jsx
@@ -3,6 +3,7 @@ import Chip from '@mui/material/Chip'
 import Skeleton from '@mui/material/Skeleton'
 import { Avatar as MuiAvatar } from '@mui/material'
 import { PRIMARY_COLORS } from '../../common/colors'
+import { toV3URL } from '../../common/utils'
 
 const PRIMARY_STYLE = {
   backgroundColor: `${PRIMARY_COLORS['95']} !important`,
@@ -114,12 +115,22 @@ const Avatar = ({ entity, icon }) => {
     </MuiAvatar>
 }
 
-const Label = ({ entity, hideType }) => {
+const Label = ({ entity, hideType, isVersion }) => {
   return (
     <span style={{display: 'flex', alignItems: 'center'}} className='entity-label'>
       <span className='entity-id'>
         <b>{entity?.short_code || entity?.id || entity?.username}</b>
       </span>
+      {
+        isVersion &&
+          <React.Fragment>
+            <span className='divider-span' />
+            <span className='entity-type'>
+              {entity.version || entity.id}
+            </span>
+          </React.Fragment>
+
+      }
       {
         (entity?.type?.includes('Concept') && entity?.display_name) &&
           <span className='entity-name' style={{marginLeft: '4px'}}>
@@ -140,13 +151,13 @@ const Label = ({ entity, hideType }) => {
 }
 
 
-const BaseEntityChip = ({ entity, icon, hideType, primary, size, sx, noLink, ...rest }) => {
+const BaseEntityChip = ({ entity, icon, hideType, primary, size, sx, noLink, isVersion, ...rest }) => {
   const sizeStyle = ENTITY_CHIP_SIZE_MAP[size || 'medium'] || ENTITY_CHIP_SIZE_MAP.medium
   const baseStyle = primary ? PRIMARY_STYLE : SECONDARY_STYLE
   return (
     <Chip
       avatar={<Avatar entity={entity} icon={icon} />}
-      label={<Label entity={entity} hideType={hideType} />}
+      label={<Label entity={entity} hideType={hideType} isVersion={isVersion} />}
       variant='outlined'
       sx={{
         borderRadius: '4px',
@@ -161,8 +172,10 @@ const BaseEntityChip = ({ entity, icon, hideType, primary, size, sx, noLink, ...
       onClick={noLink ? undefined : event => {
         event.stopPropagation()
       }}
-      href={noLink ? undefined : '#' + (entity?.version_url || entity?.url)}
+      href={noLink ? undefined : '#' + (toV3URL(entity?.version_url || entity?.url))}
       component='a'
+      target='_blank'
+      rel='noreferrer noopener'
       {...rest}
     />
   )
diff --git a/src/components/common/OwnerButton.jsx b/src/components/common/OwnerButton.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import Button from '@mui/material/Button'
 import OwnerIcon from './OwnerIcon'
 import OwnerTooltip from './OwnerTooltip'
+import { toV3URL } from '../../common/utils'
 
 const Owner = ({owner, ownerType, ownerURL, noIcons, sx, ...rest}) => {
   const iconProps = {color: 'secondary', style: {marginRight: '8px', width: '0.8em'}}
@@ -26,8 +27,10 @@ const Owner = ({owner, ownerType, ownerURL, noIcons, sx, ...rest}) => {
         ...sx
       }}
       startIcon={!noIcons && <OwnerIcon noTooltip ownerType={ownerType} {...iconProps} />}
-      href={ownerURL ? '#' + ownerURL : undefined}
+      href={ownerURL ? toV3URL(ownerURL) : undefined}
       component="button"
+      target='_blank'
+      rel='noreferrer noopener'
       {...rest}
     >
       <span className='owner-button-label'>{owner}</span>
diff --git a/src/components/map-projects/AutoMatchDialog.jsx b/src/components/map-projects/AutoMatchDialog.jsx
@@ -6,29 +6,35 @@ import DialogContent from '@mui/material/DialogContent';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogActions from '@mui/material/DialogActions';
 import FormControlLabel from '@mui/material/FormControlLabel';
+import FormControl from '@mui/material/FormControl';
 import Checkbox from '@mui/material/Checkbox';
 import FormHelperText from '@mui/material/FormHelperText';
 import Button from '@mui/material/Button';
+import RadioGroup from '@mui/material/RadioGroup';
+import Radio from '@mui/material/Radio';
+import FormLabel from '@mui/material/FormLabel';
+
 import DoubleArrowIcon from '@mui/icons-material/DoubleArrow';
 
 import CloseIconButton from '../common/CloseIconButton'
+import RepoChip from '../repos/RepoVersionChip'
 import AIAssistantButton from './AIAssistantButton'
 
 
-const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnmappedOnly, rowStatuses, autoRunAIAnalysis, setAutoRunAIAnalysis, AIModels, AIModel, setAIModel, repo, onSubmit, inAIAssistantGroup}) => {
+const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnmappedOnly, rowStatuses, autoRunAIAnalysis, setAutoRunAIAnalysis, AIModels, AIModel, setAIModel, repoVersion, onSubmit, inAIAssistantGroup}) => {
   const { t } = useTranslation()
 
   const getHelperTextForAutoMatchUnmapped = () => {
     if (autoMatchUnmappedOnly) {
-      const count = rowStatuses.readyForReview.length;
+      const count = rowStatuses.unmapped.length;
       if (count > 0) {
         return t('map_project.auto_match_unmapped_only_note', {count: count.toLocaleString()});
       }
       return t('map_project.auto_match_unmapped_only_note_no_count');
     }
     const approvedCount = rowStatuses.reviewed.length;
     const proposedCount = rowStatuses.readyForReview.length;
-    if (approvedCount > 0 && proposedCount > 0) {
+    if (approvedCount > 0 || proposedCount > 0) {
       return t('map_project.auto_match_note', {
         approvedCount: approvedCount.toLocaleString(),
         proposedCount: proposedCount.toLocaleString()
@@ -37,6 +43,8 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
     return t('map_project.auto_match_note_no_counts');
   };
 
+  const isDisabled = !repoVersion?.version_url
+
   return (
     <Dialog
       open={open}
@@ -55,8 +63,34 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
         <span>{t('map_project.auto_match')}</span>
         <CloseIconButton onClick={onClose} />
       </DialogTitle>
-      <DialogContent sx={{paddingTop: '12px !important'}}>
-        <FormControlLabel sx={{marginTop: '12px', width: '100%'}} control={<Checkbox checked={autoMatchUnmappedOnly} onChange={event => setAutoMatchUnmappedOnly(event.target.checked)} />} label={t('map_project.unmapped_only')} />
+      <DialogContent>
+        <div className='col-xs-12 padding-0' style={{display: 'flex', alignItems: 'center', fontSize: '1rem'}}>
+          {t('map_project.target_repository')}
+          {
+            repoVersion?.id &&
+              <RepoChip repo={repoVersion} hideType sx={{marginLeft: '16px'}} />
+          }
+        </div>
+        <FormControl sx={{marginTop: '12px'}}>
+          <FormLabel id="automatch-rows">{t('map_project.input_dataset')}</FormLabel>
+          <RadioGroup
+            row
+            aria-labelledby="automatch-rows"
+            name="automatch-rows"
+            onChange={() => setAutoMatchUnmappedOnly(!autoMatchUnmappedOnly)}
+          >
+            <FormControlLabel
+              value="unmapped"
+              control={<Radio checked={autoMatchUnmappedOnly} />}
+              label={t('map_project.unmapped_only') + ` (${rowStatuses.unmapped.length.toLocaleString()})`}
+            />
+            <FormControlLabel
+              value="all"
+              control={<Radio checked={!autoMatchUnmappedOnly} />}
+              label={t('map_project.all_rows') + ` (${(rowStatuses.unmapped.length + rowStatuses.readyForReview.length).toLocaleString()})`}
+            />
+          </RadioGroup>
+        </FormControl>
         <FormHelperText sx={{marginTop: '-4px'}}>
           {
             getHelperTextForAutoMatchUnmapped()
@@ -66,7 +100,7 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
           inAIAssistantGroup &&
             <>
               <FormControlLabel
-                sx={{marginTop: '0px', width: '100%'}}
+                sx={{marginTop: '12px', width: '100%'}}
                 control={
                   <Checkbox
                     checked={autoRunAIAnalysis}
@@ -102,7 +136,7 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
           size='small'
           sx={{textTransform: 'none', marginLeft: '12px'}}
           endIcon={<DoubleArrowIcon />}
-          disabled={!repo?.url}
+          disabled={isDisabled}
           onClick={onSubmit}
         >
           {t('common.submit')}
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
@@ -322,7 +322,7 @@ const MapProject = () => {
         return
       }
       setFilters(response.data?.filters || {})
-      if(response.data.url) {
+      if(response.data?.url) {
         APIService.new().overrideURL(response.data.url).appendToUrl('logs/').get().then(response => {
           setLogs(response.data.logs?.row_logs || [])
           setProjectLogs(response.data.logs?.project_logs || [])
@@ -2879,7 +2879,7 @@ const MapProject = () => {
               AIModels,
               AIModel,
               setAIModel,
-              repo,
+              repoVersion,
               inAIAssistantGroup
             }}
           />
diff --git a/src/components/repos/RepoVersionButton.jsx b/src/components/repos/RepoVersionButton.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
 import DotSeparator from '../common/DotSeparator'
+import { toV3URL } from '../../common/utils'
 
 const RepoVersionButton = ({icon, repo, repoType, version, repoLabelStyle, versionStyle, href, vertical, size, sx}) => {
   const verticalStyle = version && vertical ? {flexDirection: 'column', alignItems: 'baseline', textAlign: 'left'} : {}
@@ -27,9 +28,11 @@ const RepoVersionButton = ({icon, repo, repoType, version, repoLabelStyle, versi
         ...sx
       }}
       startIcon={icon}
-      href={href ? '#' + href : undefined}
+      href={href ? toV3URL(href) : undefined}
       component="button"
       size={size}
+      target='_blank'
+      rel='noreferrer noopener'
     >
       <span className='repo-button-group' style={{display: 'flex', alignItems: 'center', ...verticalStyle}}>
         <span style={{display: 'flex', alignItems: 'center'}}>
diff --git a/src/components/repos/RepoVersionChip.jsx b/src/components/repos/RepoVersionChip.jsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import RepoIcon from '@mui/icons-material/FolderOutlined';
+import RepoFilledIcon from '@mui/icons-material/Folder';
+import BaseEntityChip from '../common/BaseEntityChip'
+import RepoTooltip from './RepoTooltip'
+
+const RepoChip = ({ repo, noTooltip, basicTooltip, filled, ...rest }) => {
+  const icon = filled ? <RepoFilledIcon /> : <RepoIcon />
+        return noTooltip ? (
+          <BaseEntityChip entity={repo} icon={icon} isVersion {...rest} />
+        ) : (
+          <RepoTooltip repo={repo} basicTooltip={basicTooltip}>
+            <BaseEntityChip entity={repo} icon={icon} isVersion {...rest} />
+          </RepoTooltip>
+        )
+}
+
+export default RepoChip;
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
@@ -562,7 +562,9 @@
     "created_by_log": "<0>{{created_by}}</0> created mapping project in the <1>{{owner}}</1> workspace",
     "candidates_metadata": "Candidates Metadata",
     "full_project_export": "Full Project Export",
-    "select_an_algo": "Select an algorithm"
+    "select_an_algo": "Select an algorithm",
+    "input_dataset": "Input Dataset",
+    "all_rows": "All Rows"
   },
   "app": {
     "web_version": "Web Version",
