diff --git a/app/config/environment.d.ts b/app/config/environment.d.ts index a04a23a875a..51c702dcfe6 100644 --- a/app/config/environment.d.ts +++ b/app/config/environment.d.ts @@ -18,6 +18,8 @@ export interface KeenConfig { } declare const config: { + WATER_BUTLER_ENABLED: boolean; + PLAUDIT_WIDGET_URL: string, environment: any; lintOnBuild: boolean; testsEnabled: boolean; @@ -77,6 +79,7 @@ declare const config: { devMode: boolean; cookieDomain: string; authenticator: string; + metricsStartDate: string; cookies: { status: string; keenUserId: string; diff --git a/app/institutions/discover/controller.ts b/app/institutions/discover/controller.ts index ffb5706ddb4..48a4a3cd0d6 100644 --- a/app/institutions/discover/controller.ts +++ b/app/institutions/discover/controller.ts @@ -8,7 +8,7 @@ import { Filter, OnSearchParams, ResourceTypeFilterValue } from 'osf-components/ export default class InstitutionDiscoverController extends Controller { @service currentUser!: CurrentUser; - @tracked q?: string = ''; + @tracked cardSearchText?: string = ''; @tracked sort?: string = '-relevance'; @tracked resourceType: ResourceTypeFilterValue = ResourceTypeFilterValue.Projects; @tracked activeFilters?: Filter[] = []; diff --git a/app/models/contributor.ts b/app/models/contributor.ts index 4b2007fd81a..e311e9dd5c0 100644 --- a/app/models/contributor.ts +++ b/app/models/contributor.ts @@ -3,6 +3,7 @@ import { not } from '@ember/object/computed'; import { buildValidations, validator } from 'ember-cp-validations'; import DraftRegistrationModel from './draft-registration'; +import PreprintModel from './preprint'; import NodeModel from './node'; import OsfModel, { Permission } from './osf-model'; import UserModel from './user'; @@ -53,6 +54,9 @@ export default class ContributorModel extends OsfModel.extend(Validations) { @belongsTo('node', { inverse: 'contributors', polymorphic: true }) node!: AsyncBelongsTo & NodeModel; + @belongsTo('preprint', { inverse: 'contributors'}) + preprint!: AsyncBelongsTo & PreprintModel; + @belongsTo('draft-registration', { inverse: 'contributors' }) draftRegistration!: AsyncBelongsTo & DraftRegistrationModel; diff --git a/app/models/file-provider.ts b/app/models/file-provider.ts index 4b931e33303..6e786a41dc5 100644 --- a/app/models/file-provider.ts +++ b/app/models/file-provider.ts @@ -19,7 +19,7 @@ export default class FileProviderModel extends BaseFileItem { @belongsTo('base-file-item', { polymorphic: true }) rootFolder!: AsyncBelongsTo & FileModel; - @hasMany('file', { polymorphic: true }) + @hasMany('file', { inverse:'parentFolder', polymorphic: true }) files!: AsyncHasMany; @belongsTo('abstract-node', { inverse: 'files', polymorphic: true }) diff --git a/app/models/file.ts b/app/models/file.ts index 88dbeaff84d..9eceb34e00a 100644 --- a/app/models/file.ts +++ b/app/models/file.ts @@ -5,6 +5,7 @@ import { Link } from 'jsonapi-typescript'; import { FileReference } from 'ember-osf-web/packages/registration-schema'; import getHref from 'ember-osf-web/utils/get-href'; +import PreprintModel from 'ember-osf-web/models/preprint'; import AbstractNodeModel from './abstract-node'; import BaseFileItem, { BaseFileLinks } from './base-file-item'; import CommentModel from './comment'; @@ -56,8 +57,9 @@ export default class FileModel extends BaseFileItem { @hasMany('comment', { inverse: null }) comments!: AsyncHasMany; - @belongsTo('abstract-node', { polymorphic: true }) - target!: (AsyncBelongsTo & AbstractNodeModel) | (AsyncBelongsTo & DraftNode); + @belongsTo('osf-model', { polymorphic: true }) + // eslint-disable-next-line max-len + target!: (AsyncBelongsTo & AbstractNodeModel) | (AsyncBelongsTo & PreprintModel) | (AsyncBelongsTo & DraftNode); // BaseFileItem override isFileModel = true; diff --git a/app/models/preprint-provider.ts b/app/models/preprint-provider.ts index bdf21c91f48..22ab4abf0ea 100644 --- a/app/models/preprint-provider.ts +++ b/app/models/preprint-provider.ts @@ -18,6 +18,7 @@ const { defaultProvider } = config; export default class PreprintProviderModel extends ProviderModel { @service intl!: Intl; + @attr('fixstring') email_support!: string | null; @attr('array') subjectsAcceptable!: string[]; @attr('array') additionalProviders!: string[]; @attr('string') shareSource!: string; @@ -52,23 +53,29 @@ export default class PreprintProviderModel extends ProviderModel { }; } + get searchPlaceholder(): string { + return this.intl.t('preprints.header.search_placeholder', + { placeholder: this.documentType.plural}); + } + @computed('id') - get preprintWordInTitle() { - return this.id !== 'thesiscommons'; + get preprintWordNotInTitle() { + return this.id === 'thesiscommons'; } // Is either OSF Preprints if provider is the default provider, // name+preprintWord.pluralCapitalized(e.g.AfricArXiv Preprints or MarXiv Papers), or "Thesis Commons" - @computed('documentType.pluralCapitalized', 'id', 'name', 'preprintWordInTitle') + @computed('documentType.pluralCapitalized', 'id', 'name', 'preprintWordNotInTitle') get providerTitle() { if (this.id !== defaultProvider) { - if (this.preprintWordInTitle) { - return this.intl.t('preprints.provider-title', - { name: this.name, pluralizedPreprintWord: this.documentType.pluralCapitalized }); + if (this.preprintWordNotInTitle) { + return this.name; } - return this.name; + return this.intl.t('preprints.provider-title', + { name: this.name, pluralizedPreprintWord: this.documentType.pluralCapitalized }); + } else { + return this.intl.t('preprints.header.osf_preprints'); } - return this.intl.t('preprints.osf-title'); } } diff --git a/app/models/preprint-request-action.ts b/app/models/preprint-request-action.ts new file mode 100644 index 00000000000..1fa6764c759 --- /dev/null +++ b/app/models/preprint-request-action.ts @@ -0,0 +1,32 @@ +import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model'; +import PreprintRequestModel from 'ember-osf-web/models/preprint-request'; +import UserModel from 'ember-osf-web/models/user'; + +import OsfModel from './osf-model'; + + +export enum PreprintRequestActionTriggerEnum { + SUBMIT= 'submit', + ACCEPT = 'accept', + REJECT = 'reject', +} + +export default class PreprintRequestActionModel extends OsfModel { + @attr('string') comment!: string; + @attr('string') actionTrigger!: string; + @attr('date') dateModified!: Date; + @attr('boolean') auto!: boolean; + + // Relationships + @belongsTo('preprint-request', { inverse: 'actions' }) + target!: (AsyncBelongsTo & PreprintRequestModel); + + @belongsTo('user', { inverse: null, async: true }) + creator!: AsyncBelongsTo & UserModel; +} + +declare module 'ember-data/types/registries/model' { + export default interface ModelRegistry { + 'preprint-request-action': PreprintRequestActionModel; + } // eslint-disable-line semi +} diff --git a/app/models/preprint-request.ts b/app/models/preprint-request.ts new file mode 100644 index 00000000000..755a25fbbe2 --- /dev/null +++ b/app/models/preprint-request.ts @@ -0,0 +1,40 @@ +import { AsyncBelongsTo, SyncHasMany, attr, belongsTo, hasMany } from '@ember-data/model'; +import PreprintModel from 'ember-osf-web/models/preprint'; +import UserModel from 'ember-osf-web/models/user'; +import PreprintRequestActionModel from 'ember-osf-web/models/preprint-request-action'; + +import OsfModel from './osf-model'; + +export enum PreprintRequestType{ + WITHDRAWAL = 'withdrawal', +} + +export enum PreprintRequestMachineState { + PENDING = 'pending', + ACCEPTED = 'accepted', + REJECTED = 'rejected', +} + +export default class PreprintRequestModel extends OsfModel { + @attr('string') comment!: string; + @attr('date') dateLastTransitioned!: Date; + @attr('date') created!: Date; + @attr('date') modified!: Date; + @attr('string') machineState!: string; + @attr('string') requestType!: string; + + @belongsTo('preprint', { inverse: 'requests'}) + target!: (AsyncBelongsTo & PreprintModel); + + @belongsTo('user', { inverse: null, async: true }) + creator!: AsyncBelongsTo & UserModel; + + @hasMany('preprint-request-action', { inverse: 'target'}) + actions!: SyncHasMany & PreprintRequestActionModel; +} + +declare module 'ember-data/types/registries/model' { + export default interface ModelRegistry { + 'preprint-request': PreprintRequestModel; + } // eslint-disable-line semi +} diff --git a/app/models/preprint.ts b/app/models/preprint.ts index dd312e80a35..9dd77d6448f 100644 --- a/app/models/preprint.ts +++ b/app/models/preprint.ts @@ -1,29 +1,60 @@ -import { attr, belongsTo, hasMany, SyncHasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model'; +import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model'; import { computed } from '@ember/object'; import { alias } from '@ember/object/computed'; +import CitationModel from 'ember-osf-web/models/citation'; +import PreprintRequestModel from 'ember-osf-web/models/preprint-request'; +import { ReviewsState } from 'ember-osf-web/models/provider'; +import ReviewActionModel from 'ember-osf-web/models/review-action'; import ContributorModel from './contributor'; import FileModel from './file'; import LicenseModel from './license'; import NodeModel from './node'; -import OsfModel from './osf-model'; +import OsfModel, { Permission } from './osf-model'; import PreprintProviderModel from './preprint-provider'; -import ReviewActionModel from './review-action'; import SubjectModel from './subject'; +export enum PreprintDataLinksEnum { + AVAILABLE = 'available', + YES = 'yes', + NO = 'no', + NOT_APPLICABLE = 'not_applicable', +} + +export enum PreprintPreregLinksEnum { + AVAILABLE = 'available', + YES = 'yes', + NO = 'no', + NOT_APPLICABLE = 'not_applicable', +} + export default class PreprintModel extends OsfModel { @attr('fixstring') title!: string; @attr('date') dateCreated!: Date; @attr('date') datePublished!: Date; + @attr('date') dateWithdrawn!: Date; @attr('date') originalPublicationDate!: Date | null; @attr('date') dateModified!: Date; @attr('fixstring') doi!: string | null; + @attr('boolean') public!: boolean; @attr('boolean') isPublished!: boolean; @attr('boolean') isPreprintOrphan!: boolean; @attr('object') licenseRecord!: any; - @attr('string') reviewsState!: string; + @attr('string') reviewsState!: ReviewsState; + @attr('string') description!: string; @attr('date') dateLastTransitioned!: Date; @attr('date') preprintDoiCreated!: Date; + @attr('array') currentUserPermissions!: Permission[]; + @attr('fixstringarray') tags!: string[]; + @attr('fixstring') withdrawalJustification! : string; + @attr('boolean') hasCoi!: boolean; + @attr('string') hasDataLinks!: PreprintDataLinksEnum; + @attr('string') hasPreregLinks!: PreprintPreregLinksEnum; + @attr('string') conflictOfInterestStatement!: string; + @attr('array') dataLinks!: string[]; + @attr('array') preregLinks!: string[]; + @attr('string') whyNoData!: string; + @attr('string') whyNoPrereg!: string; @belongsTo('node', { inverse: 'preprints' }) node!: AsyncBelongsTo & NodeModel; @@ -37,18 +68,34 @@ export default class PreprintModel extends OsfModel { @belongsTo('preprint-provider', { inverse: 'preprints' }) provider!: AsyncBelongsTo & PreprintProviderModel; - @hasMany('review-action', { inverse: 'target' }) + @hasMany('review-action') reviewActions!: AsyncHasMany; - @hasMany('contributor') - contributors!: AsyncHasMany; + @hasMany('files', { inverse: 'target'}) + files!: AsyncHasMany & FileModel; + + @hasMany('contributors', { inverse: 'preprint'}) + contributors!: AsyncHasMany & ContributorModel; - @hasMany('subject', { inverse: null, async: false }) - subjects!: SyncHasMany; + @hasMany('contributor', { inverse: null }) + bibliographicContributors!: AsyncHasMany; + + @belongsTo('citation', { inverse: null }) + citation!: AsyncBelongsTo; + + @hasMany('subject', { inverse: null}) + subjects!: AsyncHasMany; + + @hasMany('preprint-request', { inverse: 'target'}) + requests!: AsyncHasMany; @alias('links.doi') articleDoiUrl!: string | null; @alias('links.preprint_doi') preprintDoiUrl!: string; + get isWithdrawn(): boolean{ + return this.dateWithdrawn !== null; + } + @computed('license', 'licenseRecord') get licenseText(): string { const text = this.license.get('text') || ''; diff --git a/app/models/provider.ts b/app/models/provider.ts index 2372f256b5d..c8da0d06a1c 100644 --- a/app/models/provider.ts +++ b/app/models/provider.ts @@ -20,6 +20,21 @@ export interface Assets { wide_white: string; } +export enum PreprintProviderReviewsWorkFlow{ + PRE_MODERATION = 'pre-moderation', + POST_MODERATION = 'post-moderation' +} + +export enum ReviewsState { + INITIAL = 'initial', + PENDING = 'pending', + ACCEPTED = 'accepted', + REJECTED = 'rejected', + PENDING_WITHDRAWAL = 'pendingWithdrawal', + WITHDRAWAL_REJECTED = 'withdrawalRejected', + WITHDRAWN = 'withdrawn', +} + export enum ReviewPermissions { SetUpModeration = 'set_up_moderation', ViewSubmissions = 'view_submissions', @@ -39,7 +54,6 @@ export enum ReviewPermissions { } /* eslint-enable camelcase */ - export default abstract class ProviderModel extends OsfModel { @attr('fixstring') name!: string; @attr('fixstring') description!: string; @@ -54,7 +68,7 @@ export default abstract class ProviderModel extends OsfModel { @attr('boolean') allowCommenting!: boolean; @attr('boolean') allowUpdates!: boolean; @attr('array') permissions!: ReviewPermissions[]; - @attr('fixstring') reviewsWorkflow!: string | null; + @attr('fixstring') reviewsWorkflow!: PreprintProviderReviewsWorkFlow | null; @attr('boolean') reviewsCommentsAnonymous!: boolean | null; @attr() assets?: Partial; // TODO: camelize in transform diff --git a/app/models/review-action.ts b/app/models/review-action.ts index 4abee75e8be..ec8eec25efe 100644 --- a/app/models/review-action.ts +++ b/app/models/review-action.ts @@ -2,6 +2,7 @@ import { attr, belongsTo, AsyncBelongsTo } from '@ember-data/model'; import { computed } from '@ember/object'; import { inject as service } from '@ember/service'; import Intl from 'ember-intl/services/intl'; +import PreprintModel from 'ember-osf-web/models/preprint'; import Action from './action'; import RegistrationModel, { RegistrationReviewStates } from './registration'; @@ -63,7 +64,8 @@ export default class ReviewActionModel extends Action { @attr('string') toState!: RegistrationReviewStates; @belongsTo('registration', { inverse: 'reviewActions', polymorphic: true }) - target!: AsyncBelongsTo & RegistrationModel; + target!: (AsyncBelongsTo & RegistrationModel + ) | (AsyncBelongsTo & PreprintModel); @computed('actionTrigger') get triggerPastTense(): string { diff --git a/app/models/user.ts b/app/models/user.ts index 1c7e2f945f1..2bccde9981e 100644 --- a/app/models/user.ts +++ b/app/models/user.ts @@ -53,6 +53,7 @@ const Validations = buildValidations({ }); export interface UserLinks extends OsfLinks { + html: Link; profile_image: Link; // eslint-disable-line camelcase } diff --git a/app/preprints/-components/branded-footer/styles.scss b/app/preprints/-components/branded-footer/styles.scss new file mode 100644 index 00000000000..461a9b90af6 --- /dev/null +++ b/app/preprints/-components/branded-footer/styles.scss @@ -0,0 +1,18 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.branded-footer-links { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + margin: 10px 0; + + .social > a { + margin: 0 4px; + } + + .social > a:hover { + text-decoration: none; + } +} diff --git a/app/preprints/-components/branded-footer/template.hbs b/app/preprints/-components/branded-footer/template.hbs new file mode 100644 index 00000000000..ac74507b72c --- /dev/null +++ b/app/preprints/-components/branded-footer/template.hbs @@ -0,0 +1,5 @@ +{{#if @footerLinks}} +
+ {{html-safe @footerLinks}} +
+{{/if}} \ No newline at end of file diff --git a/app/preprints/-components/plaudit-widget/component.ts b/app/preprints/-components/plaudit-widget/component.ts new file mode 100644 index 00000000000..628cfab6468 --- /dev/null +++ b/app/preprints/-components/plaudit-widget/component.ts @@ -0,0 +1,6 @@ +import Component from '@glimmer/component'; +import config from 'ember-osf-web/config/environment'; + +export default class PlauditWidget extends Component { + plauditWidgetUrl = config.PLAUDIT_WIDGET_URL; +} diff --git a/app/preprints/-components/plaudit-widget/template.hbs b/app/preprints/-components/plaudit-widget/template.hbs new file mode 100644 index 00000000000..a2877ce8cb8 --- /dev/null +++ b/app/preprints/-components/plaudit-widget/template.hbs @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/app/preprints/-components/preprint-abstract/styles.scss b/app/preprints/-components/preprint-abstract/styles.scss new file mode 100644 index 00000000000..0bdc85e54a1 --- /dev/null +++ b/app/preprints/-components/preprint-abstract/styles.scss @@ -0,0 +1,3 @@ +.abstract-truncated::after { + content: ' \2026'; +} diff --git a/app/preprints/-components/preprint-abstract/template.hbs b/app/preprints/-components/preprint-abstract/template.hbs new file mode 100644 index 00000000000..f4a1eb5ecdd --- /dev/null +++ b/app/preprints/-components/preprint-abstract/template.hbs @@ -0,0 +1,6 @@ +
+

{{t 'preprints.detail.abstract'}}

+ + {{@preprint.description}} + +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-assertion-link/styles.scss b/app/preprints/-components/preprint-assertion-link/styles.scss new file mode 100644 index 00000000000..599de3ae056 --- /dev/null +++ b/app/preprints/-components/preprint-assertion-link/styles.scss @@ -0,0 +1,19 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.assertions-links { + list-style: none; + margin: 0; + padding: 0; + + li { + margin-bottom: 10px; + } + + & li > a { + color: $color-text-blue-dark; + + &:hover { + color: $color-text-blue-dark; + } + } +} diff --git a/app/preprints/-components/preprint-assertion-link/template.hbs b/app/preprints/-components/preprint-assertion-link/template.hbs new file mode 100644 index 00000000000..decb70cbebd --- /dev/null +++ b/app/preprints/-components/preprint-assertion-link/template.hbs @@ -0,0 +1,14 @@ +
    + {{#each @links as |href|}} +
  • + + {{href}} + +
    • + {{/each}} +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-author-assertions/component.ts b/app/preprints/-components/preprint-author-assertions/component.ts new file mode 100644 index 00000000000..66eef013c18 --- /dev/null +++ b/app/preprints/-components/preprint-author-assertions/component.ts @@ -0,0 +1,64 @@ +import Component from '@glimmer/component'; +import { inject as service } from '@ember/service'; +import Intl from 'ember-intl/services/intl'; +import PreprintModel from 'ember-osf-web/models/preprint'; +import Features from 'ember-feature-flags'; +import ProviderModel from 'ember-osf-web/models/provider'; +import { tracked } from '@glimmer/tracking'; + +interface InputArgs { + preprint: PreprintModel; + provider: ProviderModel; + documentType: string; +} + +export default class PreprintAuthorAssertions extends Component { + @service features!: Features; + @service intl!: Intl; + + @tracked displayCoi = false; + @tracked displayDataLinks = false; + @tracked displayPreregLinks = false; + + preprint = this.args.preprint; + provider = this.args.provider; + documentType = this.args.documentType; + + public get availableDataLinksMessage(): string { + const prefix = 'preprints.detail.author-assertions.available.'; + const suffix = this.preprint.hasDataLinks; + return this.intl.t(`${prefix}${suffix}`); + } + + public get availablePreregLinksMessage(): string { + const prefix = 'preprints.detail.author-assertions.available.'; + const suffix = this.preprint.hasPreregLinks; + return this.intl.t(`${prefix}${suffix}`); + + } + + public get shouldShowSloanIcons(): boolean { + return this.hasSloanData(); + } + + private hasSloanData(): boolean { + return this.hasCoi || this.hasDataLinks || this.hasPreregLinks; + } + + public get hasCoi(): boolean { + return this.preprint.hasCoi; + } + + public get hasCoiStatement(): boolean { + return typeof this.preprint.conflictOfInterestStatement === 'string'; + } + + public get hasDataLinks(): boolean { + return typeof this.preprint.hasDataLinks === 'string'; + } + + public get hasPreregLinks(): boolean { + return typeof this.preprint.hasPreregLinks === 'string'; + } +} + diff --git a/app/preprints/-components/preprint-author-assertions/styles.scss b/app/preprints/-components/preprint-author-assertions/styles.scss new file mode 100644 index 00000000000..1114790fb04 --- /dev/null +++ b/app/preprints/-components/preprint-author-assertions/styles.scss @@ -0,0 +1,50 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.author-assertions-page-container { + padding: 10px 0; + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + + .author-assertions-container { + width: calc(100% - 100px); + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + + .header-label { + font-size: 11px; + text-transform: uppercase; + padding-bottom: 2px; + font-weight: bold; + margin-bottom: 10px; + } + + .author-assertions { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + margin: 0 10px; + + .assertions-container { + justify-content: center; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + + .assertion-header-label { + font-size: 11px; + text-transform: uppercase; + padding-bottom: 2px; + font-weight: bold; + padding: 0 20px; + } + } + } + } +} diff --git a/app/preprints/-components/preprint-author-assertions/template.hbs b/app/preprints/-components/preprint-author-assertions/template.hbs new file mode 100644 index 00000000000..1f87b1e34d8 --- /dev/null +++ b/app/preprints/-components/preprint-author-assertions/template.hbs @@ -0,0 +1,142 @@ +{{#if this.shouldShowSloanIcons}} +
+
+
+ {{~t 'preprints.detail.author-assertions.header_label'~}} +
+
+ {{#if this.hasCoi}} +
+
+ {{~t 'preprints.detail.author-assertions.conflict_of_interest.title'~}} +
+ + + +

{{t 'preprints.detail.author-assertions.conflict_of_interest.title'}}

+ + +
+ {{#if this.hasCoiStatement}} + {{~this.preprint.conflictOfInterestStatement~}} + {{else}} + {{~t 'preprints.detail.author-assertions.conflict_of_interest.no'~}} + {{/if}} +
+ + +
+ {{/if}} + + {{#if this.hasDataLinks}} +
+
+ {{~t 'preprints.detail.author-assertions.public_data.title'~}} +
+
+ + + +

{{t 'preprints.detail.author-assertions.public_data.title'}}

+ + +
+ {{#if (eq this.preprint.hasDataLinks 'available')}} + + {{else if (eq this.preprint.hasDataLinks 'no')}} + {{#if this.preprint.whyNoData}} + {{this.preprint.whyNoData}} + {{else}} + {{~t 'preprints.detail.author-assertions.public_data.no'~}} + {{/if}} + {{else}} + {{~t 'preprints.detail.author-assertions.public_data.not_applicable' documentType=this.documentType~}} + {{/if}} +
+ + +
+
+ {{/if}} + + {{#if this.hasPreregLinks}} +
+
+ {{~t 'preprints.detail.author-assertions.prereg.title'~}} +
+
+ + + +

{{t 'preprints.detail.author-assertions.prereg.title'}}

+ + +
+ {{#if (eq this.preprint.hasPreregLinks 'available')}} + + {{else if (eq this.preprint.hasPreregLinks 'no')}} + {{#if this.preprint.whyNoPrereg}} + {{this.preprint.whyNoPrereg}} + {{else}} + {{~t 'preprints.detail.author-assertions.prereg.no'~}} + {{/if}} + {{else}} + {{~t 'preprints.detail.author-assertions.prereg.not_applicable' documentType=this.documentType~}} + {{/if}} +
+ + +
+
+ {{/if}} +
+
+
+{{/if}} \ No newline at end of file diff --git a/app/preprints/-components/preprint-discipline/component.ts b/app/preprints/-components/preprint-discipline/component.ts new file mode 100644 index 00000000000..50866809b2d --- /dev/null +++ b/app/preprints/-components/preprint-discipline/component.ts @@ -0,0 +1,15 @@ +import Component from '@glimmer/component'; +import SubjectModel from 'ember-osf-web/models/subject'; + +interface InputArgs { + subjects: SubjectModel[]; +} + +export default class PreprintDiscipline extends Component { + subjects = this.args.subjects; + + get disciplineReduced(): SubjectModel[] { + // Preprint disciplines are displayed in collapsed form on content page + return this.subjects.reduce((acc: SubjectModel[], val: SubjectModel) => acc.concat(val), []).uniqBy('id'); + } +} diff --git a/app/preprints/-components/preprint-discipline/styles.scss b/app/preprints/-components/preprint-discipline/styles.scss new file mode 100644 index 00000000000..4f580fce232 --- /dev/null +++ b/app/preprints/-components/preprint-discipline/styles.scss @@ -0,0 +1,8 @@ +.subject-preview { + display: inline-block; + background-color: $bg-light; + border-radius: 3px; + border: 1px solid $color-light; + padding: 1px 7px; + margin-bottom: 4px; +} diff --git a/app/preprints/-components/preprint-discipline/template.hbs b/app/preprints/-components/preprint-discipline/template.hbs new file mode 100644 index 00000000000..7de2e4725c9 --- /dev/null +++ b/app/preprints/-components/preprint-discipline/template.hbs @@ -0,0 +1,6 @@ +
+

{{t 'preprints.detail.disciplines'}}

+ {{#each this.disciplineReduced as |subject|}} + {{subject.text}} + {{/each}} +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-doi/component.ts b/app/preprints/-components/preprint-doi/component.ts new file mode 100644 index 00000000000..6ad155176a8 --- /dev/null +++ b/app/preprints/-components/preprint-doi/component.ts @@ -0,0 +1,14 @@ +import Component from '@glimmer/component'; +import PreprintModel from 'ember-osf-web/models/preprint'; +import PreprintProviderModel from 'ember-osf-web/models/preprint-provider'; + +interface InputArgs { + preprint: PreprintModel; + provider: PreprintProviderModel; +} + +export default class PreprintAbstract extends Component { + provider = this.args.provider; + + documentType = this.provider.documentType.singular; +} diff --git a/app/preprints/-components/preprint-doi/template.hbs b/app/preprints/-components/preprint-doi/template.hbs new file mode 100644 index 00000000000..55942ff37e3 --- /dev/null +++ b/app/preprints/-components/preprint-doi/template.hbs @@ -0,0 +1,23 @@ +
+

{{t 'preprints.detail.preprint_doi' documentType=this.documentType}}

+ {{#if @preprint.preprintDoiUrl}} + {{#if @preprint.preprintDoiCreated}} + + {{@preprint.preprintDoiUrl}} + + {{else}} +

{{@preprint.preprintDoiUrl}}

+

{{t 'preprints.detail.preprint_pending_doi_minted'}}

+ {{/if}} + {{else}} + {{#if (not @preprint.public)}} + {{t 'preprints.detail.preprint_pending_doi' documentType=this.documentType}} + {{else if (and this.provider.reviewsWorkflow (not this.preprint.isPublished))}} + {{t 'preprints.detail.preprint_pending_doi_moderation'}} + {{/if}} + {{/if}} +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-license/component.ts b/app/preprints/-components/preprint-license/component.ts new file mode 100644 index 00000000000..b29ae5e3e06 --- /dev/null +++ b/app/preprints/-components/preprint-license/component.ts @@ -0,0 +1,18 @@ +import { action } from '@ember/object'; +import Component from '@glimmer/component'; +import { tracked } from '@glimmer/tracking'; +import PreprintModel from 'ember-osf-web/models/preprint'; + +interface InputArgs { + preprint: PreprintModel; +} + +export default class PreprintLicense extends Component { + preprint = this.args.preprint; + @tracked showLicenseText = false; + + @action + toggleLicenseText(): void { + this.showLicenseText = !this.showLicenseText; + } +} diff --git a/app/preprints/-components/preprint-license/styles.scss b/app/preprints/-components/preprint-license/styles.scss new file mode 100644 index 00000000000..ddf500d88e3 --- /dev/null +++ b/app/preprints/-components/preprint-license/styles.scss @@ -0,0 +1,23 @@ +.license-text { + pre { + white-space: pre-wrap; + font-size: 75%; + width: 100%; + text-align: justify; + max-height: 300px; + word-break: normal; + overflow: auto; + display: block; + padding: 9.5px; + margin: 0 0 10px; + line-height: 1.42857; + word-wrap: break-word; + background-color: $bg-light; + border: 1px solid $color-shadow-gray-light; + border-radius: 4px; + } + + span { + cursor: pointer; + } +} diff --git a/app/preprints/-components/preprint-license/template.hbs b/app/preprints/-components/preprint-license/template.hbs new file mode 100644 index 00000000000..4830862ec35 --- /dev/null +++ b/app/preprints/-components/preprint-license/template.hbs @@ -0,0 +1,14 @@ +{{#if this.preprint.license.name}} +
+

{{t 'preprints.detail.license'}}

+ {{this.preprint.license.name}} + + + + {{#if this.showLicenseText}} + 
{{this.preprint.licenseText}}
+ {{/if}} +
+{{/if}} \ No newline at end of file diff --git a/app/preprints/-components/preprint-status-banner/component.ts b/app/preprints/-components/preprint-status-banner/component.ts new file mode 100644 index 00000000000..70964a9c612 --- /dev/null +++ b/app/preprints/-components/preprint-status-banner/component.ts @@ -0,0 +1,210 @@ +import Component from '@glimmer/component'; +import { inject as service } from '@ember/service'; +import Theme from 'ember-osf-web/services/theme'; +import Intl from 'ember-intl/services/intl'; +import PreprintModel from 'ember-osf-web/models/preprint'; +import { task } from 'ember-concurrency'; +import { waitFor } from '@ember/test-waiters'; +import { alias } from '@ember/object/computed'; +import PreprintRequestActionModel from 'ember-osf-web/models/preprint-request-action'; +import { taskFor } from 'ember-concurrency-ts'; +import PreprintProviderModel from 'ember-osf-web/models/preprint-provider'; +import { tracked } from '@glimmer/tracking'; +import { ReviewsState } from 'ember-osf-web/models/provider'; +import ReviewActionModel from 'ember-osf-web/models/review-action'; + +const UNKNOWN = 'unknown'; +const PENDING = 'pending'; +const ACCEPTED = 'accepted'; +const REJECTED = 'rejected'; +const PENDING_WITHDRAWAL = 'pendingWithdrawal'; +const WITHDRAWAL_REJECTED = 'withdrawalRejected'; +const WITHDRAWN = 'withdrawn'; + +const PRE_MODERATION = 'pre-moderation'; +const POST_MODERATION = 'post-moderation'; + +const STATUS = Object({}); +STATUS[PENDING]= 'preprints.detail.status_banner.pending'; +STATUS[ACCEPTED]= 'preprints.detail.status_banner.accepted'; +STATUS[REJECTED]= 'preprints.detail.status_banner.rejected'; +STATUS[PENDING_WITHDRAWAL]= 'preprints.detail.status_banner.pending_withdrawal'; +STATUS[WITHDRAWAL_REJECTED]= 'preprints.detail.status_banner.withdrawal_rejected'; + +const MESSAGE = Object({}); +MESSAGE[PRE_MODERATION] = 'preprints.detail.status_banner.message.pending_pre'; +MESSAGE[POST_MODERATION] = 'preprints.detail.status_banner.message.pending_post'; +MESSAGE[ACCEPTED] = 'preprints.detail.status_banner.message.accepted'; +MESSAGE[REJECTED] = 'preprints.detail.status_banner.message.rejected'; +MESSAGE[PENDING_WITHDRAWAL] = 'preprints.detail.status_banner.message.pending_withdrawal'; +MESSAGE[WITHDRAWAL_REJECTED] = 'preprints.detail.status_banner.message.withdrawal_rejected'; +MESSAGE[WITHDRAWN] = 'preprints.detail.status_banner.message.withdrawn'; +MESSAGE[UNKNOWN] = 'preprints.detail.status_banner.message.withdrawn'; + +const WORKFLOW = Object({}); +WORKFLOW[PRE_MODERATION] = 'preprints.detail.status_banner.pre_moderation'; +WORKFLOW[POST_MODERATION] = 'preprints.detail.status_banner.post_moderation'; +WORKFLOW[UNKNOWN] = 'preprints.detail.status_banner.post_moderation'; + +const CLASS_NAMES = Object({}); +CLASS_NAMES[PRE_MODERATION] = 'preprint-status-pending-pre'; +CLASS_NAMES[POST_MODERATION] = 'preprint-status-pending-post'; +CLASS_NAMES[ACCEPTED] = 'preprint-status-accepted'; +CLASS_NAMES[REJECTED] = 'preprint-status-rejected'; +CLASS_NAMES[PENDING_WITHDRAWAL] = 'preprint-status-rejected'; +CLASS_NAMES[WITHDRAWAL_REJECTED] = 'preprint-status-rejected'; +CLASS_NAMES[WITHDRAWN] = 'preprint-status-withdrawn'; +CLASS_NAMES[UNKNOWN] = 'preprint-status-withdrawn'; + +const ICONS = Object({}); +ICONS[PENDING] = 'hourglass'; +ICONS[ACCEPTED] = 'check-circle'; +ICONS[REJECTED] = 'times-circle'; +ICONS[PENDING_WITHDRAWAL] = 'hourglass'; +ICONS[WITHDRAWAL_REJECTED] = 'times-circle'; +ICONS[WITHDRAWN] = 'exclamation-triangle'; +ICONS[UNKNOWN] = 'exclamation-triangle'; + +interface InputArgs { + submission: PreprintModel; +} + +export default class PreprintStatusBanner extends Component{ + @service intl!: Intl; + @service theme!: Theme; + + submission = this.args.submission; + isWithdrawn = this.args.submission.isWithdrawn; + + provider: PreprintProviderModel | undefined; + + @tracked displayComment = false; + isPendingWithdrawal = false; + isWithdrawalRejected = false; + + // translations + labelModeratorFeedback = 'preprints.detail.status_banner.feedback.moderator_feedback'; + moderator = 'preprints.detail.status_banner.feedback.moderator'; + baseMessage = 'preprints.detail.status_banner.message.base'; + + latestAction: PreprintRequestActionModel | ReviewActionModel | undefined; + + @alias('latestAction.comment') reviewerComment: string | undefined; + @alias('latestAction.creator.fullName') reviewerName: string | undefined; + + constructor(owner: unknown, args: InputArgs) { + super(owner, args); + + taskFor(this.loadPreprintState).perform(); + } + + public get getClassName(): string { + if (this.isPendingWithdrawal) { + return CLASS_NAMES[PENDING_WITHDRAWAL]; + } else if (this.isWithdrawn) { + return CLASS_NAMES[WITHDRAWN]; + } else if (this.isWithdrawalRejected) { + return CLASS_NAMES[WITHDRAWAL_REJECTED]; + } else { + return this.submission.reviewsState === PENDING ? + CLASS_NAMES[this.provider?.reviewsWorkflow || UNKNOWN] : + CLASS_NAMES[this.submission.reviewsState]; + } + } + + public get bannerContent(): string { + if (this.isPendingWithdrawal) { + return this.intl.t(this.statusExplanation, { documentType: this.provider?.documentType.singular }); + } else if (this.isWithdrawn) { + return this.intl.t(MESSAGE[WITHDRAWN], { documentType: this.provider?.documentType.singular }); + } else if (this.isWithdrawalRejected) { + return this.intl.t(MESSAGE[WITHDRAWAL_REJECTED], { documentType: this.provider?.documentType.singular }); + } else { + const tName = this.theme.isProvider ? + this.theme.provider?.name : + this.intl.t('preprints.detail.status_banner.brand_name'); + const tWorkflow = this.intl.t(this.workflow); + const tStatusExplanation = this.intl.t(this.statusExplanation); + const base = (this.intl.t(this.baseMessage, { + name: tName, + reviewsWorkflow: + tWorkflow, + documentType: this.provider?.documentType.singular, + })); + return `${base} ${tStatusExplanation}`; + } + } + + private get statusExplanation(): string { + if (this.isPendingWithdrawal) { + return MESSAGE[PENDING_WITHDRAWAL]; + } else if (this.isWithdrawalRejected) { + return MESSAGE[WITHDRAWAL_REJECTED]; + } else { + return this.submission.reviewsState === PENDING ? + MESSAGE[this.provider?.reviewsWorkflow || UNKNOWN ] : + MESSAGE[this.submission.reviewsState]; + } + } + + public get status(): string { + let currentState = this.submission.reviewsState; + if (this.isPendingWithdrawal) { + currentState = ReviewsState.PENDING_WITHDRAWAL; + } else if (this.isWithdrawalRejected) { + currentState = ReviewsState.WITHDRAWAL_REJECTED; + } + return STATUS[currentState]; + } + + public get icon(): string { + let currentState = this.submission.reviewsState; + if (this.isPendingWithdrawal) { + currentState = ReviewsState.PENDING_WITHDRAWAL; + } else if (this.isWithdrawalRejected) { + currentState = ReviewsState.WITHDRAWAL_REJECTED; + } else if (this.isWithdrawn) { + currentState = ReviewsState.WITHDRAWN; + } + return ICONS[currentState]; + } + + private get workflow(): string { + return WORKFLOW[this.provider?.reviewsWorkflow || UNKNOWN]; + } + + @task + @waitFor + async loadPreprintState() { + this.provider = await this.submission.provider; + + if (this.isWithdrawn) { + return; + } + const submissionActions = await this.submission.reviewActions; + const latestSubmissionAction = submissionActions.firstObject; + const withdrawalRequests = await this.submission.requests; + const withdrawalRequest = withdrawalRequests.firstObject; + if (withdrawalRequest) { + const requestActions = await withdrawalRequest.queryHasMany('actions', { + sort: '-modified', + }); + + const latestRequestAction = requestActions.firstObject; + if (latestRequestAction && latestRequestAction.actionTrigger === 'reject') { + this.isWithdrawalRejected = true; + this.latestAction = latestRequestAction; + return; + } else { + this.isPendingWithdrawal = true; + return; + } + } + + if (this.provider.reviewsCommentsPrivate) { + return; + } + + this.latestAction = latestSubmissionAction; + } +} diff --git a/app/preprints/-components/preprint-status-banner/styles.scss b/app/preprints/-components/preprint-status-banner/styles.scss new file mode 100644 index 00000000000..b073d71ed37 --- /dev/null +++ b/app/preprints/-components/preprint-status-banner/styles.scss @@ -0,0 +1,132 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +$color-alert-bg-warning: #fcf8e3; +$color-alert-border-warning: #faebcc; +$color-alert-text-warning: #8a6d3b; + +$color-alert-bg-success: #dff0d8; +$color-alert-border-success: #d6e9c6; +$color-alert-text-success: #3c763d; + +$color-alert-bg-danger: #f2dede; +$color-alert-border-danger: #ebccd1; +$color-alert-text-danger: #a94442; + +$color-alert-bg-info: #d9edf7; +$color-alert-border-info: #bce8f1; +$color-alert-text-info: #31708f; + +$color-bg-color-grey: #333; +$color-bg-color-light: #eee; +$color-border-light: #ddd; + +.preprint-status-pending-pre { + background-color: $color-alert-bg-warning; + border: 1px solid $color-alert-border-warning; + color: $color-alert-text-warning; + + .status-icon { + -webkit-text-stroke: 1px $color-alert-text-warning; + font-size: 14px; + } +} + +.preprint-status-pending-post { + background-color: $color-alert-bg-info; + border: 1px solid $color-alert-border-info; + color: $color-alert-text-info; + + .status-icon { + -webkit-text-stroke: 1px $color-alert-text-info; + font-size: 14px; + } +} + +.preprint-banner-status-container { + height: 75px; + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + font-size: 16px; + + .preprint-banner-status { + height: 75px; + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + font-size: 16px; + + &.preprint-status-accepted { + background-color: $color-alert-bg-success; + border: 1px solid $color-alert-border-success; + color: $color-alert-text-success; + + .status-icon { + -webkit-text-stroke: 0; + font-size: 16px; + } + } + + &.preprint-status-rejected { + background-color: $color-alert-bg-danger; + border: 1px solid $color-alert-border-danger; + color: $color-alert-text-danger; + + .status-icon { + -webkit-text-stroke: 0; + font-size: 16px; + } + } + + &.preprint-status-withdrawn { + background-color: $color-alert-bg-warning; + border: 1px solid $color-alert-border-warning; + color: $color-alert-text-warning; + + .status-icon { + -webkit-text-stroke: 1px $color-alert-text-warning; + font-size: 14px; + } + } + + .display-container { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + padding: 10px; + + .reviewer-feedback { + margin-left: 15px; + + } + } + } +} + +.status-banner-dialog { + .status { + font-size: 1.4em; + + strong { + display: inline-block; // required for the text-transform + } + + strong::first-letter { + text-transform: uppercase; + } + } + + .moderator-comment { + font-size: 1.8em; + padding: 30px 15px; + + p { + padding-bottom: 5px; + } + } +} diff --git a/app/preprints/-components/preprint-status-banner/template.hbs b/app/preprints/-components/preprint-status-banner/template.hbs new file mode 100644 index 00000000000..6c766957af1 --- /dev/null +++ b/app/preprints/-components/preprint-status-banner/template.hbs @@ -0,0 +1,58 @@ +
+ {{#if (or this.submission.provider?.isPending this.loadPreprintState.isRunning) }} + {{ t 'preprints.detail.status_banner.loading' }} + {{else}} +
+
+ {{#if this.isWithdrawn}} +
+
+ {{else}} +
+
+ {{#if (and this.reviewerComment (not this.submission.provider.reviewsCommentsPrivate))}} +
+ + + +

{{t this.labelModeratorFeedback }}

+ + +
+ {{t this.status}} +
+
+

{{this.reviewerComment}}

+ {{#unless this.submission.provider.reviewsCommentsAnonymous}} +
{{this.reviewerName}}
+ {{/unless}} + {{if this.theme.isProvider this.theme.provider.name (t 'preprints.detail.status_banner.brand_name')}} {{t this.moderator}} +
+ + +
+ {{/if}} + {{/if}} +
+
+ {{/if}} +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-tag/styles.scss b/app/preprints/-components/preprint-tag/styles.scss new file mode 100644 index 00000000000..c49c0eaaaa8 --- /dev/null +++ b/app/preprints/-components/preprint-tag/styles.scss @@ -0,0 +1,8 @@ +.badge { + display: inline-block; + background-color: $bg-light; + border-radius: 3px; + border: 1px solid $color-light; + padding: 1px 7px; + margin-bottom: 4px; +} diff --git a/app/preprints/-components/preprint-tag/template.hbs b/app/preprints/-components/preprint-tag/template.hbs new file mode 100644 index 00000000000..f394e021d98 --- /dev/null +++ b/app/preprints/-components/preprint-tag/template.hbs @@ -0,0 +1,10 @@ +
+

{{t 'preprints.detail.tags'}}

+ {{#if @preprint.tags.length}} + {{#each @preprint.tags as |tag|}} + {{tag}} + {{/each}} + {{else}} + {{t 'preprints.detail.none'}} + {{/if}} +
\ No newline at end of file diff --git a/app/preprints/-components/preprint-tombstone/styles.scss b/app/preprints/-components/preprint-tombstone/styles.scss new file mode 100644 index 00000000000..b0e955fa4d4 --- /dev/null +++ b/app/preprints/-components/preprint-tombstone/styles.scss @@ -0,0 +1,16 @@ +.withdrawn-container { + padding: 0 15px; + width: 100%; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + + h4 { + padding-bottom: 15px; + padding-top: 15px; + margin-top: 10px; + margin-bottom: 10px; + font-weight: bold; + } +} diff --git a/app/preprints/-components/preprint-tombstone/template.hbs b/app/preprints/-components/preprint-tombstone/template.hbs new file mode 100644 index 00000000000..d29d1c4eba1 --- /dev/null +++ b/app/preprints/-components/preprint-tombstone/template.hbs @@ -0,0 +1,15 @@ +
+ {{#if @preprint.withdrawalJustification}} +
+

{{t 'preprints.detail.reason_for_withdrawal'}}

+

+ {{@preprint.withdrawalJustification}} +

+
+ {{/if}} + + + + + +
\ No newline at end of file diff --git a/app/preprints/-components/taxonomy-top-list/component.ts b/app/preprints/-components/taxonomy-top-list/component.ts new file mode 100644 index 00000000000..da20db0b30f --- /dev/null +++ b/app/preprints/-components/taxonomy-top-list/component.ts @@ -0,0 +1,92 @@ +import Component from '@glimmer/component'; +import SubjectModel from 'ember-osf-web/models/subject'; +import Media from 'ember-responsive'; +import { inject as service } from '@ember/service'; + +interface InputArgs { + list: SubjectModel[]; + provider: string; +} + +interface PairModel { + queryParam: object; + text: string; +} + +export default class TaxonomyTopList extends Component { + @service media!: Media; + + provider = this.args.provider; + + get isMobile(): boolean { + return this.media.isMobile; + } + + get sortedList() { + if (!this.args.list) { + return; + } + const sortedList = this.args.list.sortBy('text'); + const pairedList = [] as PairModel[][]; + + if (this.isMobile) { + for (let i = 0; i < sortedList.get('length'); i += 1) { + const pair: PairModel[] = []; + const subject= sortedList.objectAt(i) as SubjectModel; + pair.pushObject({ + queryParam: { + activeFilters: [{ + propertyVisibleLabel:'Subject', + propertyPathKey:'subject', + label:subject.text, + value: subject?.links?.iri, + }], + }, + text: subject?.text, + } as PairModel); + pairedList.pushObject(pair); + } + } else { + for (let i = 0; i < sortedList.get('length'); i += 2) { + const pair: PairModel[] = []; + // path in pair needs to be a list because that's what the + // subject param in the discover controller is expecting + const subjectOdd = sortedList.objectAt(i) as SubjectModel; + pair.pushObject({ + queryParam: { + activeFilters: [{ + propertyVisibleLabel:'Subject', + propertyPathKey:'subject', + label:subjectOdd.text, + value: subjectOdd?.links?.iri, + }], + }, + text: subjectOdd?.text, + } as PairModel); + + if (sortedList.objectAt(i + 1)) { + const subjectEven = sortedList.objectAt(i + 1) as SubjectModel; + pair.pushObject({ + queryParam: { + activeFilters: [{ + propertyVisibleLabel:'Subject', + propertyPathKey:'subject', + label:subjectEven.text, + value: subjectEven?.links?.iri, + }], + }, + text: subjectEven?.text, + }); + } + pairedList.pushObject(pair); + } + + } + + if (pairedList.length > 0 && typeof this.args.provider !== 'string') { + throw new Error('A provider string must be provided with a valid list'); + } + + return pairedList; + } +} diff --git a/app/preprints/-components/taxonomy-top-list/styles.scss b/app/preprints/-components/taxonomy-top-list/styles.scss new file mode 100644 index 00000000000..4991ca1c5bf --- /dev/null +++ b/app/preprints/-components/taxonomy-top-list/styles.scss @@ -0,0 +1,57 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.subject-container { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; + margin-bottom: 10px; + + .subject-item { + width: calc(50% - 20px); + + .btn { + display: inline-block; + margin-bottom: 0; + font-weight: 400; + text-align: center; + white-space: nowrap; + touch-action: manipulation; + cursor: pointer; + background-image: none; + border: 1px solid transparent; + border-radius: 2px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857; + user-select: none; + vertical-align: middle; + color: $color-text-white; + } + + .subject-button { + width: 100%; + font-size: 17px; + overflow: hidden; + text-overflow: ellipsis; + background-color: var(--primary-color); + color: var(--secondary-color); + border: 1px solid var(--secondary-color); + + &:hover { + color: var(--primary-color); + background-color: var(--secondary-color); + border: 1px solid var(--primary-color); + } + } + } + + &.mobile { + flex-direction: column; + + .subject-item { + width: 100%; + } + } +} diff --git a/app/preprints/-components/taxonomy-top-list/template.hbs b/app/preprints/-components/taxonomy-top-list/template.hbs new file mode 100644 index 00000000000..897d2dc9630 --- /dev/null +++ b/app/preprints/-components/taxonomy-top-list/template.hbs @@ -0,0 +1,18 @@ +{{#each this.sortedList as |pair|}} +
+ {{#each pair as |subject|}} +
+ + {{subject.text}} + +
+ {{/each}} +
+{{/each}} diff --git a/app/preprints/detail/controller.ts b/app/preprints/detail/controller.ts new file mode 100644 index 00000000000..620245f4f34 --- /dev/null +++ b/app/preprints/detail/controller.ts @@ -0,0 +1,134 @@ +import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import { inject as service } from '@ember/service'; +import config from 'ember-osf-web/config/environment'; +import Theme from 'ember-osf-web/services/theme'; +import CurrentUserService from 'ember-osf-web/services/current-user'; +import Features from 'ember-feature-flags'; +import ContributorModel from 'ember-osf-web/models/contributor'; +import Intl from 'ember-intl/services/intl'; +import { Permission } from 'ember-osf-web/models/osf-model'; +import { ReviewsState, PreprintProviderReviewsWorkFlow } from 'ember-osf-web/models/provider'; +import { tracked } from '@glimmer/tracking'; +import Media from 'ember-responsive'; + + +/** + * Takes an object with query parameter name as the key and value, + * or [value, maxLength] as the values. + * + * @method queryStringify + * @param queryParams {!object} + * @param queryParams.key {!array|!string} + * @param queryParams.key[0] {!string} + * @param queryParams.key[1] {int} + * @return {string} + */ + +const DATE_LABEL = { + created: 'preprints.detail.date_label.created_on', + submitted: 'preprints.detail.date_label.submitted_on', +}; + +/** + * @module ember-preprints + * @submodule controllers + */ + +/** + * @class Content Controller + */ +export default class PrePrintsDetailController extends Controller { + @service theme!: Theme; + @service currentUser!: CurrentUserService; + @service features!: Features; + @service intl!: Intl; + @service media!: Media; + + @tracked fullScreenMFR = false; + + metricsStartDate = config.OSF.metricsStartDate; + + get hyperlink(): string { + return window.location.href; + } + + get fileDownloadUrl(): string { + const version = this.model.primaryFile.version; + const path = `${this.model.preprint.id}/download/?`; + return `${config.OSF.url}${path}${version ? `version=${version}` : ''}`.replace(/[&?]$/, ''); + } + + get facebookAppId(): string { + return this.model.provider.facebookAppId ? this.model.provider.facebookAppId : config.FB_APP_ID; + } + + get dateLabel(): string { + return this.model.provider.reviewsWorkflow === PreprintProviderReviewsWorkFlow.PRE_MODERATION ? + DATE_LABEL.submitted : + DATE_LABEL.created; + } + + get editButtonLabel(): string { + const editPreprint = 'preprints.detail.project_button.edit_preprint'; + const editResubmitPreprint = 'preprints.detail.project_button.edit_resubmit_preprint'; + const translation = this.model.provider.reviewsWorkflow === PreprintProviderReviewsWorkFlow.PRE_MODERATION + && this.model.preprint.reviewsState === ReviewsState.REJECTED && this.isAdmin() + ? editResubmitPreprint : editPreprint; + return this.intl.t(translation, { + documentType: this.model.provider.documentType.singular, + }); + } + + private isAdmin(): boolean { + // True if the current user has admin permissions for the node that contains the preprint + return (this.model.preprint.currentUserPermissions).includes(Permission.Admin); + } + + get userIsContrib(): boolean { + if (this.isAdmin()) { + return true; + } else if (this.model.contributors.length) { + const authorIds = [] as string[]; + this.model.contributors.forEach((author: ContributorModel) => { + authorIds.push(author.id); + }); + return this.currentUser.currentUserId ? authorIds.includes(this.currentUser.currentUserId) : false; + } + return false; + } + + get showStatusBanner(): boolean { + return ( + this.model.provider.reviewsWorkflow + && this.model.preprint.public + && this.userIsContrib + && this.model.preprint.reviewsState !== ReviewsState.INITIAL + && !this.model.preprint.isPreprintOrphan + ); + } + + get authors(): ContributorModel[] { + return this.model.contributors; + } + + emailHref(): string { + const titleEncoded = encodeURIComponent(this.model.title); + const hrefEncoded = encodeURIComponent(window.location.href); + return `mailto:?subject=${titleEncoded}&body=${hrefEncoded}`; + } + + @action + expandMFR() { + this.fullScreenMFR = !this.fullScreenMFR; + } + + @action + trackNonContributors(category: string, label: string, url: string): void { + this.send('click', category, label, url); + } + + get isMobile() { + return this.media.isMobile; + } +} diff --git a/app/preprints/detail/route.ts b/app/preprints/detail/route.ts new file mode 100644 index 00000000000..d137f76bee5 --- /dev/null +++ b/app/preprints/detail/route.ts @@ -0,0 +1,72 @@ +import Store from '@ember-data/store'; +import Route from '@ember/routing/route'; +import RouterService from '@ember/routing/router-service'; +import { inject as service } from '@ember/service'; +import Theme from 'ember-osf-web/services/theme'; +import captureException from 'ember-osf-web/utils/capture-exception'; + +/** + * @module ember-preprints + * @submodule routes + */ + +/** + * @class Content Route Handler + */ + + +/** + * Loads all disciplines and preprint providers to the index page + * @class Index Route Handler + */ +export default class PreprintsDetail extends Route { + @service store!: Store; + @service theme!: Theme; + @service router!: RouterService; + + async model(params: { guid : string }) { + try { + const guid = params.guid; + + const preprint = await this.store.findRecord('preprint', guid, { + adapterOptions: { + query: { + 'metrics[views]': 'total', + 'metrics[downloads]': 'total', + }, + }, + }); + + const provider = await preprint?.get('provider'); + + const primaryFile = await preprint?.get('primaryFile'); + + this.theme.set('providerType', 'preprint'); + this.theme.set('id', provider.id); + + const contributors = await preprint?.queryHasMany('contributors'); + + const license = await preprint?.get('license'); + + const node = await preprint?.get('node'); + + const subjects = await preprint?.queryHasMany('subjects'); + + return { + preprint, + brand: provider.brand.content, + contributors, + provider, + primaryFile, + license, + subjects, + node, + }; + + } catch (error) { + captureException(error); + this.router.transitionTo('not-found', 'preprints'); + return null; + } + } +} diff --git a/app/preprints/detail/styles.scss b/app/preprints/detail/styles.scss new file mode 100644 index 00000000000..1dc21d829ca --- /dev/null +++ b/app/preprints/detail/styles.scss @@ -0,0 +1,260 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.preprints-details-page-container { + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + .btn { + display: inline-block; + margin-bottom: 0; + font-weight: 400; + text-align: center; + white-space: nowrap; + touch-action: manipulation; + cursor: pointer; + background-image: none; + border: 1px solid transparent; + border-radius: 2px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857; + user-select: none; + vertical-align: middle; + color: $color-text-white; + } + + .btn-primary { + color: $color-text-white; + background-color: $color-bg-blue-dark; + border-color: #2e6da4; + } + + .header-container { + padding: 30px 0; + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + color: $color-text-white; + background: var(--hero-background-img-url); + + .preprint-author-container, + .preprint-title-container { + width: calc(100% - 100px); + padding-top: 20px; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + + .view-authors { + color: $color-text-white; + padding-bottom: 15px; + + a { + color: #6dd1de; + } + + .detail-header-label { + font-size: 11px; + text-transform: uppercase; + padding-bottom: 2px; + } + } + } + } + + .data-container { + padding: 30px; + width: 100%; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; + + .withdrawn-container { + padding: 0 15px; + width: 100%; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + } + + .data-container-left, + .data-container-right { + padding: 0 15px; + width: 50%; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + } + + .data-container-left { + height: 1150px; + + &.expanded { + width: 100%; + } + + &.collapsed { + width: 50%; + } + + .file-description-container { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; + width: 100%; + padding-top: 15px; + + .file-description { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; + width: 75%; + } + + .toggle-button { + width: 25%; + min-width: 100px; + display: flex; + justify-content: flex-end; + align-items: flex-start; + } + } + } + + .withdrawn-container, + .data-container-right { + height: 100%; + + h4 { + padding-bottom: 15px; + padding-top: 15px; + margin-top: 10px; + margin-bottom: 10px; + font-weight: bold; + } + + .plaudit-container { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + width: 100%; + min-height: 90px; + + .plaudit { + width: calc(100% - 145px); + padding-right: 30px; + } + + .sharing-icons { + font-size: 1.5rem; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; + width: 145px; + } + } + + .download-container { + background-color: $bg-light; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 100%; + padding: 10px; + } + } + } + + &.mobile { + .header-container { + padding: 0; + flex-direction: column; + + .preprint-author-container, + .preprint-title-container { + width: 100%; + padding: 0 10px; + } + } + + .data-container { + padding: 10px; + flex-direction: column; + justify-content: flex-start; + align-items: center; + + .data-container-left, + .data-container-right { + width: 100%; + padding: 0; + } + + .data-container-left { + height: 481px; + + .file-description-container { + flex-direction: column; + justify-content: flex-start; + margin-bottom: 20px; + + & > div { + margin-top: 10px; + } + + .file-description { + width: 100%; + flex-direction: column; + } + + .toggle-button { + width: 100%; + align-items: flex-end; + } + } + } + + .data-container-right { + .download-container { + flex-direction: column; + align-items: flex-start; + + & > div { + margin-top: 10px; + } + } + + .plaudit-container { + flex-direction: column; + align-items: flex-start; + + .plaudit { + width: 100%; + padding-right: 0; + height: 90px; + } + + .sharing-icons { + padding: 10px; + justify-content: space-between; + align-items: flex-start; + width: 145px; + } + } + } + } + } +} diff --git a/app/preprints/detail/template.hbs b/app/preprints/detail/template.hbs new file mode 100644 index 00000000000..043a1b35323 --- /dev/null +++ b/app/preprints/detail/template.hbs @@ -0,0 +1,199 @@ +{{page-title this.model.preprint.title replace=false}} + + +
+
+
+

{{this.model.preprint.title}}

+ {{#unless this.model.preprint.isWithdrawn}} +
+ {{#if (and this.userIsContrib (not this.isPendingWithdrawal))}} + + {{this.editButtonLabel}} + + + {{/if}} +
+
+ {{/unless}} +
+
+
+
+ {{t 'preprints.detail.header.authors_label'}} +
+ +
+
+ +
+ {{#if (or this.showStatusBanner this.isWithdrawn)}} + + {{/if}} +
+ {{#if this.model.preprint.isWithdrawn}} + + {{else}} +
+ {{#if this.model.preprint.isPreprintOrphan}} + + {{t 'preprints.detail.orphan_preprint'}} + + {{else}} + {{#if this.model.preprint.public}} + +
+
+
{{t this.dateLabel}}: {{moment-format this.model.dateCreated 'MMMM DD, YYYY'}}
+ {{#unless this.isMobile}} +
|
+ {{/unless}} + {{#if this.isWithdrawn}} +
{{t 'preprints.detail.header.withdrawn_on'}}: {{moment-format this.model.preprint.dateWithdrawn 'MMMM DD, YYYY'}}
+ {{else}} +
{{t 'preprints.detail.header.last_edited'}}: {{moment-format this.model.preprint.dateModified 'MMMM DD, YYYY'}}
+ {{/if}} +
+ {{#unless this.isMobile}} +
+ +
+ {{/unless}} +
+ {{else}} + + {{t 'preprints.detail.private_preprint_warning' documentType=this.model.provider.documentType.singular supportEmail='support@osf.io'}} + + {{/if}} + {{/if}} +
+ {{#unless this.fullScreenMFR }} +
+
+
+ + {{t 'preprints.detail.share.download' documentType=this.model.provider.documentType.singular}} + +
+
+ {{t 'preprints.detail.share.views'}}: {{this.model.preprint.apiMeta.metrics.views}} | {{t 'preprints.detail.share.downloads'}}: {{this.model.preprint.apiMeta.metrics.downloads}} + + {{t 'preprints.detail.share.metrics_disclaimer'}} {{moment-format this.metricsStartDate 'YYYY-MM-DD'}} + +
+
+
+
+ +
+ +
+ {{links.email}} +
+
+ {{links.twitter}} +
+
+ {{links.facebook}} +
+
+ {{links.linkedIn}} +
+ +
+ + {{#if this.model.node}} +
+

{{t 'preprints.detail.supplemental_materials'}}

+ + {{this.model.node.links.html}} + + +
+ {{/if}} + + {{#if this.model.preprint.articleDoiUrl}} +
+

{{t 'preprints.detail.article_doi'}}

+ + {{this.model.preprint.articleDoiUrl}} + +
+ {{/if}} + + + + {{#if this.model.preprint.originalPublicationDate}} +
+

{{t 'preprints.detail.original_publication_date'}}

+

+ {{moment-format this.model.preprint.originalPublicationDate 'YYYY-MM-DD'}} +

+
+ {{/if}} +
+

{{t 'preprints.detail.citations'}}

+ +
+
+ {{/unless}} + {{/if}} +
+
diff --git a/app/preprints/index/controller.ts b/app/preprints/index/controller.ts new file mode 100644 index 00000000000..8f6b536033a --- /dev/null +++ b/app/preprints/index/controller.ts @@ -0,0 +1,42 @@ +import Store from '@ember-data/store'; +import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import RouterService from '@ember/routing/router-service'; +import { inject as service } from '@ember/service'; +import Theme from 'ember-osf-web/services/theme'; +import Media from 'ember-responsive'; +import Intl from 'ember-intl/services/intl'; + +export default class Preprints extends Controller { + @service store!: Store; + @service theme!: Theme; + @service router!: RouterService; + @service media!: Media; + @service intl!: Intl; + + get isMobile(): boolean { + return this.media.isMobile; + } + + get isOsf(): boolean { + return this.theme?.provider?.id === 'osf'; + } + + @action + onSearch(query: string) { + let route = 'search'; + + if (this.theme.isSubRoute) { + route = 'provider.discover'; + } + + this.router.transitionTo(route, { queryParams: { q: query } }); + } + + get supportEmail(): string { + const { isProvider, provider } = this.theme; + + // eslint-disable-next-line max-len + return `mailto:${isProvider && provider && provider.emailSupport ? provider.emailSupport : this.intl.t('contact.email')}`; + } +} diff --git a/app/preprints/index/route.ts b/app/preprints/index/route.ts new file mode 100644 index 00000000000..5d3b73376eb --- /dev/null +++ b/app/preprints/index/route.ts @@ -0,0 +1,53 @@ +import Store from '@ember-data/store'; +import Route from '@ember/routing/route'; +import RouterService from '@ember/routing/router-service'; +import { inject as service } from '@ember/service'; +import Theme from 'ember-osf-web/services/theme'; +import captureException from 'ember-osf-web/utils/capture-exception'; + +/** + * Loads all disciplines and preprint providers to the index page + * @class Index Route Handler + */ +export default class Preprints extends Route { + @service store!: Store; + @service theme!: Theme; + @service router!: RouterService; + + async model(params: { provider_id : string }) { + try { + const provider_id = params.provider_id ? params.provider_id : 'osf'; + + const provider = await this.store.findRecord('preprint-provider', provider_id, { + include: 'brand', + }); + this.theme.set('providerType', 'preprint'); + this.theme.set('id', provider_id); + + const taxonomies = await this.theme.provider?.queryHasMany('highlightedSubjects', { + page: { + size: 20, + }, + }); + + let brandedProviders = []; + + if (this.theme.id === 'osf') { + const allProviders = await this.store.findAll('preprint-provider', { reload: true }); + brandedProviders = allProviders.filter(item => item.id !== 'osf'); + } + + return { + provider, + taxonomies, + brandedProviders, + brand: provider.brand.content, + }; + + } catch (error) { + captureException(error); + this.router.transitionTo('not-found', 'preprints'); + return null; + } + } +} diff --git a/app/preprints/index/styles.scss b/app/preprints/index/styles.scss new file mode 100644 index 00000000000..e90e5bd0d33 --- /dev/null +++ b/app/preprints/index/styles.scss @@ -0,0 +1,213 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.preprints-page-container { + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + .preprint-header { + border-bottom: 1px solid var(--primary-color); + width: 100%; + background-color: var(--secondary-color); + color: var(--primary-color) !important; + + a:not(.btn) { + color: var(--primary-color); + text-decoration: underline; + } + + .description { + color: var(--primary-color); + } + + .submit-container { + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + color: var(--primary-color); + + .or-container { + font-size: 21px; + margin-bottom: 20px; + font-weight: 300; + line-height: 1.4; + color: $color-text-white; + + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + .example-container { + display: flex; + justify-content: center; + align-items: center; + width: 100%; + margin-top: 25px; + } + } + } + + /* Subject Panel */ + .preprint-subjects-container { + background-color: $color-bg-gray-lighter; + border-bottom: 1px solid #6d8a98; + padding: 15px 0; + width: 100%; + flex-direction: column; + display: flex; + justify-content: center; + align-items: center; + + .preprint-subjects-inner-container { + background-color: $color-bg-gray-lighter; + padding: 0 30px; + width: calc(100% - 60px); + flex-direction: column; + display: flex; + justify-content: flex-start; + align-items: flex-start; + + .subject-list-container { + padding: 25px; + width: 100%; + flex-direction: column; + display: flex; + justify-content: flex-start; + align-items: flex-start; + } + } + } + + /* Preprint providers and become provider */ + .preprint-tool-container { + background: var(--hero-background-img-url); + color: $color-text-white; + text-shadow: 0 0 5px #506069; + background-size: cover; + padding: 15px 0; + min-width: 100%; + min-height: 100%; + width: 100%; + flex-direction: column; + display: flex; + justify-content: center; + align-items: center; + + .preprint-tool-inner-container { + padding-right: 30px; + padding-left: 30px; + width: calc(100% - 60px); + flex-direction: column; + display: flex; + justify-content: flex-start; + align-items: flex-start; + + .subtitle { + margin-bottom: 25px; + } + + .preprint-contact-container, + .preprint-logos-container { + padding: 25px; + width: 100%; + flex-direction: row; + flex-wrap: wrap; + display: flex; + justify-content: center; + align-items: flex-start; + + .provider-logo { + width: 150px; + height: 75px; + background-size: contain; + background-repeat: no-repeat; + background-position: center; + margin: 15px; + } + } + + .preprint-contact-container { + flex-direction: column; + align-items: center; + + .lead { + font-size: 21px; + line-height: 1.4; + font-weight: 300; + padding-bottom: 10px; + text-align: center; + + .links { + color: $color-text-white; + text-decoration: underline; + } + } + + .contact { + margin-top: 20px; + } + } + } + } + + .osf-preprint-advisory-container { + background-image: none; + } + + &.mobile { + .preprint-subjects-inner-container { + padding: 0; + background-color: $color-bg-gray-lighter; + padding: 0, 10px; + width: calc(100% - 20px); + + .subject-list-container { + padding: 25px 0; + width: 100%; + flex-direction: column; + } + } + + .preprint-tool-inner-container { + padding: 15px 10px; + width: calc(100% - 20px); + } + } + + .btn { + display: inline-block; + margin-bottom: 0; + font-weight: 400; + text-align: center; + white-space: nowrap; + touch-action: manipulation; + cursor: pointer; + background-image: none; + border: 1px solid transparent; + border-radius: 2px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857; + user-select: none; + vertical-align: middle; + color: $color-text-white; + } + + .btn-success { + background-color: #357935; + border-color: #2d672d; + } + + .btn-lg { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33333; + } +} diff --git a/app/preprints/index/template.hbs b/app/preprints/index/template.hbs new file mode 100644 index 00000000000..63e8a69b1dc --- /dev/null +++ b/app/preprints/index/template.hbs @@ -0,0 +1,167 @@ +
+ {{!HEADER}} +
+ + {{#branded-header.lead}} +
+ {{html-safe this.theme.provider.description}} +
+
+ + {{t 'preprints.header.powered_by'}} + +
+ {{/branded-header.lead}} + {{#branded-header.row}} + {{#if this.theme.provider.allowSubmissions}} +
+
{{t 'preprints.header.or'}}
+ + {{t 'preprints.header.submit_label' documentType=this.theme.provider.content.documentType}} + +
+ + {{t 'preprints.header.example'}} + +
+
+ {{/if}} + {{/branded-header.row}} + +
+ {{!END HEADER}} + + {{!SUBJECTS}} +
+
+

{{#if this.theme.provider.additionalProviders}} + {{t 'preprints.subjects.heading.provider'}} + {{else}} + {{if this.theme.provider.hasHighlightedSubjects (t 'preprints.subjects.heading.hasHighlightedSubjects') (t 'preprints.subjects.heading.noHighlightedSubjects')}} + {{/if}} +

+ {{#if this.theme.provider.hasHighlightedSubjects}} + + {{t 'preprints.subjects.links.seeAllSubjects'}} + + {{/if}} +
+ {{#if this.theme.provider.additionalProviders}} + {{additional-provider-list additionalProviders=this.theme.provider.additionalProviders}} + {{else}} + + {{/if}} +
+
+
+ + {{#unless this.theme.isProvider}} + {{!SERVICES}} +
+
+

{{t 'preprints.services.top.heading' documentType=this.theme.provider.documentType.singularCapitalized}}

+

+ {{t 'preprints.services.top.paragraph' documentType=this.theme.provider.documentType.singular}} +

+
+ {{#each this.model.brandedProviders as |provider| }} + {{#if (not-eq provider.id 'livedata') }} + + {{/if}} + {{/each}} +
+
+
+ {{t 'preprints.services.bottom.p1' documentType=this.theme.provider.documentType.singular}} +
+
+ {{t 'preprints.services.bottom.div.line1'}} + + + {{t 'preprints.services.bottom.div.linkText1'}} + + + {{t 'preprints.services.bottom.div.line2'}} + + + {{t 'preprints.services.bottom.div.linkText2'}} + + + {{t 'preprints.services.bottom.div.line3'}} +
+
+ + {{t 'preprints.services.bottom.contact'}} + +
+
+
+
+ {{/unless}} + + + {{!ADVISORY GROUP}} + {{#if this.theme.provider.advisoryBoard.length}} +
+
+ {{html-safe this.theme.provider.advisoryBoard}} +
+
+ {{/if}} +
+{{!END INDEX}} diff --git a/app/preprints/template.hbs b/app/preprints/template.hbs index 21847e39d8d..f83103440ff 100644 --- a/app/preprints/template.hbs +++ b/app/preprints/template.hbs @@ -1,9 +1,16 @@ {{page-title this.theme.provider.providerTitle replace=true}} -
- - {{outlet}} -
+{{#if this.theme.isProvider}} +
+ + +
+{{/if}} +{{outlet}} + +
+ +
\ No newline at end of file diff --git a/app/resolve-guid/route.ts b/app/resolve-guid/route.ts index 111dbaef86f..8d6571eb323 100644 --- a/app/resolve-guid/route.ts +++ b/app/resolve-guid/route.ts @@ -36,7 +36,7 @@ export default class ResolveGuid extends Route { return { file: 'guid-file', node: 'guid-node', - preprint: 'guid-preprint', + preprint: 'preprints.detail', registration: this.features.isEnabled(routes['registries.overview']) ? 'registries.overview' : 'guid-registration', @@ -75,7 +75,14 @@ export default class ResolveGuid extends Route { throw new Error(`Unknown GUID referentType: ${guid.referentType}`); } - expanded = this.generateURL(this.routeMap[guid.referentType], params.guid); + if (guid.referentType === 'preprint') { + const preprint = await this.store.findRecord('preprint', params.guid); + const providerId = preprint.belongsTo('provider').id(); + expanded = this.generateURL(this.routeMap['preprint'], providerId, params.guid); + } else { + expanded = this.generateURL(this.routeMap[guid.referentType], params.guid); + } + } let url = expanded; diff --git a/app/router.ts b/app/router.ts index e69ef624be8..bed912efd32 100644 --- a/app/router.ts +++ b/app/router.ts @@ -25,10 +25,15 @@ Router.map(function() { this.route('discover', { path: '/:institution_id' }); this.route('dashboard', { path: '/:institution_id/dashboard' }); }); + this.route('preprints', function() { - this.route('discover'); + this.route('index', { path: '/' }); + this.route('index', { path: '/:provider_id' }); this.route('discover', { path: '/:provider_id/discover' }); + this.route('detail', { path: '/:provider_id/:guid' }); }); + + this.route('register'); this.route('settings', function() { this.route('profile', function() { @@ -74,7 +79,6 @@ Router.map(function() { }); }); - this.route('guid-preprint', { path: '--preprint/:guid' }); this.route('guid-registration', { path: '--registration/:guid' }, function() { this.mount('analytics-page', { as: 'analytics' }); diff --git a/app/search/controller.ts b/app/search/controller.ts index e8ed982aa50..5aca419d97b 100644 --- a/app/search/controller.ts +++ b/app/search/controller.ts @@ -4,7 +4,7 @@ import { tracked } from '@glimmer/tracking'; import { Filter, OnSearchParams, ResourceTypeFilterValue } from 'osf-components/components/search-page/component'; export default class SearchController extends Controller { - @tracked q?: string = ''; + @tracked cardSearchText?: string = ''; @tracked sort?: string = '-relevance'; @tracked resourceType?: ResourceTypeFilterValue | null = null; @tracked activeFilters?: Filter[] = []; diff --git a/app/serializers/preprint-request-action.ts b/app/serializers/preprint-request-action.ts new file mode 100644 index 00000000000..2b9d3a4fd52 --- /dev/null +++ b/app/serializers/preprint-request-action.ts @@ -0,0 +1,14 @@ +import OsfSerializer from './osf-serializer'; + +export default class PreprintRequestActionSerializer extends OsfSerializer { + attrs: any = { + ...this.attrs, // from OsfSerializer + actionTrigger: 'trigger', + }; +} + +declare module 'ember-data/types/registries/serializer' { + export default interface SerializerRegistry { + 'preprint-request-action': PreprintRequestActionSerializer; + } // eslint-disable-line semi +} diff --git a/app/serializers/preprint-request.ts b/app/serializers/preprint-request.ts new file mode 100644 index 00000000000..18319f8c50a --- /dev/null +++ b/app/serializers/preprint-request.ts @@ -0,0 +1,10 @@ +import OsfSerializer from './osf-serializer'; + +export default class PreprintRequestSerializer extends OsfSerializer { +} + +declare module 'ember-data/types/registries/serializer' { + export default interface SerializerRegistry { + 'preprint-request': PreprintRequestSerializer; + } // eslint-disable-line semi +} diff --git a/app/styles/_preprint.scss b/app/styles/_preprint.scss new file mode 100644 index 00000000000..bb1767500fc --- /dev/null +++ b/app/styles/_preprint.scss @@ -0,0 +1,67 @@ +// stylelint-disable max-nesting-depth, selector-max-compound-selectors + +.preprint-advisory-container { + background: var(--hero-background-img-url); + background-color: $color-bg-gray-lighter; + border-bottom: 1px solid #6d8a98; + padding: 15px 0; + width: 100%; + flex-direction: column; + display: flex; + justify-content: center; + align-items: center; + + .preprint-advisory-inner-container { + padding: 0 30px; + width: calc(100% - 60px); + flex-direction: column; + display: flex; + justify-content: flex-start; + align-items: flex-start; + + .preprint-advisory-header { + width: 100%; + } + + .preprint-advisory-list { + width: 100%; + flex-direction: row; + display: flex; + justify-content: flex-start; + align-items: flex-start; + margin-top: 25px; + + .preprint-advisory-list-column { + width: 50%; + + ul { + list-style: none; + + li { + padding-top: 5px; + font-size: 16px; + } + } + } + } + } + + &.mobile { + .preprint-advisory-inner-container { + padding: 0 10px; + width: calc(100% - 20px); + + .preprint-advisory-list { + flex-direction: column; + + .preprint-advisory-list-column { + width: 100%; + + ul { + padding: 0; + } + } + } + } + } +} diff --git a/app/styles/headers.scss b/app/styles/headers.scss index ce654bede9b..5663ca4d799 100644 --- a/app/styles/headers.scss +++ b/app/styles/headers.scss @@ -19,6 +19,9 @@ // Branding @import 'branding'; +// Preprints +@import 'preprint'; + .theme-dropdown .dropdown-menu { position: static; display: block; diff --git a/config/environment.js b/config/environment.js index e802090a825..c10b1dd4a89 100644 --- a/config/environment.js +++ b/config/environment.js @@ -28,6 +28,7 @@ const { GOOGLE_TAG_MANAGER_ID, KEEN_CONFIG: keenConfig, LINT_ON_BUILD: lintOnBuild = false, + WATER_BUTLER_ENABLED = true, MIRAGE_ENABLED = false, MIRAGE_SCENARIOS = [ 'loggedIn', @@ -48,6 +49,8 @@ const { OSF_FILE_URL: waterbutlerUrl = 'http://localhost:7777/', OSF_HELP_URL: helpUrl = 'http://localhost:4200/help', OSF_AUTHENTICATOR: osfAuthenticator = 'osf-cookie', + PLAUDIT_WIDGET_URL: plauditWidgetUrl = 'https://osf-review.plaudit.pub/embed/endorsements.js', + METRICS_START_DATE: metricsStartDate = '2019-01-01', POLICY_URL_PREFIX = 'https://github.com/CenterForOpenScience/centerforopenscience.org/blob/master/', POPULAR_LINKS_NODE: popularNode = '57tnq', // POPULAR_LINKS_REGISTRATIONS = '', @@ -69,6 +72,8 @@ module.exports = function(environment) { const ENV = { modulePrefix: 'ember-osf-web', + WATER_BUTLER_ENABLED, + plauditWidgetUrl, environment, lintOnBuild, testsEnabled: false, // Disable tests by default. @@ -151,6 +156,7 @@ module.exports = function(environment) { shareApiUrl, shareSearchUrl, devMode, + metricsStartDate, cookieDomain, authenticator: `authenticator:${osfAuthenticator}`, cookies: { diff --git a/lib/app-components/addon/components/branded-navbar/template.hbs b/lib/app-components/addon/components/branded-navbar/template.hbs index e6b1a93f2a5..5407d118517 100644 --- a/lib/app-components/addon/components/branded-navbar/template.hbs +++ b/lib/app-components/addon/components/branded-navbar/template.hbs @@ -11,6 +11,7 @@
diff --git a/lib/app-components/app/components/search-help-modal/component.js b/lib/app-components/app/components/search-help-modal/component.js deleted file mode 100644 index 6056b8489d7..00000000000 --- a/lib/app-components/app/components/search-help-modal/component.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'app-components/components/search-help-modal/component'; diff --git a/lib/app-components/package.json b/lib/app-components/package.json index 1a65f76c407..a3e11011992 100644 --- a/lib/app-components/package.json +++ b/lib/app-components/package.json @@ -28,7 +28,6 @@ "ember-toastr": "*", "ember-wormhole": "*", "katex": "*", - "liquid-fire": "*", - "moment-timezone": "*" + "liquid-fire": "*" } } diff --git a/lib/osf-components/addon/components/branded-header/component.ts b/lib/osf-components/addon/components/branded-header/component.ts new file mode 100644 index 00000000000..fd94249c681 --- /dev/null +++ b/lib/osf-components/addon/components/branded-header/component.ts @@ -0,0 +1,62 @@ +import Component from '@glimmer/component'; +import { action, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Intl from 'ember-intl/services/intl'; +import Media from 'ember-responsive'; + +import Analytics from 'ember-osf-web/services/analytics'; +import { tracked } from '@glimmer/tracking'; +import { requiredAction } from 'ember-osf-web/decorators/component'; + +interface InputArgs { + onSearch: (value: string) => void; + translationParent?: string; + showHelp: false; + searchPlaceholder?: string; +} + +export default class BrandedHeader extends Component { + @service analytics!: Analytics; + @service intl!: Intl; + @service media!: Media; + @requiredAction onSearch!: (value: string) => void; + @tracked showingHelp = false; + + notBranded = true; + localClassNameBindings = ['notBranded:Header']; + today = new Date(); + value = ''; + searchable = 0; + + get showHelp(): boolean { + return this.args.showHelp; + } + + get isMobile(): boolean { + return this.media.isMobile; + } + + get searchPlaceholder() { + return this.args.searchPlaceholder ? this.args.searchPlaceholder + : this.intl.t(`${this.args.translationParent}.header.search_placeholder`); + } + + @computed('args.translationParent') + get headerAriaLabel() { + if (this.args.translationParent === 'preprints') { + return this.intl.t(`${this.args.translationParent}.header.osf_preprints`); + } + return this.intl.t(`${this.args.translationParent}.header.osf_registrations`); + } + + @action + onSubmit() { + this.analytics.click('link', 'Discover - Search', this.value); + this.args.onSearch(this.value); + } + + @action + toggleHelp() { + this.showingHelp = !this.showingHelp; + } +} diff --git a/lib/registries/addon/components/registries-header/styles.scss b/lib/osf-components/addon/components/branded-header/styles.scss similarity index 79% rename from lib/registries/addon/components/registries-header/styles.scss rename to lib/osf-components/addon/components/branded-header/styles.scss index 3806e523b90..45874ae9aee 100644 --- a/lib/registries/addon/components/registries-header/styles.scss +++ b/lib/osf-components/addon/components/branded-header/styles.scss @@ -7,6 +7,25 @@ flex-direction: column; justify-content: center; align-items: center; + color: $color-text-white; + background: var(--hero-background-img-url); + + .lead { + font-size: 21px; + margin-bottom: 20px; + font-weight: 300; + line-height: 1.4; + + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + p { + color: $color-text-white; + } .brand-container { display: flex; @@ -16,12 +35,17 @@ width: 100%; margin-top: 25px; + .brand { - background: var(--hero-logo-img-url) top center no-repeat; - background-size: contain; height: 70px; width: 100%; + + &.brand-logo { + background: var(--hero-logo-img-url) top center no-repeat; + background-size: contain; + } } + } .search-container { @@ -77,9 +101,6 @@ } } - .search-container.mobile { - width: 100%; - } .provider-description { justify-content: center; @@ -93,26 +114,16 @@ padding-top: 10px; padding-bottom: 10px; } -} -.RegistriesHeader { - color: #fff; - width: 100%; - margin-bottom: 25px; + &.mobile { + padding: 30px 10px; - a { - color: #80c2f7; - text-decoration: none; - } - - p { - color: $white; - } + .search-container { + width: 100%; - .lead { - font-size: 21px; - margin-bottom: 20px; - font-weight: 300; - line-height: 1.4; + .form { + margin: 0; + } + } } } diff --git a/lib/registries/addon/components/registries-header/template.hbs b/lib/osf-components/addon/components/branded-header/template.hbs similarity index 55% rename from lib/registries/addon/components/registries-header/template.hbs rename to lib/osf-components/addon/components/branded-header/template.hbs index f516cebd364..37bca6939d1 100644 --- a/lib/registries/addon/components/registries-header/template.hbs +++ b/lib/osf-components/addon/components/branded-header/template.hbs @@ -1,7 +1,8 @@ -
+
-
+
- + {{#if this.showHelp}} {{/if}}
- {{#if @providerModel.htmlSafeDescription}} -
- {{@providerModel.htmlSafeDescription}} -
- {{/if}}
{{yield (hash row=(element ''))}}
- {{search-help-modal isOpen=(mut this.showingHelp)}} +
diff --git a/lib/osf-components/addon/components/citation-viewer/component.ts b/lib/osf-components/addon/components/citation-viewer/component.ts index 484a24de0ee..c4b16a8c20f 100644 --- a/lib/osf-components/addon/components/citation-viewer/component.ts +++ b/lib/osf-components/addon/components/citation-viewer/component.ts @@ -29,7 +29,7 @@ const defaultCitations: DefaultCitation[] = [ ]; function citationUrl(citable: Node | Preprint, citationStyleId: string) { - const relatedHref = getRelatedHref(citable.links.relationships!.citation); + const relatedHref = getRelatedHref(citable?.links.relationships!.citation); if (!relatedHref) { throw Error('Error getting citation URL'); @@ -46,6 +46,7 @@ export default class CitationViewer extends Component { // Required parameter citable!: Node | Preprint; + // Private properties @service store!: Store; @service currentUser!: CurrentUser; diff --git a/lib/osf-components/addon/components/file-renderer/component.ts b/lib/osf-components/addon/components/file-renderer/component.ts index d93c39bd54d..178d41d781c 100644 --- a/lib/osf-components/addon/components/file-renderer/component.ts +++ b/lib/osf-components/addon/components/file-renderer/component.ts @@ -69,7 +69,12 @@ export default class FileRenderer extends Component { // This is most apparent in 3D files const urlWithParams = new URL(renderUrl); urlWithParams.searchParams.set('url', this.downloadUrl); - return this.isLoading ? '' : urlWithParams.toString(); + if (config.WATER_BUTLER_ENABLED) { + return this.isLoading ? '' : urlWithParams.toString(); + } else { + return this.isLoading ? '' : this.downloadUrl; + + } } didReceiveAttrs(): void { diff --git a/lib/app-components/addon/components/search-help-modal/component.ts b/lib/osf-components/addon/components/search-help-modal/component.ts similarity index 74% rename from lib/app-components/addon/components/search-help-modal/component.ts rename to lib/osf-components/addon/components/search-help-modal/component.ts index 7e51cdd4a30..c6b4ce0aa37 100644 --- a/lib/app-components/addon/components/search-help-modal/component.ts +++ b/lib/osf-components/addon/components/search-help-modal/component.ts @@ -1,12 +1,8 @@ import { getOwner } from '@ember/application'; -import Component from '@ember/component'; +import Component from '@glimmer/component'; import RouterService from '@ember/routing/router-service'; import { inject as service } from '@ember/service'; -import { layout } from 'ember-osf-web/decorators/component'; -import styles from './styles'; -import template from './template'; - /** * Modal that provides examples and explanation of Lucene Search syntax * @@ -16,11 +12,14 @@ import template from './template'; * }} * ``` */ -@layout(template, styles) -export default class SearchHelpModal extends Component { - @service router!: RouterService; - isOpen = false; +interface InputArgs { + isOpen: false; + onClose: () => void; +} + +export default class SearchHelpModal extends Component { + @service router!: RouterService; examples: Array<{ q: string, text: string }> = [ { diff --git a/lib/app-components/addon/components/search-help-modal/styles.scss b/lib/osf-components/addon/components/search-help-modal/styles.scss similarity index 100% rename from lib/app-components/addon/components/search-help-modal/styles.scss rename to lib/osf-components/addon/components/search-help-modal/styles.scss diff --git a/lib/app-components/addon/components/search-help-modal/template.hbs b/lib/osf-components/addon/components/search-help-modal/template.hbs similarity index 93% rename from lib/app-components/addon/components/search-help-modal/template.hbs rename to lib/osf-components/addon/components/search-help-modal/template.hbs index 02875afd4da..79ff2f6e039 100644 --- a/lib/app-components/addon/components/search-help-modal/template.hbs +++ b/lib/osf-components/addon/components/search-help-modal/template.hbs @@ -1,7 +1,7 @@
diff --git a/lib/osf-components/addon/components/search-page/styles.scss b/lib/osf-components/addon/components/search-page/styles.scss index a243d42c7ec..71e99fcfd0c 100644 --- a/lib/osf-components/addon/components/search-page/styles.scss +++ b/lib/osf-components/addon/components/search-page/styles.scss @@ -327,6 +327,31 @@ } } +.search-help-tutorial { + background-color: $osf-dark-blue-navbar; + color: $color-text-white; + width: 400px; + max-width: 100%; + z-index: 100; + + // prevent target element styles from dictating popover text-styles + white-space: wrap; + text-align: initial; + + .enumeration { + float: left; + } + + .help-button-wrappers { + float: right; + } + + .skip-button { + color: $color-text-white; + } +} + + .object-type-filter-link { font-size: 1.3em; padding: 18px 15px; diff --git a/lib/osf-components/addon/components/sharing-icons/component.ts b/lib/osf-components/addon/components/sharing-icons/component.ts index 5c0feb796c7..e87995a9b68 100644 --- a/lib/osf-components/addon/components/sharing-icons/component.ts +++ b/lib/osf-components/addon/components/sharing-icons/component.ts @@ -49,4 +49,16 @@ export default class SharingIcons extends Component { }; return `mailto:?${param(queryParams)}`; } + + @computed('hyperlink', 'title', 'description') + get linkedInHref(): string { + const queryParams = { + url: this.hyperlink, + mini: true, + title: this.title, + summary: this.description || this.title, + source: 'OSF', + }; + return `https://www.linkedin.com/shareArticle?${param(queryParams)}`; + } } diff --git a/lib/osf-components/addon/components/sharing-icons/template.hbs b/lib/osf-components/addon/components/sharing-icons/template.hbs index 951e985e9f7..e9c61fb57a6 100644 --- a/lib/osf-components/addon/components/sharing-icons/template.hbs +++ b/lib/osf-components/addon/components/sharing-icons/template.hbs @@ -13,6 +13,13 @@ icon='facebook-square' showText=@showText ) + linkedIn=(component 'sharing-icons/sharing-anchor' + href=this.linkedInHref + medium='LinkedIn' + analyticsName='Share - linkedIn' + icon='linkedin' + showText=@showText + ) email=(component 'sharing-icons/sharing-anchor' href=this.emailHref medium='Email' @@ -25,6 +32,7 @@ {{else}} {{links.twitter}} {{links.facebook}} + {{links.linkedIn}} {{links.email}} {{/if}} {{/let}} diff --git a/lib/osf-components/app/components/branded-header/component.js b/lib/osf-components/app/components/branded-header/component.js new file mode 100644 index 00000000000..a6873de460e --- /dev/null +++ b/lib/osf-components/app/components/branded-header/component.js @@ -0,0 +1 @@ +export { default } from 'osf-components/components/branded-header/component'; diff --git a/lib/osf-components/app/components/branded-header/template.js b/lib/osf-components/app/components/branded-header/template.js new file mode 100644 index 00000000000..d3da8551c78 --- /dev/null +++ b/lib/osf-components/app/components/branded-header/template.js @@ -0,0 +1 @@ +export { default } from 'osf-components/components/branded-header/template'; diff --git a/lib/osf-components/app/components/search-help-modal/component.js b/lib/osf-components/app/components/search-help-modal/component.js new file mode 100644 index 00000000000..7f96f5c5fde --- /dev/null +++ b/lib/osf-components/app/components/search-help-modal/component.js @@ -0,0 +1 @@ +export { default } from 'osf-components/components/search-help-modal/component'; diff --git a/lib/osf-components/app/components/search-help-modal/template.js b/lib/osf-components/app/components/search-help-modal/template.js new file mode 100644 index 00000000000..8faada3c8d7 --- /dev/null +++ b/lib/osf-components/app/components/search-help-modal/template.js @@ -0,0 +1 @@ +export { default } from 'osf-components/components/search-help-modal/template'; diff --git a/lib/registries/addon/branded/discover/route.ts b/lib/registries/addon/branded/discover/route.ts index c9f253ba6ba..fdd17e9da42 100644 --- a/lib/registries/addon/branded/discover/route.ts +++ b/lib/registries/addon/branded/discover/route.ts @@ -1,8 +1,8 @@ import Route from '@ember/routing/route'; import RouterService from '@ember/routing/router-service'; import { inject as service } from '@ember/service'; - import RegistrationProviderModel from 'ember-osf-web/models/registration-provider'; + import { notFoundURL } from 'ember-osf-web/utils/clean-url'; export default class BrandedRegistriesDiscoverRoute extends Route { diff --git a/lib/registries/addon/components/registries-header/component.ts b/lib/registries/addon/components/registries-header/component.ts deleted file mode 100644 index cd70e76c4ba..00000000000 --- a/lib/registries/addon/components/registries-header/component.ts +++ /dev/null @@ -1,59 +0,0 @@ -import Component from '@ember/component'; -import { action, computed } from '@ember/object'; -import { inject as service } from '@ember/service'; -import Intl from 'ember-intl/services/intl'; -import Media from 'ember-responsive'; - -import { layout, requiredAction } from 'ember-osf-web/decorators/component'; -import ProviderModel from 'ember-osf-web/models/provider'; -import Analytics from 'ember-osf-web/services/analytics'; -import template from './template'; - -@layout(template) -export default class RegistriesHeader extends Component { - @service analytics!: Analytics; - @service intl!: Intl; - @service media!: Media; - @requiredAction onSearch!: (value: string) => void; - - providerModel?: ProviderModel; - notBranded = true; - localClassNameBindings = ['notBranded:RegistriesHeader']; - today = new Date(); - showingHelp = false; - value = ''; - searchable = 0; - showHelp = false; - - @computed('providerModel.name') - get headerAriaLabel() { - return this.providerModel ? this.providerModel.name.concat(' ', this.intl.t('registries.header.registrations')) - : this.intl.t('registries.header.osf_registrations'); - } - - @action - onSubmit() { - if (this.providerModel) { - this.analytics.click('link', `Discover - Search ${this.providerModel.name}`, this.value); - } else { - this.analytics.click('link', 'Discover - Search', this.value); - } - this.onSearch(this.value); - } - - @action - toggleHelp() { - this.set('showingHelp', !this.showingHelp); - } - - @action - keyPress(event: KeyboardEvent) { - if (event.keyCode !== 13) { - if (this.providerModel) { - this.analytics.track('input', 'onkeyup', `Discover - Search ${this.providerModel.name}`, this.value); - } else { - this.analytics.track('input', 'onkeyup', 'Discover - Search', this.value); - } - } - } -} diff --git a/lib/registries/addon/discover/template.hbs b/lib/registries/addon/discover/template.hbs new file mode 100644 index 00000000000..d26027f5d4c --- /dev/null +++ b/lib/registries/addon/discover/template.hbs @@ -0,0 +1,108 @@ +{{page-title (t 'registries.discover.page_title') prepend=false}} + + + + {{branded-header + providerModel=this.providerModel + showHelp=true + value=(mut this.query) + onSearch=(action 'onSearch') + searchable=this.searchable + }} + + +
+
+ {{#if this.searchOptions}} + {{#discover.sidebar as |sidebar|}} + {{registries-provider-facet + options=this.filterableSources + searchOptions=this.searchOptions + onSearchOptionsUpdated=sidebar.onSearchOptionsUpdated + provider=this.providerModel + }} + + {{registries-registration-type-facet + searchOptions=this.searchOptions + onSearchOptionsUpdated=sidebar.onSearchOptionsUpdated + provider=this.providerModel + }} + + {{!-- TODO: this feature is not ready yet. Will be implemented in Phase2 Branded Reg --}} + {{!-- {{#if this.providerModel}} + {{registries-subjects-facet + provider=this.providerModel + searchOptions=this.searchOptions + onSearchOptionsUpdated=sidebar.onSearchOptionsUpdated + provider=this.providerModel + }} + {{/if}} --}} + {{/discover.sidebar}} + {{/if}} +
+
+ {{#if (and this.doSearch.lastSuccessful this.searchOptions)}} + {{registries-discover-results-header + totalResults=this.totalResults + searchOptions=this.searchOptions + sortOptions=this.sortOptions + provider=this.providerModel + setOrder=(action this.setOrder) + }} + {{#discover.results + (html-attributes data-test-results=true) + as |result| + }} + + {{/discover.results}} + + {{#unless this.totalResults}} +
+

+ {{t 'registries.discover.no_results'}} +

+ {{t 'registries.discover.try_broadening'}} +
+ {{/unless}} + + {{#if (gt this.maxPage 1) }} +
+ {{search-paginator + current=this.searchOptions.page + maximum=this.maxPage + pageChanged=(action 'changePage') + }} +
+ {{/if}} + {{else if this.doSearch.isError}} +
+ {{t 'registries.discover.error_loading'}} +
+ {{else}} +
+ {{loading-indicator dark=true}} +
+ {{/if}} +
+
+ + + diff --git a/lib/registries/addon/index/template.hbs b/lib/registries/addon/index/template.hbs index c1a85e4a596..e571e88bf31 100644 --- a/lib/registries/addon/index/template.hbs +++ b/lib/registries/addon/index/template.hbs @@ -1,11 +1,16 @@ - {{#registries-header onSearch=(action 'onSearch') as |header|}} - {{#header.lead}} + + {{#branded-header.lead}} {{t 'registries.index.lead' htmlSafe=true}} - {{/header.lead}} - {{#header.row}} + {{/branded-header.lead}} + {{#branded-header.row}} - {{/header.row}} - {{/registries-header}} + {{/branded-header.row}} + {{#if this.getRecentRegistrations.isRunning}} diff --git a/mirage/config.ts b/mirage/config.ts index 8f1437b91d2..63846dbe581 100644 --- a/mirage/config.ts +++ b/mirage/config.ts @@ -66,6 +66,9 @@ export default function(this: Server) { this.get('/index-card-search', cardSearch); this.get('/index-value-search', valueSearch); // this.get('/index-card/:id', Detail); + this.get('/index-card-searches', cardSearch); + this.get('/index-value-searches', valueSearch); + // this.get('/index-cards/:id', Detail); this.urlPrefix = apiUrl; this.namespace = '/v2'; @@ -293,7 +296,85 @@ export default function(this: Server) { only: ['index'], }); - osfResource(this, 'preprint-provider', { path: '/providers/preprints' }); + osfResource(this, 'preprint-provider', { + path: '/providers/preprints', + defaultPageSize: 1000, + }); + osfNestedResource(this, 'preprint-provider', 'highlightedSubjects', { + only: ['index'], + path: '/providers/preprints/:parentID/subjects/highlighted/', + relatedModelName: 'subject', + }); + osfNestedResource(this, 'preprint-provider', 'preprints', { + path: '/providers/preprints/:parentID/preprints/', + relatedModelName: 'preprint', + }); + + /** + * Preprint Details + */ + + osfResource(this, 'preprint'); + osfNestedResource(this, 'preprint', 'contributors', { + path: '/preprints/:parentID/contributors/', + defaultSortKey: 'index', + relatedModelName: 'contributor', + }); + osfNestedResource(this, 'preprint', 'bibliographicContributors', { + path: '/preprints/:parentID/bibliographic_contributors/', + defaultSortKey: 'index', + relatedModelName: 'contributor', + }); + osfNestedResource(this, 'preprint', 'files', { + path: '/preprints/:parentID/files/', + defaultSortKey: 'index', + relatedModelName: 'file', + }); + osfNestedResource(this, 'preprint', 'primaryFile', { + path: '/wb/files/:fileID/', + defaultSortKey: 'index', + relatedModelName: 'file', + }); + osfNestedResource(this, 'preprint', 'subjects', { + path: '/preprints/:parentID/subjects/', + defaultSortKey: 'index', + relatedModelName: 'subject', + }); + this.get('/preprints/:guid/citation/:citationStyleID', getCitation); + + /** + * Preprint Review Actions + */ + + osfNestedResource(this, 'preprint', 'reviewActions', { + path: '/preprints/:parentID/review_actions/', + defaultSortKey: 'index', + relatedModelName: 'review-action', + }); + + /** + * Preprint Requests + */ + + osfNestedResource(this, 'preprint', 'requests', { + path: '/preprints/:parentID/requests/', + defaultSortKey: 'index', + relatedModelName: 'preprint-request', + }); + + /** + * Preprint Request Actions + */ + osfResource(this, 'preprint-request', {path: '/requests'}); + osfNestedResource(this, 'preprint-request', 'actions', { + path: '/requests/:parentID/actions', + relatedModelName: 'preprint-request-action', + }); + + /** + * End Preprint Details + */ + osfResource(this, 'registration-provider', { path: '/providers/registrations' }); osfNestedResource(this, 'registration-provider', 'moderators', { only: ['index', 'show', 'update', 'delete'], diff --git a/mirage/factories/preprint-request-action.ts b/mirage/factories/preprint-request-action.ts new file mode 100644 index 00000000000..0b1f3a77e0c --- /dev/null +++ b/mirage/factories/preprint-request-action.ts @@ -0,0 +1,34 @@ +import { Factory } from 'ember-cli-mirage'; +import PreprintRequestActionModel, +{ PreprintRequestActionTriggerEnum } from 'ember-osf-web/models/preprint-request-action'; + +import { guid, guidAfterCreate } from './utils'; + +export default Factory.extend({ + id: guid('preprint'), + + actionTrigger: PreprintRequestActionTriggerEnum.SUBMIT, + dateModified: new Date('2023-08-29T10:35:27.746938Z'), + auto: false, + + afterCreate(preprintRequestAction, server) { + guidAfterCreate(preprintRequestAction, server); + + preprintRequestAction.update({ + creator: preprintRequestAction.target.creator, + target: preprintRequestAction.target, + }); + }, +}); + +declare module 'ember-cli-mirage/types/registries/model' { + export default interface MirageModelRegistry { + 'preprint-request-action': PreprintRequestActionModel; + } // eslint-disable-line semi +} + +declare module 'ember-cli-mirage/types/registries/schema' { + export default interface MirageSchemaRegistry { + 'preprint-request-action': PreprintRequestActionModel; + } // eslint-disable-line semi +} diff --git a/mirage/factories/preprint-request.ts b/mirage/factories/preprint-request.ts new file mode 100644 index 00000000000..d09ae6c8066 --- /dev/null +++ b/mirage/factories/preprint-request.ts @@ -0,0 +1,99 @@ +import { Factory, Trait, trait } from 'ember-cli-mirage'; +import faker from 'faker'; +import PreprintRequestModel, +{ PreprintRequestMachineState, PreprintRequestType } from 'ember-osf-web/models/preprint-request'; +import { PreprintRequestActionTriggerEnum } from 'ember-osf-web/models/preprint-request-action'; + +import { guid, guidAfterCreate} from './utils'; + +export interface PreprintRequestTraits { + pending: Trait; + rejectComment: Trait; + acceptComment: Trait; + rejectNoComment: Trait; +} + +export default Factory.extend({ + id: guid('preprint'), + + comment: faker.lorem.sentence(100), + machineState: PreprintRequestMachineState.PENDING, + requestType: PreprintRequestType.WITHDRAWAL, + dateLastTransitioned: new Date('2023-08-29T10:35:27.746938Z'), + created: new Date('2023-08-29T10:35:27.746938Z'), + modified: new Date('2023-08-29T10:35:27.746938Z'), + + afterCreate(preprintRequest, server) { + guidAfterCreate(preprintRequest, server); + + const creator = server.create('user', { + givenName: 'Trio', + familyName: 'Lipa', + }); + + preprintRequest.update({ + creator, + target: preprintRequest.target, + }); + }, + + pending: trait({ + afterCreate(preprintRequest, server) { + const preprintRequestAction = server.create('preprintRequestAction', + { + actionTrigger: PreprintRequestActionTriggerEnum.SUBMIT, + target: preprintRequest, + comment: faker.lorem.sentence(100), + }); + preprintRequest.update({ actions: [preprintRequestAction ]}); + }, + }), + + rejectNoComment: trait({ + afterCreate(preprintRequest, server) { + const preprintRequestAction = server.create('preprintRequestAction', + { + actionTrigger: PreprintRequestActionTriggerEnum.REJECT, + target: preprintRequest, + comment: null, + }); + preprintRequest.update({ actions: [preprintRequestAction ]}); + }, + }), + + rejectComment: trait({ + afterCreate(preprintRequest, server) { + const preprintRequestAction = server.create('preprintRequestAction', + { + actionTrigger: PreprintRequestActionTriggerEnum.REJECT, + target: preprintRequest, + comment: faker.lorem.sentence(100), + }); + preprintRequest.update({ actions: [preprintRequestAction ]}); + }, + }), + + acceptComment: trait({ + afterCreate(preprintRequest, server) { + const preprintRequestAction = server.create('preprintRequestAction', + { + actionTrigger: PreprintRequestActionTriggerEnum.ACCEPT, + target: preprintRequest, + comment: faker.lorem.sentence(100), + }); + preprintRequest.update({ actions: [preprintRequestAction ]}); + }, + }), +}); + +declare module 'ember-cli-mirage/types/registries/model' { + export default interface MirageModelRegistry { + 'preprint-request': PreprintRequestModel; + } // eslint-disable-line semi +} + +declare module 'ember-cli-mirage/types/registries/schema' { + export default interface MirageSchemaRegistry { + 'preprint-request': PreprintRequestModel; + } // eslint-disable-line semi +} diff --git a/mirage/factories/preprint.ts b/mirage/factories/preprint.ts new file mode 100644 index 00000000000..6d2b199a69a --- /dev/null +++ b/mirage/factories/preprint.ts @@ -0,0 +1,213 @@ +import { Factory, Trait, trait } from 'ember-cli-mirage'; +import faker from 'faker'; +import { ReviewActionTrigger } from 'ember-osf-web/models/review-action'; + +import PreprintModel from 'ember-osf-web/models/preprint'; +import { Permission } from 'ember-osf-web/models/osf-model'; +import { ReviewsState } from 'ember-osf-web/models/provider'; + +import { guid, guidAfterCreate} from './utils'; + +function buildLicenseText(): string { + let text = faker.lorem.sentence(100); + [250, 100, 250, 300].map((length: number) => { + text = `${text}\n\n${faker.lorem.sentence(length)}`; + }); + return text; +} + +export interface PreprintMirageModel extends PreprintModel { + isPreprintDoi: boolean; + addLicenseName: boolean; +} + +export interface PreprintTraits { + pendingWithdrawal: Trait; + isContributor: Trait; + rejectedWithdrawalComment: Trait; + acceptedWithdrawalComment: Trait; + rejectedWithdrawalNoComment: Trait; + reviewAction: Trait; +} + +export default Factory.extend({ + id: guid('preprint'), + title: faker.lorem.sentence(), + + isPreprintDoi: true, + + addLicenseName: true, + + currentUserPermissions: [Permission.Admin], + + reviewsState: ReviewsState.REJECTED, + + public: true, + + isPreprintOrphan: false, + + description: faker.lorem.sentence(), + + licenseRecord: { + copyright_holders: [ + 'Futa', + 'Yuhuai', + 'Brian G.', + ], + year: '2023', + }, + + dateWithdrawn: null, + + doi: null, + + tags() { + return faker.lorem.words(5).split(' '); + }, + + citation: null, + + apiMeta: { + metrics: { + downloads: faker.random.number(1000), + views: faker.random.number(10000), + }, + }, + + afterCreate(preprint, server) { + guidAfterCreate(preprint, server); + + const file = server.create('file', { + id: 'afile', + target: preprint, + links: { + info: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + move: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + delete: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + html: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + upload: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + download: 'http://localhost:4200/assets/osf-assets/mfr-test.pdf', + }, + }); + + const node = server.create('node'); + + const license = server.create('license', { + name: preprint.addLicenseName ? 'Mozilla Public License 3.0' : undefined, + text: buildLicenseText(), + url: 'https://creativecommons.org/licenses/by/4.0/legalcode', + requiredFields: [], + }); + + const subjects = [ + server.create('subject', 'withChildren'), + server.create('subject'), + server.create('subject', 'withChildren'), + ]; + + const contributorUser = server.create('user', { + givenName: 'Emmit', + familyName: 'Stud', + }); + + const contributor = server.create('contributor', { + preprint, + users: contributorUser, + index: 0, + }); + + const secondContributor = server.create('contributor'); + + const unregisteredContributor = server.create('contributor', 'unregistered'); + + const thirdContributor = server.create('contributor'); + + const allContributors = [contributor, unregisteredContributor, secondContributor, thirdContributor]; + + preprint.update({ + contributors: allContributors, + bibliographicContributors: allContributors, + files: [file], + primaryFile: file, + license, + subjects, + date_created: new Date('2018-05-05T14:49:27.746938Z'), + date_modified: new Date('2018-07-02T11:51:07.837747Z'), + date_published: new Date('2018-05-05T14:54:01.681202Z'), + node, + }); + }, + + pendingWithdrawal: trait({ + afterCreate(preprint, server) { + const preprintRequest = server.create('preprintRequest', { + target: preprint, + }, 'pending'); + preprint.update({ requests: [preprintRequest ]}); + }, + }), + + isContributor: trait({ + afterCreate(preprint, server) { + const { currentUserId } = server.schema.roots.first(); + server.create('contributor', { + preprint, + id: currentUserId, + }); + }, + }), + + rejectedWithdrawalComment: trait({ + afterCreate(preprint, server) { + const preprintRequest = server.create('preprintRequest', { + target: preprint, + }, 'rejectComment'); + preprint.update({ requests: [preprintRequest ]}); + }, + }), + + acceptedWithdrawalComment: trait({ + afterCreate(preprint, server) { + const preprintRequest = server.create('preprintRequest', { + target: preprint, + }, 'acceptComment'); + preprint.update({ requests: [preprintRequest ]}); + }, + }), + + rejectedWithdrawalNoComment: trait({ + afterCreate(preprint, server) { + const preprintRequest = server.create('preprintRequest', { + target: preprint, + }, 'rejectNoComment'); + preprint.update({ requests: [preprintRequest ]}); + }, + }), + + reviewAction: trait({ + afterCreate(preprint, server) { + // console.log('created'); + const creator = server.create('user', { fullName: 'Review action Commentor' }); + const preprintReviewAction = server.create('review-action', { + target: preprint, + creator, + actionTrigger: ReviewActionTrigger.RequestWithdrawal, + comment: 'This is a job for Mario & Luigi >_<', + }); + preprint.update({ reviewActions: [preprintReviewAction]}); + }, + }), + +}); + +declare module 'ember-cli-mirage/types/registries/model' { + export default interface MirageModelRegistry { + preprint: PreprintModel; + } // eslint-disable-line semi +} + +declare module 'ember-cli-mirage/types/registries/schema' { + export default interface MirageSchemaRegistry { + preprint: PreprintModel; + } // eslint-disable-line semi +} diff --git a/mirage/fixtures/preprint-providers.ts b/mirage/fixtures/preprint-providers.ts index 097df9fd028..25f1870bd46 100644 --- a/mirage/fixtures/preprint-providers.ts +++ b/mirage/fixtures/preprint-providers.ts @@ -1,10 +1,14 @@ import PreprintProvider from 'ember-osf-web/models/preprint-provider'; +import { placekitten } from 'ember-osf-web/mirage/utils'; +import { PreprintProviderReviewsWorkFlow } from 'ember-osf-web/models/provider'; import { randomGravatar } from '../utils'; -function randomAssets() { +function randomAssets(i: number, includeImage = true) { + const image = includeImage ? placekitten(150, 75, i) : undefined; return { square_color_no_transparent: randomGravatar(100), + wide_white: image, }; } @@ -13,61 +17,84 @@ const preprintProviders: Array> = [ id: 'osf', name: 'Open Science Framework', preprintWord: 'preprint', - assets: randomAssets(), + assets: randomAssets(1), + footerLinks: 'fake footer links', + reviewsWorkflow: PreprintProviderReviewsWorkFlow.PRE_MODERATION, }, { id: 'thesiscommons', name: 'Thesis Commons', preprintWord: 'thesis', - assets: randomAssets(), + assets: randomAssets(2), + footerLinks: 'fake footer links', }, { id: 'preprintrxiv', name: 'PreprintrXiv', preprintWord: 'preprint', - assets: randomAssets(), + assets: randomAssets(3), + footerLinks: 'fake footer links', + reviewsCommentsPrivate: true, + reviewsWorkflow: PreprintProviderReviewsWorkFlow.PRE_MODERATION, }, { id: 'paperxiv', name: 'PaperXiv', preprintWord: 'paper', - assets: randomAssets(), + assets: randomAssets(4), + footerLinks: 'fake footer links', }, { id: 'thesisrxiv', name: 'ThesisrXiv', preprintWord: 'thesis', - assets: randomAssets(), + assets: randomAssets(5), + footerLinks: 'fake footer links', }, { id: 'workrxiv', name: 'WorkrXiv', preprintWord: 'work', - assets: randomAssets(), + assets: randomAssets(6), + footerLinks: 'fake footer links', }, { id: 'docrxiv', name: 'DocrXiv', preprintWord: 'default', - assets: randomAssets(), + assets: randomAssets(7), + footerLinks: 'fake footer links', }, { id: 'agrixiv', name: 'AgriXiv', preprintWord: 'preprint', - assets: randomAssets(), + assets: randomAssets(8), + reviewsWorkflow: PreprintProviderReviewsWorkFlow.POST_MODERATION, }, { id: 'biohackrxiv', name: 'BioHackrXiv', preprintWord: 'preprint', - assets: randomAssets(), + assets: randomAssets(9), }, { id: 'nutrixiv', name: 'NutriXiv', preprintWord: 'preprint', - assets: randomAssets(), + assets: randomAssets(10), + }, + { + id: 'paleorxiv', + name: 'PaleoRrxiv', + preprintWord: 'preprint', + assets: randomAssets(10, false), + }, + { + id: 'sportrxiv', + name: 'Sport-Rxiv', + preprintWord: 'paper', + assets: randomAssets(10), }, ]; diff --git a/mirage/scenarios/collections.ts b/mirage/scenarios/collections.ts index 07f65338ce2..34a7c4c6188 100644 --- a/mirage/scenarios/collections.ts +++ b/mirage/scenarios/collections.ts @@ -8,6 +8,7 @@ import { Permission } from 'ember-osf-web/models/osf-model'; import User from 'ember-osf-web/models/user'; import { CollectionSubmissionActionTrigger } from 'ember-osf-web/models/collection-submission-action'; import { MirageSubmissionAction } from 'ember-osf-web/mirage/factories/collection-submission'; +import { PreprintProviderReviewsWorkFlow } from 'ember-osf-web/models/provider'; /** @@ -55,7 +56,7 @@ export function collectionScenario(server: Server, currentUser: ModelInstance, +) { + buildOSF(server, currentUser); + buildrXiv(server, currentUser); + buildThesisCommons(server, currentUser); + buildAgrixiv(server, currentUser); + buildNutrixiv(server); + buildBiohackrxiv(server); +} + +function buildOSF( + server: Server, + currentUser: ModelInstance, +) { + const osf = server.schema.preprintProviders.find('osf') as ModelInstance; + + const brand = server.create('brand', { + primaryColor: '#286090', + secondaryColor: '#fff', + heroLogoImage: 'images/default-brand/osf-preprints-white.png', + heroBackgroundImage: 'images/default-brand/bg-dark.jpg', + }); + + const currentUserModerator = server.create('moderator', + { id: currentUser.id, user: currentUser, provider: osf }, 'asAdmin'); + + const rejectedAdminPreprint = server.create('preprint', { + provider: osf, + id: 'osf-rejected-admin', + title: 'Preprint RWF: Pre-moderation, Admin and Rejected with Review Actions comment', + currentUserPermissions: [Permission.Admin], + reviewsState: ReviewsState.REJECTED, + tags: [], + }, 'reviewAction'); + + const approvedAdminPreprint = server.create('preprint', { + provider: osf, + id: 'osf-approved-admin', + title: 'Preprint RWF: Pre-moderation, Admin and Approved', + currentUserPermissions: [Permission.Admin], + reviewsState: ReviewsState.ACCEPTED, + description: `${faker.lorem.sentence(200)}\n${faker.lorem.sentence(100)}`, + doi: '10.30822/artk.v1i1.79', + originalPublicationDate: new Date('2016-11-30T16:00:00.000000Z'), + preprintDoiCreated: new Date('2016-11-30T16:00:00.000000Z'), + hasCoi: true, + hasDataLinks: PreprintDataLinksEnum.NOT_APPLICABLE, + hasPreregLinks: PreprintPreregLinksEnum.NOT_APPLICABLE, + }); + + const notContributorPreprint = server.create('preprint', { + provider: osf, + id: 'osf-not-contributor', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Rejected', + currentUserPermissions: [], + reviewsState: ReviewsState.REJECTED, + hasDataLinks: PreprintDataLinksEnum.NO, + hasPreregLinks: PreprintPreregLinksEnum.NO, + whyNoData: `Why No Data\n${faker.lorem.sentence(200)}\n${faker.lorem.sentence(300)}`, + whyNoPrereg: `Why No Prereg\n${faker.lorem.sentence(200)}\n${faker.lorem.sentence(300)}`, + tags: [], + }); + + const rejectedPreprint = server.create('preprint', { + provider: osf, + id: 'osf-rejected', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Rejected', + currentUserPermissions: [], + reviewsState: ReviewsState.REJECTED, + hasDataLinks: PreprintDataLinksEnum.NO, + hasPreregLinks: PreprintPreregLinksEnum.NO, + tags: [], + }, 'isContributor'); + + const approvedPreprint = server.create('preprint', { + provider: osf, + id: 'osf-approved', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Approved', + currentUserPermissions: [], + doi: '10.30822/artk.v1i1.79', + reviewsState: ReviewsState.ACCEPTED, + description: `${faker.lorem.sentence(200)}\n${faker.lorem.sentence(300)}`, + originalPublicationDate: new Date('2016-11-30T16:00:00.000000Z'), + preprintDoiCreated: new Date('2016-11-30T16:00:00.000000Z'), + hasCoi: true, + hasDataLinks: PreprintDataLinksEnum.AVAILABLE, + dataLinks: ['Data link 1', 'Data link 2', 'Data link 3'], + hasPreregLinks: PreprintPreregLinksEnum.AVAILABLE, + preregLinks: ['Prereg link 1', 'Prereg link 2', 'Prereg link 3'], + conflictOfInterestStatement: `${faker.lorem.sentence(200)}\n${faker.lorem.sentence(300)}`, + }, 'isContributor'); + + const orphanedPreprint = server.create('preprint', { + provider: osf, + id: 'osf-orphan', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Approved', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPreprintOrphan: true, + }, 'isContributor'); + + const privatePreprint = server.create('preprint', Object({ + provider: osf, + id: 'osf-private', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Approved', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + public: false, + isPreprintDoi: false, + }), 'isContributor'); + + const publicDoiPreprint = server.create('preprint', Object({ + provider: osf, + id: 'osf-public-doi', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Approved', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + public: true, + isPreprintDoi: false, + isPublished: false, + }), 'isContributor'); + + const notPublishedPreprint = server.create('preprint', { + provider: osf, + id: 'osf-not-published', + title: 'Preprint RWF: Pre-moderation, Non-Admin and Approved', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'isContributor'); + + const withdrawnPreprint = server.create('preprint', Object({ + provider: osf, + id: 'osf-withdrawn', + title: 'Preprint Non-Admin, Not Published and withdrawn - no license - no justification', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + dateWithdrawn: new Date(), + addLicenseName: false, + }), 'isContributor'); + + const withdrawnLicensePreprint = server.create('preprint', Object({ + provider: osf, + id: 'osf-withdrawn-license', + title: 'Preprint Non-Admin, Not Published and withdrawn - license - justification - tombstone', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + dateWithdrawn: new Date(), + withdrawalJustification: 'This is the justification', + description: `${faker.lorem.sentence(200)}\n${faker.lorem.sentence(100)}`, + }), 'isContributor'); + + const pendingWithdrawalPreprint = server.create('preprint', { + provider: osf, + id: 'osf-pending-withdrawal', + title: 'Preprint Non-Admin, Not Published and Pending Withdrawal', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'pendingWithdrawal', 'isContributor'); + + const rejectedWithdrawalPreprintNoComment = server.create('preprint', { + provider: osf, + id: 'osf-rejected-withdrawal-no-comment', + title: 'Preprint Non-Admin, Not Published and Rejected Withdrawal - No Comment', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'rejectedWithdrawalNoComment', 'isContributor'); + + const rejectedWithdrawalPreprintComment = server.create('preprint', { + provider: osf, + id: 'osf-rejected-withdrawal-comment', + title: 'Preprint Non-Admin, Not Published and Rejected Withdrawal - Comment - Reviews Allowed', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'rejectedWithdrawalComment', 'isContributor'); + + const acceptedWithdrawalPreprintComment = server.create('preprint', { + provider: osf, + id: 'osf-accepted-withdrawal-comment', + title: 'Preprint Non-Admin, Not Published and Accepted Withdrawal - Comment - Reviews Allowed', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'acceptedWithdrawalComment'); + + const subjects = server.createList('subject', 7); + + osf.update({ + allowSubmissions: true, + highlightedSubjects: subjects, + // currentUser, + // eslint-disable-next-line max-len + advisory_board: '
\n

Advisory Group

\n

Our advisory group includes leaders in preprints and scholarly communication\n

\n
\n
    \n
  • Devin Berg : engrXiv, University of Wisconsin-Stout
    • \n
  • Pete Binfield : PeerJ PrePrints
    • \n
  • Benjamin Brown : PsyArXiv, Georgia Gwinnett College
    • \n
  • Philip Cohen : SocArXiv, University of Maryland
    • \n
  • Kathleen Fitzpatrick : Modern Language Association
    • \n
\n
\n
\n
    \n
  • John Inglis : bioRxiv, Cold Spring Harbor Laboratory Press
    • \n
  • Rebecca Kennison : K | N Consultants
    • \n
  • Kristen Ratan : CoKo Foundation
    • \n
  • Oya Rieger : Ithaka S+R
    • \n
  • Judy Ruttenberg : SHARE, Association of Research Libraries
    • \n
\n
\n
', + footer_links: '', + brand, + moderators: [currentUserModerator], + preprints: [ + rejectedAdminPreprint, + approvedAdminPreprint, + approvedPreprint, + rejectedPreprint, + orphanedPreprint, + privatePreprint, + notPublishedPreprint, + withdrawnPreprint, + withdrawnLicensePreprint, + pendingWithdrawalPreprint, + rejectedWithdrawalPreprintNoComment, + rejectedWithdrawalPreprintComment, + acceptedWithdrawalPreprintComment, + notContributorPreprint, + publicDoiPreprint, + ], + description: 'This is the description for osf', + }); +} + +function buildrXiv( + server: Server, + currentUser: ModelInstance, +) { + const preprintrxiv = server.schema.preprintProviders.find('preprintrxiv') as ModelInstance; + + const brand = server.create('brand', { + primaryColor: '#286090', + secondaryColor: '#fff', + heroLogoImage: 'images/default-brand/osf-preprints-white.png', + heroBackgroundImage: 'images/default-brand/bg-dark.jpg', + }); + + const currentUserModerator = server.create('moderator', + { id: currentUser.id, user: currentUser, provider: preprintrxiv}, 'asAdmin'); + + const rejectedWithdrawalPreprintCommentPrivate = server.create('preprint', { + provider: preprintrxiv, + id: 'preprintrxiv-rejected-withdrawal-comment', + title: 'Preprint Non-Admin, Not Published and Rejected Withdrawal - Comment - Reviews Disabled', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'rejectedWithdrawalComment', 'isContributor'); + + const pendingPreprint = server.create('preprint', Object({ + provider: preprintrxiv, + id: 'preprintrxiv-pending', + title: 'Preprint Non-Admin, Pending - Pre Moderation', + currentUserPermissions: [], + reviewsState: ReviewsState.PENDING, + isPublished: false, + }) , 'isContributor'); + + const subjects = server.createList('subject', 7); + + preprintrxiv.update({ + allowSubmissions: true, + highlightedSubjects: subjects, + // eslint-disable-next-line max-len + advisory_board: '
\n

Advisory Group

\n

Our advisory group includes leaders in preprints and scholarly communication\n

\n
\n
    \n
  • Devin Berg : engrXiv, University of Wisconsin-Stout
    • \n
  • Pete Binfield : PeerJ PrePrints
    • \n
  • Benjamin Brown : PsyArXiv, Georgia Gwinnett College
    • \n
  • Philip Cohen : SocArXiv, University of Maryland
    • \n
  • Kathleen Fitzpatrick : Modern Language Association
    • \n
\n
\n
\n
    \n
  • John Inglis : bioRxiv, Cold Spring Harbor Laboratory Press
    • \n
  • Rebecca Kennison : K | N Consultants
    • \n
  • Kristen Ratan : CoKo Foundation
    • \n
  • Oya Rieger : Ithaka S+R
    • \n
  • Judy Ruttenberg : SHARE, Association of Research Libraries
    • \n
\n
\n
', + footer_links: '', + brand, + moderators: [currentUserModerator], + preprints: [ + rejectedWithdrawalPreprintCommentPrivate, pendingPreprint, + ], + description: 'This is the description for preprintrXiv', + }); +} + +function buildThesisCommons( + server: Server, + currentUser: ModelInstance, ) { const thesisCommons = server.schema.preprintProviders.find('thesiscommons') as ModelInstance; const brand = server.create('brand', { @@ -19,24 +298,70 @@ export function preprintsScenario( const preprints = server.createList('preprint', 3, { provider: thesisCommons, }); + + const subjects = server.createList('subject', 2); + thesisCommons.update({ + highlightedSubjects: subjects, brand, moderators: [currentUserModerator], preprints, description: '

This is the description for Thesis Commons and it has an inline-style!

', + // eslint-disable-next-line max-len + advisory_board: '

Steering Committee

\n
\n
    \n
  • Obasegun Ayodele, Vilsquare.org, Nigeria
    • \n
  • Fayza Mahmoud, Alexandria University, Egypt
    • \n
  • Johanssen Obanda, Jabulani Youths for Transformation (JAY4T), Kenya
    • \n
  • Umar Ahmad, University Putra Malaysia (UPM) and the Malaysia Genome Institute (MGI)
    • \n
  • Michael Cary, West Virginia University, USA
    • \n
  • Nada Fath, Mohamed V University & Hassan II Institute of Agronomy and Veterinary Medicine, Rabat, Morocco
    • \n
  • Greg Simpson, Cranfield University, England & South Africa
    • \n
\n
\n
    \n
  • Hisham Arafat, EMEA Applications Consulting, Egypt
    • \n
  • Justin Sègbédji Ahinon, AfricArXiv co-founder, IGDORE, Bénin
    • \n
  • Mahmoud M Ibrahim, Uniklinik RWTH Aachen, Germany & Egypt
    • \n
  • Luke Okelo, Technical University of Kenya
    • \n
  • Ryszard Auksztulewicz, MPI of Empirical Aesthetics, Germany & City University of Hong Kong
    • \n
  • Osman Aldirdiri, University of Khartoum, Sudan
    • \n
  • Jo Havemann, AfricArXiv co-founder, Access 2 Perspectives‘, IGDORE, Germany & Kenya
    • \n
', + // eslint-disable-next-line max-len + footer_links: '

AfricArXiv: About | Submission Guidelines | Support | Contact |

', + email_support: 'overwritten-email@osf.io', }); +} +function buildAgrixiv( + server: Server, + currentUser: ModelInstance, +) { const agrixiv = server.schema.preprintProviders.find('agrixiv') as ModelInstance; + const agrixivBrand = server.create('brand', { primaryColor: '#85BF9B', secondaryColor: '#E7F7E1', heroBackgroundImage: 'https://singlecolorimage.com/get/E7F7E1/1000x1000', }); + + const currentUserModerator = server.create('moderator', + { id: currentUser.id, user: currentUser, provider: agrixiv}, 'asAdmin'); + + const rejectedWithdrawalPreprintComment = server.create('preprint', { + provider: agrixiv, + id: 'agrixiv-rejected-withdrawal-comment', + title: 'Preprint Non-Admin, Not Published and Rejected Withdrawal - Comment - Reviews Allowed', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + isPublished: false, + }, 'rejectedWithdrawalComment', 'isContributor'); + + const pendingPreprint = server.create('preprint', { + provider: agrixiv, + id: 'agrixiv-pending', + title: 'Preprint Non-Admin, Pending - Post Moderation', + currentUserPermissions: [], + reviewsState: ReviewsState.PENDING, + isPublished: false, + }, 'isContributor'); + agrixiv.update({ + moderators: [currentUserModerator], brand: agrixivBrand, description: '

This is the description for agrixiv!

', + preprints: [ + rejectedWithdrawalPreprintComment, + pendingPreprint, + ], }); +} +function buildNutrixiv( + server: Server, +) { const nutrixiv = server.schema.preprintProviders.find('nutrixiv') as ModelInstance; const nutrixivBrand = server.create('brand', { primaryColor: '#000000', @@ -47,15 +372,30 @@ export function preprintsScenario( brand: nutrixivBrand, description: '

This is the description for nutrixiv!

', }); +} +function buildBiohackrxiv(server: Server) { const biohackrxiv = server.schema.preprintProviders.find('biohackrxiv') as ModelInstance; const biohackrxivBrand = server.create('brand', { primaryColor: '#000000', secondaryColor: '#ccc', heroBackgroundImage: 'https://singlecolorimage.com/get/ffffff/1000x1000', }); + + const publicDoiPreprint = server.create('preprint', Object({ + provider: biohackrxiv, + id: 'biohackrxiv-public-doi', + title: 'Preprint RWF: No ReviewStatus, Non-Admin, Accepted, No Preprint Doi, public ', + currentUserPermissions: [], + reviewsState: ReviewsState.ACCEPTED, + public: true, + isPreprintDoi: false, + isPublished: false, + })); + biohackrxiv.update({ brand: biohackrxivBrand, description: '

This is the description for biohackrxiv!

', + preprints: [publicDoiPreprint], }); } diff --git a/mirage/serializers/contributor.ts b/mirage/serializers/contributor.ts index 741ad820bd2..8cc83825bdd 100644 --- a/mirage/serializers/contributor.ts +++ b/mirage/serializers/contributor.ts @@ -15,9 +15,15 @@ type MirageContributor = Contributor & { attrs: ContributorAttrs }; export default class ContributorSerializer extends ApplicationSerializer { buildNormalLinks(model: ModelInstance) { - const url = model.node - ? `${apiUrl}/v2/nodes/${model.node.id}/contributors/${model.id}` - : `${apiUrl}/v2/draft_registrations/${model.draftRegistration.id}/contributors/${model.id}`; + let url = ''; + if(model.node) { + url = `${apiUrl}/v2/nodes/${model.node.id}/contributors/${model.id}`; + } else if (model.preprint) { + url = `${apiUrl}/v2/preprints/${model.preprint.id}/contributors/${model.id}`; + } else { + url = `${apiUrl}/v2/draft_registrations/${model.draftRegistration.id}/contributors/${model.id}`; + } + return { self: url, }; diff --git a/mirage/serializers/file.ts b/mirage/serializers/file.ts index 3ca9150cc08..bef1b6c93cb 100644 --- a/mirage/serializers/file.ts +++ b/mirage/serializers/file.ts @@ -66,15 +66,28 @@ export default class FileSerializer extends ApplicationSerializer { buildNormalLinks(model: ModelInstance) { const { id } = model; - return { - ...super.buildNormalLinks(model), - new_folder: model.kind === 'folder' ? `${apiUrl}/wb/files/${id}/upload/?kind=folder` : undefined, - upload: `${apiUrl}/wb/files/${id}/upload/`, - download: `${apiUrl}/wb/files/${id}/download/`, - move: `${apiUrl}/wb/files/${id}/move/`, - delete: `${apiUrl}/wb/files/${id}/delete/`, - info: `${apiUrl}/v2/files/${id}/`, - html: `/${id}/`, - }; + if (model.links) { + return { + ...super.buildNormalLinks(model), + new_folder: model.kind === 'folder' ? `${apiUrl}/wb/files/${id}/upload/?kind=folder` : undefined, + upload: model.links.upload, + download: model.links.download, + move: model.links.move, + delete: `${apiUrl}/${model.links.delete}`, + info: model.links.info, + html: model.links.html, + }; + } else { + return { + ...super.buildNormalLinks(model), + new_folder: model.kind === 'folder' ? `${apiUrl}/wb/files/${id}/upload/?kind=folder` : undefined, + upload: `${apiUrl}/wb/files/${id}/upload/`, + download: `${apiUrl}/wb/files/${id}/download/`, + move: `${apiUrl}/wb/files/${id}/move/`, + delete: `${apiUrl}/wb/files/${id}/delete/`, + info: `${apiUrl}/v2/files/${id}/`, + html: `/${id}/`, + }; + } } } diff --git a/mirage/serializers/preprint-provider.ts b/mirage/serializers/preprint-provider.ts index d504ed68abb..753e75f5375 100644 --- a/mirage/serializers/preprint-provider.ts +++ b/mirage/serializers/preprint-provider.ts @@ -13,6 +13,8 @@ export default class PreprintProviderSerializer extends ApplicationSerializer) { + const has_highlighted_subjects = model.highlightedSubjects.length > 0; + const relationships: SerializedRelationships = { subjects: { links: { @@ -25,8 +27,10 @@ export default class PreprintProviderSerializer extends ApplicationSerializer { + buildNormalLinks(model: ModelInstance) { + return { + self: `${apiUrl}/v2/actions/${model.id}`, + }; + } + + buildRelationships(model: ModelInstance) { + const relationships: SerializedRelationships = { + creator: { + links: { + related: { + href: `${apiUrl}/v2/users/${model.creator.id}`, + meta: {}, + }, + }, + }, + target: { + links: { + related: { + href: `${apiUrl}/v2/requests/${model.target.id}`, + meta: {}, + }, + }, + }, + }; + return relationships; + } +} diff --git a/mirage/serializers/preprint-request.ts b/mirage/serializers/preprint-request.ts new file mode 100644 index 00000000000..7ef1400186a --- /dev/null +++ b/mirage/serializers/preprint-request.ts @@ -0,0 +1,44 @@ +import { ModelInstance } from 'ember-cli-mirage'; +import config from 'ember-osf-web/config/environment'; +import PreprintRequestModel from 'ember-osf-web/models/preprint-request'; +import ApplicationSerializer, { SerializedRelationships } from './application'; + +const { OSF: { apiUrl } } = config; + +export default class PreprintRequestSerializer extends ApplicationSerializer { + buildNormalLinks(model: ModelInstance) { + return { + self: `${apiUrl}/v2/requests/${model.id}`, + }; + } + + buildRelationships(model: ModelInstance) { + const relationships: SerializedRelationships = { + creator: { + links: { + related: { + href: `${apiUrl}/v2/users/${model.creator.id}`, + meta: {}, + }, + }, + }, + target: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.target.id}`, + meta: {}, + }, + }, + }, + actions: { + links: { + related: { + href: `${apiUrl}/v2/requests/${model.id}/actions`, + meta: {}, + }, + }, + }, + }; + return relationships; + } +} diff --git a/mirage/serializers/preprint.ts b/mirage/serializers/preprint.ts new file mode 100644 index 00000000000..53f79a73dfb --- /dev/null +++ b/mirage/serializers/preprint.ts @@ -0,0 +1,131 @@ +import { ModelInstance } from 'ember-cli-mirage'; +import config from 'ember-osf-web/config/environment'; +import { PreprintMirageModel } from 'ember-osf-web/mirage/factories/preprint'; +import ApplicationSerializer, { SerializedRelationships } from './application'; + +const { OSF: { apiUrl } } = config; + +export default class PreprintSerializer extends ApplicationSerializer { + buildNormalLinks(model: ModelInstance) { + return { + self: `${apiUrl}/v2/${model.id}/`, + doi: model.doi ? `https://doi.org/${model.doi}` : null, + preprint_doi: model.isPreprintDoi ? `https://doi.org/10.31219/osf.io/${model.id}` : null, + }; + } + + buildRelationships(model: ModelInstance) { + const relationships: SerializedRelationships = { + provider: { + data: { + id: model.provider.id, + type: 'preprint-providers', + }, + links: { + related: { + href: `${apiUrl}/v2/providers/preprints/${model.provider.id}`, + meta: {}, + }, + }, + }, + contributors: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/contributors`, + meta: this.buildRelatedLinkMeta(model, 'contributors'), + }, + }, + }, + bibliographicContributors: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/bibliographic_contributors/`, + meta: this.buildRelatedLinkMeta(model, 'bibliographicContributors'), + }, + }, + }, + files: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/files/`, + meta: this.buildRelatedLinkMeta(model, 'files'), + }, + }, + }, + primaryFile: { + links: { + related: { + href: `${apiUrl}/v2/files/${model.primaryFile.id}/`, + meta: this.buildRelatedLinkMeta(model, 'files'), + }, + }, + }, + license: { + links: { + related: { + href: `${apiUrl}/v2/licenses/${model.license.id}/`, + meta: {}, + }, + }, + }, + subjects: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/subjects/`, + meta: this.buildRelatedLinkMeta(model, 'subjects'), + }, + }, + }, + reviewActions: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/review_actions/`, + meta: this.buildRelatedLinkMeta(model, 'reviewActions'), + }, + }, + }, + requests: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/requests/`, + meta: this.buildRelatedLinkMeta(model, 'requests'), + }, + }, + }, + citation: { + links: { + related: { + href: `${apiUrl}/v2/preprints/${model.id}/citation/`, + meta: {}, + }, + }, + }, + node: { + links: { + related: { + href: `${apiUrl}/v2/nodes/${model.node.id}`, + meta: this.buildRelatedLinkMeta(model, 'node'), + }, + }, + }, + }; + + if (model.license !== null) { + const { id } = model.license; + relationships.license = { + data: { + id: id as string, + type: 'licenses', + }, + links: { + related: { + href: `${apiUrl}/v2/licenses/${id}`, + meta: {}, + }, + }, + }; + } + + return relationships; + } +} diff --git a/mirage/serializers/user.ts b/mirage/serializers/user.ts index 4036c9df063..b99941eb255 100644 --- a/mirage/serializers/user.ts +++ b/mirage/serializers/user.ts @@ -10,6 +10,14 @@ import ApplicationSerializer, { SerializedRelationships } from './application'; const { OSF: { apiUrl } } = config; export default class UserSerializer extends ApplicationSerializer { + buildNormalLinks(model: ModelInstance) { + return { + ...super.buildNormalLinks(model), + profile_image: randomGravatar(), + html: randomGravatar(), + }; + } + buildRelationships(model: ModelInstance) { const serializedRelationships: SerializedRelationships = { emails: { @@ -75,11 +83,4 @@ export default class UserSerializer extends ApplicationSerializer { } return serializedRelationships; } - - buildNormalLinks(model: ModelInstance) { - return { - ...super.buildNormalLinks(model), - profile_image: randomGravatar(), - }; - } } diff --git a/public/assets/images/default-brand/osf-preprints-white.png b/public/assets/images/default-brand/osf-preprints-white.png new file mode 100644 index 00000000000..ff363f18a63 Binary files /dev/null and b/public/assets/images/default-brand/osf-preprints-white.png differ diff --git a/tests/acceptance/preprints/branded-footer-test.ts b/tests/acceptance/preprints/branded-footer-test.ts new file mode 100644 index 00000000000..d5319026146 --- /dev/null +++ b/tests/acceptance/preprints/branded-footer-test.ts @@ -0,0 +1,45 @@ +import { render } from '@ember/test-helpers'; +import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'ember-qunit'; +import { module, test } from 'qunit'; + +module('Acceptance | preprints | branded-footer', hooks => { + setupRenderingTest(hooks); + + test('it inserts the footerLink when present', async function(assert) { + // Given no list is provided + // When the component is rendered + await render(hbs` + + + `); + + // Then the footer links are verified + assert.dom('[data-test-footer-links]').hasText('these are the footer links', 'The footer links are present'); + }); + + test('it does not insert the footerLink when undefined', async function(assert) { + // Given no list is provided + // When the component is rendered + await render(hbs``); + + // Then the footer links are verified + assert.dom('[data-test-footer-links]').doesNotExist('The footer links are not present'); + }); + + test('it does no insert the footerLink when it an empty string', async function(assert) { + // Given no list is provided + // When the component is rendered + await render(hbs` + + + `); + + // Then the footer links are verified + assert.dom('[data-test-footer-links]').doesNotExist('The footer links are not present'); + }); +}); diff --git a/tests/acceptance/preprints/index-test.ts b/tests/acceptance/preprints/index-test.ts new file mode 100644 index 00000000000..c686d31a3f8 --- /dev/null +++ b/tests/acceptance/preprints/index-test.ts @@ -0,0 +1,37 @@ +import { currentRouteName } from '@ember/test-helpers'; +import { ModelInstance } from 'ember-cli-mirage'; +import { setupMirage } from 'ember-cli-mirage/test-support'; +import { TestContext } from 'ember-test-helpers'; +import { module, test } from 'qunit'; + +import { setupOSFApplicationTest, visit } from 'ember-osf-web/tests/helpers'; +import PreprintProviderModel from 'ember-osf-web/models/preprint-provider'; + +interface PreprintIndexTestContext extends TestContext { + provider: ModelInstance; +} + +module('Acceptance | preprints | index', hooks => { + setupOSFApplicationTest(hooks); + setupMirage(hooks); + + hooks.beforeEach(async function(this: PreprintIndexTestContext) { + server.loadFixtures('preprint-providers'); + const provider = server.schema.preprintProviders.find('osf') as ModelInstance; + const brand = server.create('brand'); + provider.update({ + brand, + description: 'This is the description for OSF', + }); + this.provider = provider; + }); + + test('OSF - Provider', async function(this: PreprintIndexTestContext, assert) { + await visit('/preprints'); + assert.equal(currentRouteName(), 'preprints.index', 'Current route is preprints'); + + const pageTitle = document.getElementsByTagName('title')[0].innerText; + assert.equal(pageTitle, 'OSF Preprints', 'Page title is correct'); + assert.dom('[data-test-provider-description]').exists('This is the description for OSF'); + }); +}); diff --git a/tests/acceptance/preprints/taxonomy-top-list-test.ts b/tests/acceptance/preprints/taxonomy-top-list-test.ts new file mode 100644 index 00000000000..72b4cb77c5e --- /dev/null +++ b/tests/acceptance/preprints/taxonomy-top-list-test.ts @@ -0,0 +1,220 @@ +import Service from '@ember/service'; +import { render } from '@ember/test-helpers'; +import Ember from 'ember'; +import { hbs } from 'ember-cli-htmlbars'; +import { EnginesTestContext } from 'ember-engines/test-support'; +import SubjectModel from 'ember-osf-web/models/subject'; +import { OsfLinkRouterStub } from 'ember-osf-web/tests/integration/helpers/osf-link-router-stub'; +import { setupRenderingTest } from 'ember-qunit'; +import { module, test } from 'qunit'; + +module('Acceptance | preprints | taxonomy-top-list', hooks => { + setupRenderingTest(hooks); + + hooks.beforeEach(function(this: EnginesTestContext) { + this.owner.unregister('service:router'); + this.owner.register('service:router', OsfLinkRouterStub); + }); + + test('it creates no rows when the list is undefined', async function(this: EnginesTestContext,assert) { + // Given no list is provided + // When the component is rendered + await render(hbs` + + + `); + + // Then the subject container is verified + assert.dom('[data-test-subject-container]').doesNotExist('no subjects are displayed'); + }); + + test('it creates no rows when the list is empty', async function(this: EnginesTestContext,assert) { + // Given the taxonomy list is created with two subjects + this.set('list', [ ]); + + // When the component is rendered + await render(hbs` + + + `); + + // Then the subject container is verified + assert.dom('[data-test-subject-container]').doesNotExist('no subjects are displayed'); + }); + + test('it throws an error with a list and no provider', async function(this: EnginesTestContext,assert) { + Ember.onerror = (error: Error) => { + assert.equal(error.message, + 'A provider string must be provided with a valid list'); + }; + + // Given the taxonomy list is created with two subjects + this.set('list', [ + { + text: 'elephant', + taxonomyName: 'forgetful', + } as SubjectModel, + ]); + + // When the component is rendered + await render(hbs` + + + `); + }); + + test('it creates a row of two subjects in desktop mode', async function(this: EnginesTestContext,assert) { + // Given the taxonomy list is created with two subjects + this.set('list', [ + { + text: 'elephant', + taxonomyName: 'forgetful', + } as SubjectModel, + { + text: 'deer', + taxonomyName: 'The sneaky', + } as SubjectModel, + ]); + + // When the component is rendered + await render(hbs` + + + `); + + // Then the subject container is verified + const subjectContainers = this.element.querySelectorAll('[data-test-subject-container]'); + assert.equal(subjectContainers.length, 1, 'The subject container has 1 container'); + + // And the link containers are verified + const linkContainers = subjectContainers[0].querySelectorAll('[data-test-taxonomy-container]'); + assert.equal(linkContainers.length, 2, 'The link container is grouped in two'); + + // And the first link is verified to be sorted correctly + const links = linkContainers[0].querySelectorAll('[data-test-taxonomy-link]'); + assert.dom(links[0]).hasText('deer', 'The first link is deer'); + // And the href is corrected + // eslint-disable-next-line max-len + // TODO: should add more test here to test link destination + }); + + test('it creates two rows of two and one subject in desktop mode', async function(this: EnginesTestContext,assert) { + // Given the taxonomy list is created with two subjects + this.set('list', [ + { + text: 'elephant', + taxonomyName: 'forgetful', + } as SubjectModel, + { + text: 'bamboon', + taxonomyName: 'The great red bum', + } as SubjectModel, + { + text: 'deer', + taxonomyName: 'The sneaky', + } as SubjectModel, + ]); + + // When the component is rendered + await render(hbs` + + + `); + + + // Then the subject container is verified + const subjectContainers = this.element.querySelectorAll('[data-test-subject-container]'); + assert.equal(subjectContainers.length, 2, 'The subject container has 1 container'); + + // And the link containers are verified + let linkContainers = subjectContainers[0].querySelectorAll('[data-test-taxonomy-container]'); + assert.equal(linkContainers.length, 2, 'The link container is grouped in two'); + + // And the first link is verified to be sorted correctly + let links = linkContainers[1].querySelectorAll('[data-test-taxonomy-link]'); + assert.dom(links[0]).hasText('deer', 'The first link is deer'); + // And the href is corrected + // eslint-disable-next-line max-len + // TODO: should add more test here to test link destination + + linkContainers = subjectContainers[1].querySelectorAll('[data-test-taxonomy-container]'); + assert.equal(linkContainers.length, 1, 'The link container is grouped in one'); + + // And the third link is verified to be sorted correctly + links = linkContainers[0].querySelectorAll('[data-test-taxonomy-link]'); + assert.dom(links[0]).hasText('elephant', 'The first link is elephant'); + // And the href is corrected + // eslint-disable-next-line max-len + // TODO: should add more test here to test link destination + }); + + test('it creates a 2 rows and one subjects in mobile mode', async function(this: EnginesTestContext,assert) { + + const mediaServiceStub = Service.extend({ + isMobile: true, + isDesktop: false, + }); + + this.owner.register('service:media', mediaServiceStub); + + // Given the taxonomy list is created with two subjects + this.set('list', [ + { + text: 'elephant', + taxonomyName: 'forgetful', + } as SubjectModel, + { + text: 'deer', + taxonomyName: 'The sneaky', + } as SubjectModel, + ]); + + // When the component is rendered + await render(hbs` + + + `); + + // Then the subject container is verified + const subjectContainers = this.element.querySelectorAll('[data-test-subject-container]'); + assert.equal(subjectContainers.length, 2, 'The subject container has 1 container'); + + // And the link containers are verified + let linkContainers = subjectContainers[0].querySelectorAll('[data-test-taxonomy-container]'); + assert.equal(linkContainers.length, 1, 'The link container is grouped in one'); + + // And the first link is verified to be sorted correctly + let links = linkContainers[0].querySelectorAll('[data-test-taxonomy-link]'); + assert.dom(links[0]).hasText('deer', 'The first link is deer'); + // And the href is corrected + // eslint-disable-next-line max-len + // TODO: should add more test here to test link destination + + // And the link containers are verified + linkContainers = subjectContainers[1].querySelectorAll('[data-test-taxonomy-container]'); + assert.equal(linkContainers.length, 1, 'The link container is grouped in one'); + + // And the first link is verified to be sorted correctly + links = linkContainers[0].querySelectorAll('[data-test-taxonomy-link]'); + assert.dom(links[0]).hasText('elephant', 'The first link is elephant'); + // And the href is corrected + // eslint-disable-next-line max-len + // TODO: should add more test here to test link destination + }); +}); diff --git a/tests/engines/registries/integration/index/index-test.ts b/tests/engines/registries/integration/index/index-test.ts deleted file mode 100644 index a60e27b525d..00000000000 --- a/tests/engines/registries/integration/index/index-test.ts +++ /dev/null @@ -1,153 +0,0 @@ -import EngineInstance from '@ember/engine/instance'; -import { click, fillIn, triggerKeyEvent } from '@ember/test-helpers'; -import { setupMirage } from 'ember-cli-mirage/test-support'; -import { TestContext } from 'ember-test-helpers'; -import { module, skip } from 'qunit'; -import sinon from 'sinon'; - -import { stubRegistriesShareSearch } from 'ember-osf-web/tests/engines/registries/helpers'; -import { visit } from 'ember-osf-web/tests/helpers'; -import { setupEngineApplicationTest } from 'ember-osf-web/tests/helpers/engines'; - -import HeaderStyles from 'registries/components/registries-header/styles'; -import ServiceListStyles from 'registries/components/registries-services-list/styles'; - -module('Registries | Integration | index', hooks => { - setupEngineApplicationTest(hooks, 'registries'); - setupMirage(hooks); - - hooks.beforeEach(function(this: TestContext) { - stubRegistriesShareSearch(this); - - const engine = this.owner.lookup('-engine-instance:registries-registries') as EngineInstance; - const analytics = engine.lookup('service:analytics'); - analytics.set('click', sinon.stub(analytics, 'click')); - analytics.actions.click = analytics.click; - }); - - skip('analytics', async function(this: TestContext, assert: Assert) { - const testCases: Array<{ - name: string, - action: () => Promise, - // category, label, extra - expected: Array, - }> = [ - { - name: 'Search Button (Clicked)', - action: async () => click('button'), - expected: ['link', 'Index - Search', ''], - }, - { - name: 'Search Button (Clicked, With query)', - action: async () => { - await fillIn('[data-test-search-box]', 'My Query'); - await click('[data-test-search-button]'); - }, - expected: ['link', 'Index - Search', 'My Query'], - }, - { - name: 'Search Button (Submitted)', - action: async () => triggerKeyEvent('[data-test-search-box]', 'keydown', 13), - expected: ['link', 'Index - Search', ''], - }, - { - name: 'Search Button (Submitted, With query)', - action: async () => { - await fillIn('[data-test-search-box]', 'My Query'); - await triggerKeyEvent('[data-test-search-box]', 'keydown', 13); - }, - expected: ['link', 'Index - Search', 'My Query'], - }, - { - name: 'See Example', - action: async () => click( - `.${HeaderStyles.RegistriesHeader} a`, - ), - expected: [ - 'link', - 'Index - See Example', - 'https://osf.io/jsznk/register/565fb3678c5e4a66b5582f67', - sinon.match.any, - ], - }, - { - name: 'Browse Recent (id = 1)', - action: async () => click('[data-test-recent-registration-id="1"]'), - expected: [ - 'link', - 'Index - Browse Recent: Can Potatoes Cause Cancer?', - 'https://example.com/cancer-potatoes', - ], - }, - { - name: 'Browse Recent (id = 2)', - action: async () => click('[data-test-recent-registration-id="2"]'), - expected: [ - 'link', - 'Index - Browse Recent: Can Potatoes Cure Cancer?', - 'https://example.com/super-potatoes', - ], - }, - { - name: 'GitHub Repo', - action: async () => click( - `a.${ServiceListStyles.ServicesList__ExternalLink}:first-child`, - ), - expected: [ - 'link', - 'Index - GitHub Repo', - 'https://github.com/CenterForOpenScience/ember-osf-web', - sinon.match.any, - ], - }, - { - name: 'Requirements and Roadmap', - action: async () => click( - `a.${ServiceListStyles.ServicesList__ExternalLink}:last-child`, - ), - expected: [ - 'link', - 'Index - public roadmap', - 'https://cos.io/our-products/product-roadmap/', - sinon.match.any, - ], - }, - { - name: 'Contact Us', - action: async () => click('a.btn.btn-info.btn-lg'), - expected: [ - 'link', - 'Index - Contact', - sinon.match.any, - ], - }, - ]; - - // 1 extra assertion from setupOSFApplicationTest - assert.expect((testCases.length * 3) + 1); - const engine = this.owner.lookup('-engine-instance:registries-registries') as EngineInstance; - const stub = engine.lookup('service:analytics').click; - - for (const testCase of testCases) { - stub.reset(); - stub.callsFake((...args: any[]) => { - const event = args[args.length - 1] as MouseEvent; - // Prevent redirects from being followed - if (!event.preventDefault) { - return true; - } - - event.preventDefault(); - return false; - }); - - await visit('/registries'); - - await testCase.action(); - - assert.ok(true, testCase.name); - sinon.assert.calledOnce(stub); - sinon.assert.calledWith(stub, ...testCase.expected); - } - }); -}); diff --git a/tests/integration/components/branded-header/component-test.ts b/tests/integration/components/branded-header/component-test.ts new file mode 100644 index 00000000000..82706dc9101 --- /dev/null +++ b/tests/integration/components/branded-header/component-test.ts @@ -0,0 +1,78 @@ +import { render } from '@ember/test-helpers'; +import { hbs } from 'ember-cli-htmlbars'; +import { setupMirage } from 'ember-cli-mirage/test-support'; +import { setupIntl } from 'ember-intl/test-support'; +import { setupRenderingTest } from 'ember-qunit'; +import { TestContext } from 'ember-test-helpers'; +import { module, test } from 'qunit'; +import sinon from 'sinon'; + +module('Integration | Component | branded-header', hooks => { + setupRenderingTest(hooks); + setupMirage(hooks); + setupIntl(hooks); + + hooks.beforeEach(function(this: TestContext) { + // this.store = this.owner.lookup('service:store'); + }); + + test('default display', async function(assert) { + // Given the input variablies are set + this.set('onSearch', sinon.fake()); + this.set('searchPlaceholder', 'preprints.header.search_placeholder'); + + // When the component is rendered + await render(hbs` + {{#branded-header.lead}} +
+ This is the lead +
+ {{/branded-header.lead}} + {{#branded-header.row}} +
+ This is the row +
+ {{/branded-header.row}} + + `); + + // Then the header container is verified + const headerContainer = this.element.querySelector('[data-test-header-container]'); + assert.dom(headerContainer).exists(); + + // And the brand logo container is verified + assert.dom(this.element.querySelector('[data-test-brand-logo]')).hasAttribute('aria-label', 'OSF Preprints'); + + // And the perform search button is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-perform-search-button]')).hasAttribute('aria-label', 'Perform search'); + assert.dom(this.element.querySelector('[data-test-perform-search-button]')).hasAttribute('type', 'button'); + + // And the search icon is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-search-icon]')).hasAttribute('data-icon', 'search'); + + // And the search box is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-search-box]')).hasAttribute('placeholder', 'preprints.header.search_placeholder'); + + // And the search help button is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-search-help-button]')).hasAttribute('aria-label', 'Search help'); + assert.dom(this.element.querySelector('[data-test-search-help-button]')).hasAttribute('type', 'button'); + + // And the lead yield is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-lead-yield]')).hasText('This is the lead', 'The lead in yielded correctly'); + + // And the row yield is verified + // eslint-disable-next-line max-len + assert.dom(this.element.querySelector('[data-test-row-yield]')).hasText('This is the row', 'The lead in yielded correctly'); + }); +}); diff --git a/tests/integration/components/subscriptions/component-test.ts b/tests/integration/components/subscriptions/component-test.ts index 023cc431f1e..8a0936cb04e 100644 --- a/tests/integration/components/subscriptions/component-test.ts +++ b/tests/integration/components/subscriptions/component-test.ts @@ -2,6 +2,7 @@ import { click, render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { setupMirage } from 'ember-cli-mirage/test-support'; import { setupIntl, TestContext } from 'ember-intl/test-support'; +import RegistrationProviderModel from 'ember-osf-web/models/registration-provider'; import { SubscriptionFrequency } from 'ember-osf-web/models/subscription'; import { clickTrigger } from 'ember-power-select/test-support/helpers'; import { setupRenderingTest } from 'ember-qunit'; diff --git a/translations/en-us.yml b/translations/en-us.yml index 99c02c3ec78..f3d2c7e701d 100644 --- a/translations/en-us.yml +++ b/translations/en-us.yml @@ -24,6 +24,8 @@ documentType: pluralCapitalized: Theses singular: thesis singularCapitalized: Thesis +contact: + email: support@osf.io general: OSF: OSF share: Share @@ -1114,10 +1116,133 @@ collections: reject: rejected remove: 'removed' preprints: - osf-title: 'OSF Preprints' provider-title: '{name} {pluralizedPreprintWord}' discover: title: 'Search' + title: 'Preprints' + detail: + abstract: 'Abstract' + article_doi: 'Peer-reviewed Publication DOI' + citations: 'Citations' + collapse: 'Collapse' + date_label: + created_on: 'Created' + submitted_on: 'Submitted' + disciplines: 'Disciplines' + expand: 'Expand' + header: + last_edited: 'Last edited' + authors_label: 'Authors' + withdrawn_on: 'Withdrawn' + license: 'License' + none: 'None' + original_publication_date: 'Original publication date' + orphan_preprint: 'The user has removed this file.' + preprint_doi: '{documentType} DOI' + preprint_pending_doi: 'DOI created after {documentType} is made public' + preprint_pending_doi_moderation: 'DOI created after moderator approval' + preprint_pending_doi_minted: 'DOIs are minted by a third party, and may take up to 24 hours to be registered.' + private_preprint_warning: 'This {documentType} is private. Contact {supportEmail} if this is in error.' + project_button: + edit_preprint: 'Edit {documentType}' + edit_resubmit_preprint: 'Edit and resubmit' + see_less: 'See less' + see_more: 'See more' + share: + download: 'Download {documentType}' + downloads: 'Downloads' + download_file: 'Download file' + views: 'Views' + metrics_disclaimer: 'Metrics collected since:' + supplemental_materials: 'Supplemental Materials' + tags: 'Tags' + reason_for_withdrawal: 'Reason for withdrawal' + author-assertions: + header_label: 'Author Assertions' + describe: 'Describe' + available: + yes: 'Yes' + no: 'No' + available: 'Available' + not_applicable: 'Not applicable' + conflict_of_interest: + title: 'Conflict of Interest' + no: 'Author asserted no Conflict of Interest' + public_data: + linksToData: 'Links to data' + title: 'Public Data' + no: 'No additional information provided by author.' + not_applicable: 'Author asserted there is no data associated with this {documentType}.' + description: 'Data refers to raw and/or processed information (quantitative or qualitative) used for the analyses, case studies, and/or descriptive interpretation in the {documentType}. Public data could include data posted to open-access repositories, public archival library collection, or government archive. For data that is available under limited circumstances (e.g., after signing a data sharing agreement), choose the ‘No’ option and use the comment box to explain how others could access the data.' + prereg: + links: 'Links' + title: 'Preregistration' + type: 'Type' + chooseOne: 'Choose one' + no: 'No additional information provided by author.' + prereg_designs: 'Study Design' + prereg_analysis: 'Analysis Plan' + prereg_both: 'Both' + not_applicable: 'Author asserted that preregistration was not applicable because no data collection, extraction, or analysis is reported in this {documentType}.' + description: 'A preregistration is a description of the research design and/or analysis plan that is created and registered before researchers collected data or before they have seen/interacted with preexisting data. The description should appear in a public registry (e.g., clinicaltrials.gov, OSF, AEA registry).' + status_banner: + pre_moderation: 'pre-moderation' + post_moderation: 'post-moderation' + brand_name: 'OSF' + loading: 'Loading...' + close: 'Close' + message: + base: '{name} uses {reviewsWorkflow}. This {documentType}' + pending_pre: 'is not publicly available or searchable until approved by a moderator.' + pending_post: 'is publicly available and searchable but is subject to removal by a moderator.' + accepted: 'has been accepted by a moderator and is publicly available and searchable.' + rejected: 'has been rejected by a moderator and is not publicly available or searchable.' + pending_withdrawal: 'This {documentType} has been requested by the authors to be withdrawn. It will still be publicly searchable until the request has been approved.' + withdrawn: 'This {documentType} has been withdrawn.' + withdrawal_rejected: 'Your request to withdraw this {documentType} from the service has been denied by the moderator.' + pending: 'pending' + accepted: 'accepted' + rejected: 'rejected' + pending_withdrawal: 'pending withdrawal' + withdrawal_rejected: 'withdrawal rejected' + feedback: + moderator_feedback: 'Moderator feedback' + moderator: 'Moderator' + base: 'This {documentType}' + header: + osf_preprints: 'OSF Preprints' + search_placeholder: 'Search {placeholder} ...' + search_button: 'Perform search' + search_label: 'Search' + search_help: 'Search help' + powered_by: 'Powered by OSF Preprints' + or: 'or' + submit_label: 'Submit a preprint' + example: 'See an example' + authors_label: + subjects: + heading: + provider: 'Browse by provider' + hasHighlightedSubjects: 'Browse by featured subjects' + noHighlightedSubjects: 'Browse by subjects' + links: + seeAllSubjects: 'See all subjects available' + services: + top: + heading: '{documentType} Services' + paragraph: 'Leading {documentType} service providers use this open source infrastructure to support their communities.' + bottom: + contact: 'Contact us' + p1: 'Create your own branded {documentType} servers backed by the OSF.' + div: + line1: 'Check out the' + linkText1: 'open source code' + line2: 'and our' + linkText2: 'public roadmap' + line3: '. Input welcome!' + advisory: + heading: 'Advisory Group' + paragraph: 'Our advisory group includes leaders in preprints and scholarly communication' registries: header: osf_registrations: 'OSF Registrations' diff --git a/types/osf-api.d.ts b/types/osf-api.d.ts index 8e3ce81b0b3..3b10b28592d 100644 --- a/types/osf-api.d.ts +++ b/types/osf-api.d.ts @@ -89,10 +89,12 @@ export interface RelatedLinkMeta { id?: string; count?: number; type?: string; + has_highlighted_subjects?: boolean; } export interface NormalLinks extends JSONAPI.Links { self?: JSONAPI.Link; html?: JSONAPI.Link; + iri?: JSONAPI.Link; } /* eslint-enable camelcase */