Merge branch 'release/20.13.0'

fabmiz · fabmiz · commit 0bface3708c1 · 2020-12-17T16:12:26.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [20.13.0] - 2020-12-17
+### Added
+- moderation tests
+- the embargo end date to the moderation dropdown on the registration overview page
+- sub-dependency security (minor) upgrades
+
 ## [20.12.1] - 2020-12-09
 ### Added
 - help text to the license metadata section when submitting registration
@@ -1682,7 +1688,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.12.1...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.13.0...develop
+[20.13.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.13.0
 [20.12.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.1
 [20.12.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.0
 [20.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.11.0
diff --git a/lib/osf-components/addon/components/registries/registration-list/card/component.ts b/lib/osf-components/addon/components/registries/registration-list/card/component.ts
@@ -1,5 +1,4 @@
 import Component from '@glimmer/component';
-
 import RegistrationModel, { RegistrationReviewStates } from 'ember-osf-web/models/registration';
 
 const iconMap: Partial<Record<RegistrationReviewStates, string>> = {
diff --git a/lib/osf-components/addon/components/registries/registration-list/card/styles.scss b/lib/osf-components/addon/components/registries/registration-list/card/styles.scss
diff --git a/lib/osf-components/addon/components/registries/registration-list/card/template.hbs b/lib/osf-components/addon/components/registries/registration-list/card/template.hbs
@@ -18,6 +18,7 @@
                 {{@registration.title}}
             {{else}}
                 <OsfLink
+                    data-test-registration-title-link
                     @route='registries.overview'
                     @models={{array @registration.id}}
                     @queryParams={{hash mode='moderator'}}
diff --git a/lib/osf-components/addon/components/registries/registration-list/list/styles.scss b/lib/osf-components/addon/components/registries/registration-list/list/styles.scss
diff --git a/lib/osf-components/addon/components/registries/registration-list/list/template.hbs b/lib/osf-components/addon/components/registries/registration-list/list/template.hbs
@@ -9,7 +9,7 @@
     >
         <list.item as |registration|>
             {{#if registration}}
-                <RegistrationList::Card
+                <Registries::RegistrationList::Card
                     @registration={{registration}}
                     @state={{@manager.state}}
                 />
diff --git a/lib/osf-components/addon/components/registries/registration-list/manager/component.ts b/lib/osf-components/addon/components/registries/registration-list/manager/component.ts
@@ -1,8 +1,10 @@
 import Component from '@ember/component';
 import { action, computed } from '@ember/object';
-
+import { layout } from 'ember-osf-web/decorators/component';
 import { RegistrationReviewStates } from 'ember-osf-web/models/registration';
+import template from './template';
 
+@layout(template)
 export default class RegistrationListManager extends Component {
     reloadRegistrationsList!: () => void;
     state!: RegistrationReviewStates | string;
diff --git a/lib/osf-components/addon/components/registries/registration-list/manager/template.hbs b/lib/osf-components/addon/components/registries/registration-list/manager/template.hbs
diff --git a/lib/osf-components/addon/components/registries/review-actions-list/review-action/component.ts b/lib/osf-components/addon/components/registries/review-actions-list/review-action/component.ts
@@ -38,7 +38,6 @@ export default class ReviewAction extends Component<Args> {
                 });
         }
         if ([ReviewActionTrigger.RequestWithdrawal,
-            ReviewActionTrigger.Submit,
             ReviewActionTrigger.RequestEmbargoTermination].includes(reviewAction.actionTrigger)) {
             return this.intl.t('registries.reviewAction.contributorAction',
                 {
@@ -47,6 +46,21 @@ export default class ReviewAction extends Component<Args> {
                     date: formattedTimeSince(reviewAction.dateModified),
                 });
         }
+        if (reviewAction.actionTrigger === ReviewActionTrigger.Submit) {
+            if (this.args.embargoEndDate) {
+                return this.intl.t('registries.reviewAction.submitActionWithEmbargo',
+                    {
+                        contributor: reviewAction.creator.get('fullName'),
+                        date: formattedTimeSince(reviewAction.dateModified),
+                        embargoEndDate: this.intl.formatDate(this.args.embargoEndDate, { locale: this.intl.locale }),
+                    });
+            }
+            return this.intl.t('registries.reviewAction.submitActionWithoutEmbargo',
+                {
+                    contributor: reviewAction.creator.get('fullName'),
+                    date: formattedTimeSince(reviewAction.dateModified),
+                });
+        }
         return this.intl.t('registries.reviewAction.moderatorAction',
             {
                 action: reviewAction.triggerPastTense,
diff --git a/lib/osf-components/app/components/registries/registration-list/card/component.js b/lib/osf-components/app/components/registries/registration-list/card/component.js
@@ -0,0 +1 @@
+export { default } from 'osf-components/components/registries/registration-list/card/component';
diff --git a/lib/osf-components/app/components/registries/registration-list/card/template.js b/lib/osf-components/app/components/registries/registration-list/card/template.js
@@ -0,0 +1 @@
+export { default } from 'osf-components/components/registries/registration-list/card/template';
diff --git a/lib/osf-components/app/components/registries/registration-list/list/template.js b/lib/osf-components/app/components/registries/registration-list/list/template.js
@@ -0,0 +1 @@
+export { default } from 'osf-components/components/registries/registration-list/list/template';
diff --git a/lib/osf-components/app/components/registries/registration-list/manager/component.js b/lib/osf-components/app/components/registries/registration-list/manager/component.js
@@ -0,0 +1 @@
+export { default } from 'osf-components/components/registries/registration-list/manager/component';
diff --git a/lib/registries/addon/branded/moderation/submissions/template.hbs b/lib/registries/addon/branded/moderation/submissions/template.hbs
@@ -1,6 +1,6 @@
 {{title (t 'registries.moderation.submissions.title') prepend=false}}
 {{!-- TODO: Add number of registrations in each state in tab --}}
-<RegistrationList::Manager
+<Registries::RegistrationList::Manager
     local-class='registrationListContainer'
     @provider={{this.model}}
     @state={{this.state}}
@@ -76,5 +76,5 @@
             @sortBy='date_registered'
         />
     </div>
-    <RegistrationList::List @manager={{manager}} />
-</RegistrationList::Manager>
+    <Registries::RegistrationList::List @manager={{manager}} />
+</Registries::RegistrationList::Manager>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "20.12.1",
+  "version": "20.13.0",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",
@@ -196,7 +196,7 @@
     "loaders.css": "^0.1.2",
     "mime-types": "^2.1.22",
     "mocha": "^6.1.4",
-    "node-sass": "^4.11.0",
+    "node-sass": "^4.13.1",
     "qunit-dom": "^1.0.0",
     "sass": "^1.26.3",
     "seedrandom": "^3.0.1",
diff --git a/tests/integration/components/registries/registration-list/card/component-test.ts b/tests/integration/components/registries/registration-list/card/component-test.ts
@@ -0,0 +1,121 @@
+import { render } from '@ember/test-helpers';
+import a11yAudit from 'ember-a11y-testing/test-support/audit';
+import { hbs } from 'ember-cli-htmlbars';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { TestContext } from 'ember-intl/test-support';
+import RegistrationModel from 'ember-osf-web/models/registration';
+import { OsfLinkRouterStub } from 'ember-osf-web/tests/integration/helpers/osf-link-router-stub';
+import { setupRenderingTest } from 'ember-qunit';
+import { module, test } from 'qunit';
+
+interface ThisTestContext extends TestContext {
+    registration: RegistrationModel;
+}
+
+module('Registries | Integration | Component | registration-list-card', hooks => {
+    setupRenderingTest(hooks);
+    setupMirage(hooks);
+
+    hooks.beforeEach(function(this: ThisTestContext) {
+        this.owner.register('service:router', OsfLinkRouterStub);
+        this.store = this.owner.lookup('service:store');
+
+        const provider = server.create('registration-provider');
+        const registration = server.create('registration', {
+            title: 'Test title',
+            provider,
+        }, 'withReviewActions');
+        this.setProperties({ registration });
+    });
+
+    test('it renders pending', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='pending'
+        />`);
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="pending"]').exists();
+        assert.dom('[data-test-registration-title-link]').exists();
+        assert.dom('[data-test-registration-title-link]').hasText(this.registration.title);
+    });
+
+    test('it renders accepted', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='accepted'
+        />`);
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="accepted"]').exists();
+        assert.dom('[data-test-registration-title-link]').exists();
+        assert.dom('[data-test-registration-title-link]').hasText(this.registration.title);
+    });
+
+    test('it renders embargo', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='embargo'
+        />`);
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="embargo"]').exists();
+        assert.dom('[data-test-registration-title-link]').exists();
+        assert.dom('[data-test-registration-title-link]').hasText(this.registration.title);
+    });
+
+    test('it renders withdrawn', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='withdrawn'
+        />`);
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="withdrawn"]').exists();
+        assert.dom('[data-test-registration-title-link]').exists();
+        assert.dom('[data-test-registration-title-link]').hasText(this.registration.title);
+    });
+
+    test('it renders pending withdraw', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='pending_withdraw'
+        />`);
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="pending_withdraw"]').exists();
+        assert.dom('[data-test-registration-title-link]').exists();
+        assert.dom('[data-test-registration-title-link]').hasText(this.registration.title);
+    });
+
+    test('it renders rejected', async function(this: ThisTestContext, assert) {
+        const mirageRegistration = await this.store.findRecord('registration', this.registration.id);
+        this.set('mirageRegistration', mirageRegistration);
+        await render(hbs`
+            <Registries::RegistrationList::Card
+            @registration={{this.mirageRegistration}}
+            @state='rejected'
+        />`);
+
+        await a11yAudit(this.element);
+        assert.dom('[data-test-registration-list-card]').isVisible();
+        assert.dom('[data-test-registration-list-card-icon="rejected"]').exists();
+        assert.dom('[data-test-registration-title-link]').doesNotExist();
+        assert.dom('[data-test-registration-list-card-title]').hasText(this.registration.title);
+    });
+});
diff --git a/tests/integration/components/registries/registration-list/component-test.ts b/tests/integration/components/registries/registration-list/component-test.ts
@@ -0,0 +1,54 @@
+import { click, render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { module, test } from 'qunit';
+
+import { setupIntl, TestContext } from 'ember-intl/test-support';
+import { setupRenderingTest } from 'ember-qunit';
+import { OsfLinkRouterStub } from '../../../helpers/osf-link-router-stub';
+
+module('Integration | Component | registration-list', hooks => {
+    setupRenderingTest(hooks);
+    setupMirage(hooks);
+    setupIntl(hooks);
+
+    hooks.beforeEach(function(this: TestContext) {
+        this.owner.register('service:router', OsfLinkRouterStub);
+        this.store = this.owner.lookup('service:store');
+    });
+
+    test('list renders and paginates', async function(this: TestContext, assert) {
+        const registrations = server.createList('registration', 13, 'isPending');
+        server.create('registration-provider', { id: 'stayc', registrations });
+        const providerModel = this.store.findRecord('registration-provider', 'stayc');
+        this.set('provider', providerModel);
+        await render(hbs`
+            <Registries::RegistrationList::Manager
+                @provider={{this.provider}}
+                @state={{'pending'}}
+                as |manager|
+            >
+                <Registries::RegistrationList::List @manager={{manager}} />
+            </Registries::RegistrationList::Manager>`);
+        assert.dom('[data-test-registration-list-card]').exists({ count: 10 }, 'First page has 10 elements');
+        await click('[data-test-next-page-button]');
+        assert.dom('[data-test-registration-list-card]').exists({ count: 3 }, 'Second page has 3 elements');
+    });
+
+    test('list renders when no registration is available', async function(this: TestContext, assert) {
+        server.create('registration-provider', { id: 'stayc' });
+        const providerModel = this.store.findRecord('registration-provider', 'stayc');
+        this.set('provider', providerModel);
+        await render(hbs`
+            <Registries::RegistrationList::Manager
+                @provider={{this.provider}}
+                @state={{'pending'}}
+                as |manager|
+            >
+                <Registries::RegistrationList::List @manager={{manager}} />
+            </Registries::RegistrationList::Manager>`);
+        assert.dom('[data-test-registration-list-none]').exists({ count: 1 }, 'There are no results');
+        assert.dom('[data-test-registration-list-none]').hasText(this.intl.t('registries.registrationList.pending'));
+        assert.dom('[data-test-next-page-button]').doesNotExist('No next page button');
+    });
+});
diff --git a/tests/integration/components/registries/review-actions-list/component-test.ts b/tests/integration/components/registries/review-actions-list/component-test.ts
@@ -11,15 +11,6 @@ module('Integration | Component | review-actions-list', hooks => {
     setupIntl(hooks);
     setupMirage(hooks);
 
-    hooks.beforeEach(() => {
-        server.create('registration', {
-            id: 'single',
-        }, 'withSingleReviewAction');
-        server.create('registration', {
-            id: 'multi',
-        }, 'withReviewActions');
-    });
-
     test('error fetching review-actions', async function(assert) {
         setupOnerror((e: any) => assert.ok(e, 'Error is handled'));
 
diff --git a/tests/integration/components/registries/review-actions-list/review-action/component-test.ts b/tests/integration/components/registries/review-actions-list/review-action/component-test.ts
diff --git a/translations/en-us.yml b/translations/en-us.yml
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import Component from '@glimmer/component';`
`2`		`-`
`3`	`2`	`import RegistrationModel, { RegistrationReviewStates } from 'ember-osf-web/models/registration';`
`4`	`3`
`5`	`4`	`const iconMap: Partial<Record<RegistrationReviewStates, string>> = {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`>`
`10`	`10`	`<list.item as \|registration\|>`
`11`	`11`	`{{#if registration}}`
`12`		`- <RegistrationList::Card`
	`12`	`+ <Registries::RegistrationList::Card`
`13`	`13`	`@registration={{registration}}`
`14`	`14`	`@state={{@manager.state}}`
`15`	`15`	`/>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default } from 'osf-components/components/registries/registration-list/card/component';`