diff --git a/lib/osf-components/addon/components/search-page/component.ts b/lib/osf-components/addon/components/search-page/component.ts index 0268ed207a..1acea74dc0 100644 --- a/lib/osf-components/addon/components/search-page/component.ts +++ b/lib/osf-components/addon/components/search-page/component.ts @@ -216,6 +216,7 @@ export default class SearchPage extends Component { 'page[cursor]': page, sort, cardSearchFilter: filterQueryObject, + 'page[size]': 10, }); await searchResult.relatedProperties; this.relatedProperties = searchResult.relatedProperties; diff --git a/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs b/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs index f9c0ea9529..fd58c6295c 100644 --- a/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs +++ b/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs @@ -7,10 +7,6 @@
{{t 'osf-components.search-result-card.description'}}
{{@result.description}}
{{/if}} - {{#if @result.resourceNature}} -
{{t 'osf-components.search-result-card.resource_nature'}}
-
{{@result.resourceNature}}
- {{/if}} {{#if @result.nodeFunders}}
{{t 'osf-components.search-result-card.funder'}}
@@ -24,6 +20,18 @@
{{/if}} + {{#if @result.resourceNature}} +
{{t 'osf-components.search-result-card.resource_type'}}
+
{{@result.resourceNature}}
+ {{/if}} + {{#if @result.nodeLicense}} +
{{t 'osf-components.search-result-card.license'}}
+
{{@result.nodeLicense.name}}
+ {{/if}} + {{#if @result.absoluteUrl}} +
{{t 'osf-components.search-result-card.url'}}
+
{{@result.absoluteUrl}}
+ {{/if}} {{#if @result.doi}}
{{t 'osf-components.search-result-card.doi'}}
@@ -37,8 +45,4 @@
{{/if}} - {{#if @result.nodeLicense}} -
{{t 'osf-components.search-result-card.license'}}
-
{{@result.nodeLicense.name}}
- {{/if}} diff --git a/lib/osf-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs b/lib/osf-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs index eced25835c..e12a768f13 100644 --- a/lib/osf-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs +++ b/lib/osf-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs @@ -8,40 +8,7 @@ {{!-- Preprint Provider --}} {{#if @result.provider}}
{{t 'osf-components.search-result-card.preprint_provider'}}
-
{{@result.provider.name}}
- {{/if}} - - {{!-- License --}} - {{#if @result.license}} -
{{t 'osf-components.search-result-card.license'}}
-
{{@result.license.name}}
- {{/if}} - - {{!-- DOI --}} - {{#if @result.doi}} -
{{t 'osf-components.search-result-card.doi'}}
-
- - {{list.item}} - -
- {{/if}} - - {{!-- Conflict of interest statement --}} - {{#if @result.resourceMetadata.statedConflictOfInterest}} -
{{t 'osf-components.search-result-card.conflict_of_interest'}}
-
- {{#if @result.resourceMetadata.statedConflictOfInterest.[0].[@value]}} - {{@result.resourceMetadata.statedConflictOfInterest.[0].[@value]}} - {{else}} - {{t 'osf-components.search-result-card.no_conflict_of_interest'}} - {{/if}} -
+
{{@result.provider.name}}
{{/if}} {{!-- Associated Data --}} @@ -80,5 +47,43 @@ {{/if}} + + {{!-- Conflict of interest statement --}} + {{#if @result.resourceMetadata.statedConflictOfInterest}} +
{{t 'osf-components.search-result-card.conflict_of_interest'}}
+
+ {{#if @result.resourceMetadata.statedConflictOfInterest.[0].[@value]}} + {{@result.resourceMetadata.statedConflictOfInterest.[0].[@value]}} + {{else}} + {{t 'osf-components.search-result-card.no_conflict_of_interest'}} + {{/if}} +
+ {{/if}} + + {{!-- License --}} + {{#if @result.license}} +
{{t 'osf-components.search-result-card.license'}}
+
{{@result.license.name}}
+ {{/if}} + + {{#if @result.absoluteUrl}} +
{{t 'osf-components.search-result-card.url'}}
+
{{@result.absoluteUrl}}
+ {{/if}} + + {{!-- DOI --}} + {{#if @result.doi}} +
{{t 'osf-components.search-result-card.doi'}}
+
+ + {{list.item}} + +
+ {{/if}} diff --git a/lib/osf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs b/lib/osf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs index bc05f2af7d..1c532628c1 100644 --- a/lib/osf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs +++ b/lib/osf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs @@ -16,18 +16,26 @@ {{/if}} + {{#if @result.resourceNature}} +
{{t 'osf-components.search-result-card.resource_type'}}
+
{{@result.resourceNature}}
+ {{/if}} {{#if @result.isPartOfCollection}}
{{t 'osf-components.search-result-card.collection'}}
{{@result.isPartOfCollection.title}}
{{/if}} - {{#if @result.resourceNature}} -
{{t 'osf-components.search-result-card.resource_nature'}}
-
{{@result.resourceNature}}
- {{/if}} {{#if @resource.language}}
{{t 'osf-components.search-result-card.language'}}
{{@resource.language}}
{{/if}} + {{#if @result.license}} +
{{t 'osf-components.search-result-card.license'}}
+
{{@result.license.name}}
+ {{/if}} + {{#if @result.absoluteUrl}} +
{{t 'osf-components.search-result-card.url'}}
+
{{@result.absoluteUrl}}
+ {{/if}} {{#if @result.doi}}
{{t 'osf-components.search-result-card.doi'}}
@@ -41,8 +49,4 @@
{{/if}} - {{#if @result.license}} -
{{t 'osf-components.search-result-card.license'}}
-
{{@result.license.name}}
- {{/if}} \ No newline at end of file diff --git a/lib/osf-components/addon/components/search-result-card/registration-secondary-metadata/template.hbs b/lib/osf-components/addon/components/search-result-card/registration-secondary-metadata/template.hbs index 22daff2fec..25ac2ddc40 100644 --- a/lib/osf-components/addon/components/search-result-card/registration-secondary-metadata/template.hbs +++ b/lib/osf-components/addon/components/search-result-card/registration-secondary-metadata/template.hbs @@ -3,10 +3,6 @@
{{t 'osf-components.search-result-card.description'}}
{{@result.description}}
{{/if}} - {{#if @result.provider}} -
{{t 'osf-components.search-result-card.registration_provider'}}
-
{{@result.provider.name}}
- {{/if}} {{#if @result.funders}}
{{t 'osf-components.search-result-card.funder'}}
@@ -20,6 +16,10 @@
{{/if}} + {{#if @result.provider}} +
{{t 'osf-components.search-result-card.registration_provider'}}
+
{{@result.provider.name}}
+ {{/if}} {{#if @result.registrationTemplate}}
{{t 'osf-components.search-result-card.registration_template'}}
{{@result.registrationTemplate}}
@@ -28,6 +28,10 @@
{{t 'osf-components.search-result-card.license'}}
{{@result.license.name}}
{{/if}} + {{#if @result.absoluteUrl}} +
{{t 'osf-components.search-result-card.url'}}
+
{{@result.absoluteUrl}}
+ {{/if}} {{#if @result.doi}}
{{t 'osf-components.search-result-card.doi'}}
diff --git a/translations/en-us.yml b/translations/en-us.yml index 2dfdc4cd38..f2fc5d675c 100644 --- a/translations/en-us.yml +++ b/translations/en-us.yml @@ -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