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

Reorder card fields; Add link to preprint provider field; Change page size #1951

Merged
merged 5 commits into from
Aug 21, 2023
Merged

Reorder card fields; Add link to preprint provider field; Change page size #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e211cb7
change ordering on files secondary card
adlius Aug 21, 2023
0d381f6
change ordering for registration secondary card
adlius Aug 21, 2023
b3a8d05
change ordering f or preprints secondary card
adlius Aug 21, 2023
e1bb783
change ordering for project secondary card
adlius Aug 21, 2023
01c4481
change page size
adlius Aug 21, 2023
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
1 change: 1 addition & 0 deletions lib/osf-components/addon/components/search-page/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ export default class SearchPage extends Component<SearchArgs> {
'page[cursor]': page,
sort,
cardSearchFilter: filterQueryObject,
'page[size]': 10,
});
await searchResult.relatedProperties;
this.relatedProperties = searchResult.relatedProperties;
Expand Down
20 changes: 12 additions & 8 deletions lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<dt>{{t 'osf-components.search-result-card.description'}}</dt>
<dd>{{@result.description}}</dd>
{{/if}}
{{#if @result.resourceNature}}
<dt>{{t 'osf-components.search-result-card.resource_nature'}}</dt>
<dd>{{@result.resourceNature}}</dd>
{{/if}}
{{#if @result.nodeFunders}}
<dt>{{t 'osf-components.search-result-card.funder'}}</dt>
<dd>
Expand All @@ -24,6 +20,18 @@
</InlineList>
</dd>
{{/if}}
{{#if @result.resourceNature}}
<dt>{{t 'osf-components.search-result-card.resource_type'}}</dt>
<dd>{{@result.resourceNature}}</dd>
{{/if}}
{{#if @result.nodeLicense}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.nodeLicense.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.nodeLicense.name}}</a></dd>
{{/if}}
{{#if @result.absoluteUrl}}
<dt>{{t 'osf-components.search-result-card.url'}}</dt>
<dd><a href={{@result.absoluteUrl}} target='_blank' rel='noopener noreferrer'>{{@result.absoluteUrl}}</a></dd>
{{/if}}
{{#if @result.doi}}
<dt>{{t 'osf-components.search-result-card.doi'}}</dt>
<dd>
Expand All @@ -37,8 +45,4 @@
</InlineList>
</dd>
{{/if}}
{{#if @result.nodeLicense}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.nodeLicense.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.nodeLicense.name}}</a></dd>
{{/if}}
</dl>
73 changes: 39 additions & 34 deletions ...f-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,7 @@
{{!-- Preprint Provider --}}
{{#if @result.provider}}
<dt>{{t 'osf-components.search-result-card.preprint_provider'}}</dt>
<dd>{{@result.provider.name}}</dd>
{{/if}}

{{!-- License --}}
{{#if @result.license}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.license.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.license.name}}</a></dd>
{{/if}}

{{!-- DOI --}}
{{#if @result.doi}}
<dt>{{t 'osf-components.search-result-card.doi'}}</dt>
<dd>
<InlineList
@items={{@result.doi}}
@total={{@result.doi.count}}
@truncate={{5}}
as |list|
>
<a href={{list.item}} target='_blank' rel='noopener noreferrer'>{{list.item}}</a>
</InlineList>
</dd>
{{/if}}

{{!-- Conflict of interest statement --}}
{{#if @result.resourceMetadata.statedConflictOfInterest}}
<dt>{{t 'osf-components.search-result-card.conflict_of_interest'}}</dt>
<dd>
{{#if @result.resourceMetadata.statedConflictOfInterest.[0].[@value]}}
{{@result.resourceMetadata.statedConflictOfInterest.[0].[@value]}}
{{else}}
{{t 'osf-components.search-result-card.no_conflict_of_interest'}}
{{/if}}
</dd>
<dd><a href={{@result.provider.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.provider.name}}</a></dd>
{{/if}}

{{!-- Associated Data --}}
Expand Down Expand Up @@ -80,5 +47,43 @@
</InlineList>
</dd>
{{/if}}

{{!-- Conflict of interest statement --}}
{{#if @result.resourceMetadata.statedConflictOfInterest}}
<dt>{{t 'osf-components.search-result-card.conflict_of_interest'}}</dt>
<dd>
{{#if @result.resourceMetadata.statedConflictOfInterest.[0].[@value]}}
{{@result.resourceMetadata.statedConflictOfInterest.[0].[@value]}}
{{else}}
{{t 'osf-components.search-result-card.no_conflict_of_interest'}}
{{/if}}
</dd>
{{/if}}

{{!-- License --}}
{{#if @result.license}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.license.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.license.name}}</a></dd>
{{/if}}

{{#if @result.absoluteUrl}}
<dt>{{t 'osf-components.search-result-card.url'}}</dt>
<dd><a href={{@result.absoluteUrl}} target='_blank' rel='noopener noreferrer'>{{@result.absoluteUrl}}</a></dd>
{{/if}}

{{!-- DOI --}}
{{#if @result.doi}}
<dt>{{t 'osf-components.search-result-card.doi'}}</dt>
<dd>
<InlineList
@items={{@result.doi}}
@total={{@result.doi.count}}
@truncate={{5}}
as |list|
>
<a href={{list.item}} target='_blank' rel='noopener noreferrer'>{{list.item}}</a>
</InlineList>
</dd>
{{/if}}
</dl>

20 changes: 12 additions & 8 deletions ...sf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,26 @@
</InlineList>
</dd>
{{/if}}
{{#if @result.resourceNature}}
<dt>{{t 'osf-components.search-result-card.resource_type'}}</dt>
<dd>{{@result.resourceNature}}</dd>
{{/if}}
{{#if @result.isPartOfCollection}}
<dt>{{t 'osf-components.search-result-card.collection'}}</dt>
<dd><a href={{@result.isPartOfCollection.absoluteUrl}} target='_blank' rel='noopener noreferrer'> {{@result.isPartOfCollection.title}} </a></dd>
{{/if}}
{{#if @result.resourceNature}}
<dt>{{t 'osf-components.search-result-card.resource_nature'}}</dt>
<dd>{{@result.resourceNature}}</dd>
{{/if}}
{{#if @resource.language}}
<dt>{{t 'osf-components.search-result-card.language'}}</dt>
<dd>{{@resource.language}}</dd>
{{/if}}
{{#if @result.license}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.license.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.license.name}}</a></dd>
{{/if}}
{{#if @result.absoluteUrl}}
<dt>{{t 'osf-components.search-result-card.url'}}</dt>
<dd><a href={{@result.absoluteUrl}} target='_blank' rel='noopener noreferrer'>{{@result.absoluteUrl}}</a></dd>
{{/if}}
{{#if @result.doi}}
<dt>{{t 'osf-components.search-result-card.doi'}}</dt>
<dd>
Expand All @@ -41,8 +49,4 @@
</InlineList>
</dd>
{{/if}}
{{#if @result.license}}
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.license.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.license.name}}</a></dd>
{{/if}}
</dl>
12 changes: 8 additions & 4 deletions ...mponents/addon/components/search-result-card/registration-secondary-metadata/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
<dt>{{t 'osf-components.search-result-card.description'}}</dt>
<dd>{{@result.description}}</dd>
{{/if}}
{{#if @result.provider}}
<dt>{{t 'osf-components.search-result-card.registration_provider'}}</dt>
<dd><a href={{@result.provider.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.provider.name}}</a></dd>
{{/if}}
{{#if @result.funders}}
<dt>{{t 'osf-components.search-result-card.funder'}}</dt>
<dd>
Expand All @@ -20,6 +16,10 @@
</InlineList>
</dd>
{{/if}}
{{#if @result.provider}}
<dt>{{t 'osf-components.search-result-card.registration_provider'}}</dt>
<dd><a href={{@result.provider.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.provider.name}}</a></dd>
{{/if}}
{{#if @result.registrationTemplate}}
<dt>{{t 'osf-components.search-result-card.registration_template'}}</dt>
<dd>{{@result.registrationTemplate}}</dd>
Expand All @@ -28,6 +28,10 @@
<dt>{{t 'osf-components.search-result-card.license'}}</dt>
<dd><a href={{@result.license.identifier}} target='_blank' rel='noopener noreferrer'>{{@result.license.name}}</a></dd>
{{/if}}
{{#if @result.absoluteUrl}}
<dt>{{t 'osf-components.search-result-card.url'}}</dt>
<dd><a href={{@result.absoluteUrl}} target='_blank' rel='noopener noreferrer'>{{@result.absoluteUrl}}</a></dd>
{{/if}}
{{#if @result.doi}}
<dt>{{t 'osf-components.search-result-card.doi'}}</dt>
<dd>
Expand Down
3 changes: 2 additions & 1 deletion translations/en-us.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,8 @@ routes:
email: Email
osf-components:
search-result-card:
resource_nature: Resource nature
url: URL
resource_type: Resource type
title: Title
collection: Collection
context: Context
Expand Down
Loading