diff --git a/src/components/collections/DeleteReferencesDialog.jsx b/src/components/collections/DeleteReferencesDialog.jsx new file mode 100644 index 00000000..558f11b0 --- /dev/null +++ b/src/components/collections/DeleteReferencesDialog.jsx @@ -0,0 +1,45 @@ +import React from 'react' +import { useTranslation } from 'react-i18next' +import Dialog from '@mui/material/Dialog' +import DialogTitle from '@mui/material/DialogTitle' +import DialogContent from '@mui/material/DialogContent' +import DialogActions from '@mui/material/DialogActions' +import Button from '@mui/material/Button' +import Typography from '@mui/material/Typography' +import CircularProgress from '@mui/material/CircularProgress' + +const DeleteReferencesDialog = ({ open, onClose, onConfirm, references, loading }) => { + const { t } = useTranslation() + const conceptsCount = references.reduce((sum, r) => sum + (r.concepts || 0), 0) + const mappingsCount = references.reduce((sum, r) => sum + (r.mappings || 0), 0) + const referenceIds = references.map(r => r.id).filter(Boolean) + + return ( + + + {t('reference.remove_confirm_title', { count: references.length })} + + + + {t('reference.remove_confirm_body', { concepts: conceptsCount, mappings: mappingsCount })} + + + + + + + + ) +} + +export default DeleteReferencesDialog diff --git a/src/components/collections/RemoveFromCollectionDialog.jsx b/src/components/collections/RemoveFromCollectionDialog.jsx new file mode 100644 index 00000000..2f1a2e1b --- /dev/null +++ b/src/components/collections/RemoveFromCollectionDialog.jsx @@ -0,0 +1,256 @@ +import React from 'react' +import { useTranslation } from 'react-i18next' +import Dialog from '@mui/material/Dialog' +import DialogTitle from '@mui/material/DialogTitle' +import DialogContent from '@mui/material/DialogContent' +import DialogActions from '@mui/material/DialogActions' +import Button from '@mui/material/Button' +import Box from '@mui/material/Box' +import Typography from '@mui/material/Typography' +import Checkbox from '@mui/material/Checkbox' +import List from '@mui/material/List' +import ListItem from '@mui/material/ListItem' +import ListItemText from '@mui/material/ListItemText' +import CircularProgress from '@mui/material/CircularProgress' +import APIService from '../../services/APIService' +import { dropVersion } from '../../common/utils' +import RepoChip from '../repos/RepoChip' + +const getUrlPart = (url, part) => { + const parts = (url || '').replace(/\/$/, '').split('/') + const index = parts.lastIndexOf(part) + return index !== -1 ? parts[index + 1] : null +} + +const getRepoFromConcept = concept => { + const sourceId = concept.source || getUrlPart(concept.source_url || concept.url, 'sources') + if(!sourceId) return null + const sourceURL = concept.source_url || (concept.owner_url ? `${concept.owner_url}sources/${sourceId}/` : undefined) + + return { + id: sourceId, + short_code: sourceId, + type: 'Source', + url: sourceURL, + owner: concept.owner, + owner_type: concept.owner_type, + owner_url: concept.owner_url, + version: concept.latest_source_version, + version_url: concept.latest_source_version && sourceURL ? `${sourceURL}${concept.latest_source_version}/` : undefined, + } +} + +const getVersionToken = version => { + if(!version) return null + if(String(version).toUpperCase() === 'HEAD') return version + return String(version).match(/^v/i) ? version : `v${version}` +} + +const getMappingSourceToken = (mapping, direction) => { + const source = mapping[`${direction}_source`] || + mapping[`${direction}_source_name`] || + getUrlPart(mapping[`${direction}_source_url`] || mapping[`${direction}_concept_url`], 'sources') || + (direction === 'from' ? mapping.source : null) + const version = getVersionToken(mapping[`${direction}_source_version`] || (source === mapping.source ? mapping.latest_source_version : null)) + + return source && version ? `${source}(${version})` : source +} + +const getMappingConceptSyntax = (mapping, direction) => { + const source = getMappingSourceToken(mapping, direction) + const code = mapping[`${direction}_concept_code`] || mapping[`${direction}_concept`] || mapping.id + const name = mapping[`${direction}_concept_name_resolved`] || mapping[`${direction}_concept_name`] + const escapedName = name ? name.replace(/"/g, '\\"') : '' + + return `${source ? `${source}:` : ''}${code || ''}${escapedName ? ` "${escapedName}"` : ''}` +} + +const getMappingInlineSyntax = mapping => { + const mapType = mapping.map_type ? `[${mapping.map_type}]` : '[SAME-AS]' + return `${getMappingConceptSyntax(mapping, 'from')} ${mapType} ${getMappingConceptSyntax(mapping, 'to')}` +} + +const getResourcePath = resource => resource.concept_class !== undefined ? 'concepts' : 'mappings' + +const getResourceUrl = (resource, collectionUrl) => { + if(collectionUrl) + return `${collectionUrl}${getResourcePath(resource)}/${encodeURIComponent(resource.id)}/` + if(resource.version_url || resource.url) + return resource.version_url || resource.url + + return '' +} + +const hasReferenceIds = references => Array.isArray(references) && references.some(ref => ref?.id) + +const getReferenceLabel = reference => { + if(typeof reference === 'string') return reference + return reference?.expression || reference?.url || reference?.uri || '' +} + +const ResourceLabel = ({ resource }) => { + if(resource.concept_class !== undefined) { + const repo = getRepoFromConcept(resource) + + return ( + + + {resource.id} {resource.display_name || resource.name || ''} + + {repo && ( + + · + + + )} + + ) + } + + return ( + + {getMappingInlineSyntax(resource)} + + ) +} + +const RemoveFromCollectionDialog = ({ open, onClose, onConfirm, resources, collectionUrl, lookupCollectionUrl, loading }) => { + const { t } = useTranslation() + const [fetchingRefs, setFetchingRefs] = React.useState(false) + const [resourcesWithRefs, setResourcesWithRefs] = React.useState([]) + const [checkedRefIds, setCheckedRefIds] = React.useState(new Set()) + const baseCollectionUrl = dropVersion(collectionUrl) + const resourceLookupUrl = lookupCollectionUrl || baseCollectionUrl + + React.useEffect(() => { + if(!open || !resources?.length || !resourceLookupUrl) { + setFetchingRefs(false) + setResourcesWithRefs([]) + setCheckedRefIds(new Set()) + return + } + + let active = true + setFetchingRefs(true) + setResourcesWithRefs([]) + setCheckedRefIds(new Set()) + + Promise.all( + resources.map(resource => { + if(hasReferenceIds(resource.references)) + return Promise.resolve({ resource, references: resource.references }) + + return APIService.new() + .overrideURL(getResourceUrl(resource, resourceLookupUrl)) + .get(null, null, { includeReferences: true }) + .then(response => ({ resource, references: response?.data?.references || [] })) + .catch(() => ({ resource, references: [] })) + }) + ).then(results => { + if(!active) return + setResourcesWithRefs(results) + const allIds = new Set() + results.forEach(({ references }) => references.forEach(ref => ref.id && allIds.add(ref.id))) + setCheckedRefIds(allIds) + setFetchingRefs(false) + }) + + return () => { + active = false + } + }, [open, resources, resourceLookupUrl]) + + const onToggleRef = refId => { + setCheckedRefIds(prev => { + const next = new Set(prev) + if(next.has(refId)) next.delete(refId) + else next.add(refId) + return next + }) + } + + const showGroupHeaders = resourcesWithRefs.length > 0 + const checkedCount = checkedRefIds.size + const isDisabled = loading || fetchingRefs || checkedCount === 0 + + return ( + + + {t('reference.remove_from_collection')} + + + {fetchingRefs ? ( + + + {t('common.loading')} + + ) : ( + + {resourcesWithRefs.map(({ resource, references }, groupIndex) => ( + + {showGroupHeaders && ( + 0 ? '1px solid rgba(0,0,0,0.12)' : 'none'}}> + + + )} + {references.length === 0 ? ( + + {t('reference.no_references_found')} + + ) : ( + references.map((ref, refIndex) => { + const isLastInGroup = refIndex === references.length - 1 + const isLastGroup = groupIndex === resourcesWithRefs.length - 1 + return ( + + onToggleRef(ref.id)} + size='small' + inputProps={{'aria-label': getReferenceLabel(ref)}} + /> + + + ) + }) + )} + + ))} + + )} + + + + + + + ) +} + +export default RemoveFromCollectionDialog diff --git a/src/components/collections/TransformReferencesDialog.jsx b/src/components/collections/TransformReferencesDialog.jsx new file mode 100644 index 00000000..8016bf4e --- /dev/null +++ b/src/components/collections/TransformReferencesDialog.jsx @@ -0,0 +1,101 @@ +import React from 'react' +import { useTranslation } from 'react-i18next' +import Dialog from '@mui/material/Dialog' +import DialogTitle from '@mui/material/DialogTitle' +import DialogContent from '@mui/material/DialogContent' +import DialogActions from '@mui/material/DialogActions' +import Button from '@mui/material/Button' +import Typography from '@mui/material/Typography' +import CircularProgress from '@mui/material/CircularProgress' +import Box from '@mui/material/Box' +import Chip from '@mui/material/Chip' +import Table from '@mui/material/Table' +import TableBody from '@mui/material/TableBody' +import TableCell from '@mui/material/TableCell' +import TableContainer from '@mui/material/TableContainer' +import TableHead from '@mui/material/TableHead' +import TableRow from '@mui/material/TableRow' +import Alert from '@mui/material/Alert' +import { getTransformPreviewItems } from './referenceTransformUtils' + +const expressionSx = { + fontFamily: 'monospace', + fontSize: '12px', + overflowWrap: 'anywhere', + maxWidth: '260px', +} + +const TransformReferencesDialog = ({ open, onClose, onConfirm, references, loading }) => { + const { t } = useTranslation() + const previewItems = React.useMemo(() => getTransformPreviewItems(references), [references]) + const eligibleItems = previewItems.filter(item => item.eligible) + const skippedItems = previewItems.filter(item => !item.eligible) + const selectedCount = references?.length || 0 + + return ( + + + {t('reference.transform_confirm_title', { count: selectedCount })} + + + + {t('reference.transform_confirm_body')} + + + + + + + + + {eligibleItems.length === 0 && ( + + {t('reference.transform_no_eligible')} + + )} + + + + + + {t('reference.expression')} + {t('reference.new_expression')} + {t('common.status')} + + + + {previewItems.map(item => ( + + {item.reference?.expression} + {item.proposedExpression || '-'} + + {item.eligible ? ( + + ) : ( + + )} + + + ))} + +
+ + + + + + + + ) +} + +export default TransformReferencesDialog diff --git a/src/components/collections/referenceTransformUtils.js b/src/components/collections/referenceTransformUtils.js new file mode 100644 index 00000000..124982c2 --- /dev/null +++ b/src/components/collections/referenceTransformUtils.js @@ -0,0 +1,97 @@ +const RESOURCE_SEGMENTS = ['concepts', 'mappings'] +const REPO_SEGMENTS = ['sources', 'collections'] + +const hasRepoPin = reference => Boolean(reference?.version && String(reference.version).toUpperCase() !== 'HEAD') + +const hasResourcePin = reference => Boolean(reference?.resource_version) + +const splitExpression = expression => { + const parts = String(expression || '').split('?') + return { + path: parts[0], + query: parts.length > 1 ? parts.slice(1).join('?') : '', + } +} + +const getRelativePathParts = path => { + const match = String(path || '').match(/^(.*?)(\/(?:orgs|users)\/.*)$/) + if(!match) + return null + + return { + prefix: match[1], + parts: match[2].split('/').filter(Boolean), + } +} + +export const buildNonVersionedReferenceExpression = reference => { + const expression = reference?.expression + if(!expression) + return null + + const { path, query } = splitExpression(expression) + const parsed = getRelativePathParts(path) + if(!parsed) + return null + if(parsed.prefix) + return null + + const parts = [...parsed.parts] + const repoTypeIndex = parts.findIndex(part => REPO_SEGMENTS.includes(part)) + if(repoTypeIndex === -1) + return null + + const afterRepoIndex = repoTypeIndex + 2 + if(hasRepoPin(reference) && parts[afterRepoIndex] && !RESOURCE_SEGMENTS.includes(parts[afterRepoIndex])) + parts.splice(afterRepoIndex, 1) + + const resourceTypeIndex = parts.findIndex(part => RESOURCE_SEGMENTS.includes(part)) + const resourceVersionIndex = resourceTypeIndex + 2 + if(hasResourcePin(reference) && resourceTypeIndex !== -1 && parts[resourceVersionIndex]) + parts.splice(resourceVersionIndex, 1) + + const proposedPath = `${parsed.prefix}/${parts.join('/')}/` + return query ? `${proposedPath}?${query}` : proposedPath +} + +export const getReferenceTransformPreview = reference => { + if(!reference?.id) + return { reference, eligible: false, reasonKey: 'reference.unsupported_transform' } + + if(!hasRepoPin(reference) && !hasResourcePin(reference)) + return { reference, eligible: false, reasonKey: 'reference.already_non_versioned' } + + const proposedExpression = buildNonVersionedReferenceExpression(reference) + if(!proposedExpression || proposedExpression === reference.expression) + return { reference, eligible: false, reasonKey: 'reference.unsupported_transform' } + + return { + reference, + eligible: true, + proposedExpression, + } +} + +export const getTransformPreviewItems = references => (references || []).map(getReferenceTransformPreview) + +export const getTransformAddGroups = previewItems => { + const groups = {} + previewItems.filter(item => item.eligible).forEach(item => { + const reference = item.reference + const include = reference.include !== false + const key = JSON.stringify({ + reference_type: reference.reference_type, + include, + cascade: reference.cascade || null, + }) + if(!groups[key]) { + groups[key] = { + include, + cascade: reference.cascade || null, + items: [], + } + } + groups[key].items.push(item) + }) + return Object.values(groups) +} diff --git a/src/components/common/ResourceReferences.jsx b/src/components/common/ResourceReferences.jsx new file mode 100644 index 00000000..665ee890 --- /dev/null +++ b/src/components/common/ResourceReferences.jsx @@ -0,0 +1,39 @@ +import React from 'react' +import { useTranslation } from 'react-i18next' +import Paper from '@mui/material/Paper' +import Typography from '@mui/material/Typography' +import List from '@mui/material/List' +import ListItem from '@mui/material/ListItem' +import ListItemText from '@mui/material/ListItemText' +import Tooltip from '@mui/material/Tooltip' +import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined' +import { map } from 'lodash' + +const borderColor = 'rgba(0, 0, 0, 0.12)' + +const ResourceReferences = ({ references, resourceType }) => { + const { t } = useTranslation() + if (!references?.length) return null + return ( + + + {t('reference.references')} ({references.length}) + + + + + + {map(references, reference => ( + + + + ))} + + + ) +} + +export default ResourceReferences diff --git a/src/components/concepts/ConceptDetails.jsx b/src/components/concepts/ConceptDetails.jsx index 9951d5d7..5cdb2d3a 100644 --- a/src/components/concepts/ConceptDetails.jsx +++ b/src/components/concepts/ConceptDetails.jsx @@ -10,6 +10,7 @@ import Locales from './Locales' import Associations from './Associations' import ConceptProperties from './ConceptProperties' import ExternalIdLabel from '../common/ExternalIdLabel' +import ResourceReferences from '../common/ResourceReferences' const borderColor = 'rgba(0, 0, 0, 0.12)' @@ -48,6 +49,7 @@ const ConceptDetails = ({ concept, repo, mappings, reverseMappings, loading, loa } +
{ concept?.external_id && diff --git a/src/components/concepts/ConceptHome.jsx b/src/components/concepts/ConceptHome.jsx index 460e4ed1..79b99e25 100644 --- a/src/components/concepts/ConceptHome.jsx +++ b/src/components/concepts/ConceptHome.jsx @@ -9,6 +9,7 @@ import { toParentURI, dropVersion } from '../../common/utils' import { OperationsContext } from '../app/LayoutContext'; import RetireConfirmDialog from '../common/RetireConfirmDialog' +import RemoveFromCollectionDialog from '../collections/RemoveFromCollectionDialog' import ConceptHeader from './ConceptHeader'; import ConceptTabs from './ConceptTabs'; @@ -39,13 +40,18 @@ const ConceptHome = props => { const [reverseOwnerMappings, setReverseOwnerMappings] = React.useState([]) const [retireDialog, setRetireDialog] = React.useState(false) + const [removeFromCollectionDialog, setRemoveFromCollectionDialog] = React.useState(false) + const [removingFromCollection, setRemovingFromCollection] = React.useState(false) const { setAlert } = React.useContext(OperationsContext); + const isInCollection = Boolean(props.repo?.type?.includes('Collection') || props.url?.includes('/collections/')) + React.useEffect(() => { setLoading(true) setConcept(props.concept || {}) setVersions([]) - getService().get().then(response => { + const queryParams = isInCollection ? { includeReferences: true } : {} + getService().get(null, null, queryParams).then(response => { const resource = response.data setConcept(resource) props.repo?.id ? setRepo(repo) : fetchRepo(resource) @@ -215,6 +221,22 @@ const ConceptHome = props => { }) } + const onRemoveFromCollection = deleteBody => { + const collectionUrl = dropVersion(props.repo?.version_url || props.repo?.url) + const body = deleteBody || { ids: (concept.references || []).map(r => r.id).filter(Boolean) } + setRemovingFromCollection(true) + APIService.new().overrideURL(collectionUrl).appendToUrl('references/').delete(body).then(response => { + setRemovingFromCollection(false) + if(response?.status === 204 || response?.status === 200) { + setRemoveFromCollectionDialog(false) + setAlert({ severity: 'success', message: t('reference.remove_success') }) + props.onClose && props.onClose() + } else { + setAlert({ severity: 'error', message: response?.data?.detail || t('common.generic_error') }) + } + }) + } + return (concept?.id && repo?.id) ? ( <> @@ -243,7 +265,7 @@ const ConceptHome = props => { !edit && <>
- setEdit(true)} repo={repo} nested={props.nested} loading={loading} onRetire={() => setRetireDialog(true)} /> + setEdit(true)} repo={repo} nested={props.nested} loading={loading} onRetire={() => setRetireDialog(true)} isInCollection={isInCollection} onRemoveFromCollection={() => setRemoveFromCollectionDialog(true)} />
onTabChange(newTab)} loading={loading} /> { @@ -277,6 +299,15 @@ const ConceptHome = props => { title={`${t('common.retire')} ${t('concept.concept')}`} onSubmit={toggleRetire} /> + setRemoveFromCollectionDialog(false)} + onConfirm={onRemoveFromCollection} + resources={[concept]} + collectionUrl={dropVersion(props.repo?.version_url || props.repo?.url)} + lookupCollectionUrl={props.repo?.version_url || props.repo?.url} + loading={removingFromCollection} + /> }
diff --git a/src/components/mappings/MappingDetails.jsx b/src/components/mappings/MappingDetails.jsx index 911a6286..3f0b2959 100644 --- a/src/components/mappings/MappingDetails.jsx +++ b/src/components/mappings/MappingDetails.jsx @@ -12,6 +12,7 @@ import FromConceptCard from './FromConceptCard' import ToConceptCard from './ToConceptCard' import MappingIcon from './MappingIcon' import MappingProperties from './MappingProperties' +import ResourceReferences from '../common/ResourceReferences' const borderColor = 'rgba(0, 0, 0, 0.12)' @@ -37,6 +38,7 @@ const MappingDetails = ({ mapping }) => { } + {t('common.last_updated')} {formatDateTime(mapping.versioned_updated_on || mapping.updated_on)} {t('common.by')} diff --git a/src/components/mappings/MappingHome.jsx b/src/components/mappings/MappingHome.jsx index de5980b9..aa9fc342 100644 --- a/src/components/mappings/MappingHome.jsx +++ b/src/components/mappings/MappingHome.jsx @@ -9,6 +9,7 @@ import { toParentURI, dropVersion } from '../../common/utils' import { OperationsContext } from '../app/LayoutContext'; import RetireConfirmDialog from '../common/RetireConfirmDialog' +import RemoveFromCollectionDialog from '../collections/RemoveFromCollectionDialog' import MappingHeader from './MappingHeader'; import MappingTabs from './MappingTabs'; import MappingDetails from './MappingDetails' @@ -31,13 +32,18 @@ const MappingHome = props => { const [loading, setLoading] = React.useState(false) const [retireDialog, setRetireDialog] = React.useState(false) + const [removeFromCollectionDialog, setRemoveFromCollectionDialog] = React.useState(false) + const [removingFromCollection, setRemovingFromCollection] = React.useState(false) const { setAlert } = React.useContext(OperationsContext); + const isInCollection = Boolean(props.repo?.type?.includes('Collection') || props.url?.includes('/collections/')) + React.useEffect(() => { setLoading(true) setMapping(props.mapping || {}) setVersions([]) - getService().get().then(response => { + const queryParams = isInCollection ? { includeReferences: true } : {} + getService().get(null, null, queryParams).then(response => { const resource = response.data setMapping(resource) props.repo?.id ? setRepo(props.repo) : fetchRepo(resource) @@ -129,6 +135,22 @@ const MappingHome = props => { }) } + const onRemoveFromCollection = deleteBody => { + const collectionUrl = dropVersion(props.repo?.version_url || props.repo?.url) + const body = deleteBody || { ids: (mapping.references || []).map(r => r.id).filter(Boolean) } + setRemovingFromCollection(true) + APIService.new().overrideURL(collectionUrl).appendToUrl('references/').delete(body).then(response => { + setRemovingFromCollection(false) + if(response?.status === 204 || response?.status === 200) { + setRemoveFromCollectionDialog(false) + setAlert({ severity: 'success', message: t('reference.remove_success') }) + props.onClose && props.onClose() + } else { + setAlert({ severity: 'error', message: response?.data?.detail || t('common.generic_error') }) + } + }) + } + return (mapping?.id && repo?.id) ? ( <> @@ -154,7 +176,7 @@ const MappingHome = props => {
- setEdit(true)} onRetire={() => setRetireDialog(true)} /> + setEdit(true)} onRetire={() => setRetireDialog(true)} isInCollection={isInCollection} onRemoveFromCollection={() => setRemoveFromCollectionDialog(true)} />
onTabChange(newTab)} /> { @@ -179,6 +201,15 @@ const MappingHome = props => { title={`${t('common.retire')} ${t('mapping.mapping')}`} onSubmit={toggleRetire} /> + setRemoveFromCollectionDialog(false)} + onConfirm={onRemoveFromCollection} + resources={[mapping]} + collectionUrl={dropVersion(props.repo?.version_url || props.repo?.url)} + lookupCollectionUrl={props.repo?.version_url || props.repo?.url} + loading={removingFromCollection} + />
diff --git a/src/components/search/Search.jsx b/src/components/search/Search.jsx index 6168732b..f0db5af2 100644 --- a/src/components/search/Search.jsx +++ b/src/components/search/Search.jsx @@ -4,11 +4,20 @@ import { useLocation, useHistory } from 'react-router-dom'; import { useTranslation } from 'react-i18next' import Tabs from '@mui/material/Tabs'; import Tab from '@mui/material/Tab'; +import Button from '@mui/material/Button'; +import Tooltip from '@mui/material/Tooltip'; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; import OrgIcon from '@mui/icons-material/AccountBalance'; import UserIcon from '@mui/icons-material/Person'; +import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; +import TransformIcon from '@mui/icons-material/Transform'; +import DownIcon from '@mui/icons-material/KeyboardArrowDown'; import { forEach, keys, pickBy, isEmpty, find, uniq, has, orderBy as sortBy, uniqBy, omit, max, isEqual, isBoolean } from 'lodash'; import { COLORS } from '../../common/colors'; -import { highlightTexts } from '../../common/utils'; +import { dropVersion, highlightTexts, isLoggedIn } from '../../common/utils'; import APIService from '../../services/APIService'; import RepoIcon from '../repos/RepoIcon'; import ConceptIcon from '../concepts/ConceptIcon'; @@ -17,11 +26,23 @@ import SearchResults from './SearchResults'; import SearchFilters from './SearchFilters' import { OperationsContext } from '../app/LayoutContext'; import ReferenceFilters from '../repos/ReferenceFilters' +import DeleteReferencesDialog from '../collections/DeleteReferencesDialog' +import RemoveFromCollectionDialog from '../collections/RemoveFromCollectionDialog' +import TransformReferencesDialog from '../collections/TransformReferencesDialog' +import { getTransformAddGroups } from '../collections/referenceTransformUtils' +import RemoveCircleOutlineIcon from '@mui/icons-material/RemoveCircleOutline' const DEFAULT_LIMIT = 25; const FILTERS_WIDTH = 250 const FILTERABLE_RESOURCES = ['concepts', 'mappings', 'repos', 'sources', 'collections', 'references'] +const getBaseCollectionUrl = url => { + const match = (url || '').match(/^(.*\/collections\/[^/]+\/)(?:[^/]+\/)?(?:concepts|mappings|references)\/?$/) + return match ? match[1] : dropVersion(url) +} + +const getCollectionLookupUrl = url => (url || '').replace(/\/(concepts|mappings|references)\/?$/, '/') + const Search = props => { const { setAlert, contextRepo } = React.useContext(OperationsContext); const { t } = useTranslation() @@ -41,6 +62,13 @@ const Search = props => { const [order, setOrder] = React.useState('desc'); const [orderBy, setOrderBy] = React.useState('score'); const [isMatchOp, setIsMatchOp] = React.useState(false) + const [deleteReferencesOpen, setDeleteReferencesOpen] = React.useState(false) + const [deletingReferences, setDeletingReferences] = React.useState(false) + const [referenceActionsAnchor, setReferenceActionsAnchor] = React.useState(null) + const [transformReferencesOpen, setTransformReferencesOpen] = React.useState(false) + const [transformingReferences, setTransformingReferences] = React.useState(false) + const [bulkRemoveOpen, setBulkRemoveOpen] = React.useState(false) + const [bulkRemoving, setBulkRemoving] = React.useState(false) const didMount = React.useRef(false); const isFilterable = _resource => FILTERABLE_RESOURCES.includes(_resource) @@ -418,6 +446,146 @@ const Search = props => { history.push(getCurrentLayoutURL(getQueryParams(input, page, pageSize, filters, newOrderByField, newOrder))) } + const isHead = props.url?.includes('/HEAD/') + const isInCollection = props.url?.includes('/collections/') + const collectionUrl = isInCollection ? getBaseCollectionUrl(props.url) : null + const collectionLookupUrl = isInCollection ? getCollectionLookupUrl(props.url) : null + + const selectedReferenceObjects = resource === 'references' && selected.length > 0 + ? (result['references']?.results || []).filter(r => selected.includes(r.version_url || r.url || r.id)) + : [] + + const onDeleteReferences = deleteBody => { + const body = deleteBody || { ids: selectedReferenceObjects.map(r => r.id).filter(Boolean) } + const deleteUrl = isInCollection ? `${collectionUrl}references/` : props.url + setDeletingReferences(true) + APIService.new().overrideURL(deleteUrl).delete(body).then(response => { + setDeletingReferences(false) + if(response?.status === 204 || response?.status === 200) { + setDeleteReferencesOpen(false) + setSelected([]) + setAlert({ severity: 'success', message: t('reference.remove_success') }) + fetchResults(getQueryParams(input, page, pageSize, filters, orderBy, order)) + } else { + setAlert({ severity: 'error', message: response?.data?.detail || t('common.generic_error') }) + } + }) + } + + const addTransformedReferences = group => { + const data = { + expressions: group.items.map(item => item.proposedExpression), + include: group.include, + } + const body = { data } + if(group.cascade) { + data.cascade = group.cascade + body.cascade = typeof group.cascade === 'string' ? group.cascade : group.cascade?.method || '' + } + + return APIService.new().overrideURL(collectionUrl).appendToUrl('references/').put(body) + } + + const getAddedTransformItems = (response, group) => { + if(![200, 201].includes(response?.status)) + return [] + if(!Array.isArray(response?.data)) + return group.items + + const addedExpressions = response.data.filter(item => item.added).map(item => item.expression) + return group.items.filter(item => addedExpressions.includes(item.proposedExpression)) + } + + const onTransformReferences = async transformItems => { + const groups = getTransformAddGroups(transformItems) + setTransformingReferences(true) + + const addResults = await Promise.all(groups.map(group => addTransformedReferences(group).then(response => ({ group, response })))) + const addedItems = addResults.reduce((items, { group, response }) => [...items, ...getAddedTransformItems(response, group)], []) + const addFailures = addResults.reduce((count, { group, response }) => count + group.items.length - getAddedTransformItems(response, group).length, 0) + + if(!addedItems.length) { + setTransformingReferences(false) + setAlert({ severity: 'error', message: t('reference.transform_no_references_changed') }) + return + } + + const deleteResponse = await APIService.new() + .overrideURL(collectionUrl) + .appendToUrl('references/') + .delete({ ids: addedItems.map(item => item.reference.id).filter(Boolean) }) + + setTransformingReferences(false) + const deleteSucceeded = [200, 204].includes(deleteResponse?.status) + if(deleteSucceeded) { + setTransformReferencesOpen(false) + setSelected([]) + const transformedCount = addedItems.length + setAlert({ + severity: addFailures ? 'warning' : 'success', + message: addFailures ? + t('reference.transform_partial_success', { transformed: transformedCount, failed: addFailures }) : + t('reference.transform_success', { count: transformedCount }), + }) + fetchResults(getQueryParams(input, page, pageSize, filters, orderBy, order)) + } else { + setAlert({ + severity: 'warning', + message: t('reference.transform_delete_failed', { count: addedItems.length }), + }) + fetchResults(getQueryParams(input, page, pageSize, filters, orderBy, order)) + } + } + + const selectedRows = (result[resource]?.results || []).filter(r => selected.includes(r.version_url || r.url || r.id)) + + const onBulkRemoveFromCollection = deleteBody => { + const body = deleteBody || { ids: [] } + setBulkRemoving(true) + APIService.new().overrideURL(collectionUrl).appendToUrl('references/').delete(body).then(response => { + setBulkRemoving(false) + if(response?.status === 204 || response?.status === 200) { + setBulkRemoveOpen(false) + setSelected([]) + setAlert({ severity: 'success', message: t('reference.remove_success') }) + fetchResults(getQueryParams(input, page, pageSize, filters, orderBy, order)) + } else { + setAlert({ severity: 'error', message: response?.data?.detail || t('common.generic_error') }) + } + }) + } + + const bulkRemoveFromCollectionAction = isInCollection && isHead && ['concepts', 'mappings'].includes(resource) && isLoggedIn() && selected.length > 0 ? ( + + ) : null + + const closeReferenceActions = () => setReferenceActionsAnchor(null) + + const referenceActionsControl = resource === 'references' && isLoggedIn() && selected.length > 0 ? ( + + + + + + ) : null React.useEffect(() => { setShowItem(props.showItem || false) @@ -497,6 +665,8 @@ const Search = props => { properties={props.properties} propertyFilters={props.propertyFilters} isMatch={isMatchOp} + toolbarControl={referenceActionsControl} + extraBulkActions={bulkRemoveFromCollectionAction} /> @@ -512,6 +682,57 @@ const Search = props => { } } + + { + closeReferenceActions() + setTransformReferencesOpen(true) + }} + > + + + + {t('reference.transform_to_non_versioned')} + + { + closeReferenceActions() + setDeleteReferencesOpen(true) + }} + > + + + + {t('common.remove')} + + + setTransformReferencesOpen(false)} + onConfirm={onTransformReferences} + references={selectedReferenceObjects} + loading={transformingReferences} + /> + setDeleteReferencesOpen(false)} + onConfirm={onDeleteReferences} + references={selectedReferenceObjects} + loading={deletingReferences} + /> + setBulkRemoveOpen(false)} + onConfirm={onBulkRemoveFromCollection} + resources={selectedRows} + collectionUrl={collectionUrl} + lookupCollectionUrl={collectionLookupUrl} + loading={bulkRemoving} + /> ) } diff --git a/src/components/search/SearchResults.jsx b/src/components/search/SearchResults.jsx index 8dcac5da..aff2969a 100644 --- a/src/components/search/SearchResults.jsx +++ b/src/components/search/SearchResults.jsx @@ -235,6 +235,9 @@ const SearchResults = props => { ) : null + const allBulkActions = [addToCollectionBulkAction, props.extraBulkActions].filter(Boolean) + const bulkActionsElement = allBulkActions.length > 0 ? <>{allBulkActions} : null + React.useEffect(() => { setSelected(props.selected || []) }, [props.selected]) @@ -261,7 +264,7 @@ const SearchResults = props => { noCardDisplay={noCardDisplay} toolbarControl={props.toolbarControl} appliedFilters={props.appliedFilters} - bulkActions={addToCollectionBulkAction} + bulkActions={bulkActionsElement} /> } { diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json index d3f5747b..085dfb0f 100644 --- a/src/i18n/locales/en/translations.json +++ b/src/i18n/locales/en/translations.json @@ -52,6 +52,10 @@ "view_all_attributes": "View all attributes", "all": "All", "actions": "Actions", + "selected": "selected", + "eligible": "eligible", + "skipped": "skipped", + "status": "Status", "metadata": "Metadata", "details": "Details", "copied_to_clipboard": "Copied to clipboard", @@ -278,7 +282,33 @@ "versioned_resource": "Versioned (Resource)", "resolved_repo": "Resolved Repo", "raw": "Raw", - "translation": "Translation" + "translation": "Translation", + "remove_selected": "Remove selected", + "remove_confirm_title": "Remove {{count}} reference(s)?", + "remove_confirm_body": "This will remove {{concepts}} concepts and {{mappings}} mappings from the collection expansion.", + "not_available_in_version": "Not available in saved versions. Switch to HEAD to edit.", + "remove_success": "References removed successfully.", + "actions": "Actions", + "transform_to_non_versioned": "Transform to non-versioned reference", + "transform_confirm_title": "Transform {{count}} reference(s)?", + "transform_confirm_body": "This will add non-versioned replacement references first, then remove the old pinned references after the add succeeds.", + "transform_references": "Transform references", + "transform_success": "{{count}} reference(s) transformed successfully.", + "transform_partial_success": "{{transformed}} reference(s) transformed. {{failed}} reference(s) could not be transformed and were left unchanged.", + "transform_no_eligible": "None of the selected references can be transformed to non-versioned references.", + "transform_no_references_changed": "No references were transformed.", + "transform_delete_failed": "{{count}} non-versioned reference(s) were added, but the old pinned references could not be removed. Refresh and review the references list for duplicates.", + "already_non_versioned": "Already non-versioned", + "unsupported_transform": "Unsupported", + "new_expression": "New Expression", + "brought_in_by": "Brought into collection by", + "brought_in_by_tooltip": "This {{resource}} appears in this collection expansion as a result of these references.", + "no_references_found": "No references found.", + "remove_from_collection": "Remove from collection", + "remove_concept_confirm_title": "Remove concept from collection?", + "remove_concept_confirm_body": "This concept is brought in by the following reference(s). Removing it will delete those references from the collection.", + "remove_mapping_confirm_title": "Remove mapping from collection?", + "remove_mapping_confirm_body": "This mapping is brought in by the following reference(s). Removing it will delete those references from the collection." }, "checksums": { "standard": "Standard Checksum", diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json index cbff07ee..5152dbf0 100644 --- a/src/i18n/locales/es/translations.json +++ b/src/i18n/locales/es/translations.json @@ -24,6 +24,10 @@ "about": "Acerca de", "view_all_attributes": "Ver todos los atributos", "actions": "Acciones", + "selected": "seleccionados", + "eligible": "elegibles", + "skipped": "omitidos", + "status": "Estado", "metadata": "Metadatos", "copied_to_clipboard": "Copiado al portapapeles", "navigate": "Navegar", @@ -92,6 +96,22 @@ "website": "Sitio web", "last_login": "Último inicio de sesión" }, + "reference": { + "actions": "Acciones", + "expression": "Expresión", + "new_expression": "Nueva expresión", + "transform_to_non_versioned": "Transformar a referencia sin versión", + "transform_confirm_title": "¿Transformar {{count}} referencia(s)?", + "transform_confirm_body": "Esto agregará primero referencias de reemplazo sin versión y luego eliminará las referencias fijadas anteriores cuando la adición se complete correctamente.", + "transform_references": "Transformar referencias", + "transform_success": "{{count}} referencia(s) transformada(s) correctamente.", + "transform_partial_success": "{{transformed}} referencia(s) transformada(s). {{failed}} referencia(s) no pudieron transformarse y se dejaron sin cambios.", + "transform_no_eligible": "Ninguna de las referencias seleccionadas puede transformarse en una referencia sin versión.", + "transform_no_references_changed": "No se transformó ninguna referencia.", + "transform_delete_failed": "Se agregaron {{count}} referencia(s) sin versión, pero no se pudieron eliminar las referencias fijadas anteriores. Actualiza y revisa la lista de referencias para detectar duplicados.", + "already_non_versioned": "Ya está sin versión", + "unsupported_transform": "No compatible" + }, "search": { "filters": "Filtros", "concepts": "Conceptos", diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json index 04f8739b..06b21197 100644 --- a/src/i18n/locales/zh/translations.json +++ b/src/i18n/locales/zh/translations.json @@ -41,6 +41,10 @@ "view_all_attributes": "查看全部属性", "all": "全部", "actions": "操作", + "selected": "已选择", + "eligible": "可处理", + "skipped": "已跳过", + "status": "状态", "metadata": "元数据", "copied_to_clipboard": "已复制到粘贴板", "navigate": "导航", @@ -288,6 +292,22 @@ "user_has_not_created_public_repos_suffix": "尚未创建任何公开的存储库", "recent_activity": "最近的活动" }, + "reference": { + "actions": "操作", + "expression": "表达式", + "new_expression": "新表达式", + "transform_to_non_versioned": "转换为非版本化引用", + "transform_confirm_title": "要转换 {{count}} 个引用吗？", + "transform_confirm_body": "系统会先添加非版本化的替代引用，添加成功后再移除原来的固定版本引用。", + "transform_references": "转换引用", + "transform_success": "已成功转换 {{count}} 个引用。", + "transform_partial_success": "已转换 {{transformed}} 个引用。{{failed}} 个引用无法转换，已保持不变。", + "transform_no_eligible": "所选引用中没有可以转换为非版本化引用的项目。", + "transform_no_references_changed": "没有转换任何引用。", + "transform_delete_failed": "已添加 {{count}} 个非版本化引用，但无法移除原来的固定版本引用。请刷新并检查引用列表中是否有重复项。", + "already_non_versioned": "已经是非版本化", + "unsupported_transform": "不支持" + }, "search": { "filters": "筛选项", "concepts": "概念",