Skip to content
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

Jump to bottom

Modify header separator in query to avoid issue during export #4678

Merged
merged 8 commits into from
May 21, 2024
Merged

Modify header separator in query to avoid issue during export #4678

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4fe9ab5
Add pref to use dot to join headers or not in query results
CarolineDenis Mar 22, 2024
13fa5c1
Check for pref during export
CarolineDenis Mar 25, 2024
80037f0
Clean
CarolineDenis Mar 25, 2024
1e87e35
Change seprator to avoid issue with export
CarolineDenis Mar 26, 2024
ce94d8d
Update tests
CarolineDenis Mar 26, 2024
9b63e80
Merge remote-tracking branch 'origin/production' into issue-4491
CarolineDenis Apr 16, 2024
6383151
Merge remote-tracking branch 'origin/production' into issue-4491
CarolineDenis May 6, 2024
1d4ddf3
Lint code with ESLint and Prettier
CarolineDenis May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions specifyweb/frontend/js_src/lib/components/WbPlanView/__tests__/mappingPreview.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,61 @@ requireContext();

theories(generateMappingPathPreview, [
[['CollectionObject', ['catalogNumber']], 'Cat #'],
[['CollectionObject', ['guid']], 'Collection Object · GUID'],
[['CollectionObject', ['void']], 'Collection Object · Void'],
[['CollectionObject', ['guid']], 'Collection Object - GUID'],
[['CollectionObject', ['void']], 'Collection Object - Void'],
[['CollectionObject', ['someNonExistentField']], 'Some Non Existent Field'],
[['CollectionObject', ['name']], 'Collection Object · Name'],
[['CollectionObject', ['name']], 'Collection Object - Name'],
[['Geography', ['name']], 'Geography'],
[['CollectionObject', ['someDnaSequence']], 'Some DNA Sequence'],
[['CollectionObject', ['accession', 'accessionNumber']], 'Accession #'],
[
['CollectionObject', ['dnaSequences', '#1', 'timestampCreated-fullDate']],
'DNA Sequences · Timestamp Created',
'DNA Sequences - Timestamp Created',
],
[
['CollectionObject', ['accession', 'accessionAgents', '#1', 'role']],
'Accession Agents · Role',
'Accession Agents - Role',
],
[['SpAuditLog', ['modifiedByAgent', formattedEntry]], 'Modified By Agent'],
[['Agent', ['addresses', formattedEntry]], 'Addresses'],
[['SpAuditLog', ['fields', formattedEntry]], 'Fields'],
[['Taxon', [formatTreeRank('Kingdom'), formattedEntry]], 'Kingdom'],
[['Taxon', [formatTreeRank(anyTreeRank), formattedEntry]], 'Taxon'],
[['Taxon', [formatTreeRank(anyTreeRank), 'author']], 'Taxon · Author'],
[['Taxon', [formatTreeRank(anyTreeRank), 'fullName']], 'Taxon · Full Name'],
[['Taxon', [formatTreeRank('Kingdom'), 'author']], 'Kingdom · Author'],
[['Taxon', [formatTreeRank(anyTreeRank), 'author']], 'Taxon - Author'],
[['Taxon', [formatTreeRank(anyTreeRank), 'fullName']], 'Taxon - Full Name'],
[['Taxon', [formatTreeRank('Kingdom'), 'author']], 'Kingdom - Author'],
[['CollectionObject', []], 'Collection Object'],
[['CollectionObject', [formattedEntry]], 'Collection Object'],
[
[
'CollectionObject',
['accession', 'accessionAgents', '#1', 'agent', 'abbreviation'],
],
'Accession Agents · Abbreviation',
'Accession Agents - Abbreviation',
],
[
[
'CollectionObject',
['accession', 'accessionCitations', '#1', 'referenceWork', 'title'],
],
'Accession Citations · Reference Work · Title',
'Accession Citations - Reference Work - Title',
],
[
['CollectionObject', ['cataloger', 'addresses', '#1', 'address']],
'Cataloger · Address',
'Cataloger - Address',
],
[
[
'CollectionObject',
['collectingevent', 'collectors', '#1', 'agent', 'abbreviation'],
],
'Collectors · Abbreviation',
'Collectors - Abbreviation',
],
[
['CollectionObject', ['container', 'storage', '$Building', 'name']],
'Building',
],
[['Taxon', ['$Kingdom', 'author']], 'Kingdom · Author'],
[['Taxon', ['$Kingdom', 'author']], 'Kingdom - Author'],
[
[
'Accession',
Expand Down Expand Up @@ -90,7 +90,7 @@ theories(generateMappingPathPreview, [
'name',
],
],
'State · #2',
'State - #2',
],
[
[
Expand All @@ -105,25 +105,25 @@ theories(generateMappingPathPreview, [
'remarks',
],
],
'State · Remarks · #99',
'State - Remarks - #99',
],
[
[
'CollectionObject',
['collectionObjectCitations', '#1', 'referenceWork', 'referenceWorkType'],
],
'Collection Object Citations · Reference Work · Type',
'Collection Object Citations - Reference Work - Type',
],
[
['CollectionObject', ['dnaSequences', '#1', 'ambiguousResidues']],
'DNA Sequences · Ambiguous',
'DNA Sequences - Ambiguous',
],
[
[
'CollectionObject',
['exsiccataItems', '#1', 'exsiccata', 'referenceWork', 'title'],
],
'Exsiccata · Reference Work · Title',
'Exsiccata - Reference Work - Title',
],
[['TaxonAttribute', ['taxons', '$Family', 'taxonId']], 'Family · ID'],
[['TaxonAttribute', ['taxons', '$Family', 'taxonId']], 'Family - ID'],
]);
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/WbPlanView/mappingPreview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,5 @@ export function generateMappingPathPreview(
toManyIndexFormatted,
])
.filter(Boolean)
.join(' · ');
.join(' - ');
}