Skip to content

Commit dcfe8cf

Browse files
snyaggarwalsnyaggarwal
committed
OpenConceptLab/ocl_issues#2275 | rearranging controls
1 parent af32409 commit dcfe8cf

1 file changed

Lines changed: 44 additions & 44 deletions

File tree

‎src/components/collections/VersionList.jsx‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -396,19 +396,21 @@ const VersionList = ({ canEdit, onUpdate, onCreateExpansionClick, onCreateSimila
396396
</span>
397397
</div>
398398
<Divider orientation='vertical' style={{height: '50px'}}/>
399-
<div className='col-md-6 no-side-padding' style={{display: 'flex'}}>
400-
<div className='col-md-2 flex-column-center'>
401-
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Concepts</div>
402-
<div className='col-md-12 no-side-padding'>{expansion.summary.active_concepts}</div>
403-
</div>
404-
<Divider orientation='vertical' style={{height: '50px'}}/>
405-
<div className='col-md-2 flex-column-center'>
406-
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Mappings</div>
407-
<div className='col-md-12 no-side-padding'>{expansion.summary.active_mappings}</div>
408-
</div>
409-
<Divider orientation='vertical' style={{height: '50px'}}/>
410-
<div className='col-md-8 flex-column-center' style={{textAlign: 'left'}}>
411-
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Resolved Repo Versions</div>
399+
<div className='col-md-1 flex-column-center'>
400+
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Concepts</div>
401+
<div className='col-md-12 no-side-padding'>{expansion.summary.active_concepts}</div>
402+
</div>
403+
<Divider orientation='vertical' style={{height: '50px'}}/>
404+
<div className='col-md-1 flex-column-center'>
405+
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Mappings</div>
406+
<div className='col-md-12 no-side-padding'>{expansion.summary.active_mappings}</div>
407+
</div>
408+
<Divider orientation='vertical' style={{height: '50px'}}/>
409+
<div className='col-md-4 flex-column-center' style={{textAlign: 'left'}}>
410+
{
411+
Boolean(explicitRepoVersions?.length > 0 || evaluatedRepoVersions?.length > 0) &&
412+
<div className='col-md-12 no-side-padding gray-italics' style={{fontSize: '11px'}}>Resolved Repo Versions</div>
413+
}
412414
<div className='col-md-12 no-side-padding'>
413415
{
414416
explicitRepoVersions?.length > 0 ?
@@ -440,9 +442,13 @@ const VersionList = ({ canEdit, onUpdate, onCreateExpansionClick, onCreateSimila
440442
}
441443
</div>
442444
</div>
443-
</div>
444445
<Divider orientation='vertical' style={{height: '50px'}}/>
445446
<div className='col-md-4'>
447+
<Tooltip arrow title='Explore Expansion'>
448+
<IconButton href={`#${expansion.url}`} color='primary' size="medium">
449+
<SearchIcon fontSize='inherit' />
450+
</IconButton>
451+
</Tooltip>
446452
<Tooltip arrow title={isDefault ? 'Default Expansion' : 'Mark this expansion as default'}>
447453
<span>
448454
<IconButton
@@ -453,24 +459,6 @@ const VersionList = ({ canEdit, onUpdate, onCreateExpansionClick, onCreateSimila
453459
</IconButton>
454460
</span>
455461
</Tooltip>
456-
{
457-
canEdit &&
458-
<Tooltip arrow title='Delete Expansion'>
459-
<span>
460-
<IconButton
461-
disabled={expansion.retired || isDefault}
462-
onClick={() => onDeleteExpansionClick(expansion)}
463-
size="medium">
464-
<DeleteIcon fontSize='inherit' />
465-
</IconButton>
466-
</span>
467-
</Tooltip>
468-
}
469-
<Tooltip arrow title='Explore Expansion'>
470-
<IconButton href={`#${expansion.url}`} color='primary' size="medium">
471-
<SearchIcon fontSize='inherit' />
472-
</IconButton>
473-
</Tooltip>
474462
<Tooltip arrow title='Copy URL'>
475463
<IconButton onClick={() => onCopyClick(expansion.url)} size="medium">
476464
<CopyIcon fontSize='inherit' />
@@ -481,19 +469,31 @@ const VersionList = ({ canEdit, onUpdate, onCreateExpansionClick, onCreateSimila
481469
<ViewParametersIcon fontSize='inherit' />
482470
</IconButton>
483471
</Tooltip>
484-
<Tooltip arrow title="Create Similar Expansion: The new expansion will be created with OCL's new expansion logic, which has better version handling and improved consistency and reproducibility across servers.">
485-
<IconButton onClick={() => onCreateSimilarExpansionClick(version, expansion)} size="medium">
486-
<AddSimilarIcon fontSize='inherit' />
487-
</IconButton>
488-
</Tooltip>
489472
{
490-
expansion?.is_processing ? null :
491-
<Tooltip arrow title="Rebuild Expansion: Re-evaluates all references for this expansion using the same parameters">
492-
<IconButton onClick={() => onEvaluateExpansionClick(version, expansion)} size="medium">
493-
<EvaluateIcon fontSize='inherit' />
494-
</IconButton>
495-
</Tooltip>
496-
473+
canEdit &&
474+
<>
475+
<Tooltip arrow title="Create Similar Expansion: The new expansion will be created with OCL's new expansion logic, which has better version handling and improved consistency and reproducibility across servers.">
476+
<IconButton onClick={() => onCreateSimilarExpansionClick(version, expansion)} size="medium">
477+
<AddSimilarIcon fontSize='inherit' />
478+
</IconButton>
479+
</Tooltip>
480+
<Tooltip arrow title="Rebuild Expansion: Re-evaluates all references for this expansion using the same parameters">
481+
<IconButton onClick={() => onEvaluateExpansionClick(version, expansion)} size="medium" disabled={Boolean(expansion?.is_processing)}>
482+
<EvaluateIcon fontSize='inherit' />
483+
</IconButton>
484+
</Tooltip>
485+
<Tooltip arrow title='Delete Expansion'>
486+
<span>
487+
<IconButton
488+
color='error'
489+
disabled={expansion.retired || isDefault}
490+
onClick={() => onDeleteExpansionClick(expansion)}
491+
size="medium">
492+
<DeleteIcon fontSize='inherit' />
493+
</IconButton>
494+
</span>
495+
</Tooltip>
496+
</>
497497
}
498498
</div>
499499
</CardContent>

0 commit comments

Comments
 (0)