Merge branch 'release/24.01.0'

Author: mfraezz

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [24.01.0] - 2024-01-05
+### Added
+- Support for Disease and Data Type CollectionProvider metadata
+- data-test-* tags for Preprints Selenium tests
+
 ## [23.15.0] - 2023-11-10
 ### Added
 - Preprint detail and landing page rewrite

app/models/collection-submission.ts

@@ -21,6 +21,8 @@ export const choiceFields = tuple(
  'volume',
  'studyDesign',
  'schoolType',
+ 'dataType',
+ 'disease',
 );
 
 export enum CollectionSubmissionReviewStates {
@@ -76,9 +78,11 @@ export default class CollectionSubmissionModel extends OsfModel.extend(Validatio
  @attr('string') programArea?: string;
  @attr('string') status?: string;
  @attr('string') volume?: string;
- @attr('string') reviewsState?: CollectionSubmissionReviewStates;
  @attr('string') studyDesign?: string; // custom field for Character Lab
  @attr('string') schoolType?: string; // custom field for Character Lab
+ @attr('string') dataType?: string;
+ @attr('string') disease?: string;
+ @attr('string') reviewsState?: CollectionSubmissionReviewStates;
 
  @belongsTo('collection') collection!: Collection;
  @belongsTo('node') guid!: Node;

app/models/collection.ts

@@ -14,7 +14,9 @@ export type ChoicesFields =
  'statusChoices' |
  'volumeChoices' |
  'studyDesignChoices' |
- 'schoolTypeChoices';
+ 'schoolTypeChoices' |
+ 'dataTypeChoices' |
+ 'diseaseChoices';
 
 export const choicesFields = choiceFields.map(field => `${field}Choices`) as ChoicesFields[];
 
@@ -32,6 +34,8 @@ export default class CollectionModel extends OsfModel {
  @attr('array') volumeChoices!: string[];
  @attr('array') studyDesignChoices!: string[]; // custom field for Character Lab
  @attr('array') schoolTypeChoices!: string[]; // custom field for Character Lab
+ @attr('array') dataTypeChoices!: string[];
+ @attr('array') diseaseChoices!: string[];
 
  @belongsTo('collection-provider')
  provider!: AsyncBelongsTo<CollectionProviderModel> & CollectionProviderModel;

app/preprints/-components/preprint-discipline/template.hbs

@@ -1,6 +1,8 @@
 <div>
  <h4>{{t 'preprints.detail.disciplines'}}</h4>
- {{#each this.disciplineReduced as |subject|}}
- <span local-class='subject-preview'>{{subject.text}}</span>
- {{/each}}
+ <span data-test-subjects>
+ {{#each this.disciplineReduced as |subject|}}
+ <span local-class='subject-preview'>{{subject.text}}</span>
+ {{/each}}
+ </span>
 </div>

app/preprints/-components/preprint-status-banner/template.hbs

@@ -12,8 +12,8 @@
  {{else}}
  <div>
  <FaIcon @icon='{{this.icon}}' @prefix='far' local-class='status-icon' aria-hidden='true'/>
- <strong>{{t this.status }}:</strong>
- <span>{{this.bannerContent}}</span>
+ <strong data-test-status>{{t this.status }}:</strong>
+ <span data-test-status-explanation>{{this.bannerContent}}</span>
  </div>
  {{#if (and this.reviewerComment (not this.submission.provider.reviewsCommentsPrivate))}}
  <div local-class='reviewer-feedback'>

app/preprints/-components/preprint-tag/template.hbs

@@ -1,9 +1,11 @@
 <div>
  <h4>{{t 'preprints.detail.tags'}}</h4>
  {{#if @preprint.tags.length}}
- {{#each @preprint.tags as |tag|}}
- <span local-class='badge'>{{tag}}</span>
- {{/each}}
+ <span data-test-tags>
+ {{#each @preprint.tags as |tag|}}
+ <span local-class='badge'>{{tag}}</span>
+ {{/each}}
+ </span>
  {{else}}
  {{t 'preprints.detail.none'}}
  {{/if}}

app/preprints/-components/preprint-tombstone/template.hbs

@@ -1,8 +1,8 @@
 <div local-class='withdrawn-container'>
  {{#if @preprint.withdrawalJustification}}
- <div>
+ <div data-test-withdrawal-justification>
  <h4>{{t 'preprints.detail.reason_for_withdrawal'}}</h4>
- <p>
+ <p data-test-justification>
  {{@preprint.withdrawalJustification}}
  </p>
  </div>

app/preprints/detail/template.hbs

@@ -5,10 +5,11 @@
  local-class='preprints-details-page-container {{if this.isMobile 'mobile'}}'
  {{with-branding this.model.brand}}
  data-analytics-scope='preprints detail page'
+ data-test-preprint-header
 >
  <div local-class='header-container'>
  <div local-class='preprint-title-container'>
- <h1>{{this.model.preprint.title}}</h1>
+ <h1 data-test-preprint-title>{{this.model.preprint.title}}</h1>
  {{#unless this.model.preprint.isWithdrawn}}
  <div class='edit-preprint-button'>
  {{#if (and this.userIsContrib (not this.isPendingWithdrawal))}}
@@ -122,7 +123,14 @@
  </OsfLink>
  </div>
  <div>
- {{t 'preprints.detail.share.views'}}: {{this.model.preprint.apiMeta.metrics.views}} | {{t 'preprints.detail.share.downloads'}}: {{this.model.preprint.apiMeta.metrics.downloads}}
+ <span data-test-view-count-label>
+ {{t 'preprints.detail.share.views'}}: 
+ </span>
+ <span data-test-view-count> {{this.model.preprint.apiMeta.metrics.views}} </span> | 
+ <span data-test-download-count-label>
+ {{t 'preprints.detail.share.downloads'}}: 
+ </span>
+ <span data-test-download-count>{{this.model.preprint.apiMeta.metrics.downloads}}</span>
  <EmberTooltip>
  {{t 'preprints.detail.share.metrics_disclaimer'}} {{moment-format this.metricsStartDate 'YYYY-MM-DD'}}
  </EmberTooltip>

lib/collections/addon/components/discover-page/active-filters/data-type/template.hbs

@@ -0,0 +1,8 @@
+{{#each @context.activeFilter as |item|}}
+ <DiscoverPage::ActiveFilters::Filter
+ @item={{item}}
+ @text={{item}}
+ @ariaLabel={{t 'collections.discover_page.active_filters.remove_data_type'}}
+ @removeFilterItem={{action this.removeFilterItem item}}
+ />
+{{/each}}

lib/collections/addon/components/discover-page/active-filters/disease/template.hbs

@@ -0,0 +1,8 @@
+{{#each @context.activeFilter as |item|}}
+ <DiscoverPage::ActiveFilters::Filter
+ @item={{item}}
+ @text={{item}}
+ @ariaLabel={{t 'collections.discover_page.active_filters.remove_disease'}}
+ @removeFilterItem={{action this.removeFilterItem item}}
+ />
+{{/each}}