Skip to content

Commit

Permalink
Merge pull request #58 from NASA-PDS/ts-57
Browse files Browse the repository at this point in the history
#57 User Friendly Mission and Product Type Names in AE and in Filters
  • Loading branch information
tariqksoliman authored Jan 14, 2025
2 parents 3faa58f + 4c50bb8 commit 3e86309
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 5 deletions.
9 changes: 7 additions & 2 deletions src/components/Filter/subcomponents/ListFilter/ListFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import clsx from 'clsx'
import Checkbox from '@material-ui/core/Checkbox'

import { setFieldState } from '../../../../core/redux/actions/actions.js'
import { DISPLAY_NAME_MAPPINGS } from '../../../../core/constants.js'
import { getIn } from '../../../../core/utils.js'

const useStyles = makeStyles((theme) => ({
Expand Down Expand Up @@ -40,7 +41,7 @@ const useStyles = makeStyles((theme) => ({
label: {
display: 'flex',
lineHeight: '26px',
marginLeft: '12px',
marginLeft: '8px',
},
name: {
padding: '0px 2px',
Expand Down Expand Up @@ -94,7 +95,11 @@ const ListFilter = (props) => {
aria-label="select"
/>
<span className={c.label}>
<div className={c.name}>{field.key}</div>
<div className={c.name}>
{DISPLAY_NAME_MAPPINGS[field.key]
? DISPLAY_NAME_MAPPINGS[field.key]
: field.key}
</div>
<div className={c.count}>({field.doc_count})</div>
</span>
</li>
Expand Down
1 change: 0 additions & 1 deletion src/components/OpenSeadragonViewer/OpenSeadragonViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ const OpenSeadragonViewer = ({ image, settings, features, onLayers }) => {
setSvgOverlay(so)
drawFeatures(so, features)
})
console.log(image.src)
viewer.open({
type: 'image',
url: image.src,
Expand Down
57 changes: 57 additions & 0 deletions src/core/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,60 @@ export const MISSIONS_TO_BODIES = {
moons: ['deimos', 'phobos'],
},
}

export const DISPLAY_NAME_MAPPINGS = {
'cas': 'Cassini',
'cassini': 'Cassini',
'cassini_orbiter': 'Cassini Orbiter',
'ch1': 'Chandrayaan 1',
'chandrayaan_1': 'Chandrayaan 1',
'clem': 'Clementine',
'clementine': 'Clementine',
'go': 'Galileo',
'galileo_orbiter': 'Galileo Orbiter',
'juno': 'Juno',
'lcro': 'LCROSS',
'lcross': 'LCROSS',
'lo': 'Lunar Orbiter',
'lunar_orbiters': 'Lunar Orbiters',
'lro': 'LRO - Lunar Reconnaissance Orbiter',
'lunar_reconnaissance_orbiter': 'LRO - Lunar Reconnaissance Orbiter',
'mgn': 'Magellan',
'magellan': 'Magellan',
'mars_2020': 'Mars 2020',
'm20': 'Mars 2020',
'perseverance': 'Mars 2020 - Perseverance',
'mer': 'MER - Mars Exploration Rover',
'opportunity': 'MER - Opportunity',
'spirit': 'MER - Spirit',
'mess': 'Messenger',
'messenger': 'Messenger',
'mgs': 'Mars Global Surveyor',
'mars_global_surveyor': 'Mars Global Surveyor',
'mpf': 'Mars Pathfinder',
'csms': 'MPF - Carl Sagan Memorial Station',
'sojourner': 'MPF - Sojourner',
'mro': 'MRO - Mars Reconnaissance Orbiter',
'mars_reconnaissance_orbiter': 'MRO - Mars Reconnaissance Orbiter',
'msl': 'MSL - Mars Science Laboratory',
'nsyt': 'InSight',
'insight': 'InSight',
'insight_lander': 'InSight Lander',
'curiosity': 'MSL - Curiosity',
'nh': 'New Horizons',
'new_horizons': 'New Horizons',
'ody': '2001 Mars Odyssey',
'2001_mars_odyssey': '2001 Mars Odyssey',
'phx': 'Phoenix',
'phoenix_lander': 'Phoenix Lander',
'vik': 'Viking',
'viking_orbiter_1': 'Viking Orbiter 1',
'viking_orbiter_2': 'Viking Orbiter 2',
'viking_orbiters': 'Viking Orbiters',
'viking_lander_1': 'Viking Lander 1',
'viking_lander_2': 'Viking Lander 2',
'vgr': 'Voyager',
'voyager_1': 'Voyager 1',
'voyager_2': 'Voyager 2',
'voyager': 'Voyager',
}
6 changes: 4 additions & 2 deletions src/pages/FileExplorer/Columns/Columns.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
abbreviateNumber,
getExtension,
} from '../../../core/utils'
import { IMAGE_EXTENSIONS, ES_PATHS } from '../../../core/constants'
import { IMAGE_EXTENSIONS, ES_PATHS, DISPLAY_NAME_MAPPINGS } from '../../../core/constants'
import { streamDownloadFile } from '../../../core/downloaders/ZipStream.js'

import {
Expand Down Expand Up @@ -980,7 +980,9 @@ const Column = (props) => {
})}
title={result.key}
>
{result.key}
{DISPLAY_NAME_MAPPINGS[result.key]
? DISPLAY_NAME_MAPPINGS[result.key]
: result.key}
</div>
</div>
<div className={c.flex}>
Expand Down

0 comments on commit 3e86309

Please sign in to comment.