Skip to content

MMT-3990: Adding Published and Draft Visualizations #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 2, 2025
Merged

MMT-3990: Adding Published and Draft Visualizations #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc6e710
MMT-3990: Adding Published and Draft Visualizations
mandyparson Apr 28, 2025
1ee66b8
MMT-3990: Removing Search Bar for now
mandyparson Apr 29, 2025
12d509c
MMT-3990: Adding comments and lint
mandyparson May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion static.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"ummC": "1.18.3",
"ummS": "1.5.3",
"ummT": "1.2.0",
"ummV": "1.9.0"
"ummV": "1.9.0",
"ummVis": "1.1.0"
},
"ummJsonSchemaUrl": "http://json-schema.org/draft-07/schema#",
"edl": {
Expand Down
38 changes: 31 additions & 7 deletions static/src/js/components/DraftList/DraftList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Col from 'react-bootstrap/Col'
import Row from 'react-bootstrap/Row'

import { DATE_FORMAT } from '@/js/constants/dateFormat'
import conceptIdTypes from '@/js/constants/conceptIdTypes'
import conceptTypeDraftsQueries from '@/js/constants/conceptTypeDraftsQueries'
import constructDownloadableFile from '@/js/utils/constructDownloadableFile'
import urlValueTypeToConceptTypeStringMap from '@/js/constants/urlValueToConceptStringMap'
Expand Down Expand Up @@ -58,7 +57,7 @@ const DraftList = () => {

let cellData = originalCellData

if (!cellData && draftType === conceptIdTypes.C) cellData = '<Blank Short Name>'
if (!cellData && draftType === 'Collection') cellData = '<Blank Short Name>'
if (!cellData) cellData = '<Blank Name>'

return (
Expand All @@ -71,7 +70,7 @@ const DraftList = () => {
const buildEllipsisTextCell = useCallback((originalCellData) => {
let cellData = originalCellData

if (!cellData && draftType === conceptIdTypes.C) cellData = '<Blank Entry Title>'
if (!cellData && draftType === 'Collection') cellData = '<Blank Entry Title>'
if (!cellData) cellData = '<Blank Long Name>'

return (
Expand Down Expand Up @@ -114,7 +113,23 @@ const DraftList = () => {
dataAccessorFn: buildEllipsisTextCell
}
]
const nonCollectionColumns = [

const visColumns = [
{
dataKey: 'previewMetadata.name',
title: 'Name',
className: 'col-auto',
dataAccessorFn: buildPrimaryEllipsisLink
},
{
dataKey: 'previewMetadata.title',
title: 'Long Name',
className: 'col-auto',
dataAccessorFn: buildEllipsisTextCell
}
]

const defaultColumns = [
{
dataKey: 'ummMetadata.Name',
title: 'Name',
Expand Down Expand Up @@ -147,9 +162,18 @@ const DraftList = () => {
}
]

const columns = draftType === conceptIdTypes.C
? [...collectionColumns, ...commonColumns]
: [...nonCollectionColumns, ...commonColumns]
const getColumns = () => {
switch (draftType) {
case 'Collection':
return [...collectionColumns, ...commonColumns]
case 'Visualization':
return [...visColumns, ...commonColumns]
default:
return [...defaultColumns, ...commonColumns]
}
}

const columns = getColumns()

return (
<Row>
Expand Down
172 changes: 54 additions & 118 deletions static/src/js/components/DraftList/__tests__/DraftList.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@ import constructDownloadableFile from '@/js/utils/constructDownloadableFile'

import { GET_TOOL_DRAFTS } from '@/js/operations/queries/getToolDrafts'
import { GET_COLLECTION_DRAFTS } from '@/js/operations/queries/getCollectionDrafts'
import { GET_VISUALIZATION_DRAFTS } from '@/js/operations/queries/getVisualizationDrafts'

import ErrorBoundary from '@/js/components/ErrorBoundary/ErrorBoundary'

import {
mockCollectionDrafts,
mockToolDrafts,
mockVisualizationDrafts
} from './__mocks__/DraftListMocks'

import DraftList from '../DraftList'

vi.mock('react-bootstrap/Placeholder', () => ({ default: vi.fn() }))
Expand All @@ -27,124 +34,6 @@ vi.mock('react-router-dom', async () => ({
useParams: vi.fn().mockImplementation(() => ({ draftType: 'tools' }))
}))

const mockToolDrafts = {
count: 3,
items: [
{
conceptId: 'TD1200000092-MMT_2',
revisionDate: '2023-12-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {
Name: 'Tool TD1200000092 short name',
LongName: 'Tool TD1200000092 long name'
},
name: 'Tool TD1200000092 short name',
previewMetadata: {
conceptId: 'TD1200000092-MMT_2',
revisionId: '1',
name: 'Tool TD1200000092 short name',
longName: 'Tool TD1200000092 long name',
__typename: 'Tool'
},
providerId: 'MMT_2',
__typename: 'Draft'
},
{
conceptId: 'TD1200000093-MMT_2',
revisionDate: '2023-11-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {},
previewMetadata: {
conceptId: 'TD1200000093-MMT_2',
revisionId: '1',
name: null,
longName: null,
__typename: 'Tool'
},
providerId: 'MMT_2',
__typename: 'Draft'
},
{
conceptId: 'TD1200000094-MMT_2',
revisionDate: '2023-10-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {
Name: 'Tool TD1200000094 short name',
LongName: 'Tool TD1200000094 long name'
},
previewMetadata: {
conceptId: 'TD1200000094-MMT_2',
revisionId: '1',
name: null,
longName: null,
__typename: 'Tool'
},
providerId: 'MMT_2',
__typename: 'Draft'
}
],
__typename: 'DraftList'
}

const mockCollectionDrafts = {
count: 3,
items: [
{
conceptId: 'CD1200000092-MMT_2',
revisionDate: '2023-12-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {
ShortName: 'Collection CD1200000092 short name',
EntryTitle: 'Collection CD1200000092 entry title'
},
shortName: 'Collection CD1200000092 short name',
previewMetadata: {
conceptId: 'CD1200000092-MMT_2',
revisionId: '1',
shortName: 'Collection CD1200000092 short name',
entryTitle: 'Collection CD1200000092 entry title',
__typename: 'Collection'
},
providerId: 'MMT_2',
__typename: 'Draft'
},
{
conceptId: 'CD1200000093-MMT_2',
revisionDate: '2023-11-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {},
previewMetadata: {
conceptId: 'CD1200000093-MMT_2',
revisionId: '1',
shortName: null,
entryTitle: null,
__typename: 'Collection'
},
providerId: 'MMT_2',
__typename: 'Draft'
},
{
conceptId: 'CD1200000094-MMT_2',
revisionDate: '2023-10-08T17:56:09.385Z',
revisionId: '1',
ummMetadata: {
ShortName: 'Collection CD1200000094 short name',
EntryTitle: 'Collection CD1200000094 entry title'
},
previewMetadata: {
conceptId: 'CD1200000094-MMT_2',
revisionId: '1',
shortName: null,
entryTitle: null,
__typename: 'Collection'
},
providerId: 'MMT_2',
__typename: 'Draft'
}
],
__typename: 'DraftList'
}

const setup = ({ overrideMocks = false }) => {
const mocks = [{
request: {
Expand Down Expand Up @@ -335,4 +224,51 @@ describe('DraftList', () => {
)
})
})

describe('when draft type Visualization is given', () => {
test('renders Visualization draft list', async () => {
useParams.mockImplementation(() => ({ draftType: 'visualizations' }))

setup({
overrideMocks: [{
request: {
query: GET_VISUALIZATION_DRAFTS,
variables: {
params: {
conceptType: 'Visualization',
limit: 20,
offset: 0,
sortKey: ['-revision_date']
}
}
},
result: {
data: {
drafts: mockVisualizationDrafts
}
}
}]
})

const rows = await screen.findAllByRole('row')

expect(within(rows[1]).getByRole('cell', { name: 'Short Name 1' })).toBeInTheDocument()
expect(within(rows[1]).getByRole('cell', { name: 'Long Name 1' })).toBeInTheDocument()
expect(within(rows[1]).getByRole('cell', { name: 'Friday, April 25, 2025 5:26 PM' })).toBeInTheDocument()
expect(within(rows[1]).getByRole('cell', { name: 'MMT_1' })).toBeInTheDocument()
expect(within(rows[1]).getByRole('button', { name: /Download JSON/ })).toBeInTheDocument()

expect(within(rows[2]).getByRole('cell', { name: '<Blank Name>' })).toBeInTheDocument()
expect(within(rows[2]).getByRole('cell', { name: '<Blank Long Name>' })).toBeInTheDocument()
expect(within(rows[2]).getByRole('cell', { name: 'Thursday, May 15, 2025 10:30 AM' })).toBeInTheDocument()
expect(within(rows[2]).getByRole('cell', { name: 'MMT_1' })).toBeInTheDocument()
expect(within(rows[2]).getByRole('button', { name: /Download JSON/ })).toBeInTheDocument()

expect(within(rows[3]).getByRole('cell', { name: 'Short Name 3' })).toBeInTheDocument()
expect(within(rows[3]).getByRole('cell', { name: 'Long Name 3' })).toBeInTheDocument()
expect(within(rows[3]).getByRole('cell', { name: 'Thursday, June 5, 2025 2:45 PM' })).toBeInTheDocument()
expect(within(rows[3]).getByRole('cell', { name: 'MMT_1' })).toBeInTheDocument()
expect(within(rows[3]).getByRole('button', { name: /Download JSON/ })).toBeInTheDocument()
})
})
})
Loading