Merge branch 'develop' into feature/mirage-user-registrations

Author: brianjgeiger

app/models/draft-registration.ts

@@ -37,6 +37,7 @@ export default class DraftRegistrationModel extends OsfModel {
  @attr('fixstringarray') tags!: string[];
  @attr('node-license') nodeLicense!: NodeLicense | null;
  @attr('node-category') category!: NodeCategory;
+ @attr('boolean') hasProject!: boolean;
 
  @belongsTo('node', { inverse: 'draftRegistrations' })
  branchedFrom!: DS.PromiseObject<NodeModel> & NodeModel;

lib/osf-components/addon/components/registries/finalize-registration-modal/component.ts

@@ -2,7 +2,9 @@ import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
 import { assert } from '@ember/debug';
 import { action, computed } from '@ember/object';
+import { inject as service } from '@ember/service';
 import config from 'ember-get-config';
+import Intl from 'ember-intl/services/intl';
 import moment from 'moment';
 
 import { layout } from 'ember-osf-web/decorators/component';
@@ -16,6 +18,7 @@ import template from './template';
 @layout(template, styles)
 @tagName('')
 export default class FinalizeRegisrationModalComponent extends Component {
+ @service intl!: Intl;
  // Required parameter
  manager!: FinalizeRegistrationModalManager;
 
@@ -38,6 +41,18 @@ export default class FinalizeRegisrationModalComponent extends Component {
  }
  }
 
+ @computed('manager.draftManager.reviewsWorkflow')
+ get noticeText() {
+ const translationOptions = { learnMoreLink: this.learnMoreLink, htmlSafe: true };
+ if (this.manager.draftManager.reviewsWorkflow) {
+ return this.intl.t(
+ 'registries.finalizeRegistrationModal.notice.withModerationFromProject',
+ translationOptions,
+ );
+ }
+ return this.intl.t('registries.finalizeRegistrationModal.notice.noModerationFromProject', translationOptions);
+ }
+
  @computed('manager.{hasEmbargoEndDate,submittingRegistration}', 'makePublicOption')
  get shouldDisableSubmitButton() {
  return this.makePublicOption === ''

lib/osf-components/addon/components/registries/finalize-registration-modal/manager/template.hbs

@@ -5,4 +5,5 @@
  registration=this.registration
  hasEmbargoEndDate=this.hasEmbargoEndDate
  submittingRegistration=this.submittingRegistration
+ draftManager=this.draftManager
 )}}

lib/osf-components/addon/components/registries/finalize-registration-modal/template.hbs

@@ -9,7 +9,7 @@
  </dialog.heading>
  <dialog.main data-test-finalize-main>
  <div local-class='notice'>
- {{t 'registries.finalizeRegistrationModal.notice' learnMoreLink=this.learnMoreLink htmlSafe=true}}
+ {{this.noticeText}}
  </div>
  <div>
  <RadioButton

lib/registries/addon/drafts/draft/draft-registration-manager.ts

@@ -44,6 +44,7 @@ export default class DraftRegistrationManager {
  schemaBlocks!: SchemaBlock[];
 
  @alias('draftRegistration.id') draftId!: string;
+ @alias('provider.reviewsWorkflow') reviewsWorkflow?: string;
  @or('onPageInput.isRunning', 'onMetadataInput.isRunning') autoSaving!: boolean;
  @or('initializePageManagers.isRunning', 'initializeMetadataChangeset.isRunning') initializing!: boolean;
  @not('registrationResponsesIsValid') hasInvalidResponses!: boolean;

mirage/factories/draft-registration.ts

@@ -65,6 +65,8 @@ export default Factory.extend<DraftRegistration & DraftRegistrationTraits>({
 
  category: NodeCategory.Uncategorized,
 
+ hasProject: true,
+
  withRegistrationMetadata: trait<DraftRegistration>({
  afterCreate(draftRegistration) {
  draftRegistration.update({

tests/integration/components/registries/finalize-registration-modal/component-test.ts

@@ -1,24 +1,30 @@
 import { click, fillIn, render, settled } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
+import { t } from 'ember-intl/test-support';
 import { setupRenderingTest } from 'ember-qunit';
 import moment from 'moment';
 import { module, test } from 'qunit';
 
+import stripHtmlTags from 'ember-osf-web/utils/strip-html-tags';
+
 module('Integration | Component | finalize-registration-modal', hooks => {
  setupRenderingTest(hooks);
  setupMirage(hooks);
 
  test('make registration public immediately', async function(assert) {
  this.store = this.owner.lookup('service:store');
- const registration = server.create('registration');
+ const provider = server.create('registration-provider');
+ const registration = server.create('registration', { provider });
 
  const registrationModel = await this.store.findRecord('registration', registration.id);
+ this.set('draftManager', { provider });
  this.set('model', registrationModel);
  this.set('isOpen', false);
  await render(hbs`
  <Registries::FinalizeRegistrationModal::Manager
  @registration={{this.model}}
+ @draftManager={{this.draftManager}}
  as |manager|
  >
  <Registries::FinalizeRegistrationModal @isOpen={{this.isOpen}} @manager={{manager}} />
@@ -55,14 +61,17 @@ module('Integration | Component | finalize-registration-modal', hooks => {
 
  test('embargo registration', async function(assert) {
  this.store = this.owner.lookup('service:store');
- const registration = server.create('registration');
+ const provider = server.create('registration-provider');
+ const registration = server.create('registration', { provider });
 
  const registrationModel = await this.store.findRecord('registration', registration.id);
+ this.set('draftManager', { provider });
  this.set('model', registrationModel);
  this.set('isOpen', false);
  await render(hbs`
  <Registries::FinalizeRegistrationModal::Manager
  @registration={{this.model}}
+ @draftManager={{this.draftManager}}
  as |manager|
  >
  <Registries::FinalizeRegistrationModal @isOpen={{this.isOpen}} @manager={{manager}} />
@@ -102,4 +111,67 @@ module('Integration | Component | finalize-registration-modal', hooks => {
  // // Close the dialog
  this.set('isOpen', false);
  });
+
+ test('almost done modal content: no moderation', async function(assert) {
+ this.store = this.owner.lookup('service:store');
+ const noModerationProvider = server.create('registration-provider', { reviewsWorkflow: null });
+ const noModRegistration = server.create('registration', { provider: noModerationProvider });
+
+ const registrationModel = await this.store.findRecord('registration', noModRegistration.id);
+ this.set('draftManager', { provider: noModerationProvider });
+ this.set('model', registrationModel);
+ this.set('isOpen', true);
+ await render(hbs`
+ <Registries::FinalizeRegistrationModal::Manager
+ @registration={{this.model}}
+ @draftManager={{this.draftManager}}
+ as |manager|
+ >
+ <Registries::FinalizeRegistrationModal @isOpen={{this.isOpen}} @manager={{manager}} />
+ </Registries::FinalizeRegistrationModal::Manager>
+ `);
+ // Click immediate radio button
+ await click('[data-test-immediate-button]');
+ // Click submit button
+ await click('[data-test-submit-registration-button]');
+
+ const opts = { learnMoreLink: 'aaa.aa', htmlSafe: true };
+ assert.dom('[data-test-finalize-main]').hasTextContaining(
+ stripHtmlTags(t('registries.finalizeRegistrationModal.notice.noModerationFromProject', opts).toString()),
+ 'modal shows warning',
+ );
+ assert.dom('[data-test-finalize-main]').doesNotHaveTextContaining(
+ 'A moderator must review and approve', 'modal does not mention moderation for unmoderated providers',
+ );
+ });
+
+ test('almost done modal content: with moderation', async function(assert) {
+ this.store = this.owner.lookup('service:store');
+ const withModerationProvider = server.create('registration-provider');
+ const withModRegistration = server.create('registration', { provider: withModerationProvider });
+
+ const registrationModel = await this.store.findRecord('registration', withModRegistration.id);
+ this.set('draftManager', { provider: withModerationProvider, reviewsWorkflow: 'pre-moderation' });
+ this.set('model', registrationModel);
+ this.set('isOpen', true);
+ await render(hbs`
+ <Registries::FinalizeRegistrationModal::Manager
+ @registration={{this.model}}
+ @draftManager={{this.draftManager}}
+ as |manager|
+ >
+ <Registries::FinalizeRegistrationModal @isOpen={{this.isOpen}} @manager={{manager}} />
+ </Registries::FinalizeRegistrationModal::Manager>
+ `);
+ // Click immediate radio button
+ await click('[data-test-immediate-button]');
+ // Click submit button
+ await click('[data-test-submit-registration-button]');
+
+ const opts = { learnMoreLink: 'aaa.aa', htmlSafe: true };
+ assert.dom('[data-test-finalize-main]').hasTextContaining(
+ stripHtmlTags(t('registries.finalizeRegistrationModal.notice.withModerationFromProject', opts).toString()),
+ 'modal shows warning with moderation for moderated providers',
+ );
+ });
 });

translations/en-us.yml

@@ -1354,7 +1354,9 @@ registries:
  request_embargo_termination: 'embargo termination requested'
  finalizeRegistrationModal:
  title: 'Almost done...'
- notice: "Please keep in mind that:\n <ul>\n <li>\n Registrations cannot be modified or deleted once completed.\n </li>\n <li>\n The content and version history of Wiki and OSF Storage will be copied to the registration.\n </li>\n <li>\n This project contains links to other projects. These links will be copied into your registration, but the\n projects that they link to will not be registered. If you wish to register the linked projects, they must be\n registered separately. <a href='{learnMoreLink}' target='_blank' rel='noopener noreferrer'>Learn more about links</a>.\n </li>\n </ul>"
+ notice:
+ noModerationFromProject: 'Remember:<ul><li>Registrations cannot be modified or deleted once submitted.</li><li>Changes to any files (1) in the projects or components being registered, (2) uploaded or selected as prompt responses, including those connected through add-ons during archiving will result in archiving failure and loss of your registration timestamp. Please do not modify your files until after you have received email confirmation of archiving completion. If this registration has been archiving for more than 72 hours, please email <a href="mailto:support@osf.io">support@osf.io</a> for assistance.</li><li>The content and version history of Wiki and OSF Storage will be copied to the registration.</li><li>This project may contain links to other projects. These links will be copied into your registration, but the projects that they link to will not be registered. If you wish to register the linked projects, they must be registered separately. <a href="{learnMoreLink}" target="_blank" rel="noopener noreferrer">Learn more about links</a>.</li></ul>'
+ withModerationFromProject: 'Remember:<ul><li>Registrations cannot be modified or deleted once submitted.</li><li>Changes to any files (1) in the projects or components being registered, (2) uploaded or selected as prompt responses, including those connected through add-ons during archiving will result in archiving failure and loss of your registration timestamp. Please do not modify your files until after you have received email confirmation of archiving completion. If this registration has been archiving for more than 72 hours, please email <a href="mailto:support@osf.io">support@osf.io</a> for assistance.</li><li>The content and version history of Wiki and OSF Storage will be copied to the registration.</li><li>This project may contain links to other projects. These links will be copied into your registration, but the projects that they link to will not be registered. If you wish to register the linked projects, they must be registered separately. <a href="{learnMoreLink}" target="_blank" rel="noopener noreferrer">Learn more about links</a>.</li><li>A moderator must review and approve your registration before it will be made public or embargoed.</li></ul>'
  immediateOption: 'Make registration public immediately'
  embargoOption: 'Enter registration into embargo'
  createDoi: 'Create DOI'