OpenConceptLab/ocl_issues#1465 | concept clone | indicating if source…

… and destination are same
OpenConceptLab · Feb 14, 2023 · daaca58 · daaca58
1 parent 8cb4f4b
commit daaca58
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/components/common/CloneToSource.jsx b/src/components/common/CloneToSource.jsx
@@ -295,6 +295,7 @@ class CloneToSource extends React.Component {
               onPreviewClick={this.onPreviewClick}
               payload={payload}
               requestURL={requestURL}
+              toSource={selectedSource}
             />
           }
         </Dialog>

diff --git a/src/components/common/CloneToSourceDialogContent.jsx b/src/components/common/CloneToSourceDialogContent.jsx
@@ -11,7 +11,7 @@ import CascadeParametersForm from './CascadeParametersForm';
 import ConceptTable from '../concepts/ConceptTable';
 import APIPreview from './APIPreview'
 
-const CloneToSourceDialogContent = ({onClose, onAdd, advancedSettings, toggleSettings, defaultParams, onParamsChange, sourceName, concepts, isAdding, result, onPreviewClick, payload, requestURL }) => {
+const CloneToSourceDialogContent = ({onClose, onAdd, advancedSettings, toggleSettings, defaultParams, onParamsChange, sourceName, concepts, isAdding, result, onPreviewClick, payload, requestURL, toSource }) => {
   return (
     <React.Fragment>
       <DialogContent>
@@ -56,7 +56,7 @@ const CloneToSourceDialogContent = ({onClose, onAdd, advancedSettings, toggleSet
           </DialogContentText>
         </div>
         <div className='col-xs-12 no-side-padding' style={{marginTop: '10px'}}>
-          <ConceptTable concepts={concepts} showProgress={isAdding} showStatus={isAdding || result} visualFilters={defaultParams} onPreviewClick={onPreviewClick} />
+          <ConceptTable toSource={toSource} concepts={concepts} showProgress={isAdding} showStatus={isAdding || result} visualFilters={defaultParams} onPreviewClick={onPreviewClick} />
         </div>
 
         <div className='col-xs-12 no-side-padding' style={{marginTop: '10px'}}>

diff --git a/src/components/concepts/ConceptTable.jsx b/src/components/concepts/ConceptTable.jsx
@@ -2,9 +2,11 @@ import React from 'react';
 import { Table, TableHead, TableBody, TableRow, TableCell, IconButton, Tooltip, Badge, CircularProgress, Chip } from '@mui/material';
 import {
   QueryStats as HierarchyIcon,
-  FormatListNumbered as ListIcon
+  FormatListNumbered as ListIcon,
+  Error as ErrorIcon
 } from '@mui/icons-material'
 import { map, get, find, isEmpty, includes } from 'lodash';
+import { toParentURI } from '../../common/utils';
 import ConceptDisplayName from './ConceptDisplayName';
 import ConceptCascadeVisualizeDialog from './ConceptCascadeVisualizeDialog';
 import BetaLabel from '../common/BetaLabel';
@@ -55,7 +57,7 @@ const ConceptStatus = ({ status, added, onVisualize, onPreview }) => {
   )
 }
 
-const ConceptTable = ({ concepts, showProgress, showStatus, visualFilters, onPreviewClick }) => {
+const ConceptTable = ({ concepts, showProgress, showStatus, visualFilters, onPreviewClick, toSource }) => {
   const [visualize, setVisualize] = React.useState(false);
   const [isClonedConcept, setIsClonedConcept] = React.useState(false)
   let headers = ["Owner", "ID", "Display Name", "Class", "DataType", "Preview"]
@@ -95,7 +97,15 @@ const ConceptTable = ({ concepts, showProgress, showStatus, visualFilters, onPre
             map(concepts, concept => (
               <TableRow key={concept.id}>
                 <TableCell>
-                  {concept.owner}/{concept.source}
+                  <span style={{display: 'flex', alignItems: 'center'}}>
+                  {
+                    toSource?.url === toParentURI(concept.url) &&
+                      <Tooltip title='Same source as destination. Nothing will be cloned'>
+                        <ErrorIcon color='error' style={{marginRight: '5px'}}/>
+                      </Tooltip>
+                  }
+                    {concept.owner}/{concept.source}
+                    </span>
                 </TableCell>
                 <TableCell>
                   {concept.id}