Merge branch 'release/21.11.0'

adlius · adlius · commit 69b3082bbd95 · 2021-12-21T15:36:37.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [21.11.0] - 2021-12-21
+### Changed
+- Misc a11y and bug fixes
+- Added new error types for registration bulk upload
+
 ## [21.10.0] - 2021-11-30
 ### Added
 - Registration versioning
@@ -1814,6 +1819,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[21.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.11.0
+[21.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.2
+[21.10.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.1
 [21.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.0
 [21.9.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.2
 [21.9.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.1
diff --git a/app/guid-node/template.hbs b/app/guid-node/template.hbs
@@ -3,7 +3,7 @@
         @node={{this.model.taskInstance.value}}
     />
 {{/unless}}
-<div data-analytics-scope='Node'>
+<div data-analytics-scope='Node' role='main'>
     {{outlet}}
 </div>
 <JoinOsfBanner />
diff --git a/app/meetings/detail/-components/meeting-detail-header/template.hbs b/app/meetings/detail/-components/meeting-detail-header/template.hbs
@@ -3,9 +3,9 @@
 <div data-test-meeting-location-and-date local-class='location-and-date-text'>
     {{if this.meeting.location this.meeting.location}}
     {{if (and this.meeting.location (or this.meeting.startDate this.meeting.endDate)) ' | '}}
-    {{if this.meeting.startDate (moment-format this.meeting.startDate 'MMM DD, YYYY')}}
+    {{if this.meeting.startDate (moment-format this.meeting.startDate 'MMM DD, YYYY' timeZone='Europe/London')}}
     {{if (or this.meeting.startDate this.meeting.endDate) ' - '}}
-    {{if this.meeting.endDate (moment-format this.meeting.endDate 'MMM DD, YYYY')}}
+    {{if this.meeting.endDate (moment-format this.meeting.endDate 'MMM DD, YYYY' timeZone='Europe/London')}}
 </div>
 
 {{#if this.meeting.logoUrl}}
diff --git a/app/meetings/index/-components/meetings-list/template.hbs b/app/meetings/index/-components/meetings-list/template.hbs
@@ -59,9 +59,9 @@
                     {{meeting.location}}
                 </div>
                 <div data-test-meetings-list-item-date>
-                    {{if meeting.startDate (moment-format meeting.startDate 'MMM DD, YYYY')}}
+                    {{if meeting.startDate (moment-format meeting.startDate 'MMM DD, YYYY' timeZone='Europe/London')}}
                     {{if (or meeting.startDate meeting.endDate) ' - '}}
-                    {{if meeting.endDate (moment-format meeting.endDate 'MMM DD, YYYY')}}
+                    {{if meeting.endDate (moment-format meeting.endDate 'MMM DD, YYYY' timeZone='Europe/London')}}
                 </div>
             {{else}}
                 <div data-test-meetings-list-placeholder-name>
diff --git a/app/models/registration-provider.ts b/app/models/registration-provider.ts
@@ -34,6 +34,9 @@ export default class RegistrationProviderModel extends ProviderModel {
     @attr('array')
     permissions!: ReviewPermissions[];
 
+    @attr('boolean')
+    allowBulkUploads!: boolean;
+
     @computed('permissions')
     get currentUserCanReview() {
         if (this.permissions) {
diff --git a/lib/app-components/addon/components/branded-navbar/styles.scss b/lib/app-components/addon/components/branded-navbar/styles.scss
@@ -10,6 +10,19 @@
     :global(.navbar-collapse) {
         border-top-color: transparent;
     }
+    /* stylelint-disable */
+    #navbarScope {
+        :global(.secondary-nav-dropdown) {
+            a {
+                color: $color-text-white;
+            }
+        }
+
+        :global(.btn-success) {
+            color: $color-text-white;
+        }
+    }
+    /* stylelint-enable */
 }
 
 .navbar-image {
diff --git a/lib/osf-components/addon/components/registries/overview-form-renderer/template.hbs b/lib/osf-components/addon/components/registries/overview-form-renderer/template.hbs
@@ -2,7 +2,10 @@
     <LoadingIndicator @dark={{true}}/>
 {{else}}
     {{#if this.showMetadata}}
-        <Registries::VersionMetadata @revision={{@revision}} />
+        <Registries::VersionMetadata
+            @revision={{@revision}}
+            @registration={{@registration}}
+        />
     {{/if}}
     <Registries::RegistrationFormNavigationDropdown
         @showMetadata={{false}}
diff --git a/lib/osf-components/addon/components/registries/version-metadata/template.hbs b/lib/osf-components/addon/components/registries/version-metadata/template.hbs
@@ -1,4 +1,5 @@
 {{assert 'Registries::VersionMetadata requires @revision' @revision}}
+{{assert 'Registries::VersionMetadata requires @registration' @registration}}
 <section
     local-class='versionMetadata'
 > 
@@ -14,7 +15,7 @@
     {{!-- TODO: add description for what fields have changed --}}
     <p data-test-version-metadata-date>
         {{if @revision.isOriginalResponse 
-            (t 'registries.overview.versionMetadata.originalDate' date=(moment-format @revision.dateModified 'MMM DD, YYYY'))
+            (t 'registries.overview.versionMetadata.originalDate' date=(moment-format @registration.dateRegistered 'MMM DD, YYYY'))
             (t 'registries.overview.versionMetadata.date' date=(moment-format @revision.dateModified 'MMM DD, YYYY'))
         }}
     </p>
diff --git a/lib/osf-components/addon/components/subjects/display/styles.scss b/lib/osf-components/addon/components/subjects/display/styles.scss
@@ -23,7 +23,7 @@
     border: 1px dotted $color-border-gray-light;
     padding: 4px 8px;
     font-style: italic;
-    color: $color-text-gray-dark;
+    color: $color-text-black;
 }
 
 .RemoveButton.RemoveButton {
diff --git a/lib/osf-components/addon/components/subjects/display/template.hbs b/lib/osf-components/addon/components/subjects/display/template.hbs
@@ -21,9 +21,9 @@
                 {{/if}}
             </li>
         {{else}}
-            <span data-test-selected-subject-placeholder local-class='Placeholder'>
+            <li data-test-selected-subject-placeholder local-class='Placeholder'>
                 {{t 'osf-components.subjects.display.placeholder'}}
-            </span>
+            </li>
         {{/each}}
     </ul>
 {{/if}}
diff --git a/lib/registries/addon/branded/moderation/-components/upload-csv/component.ts b/lib/registries/addon/branded/moderation/-components/upload-csv/component.ts
@@ -25,6 +25,7 @@ interface ApiErrorDetail {
     type: string;
     invalidHeaders?: string[];
     missingHeaders?: string[];
+    duplicateHeaders?: string[];
 }
 export default class UploadCsvComponent extends Component<Args> {
     dropzoneOptions = {
@@ -65,6 +66,7 @@ export default class UploadCsvComponent extends Component<Args> {
                         htmlSafe: true,
                         invalidIds: error.invalidHeaders ? error.invalidHeaders.join(', ') : null,
                         missingIds: error.missingHeaders ? error.missingHeaders.join(', ') : null,
+                        duplicateIds: error.duplicateHeaders ? error.duplicateHeaders.join(', ') : null,
                     }),
                 },
             );
diff --git a/lib/registries/addon/branded/moderation/settings/controller.ts b/lib/registries/addon/branded/moderation/settings/controller.ts
@@ -10,7 +10,7 @@ export default class BrandedModerationSettingsController extends Controller {
     @alias('model.id') providerId?: string;
 
     get shouldShowBulkUploadWidget() {
-        return this.model.permissions.includes(ReviewPermissions.AddModerator);
+        return this.model.permissions.includes(ReviewPermissions.AddModerator) && this.model.allowBulkUploads;
     }
 
     @computed('providerId')
diff --git a/lib/registries/addon/components/registries-discover-results-header/template.hbs b/lib/registries/addon/components/registries-discover-results-header/template.hbs
@@ -8,7 +8,7 @@
         <ResponsiveDropdown as |dd|>
             <dd.trigger
                 data-test-sort-dropdown
-                data-analytics-name='Sort Registries Button{{if @provider ' @provider.name'}}'
+                data-analytics-name='Sort Registries Button{{if @provider (concat ' ' @provider.name)}}'
                 local-class='DropdownTrigger'
             >
                 {{t 'registries.discover.sort_by'}}: {{t @searchOptions.order.display}}
diff --git a/lib/registries/addon/components/registries-search-result/styles.scss b/lib/registries/addon/components/registries-search-result/styles.scss
@@ -2,6 +2,10 @@
 h3.RegistriesSearchResult__Title {
     line-height: inherit;
     margin-top: 10px;
+
+    :global(.label-default) {
+        background-color: $color-bg-gray-darker;
+    }
 }
 
 .RegistriesSearchResult__Sources {
diff --git a/lib/registries/addon/components/registries-search-result/template.hbs b/lib/registries/addon/components/registries-search-result/template.hbs
@@ -19,7 +19,7 @@
             <OsfLink
                 data-test-result-title-id={{@result.id}}
                 @href={{@result.mainLink}}
-                data-analytics-name='Result Title{{if @provider concat ' @provider.name'}}'
+                data-analytics-name='Result Title{{if @provider (concat ' ' @provider.name)}}'
             >
                 {{math @result.title}}
             </OsfLink>
diff --git a/lib/registries/addon/components/registries-services-list/styles.scss b/lib/registries/addon/components/registries-services-list/styles.scss
@@ -20,6 +20,11 @@
     text-decoration: underline;
 }
 
+.ServicesList__ExternalLink:hover {
+    color: $color-text-blue-light;
+    text-decoration: underline;
+}
+
 .ServicesList__ProviderLogo {
     height: 120px;
     background-size: contain;
diff --git a/lib/registries/addon/components/registries-services-list/template.hbs b/lib/registries/addon/components/registries-services-list/template.hbs
@@ -28,7 +28,7 @@
                     <a
                         local-class='ServicesList__ExternalLink'
                         href='https://github.com/CenterForOpenScience/ember-osf-registries'
-                        onclick={{action 'click' 'link' 'Index - GitHub Repo' 'https://github.com/CenterForOpenScience/ember-osf-registries'
+                        onclick={{action 'click' 'link' 'Index - GitHub Repo' 'https://github.com/CenterForOpenScience/ember-osf-web'
                             target=this.analytics}}
                     >
                         {{~t 'registries.index.services.bottom.div.linkText1'~}}
diff --git a/lib/registries/addon/components/sharing-icons/popover/template.hbs b/lib/registries/addon/components/sharing-icons/popover/template.hbs
@@ -4,7 +4,7 @@
     local-class='SharingIconsPopover__anchor'
     class='btn-link pull-right'
     tabindex='0'
-    data-analytics-name='Sharing Icons Popover{{if @provider concat ' @provider.name'}}'
+    data-analytics-name='Sharing Icons Popover{{if @provider (concat ' ' @provider.name)}}'
     ...attributes
 >
     <FaIcon @icon='share-alt' />
diff --git a/lib/registries/addon/discover/template.hbs b/lib/registries/addon/discover/template.hbs
@@ -73,7 +73,7 @@
 
             {{#unless this.totalResults}}
                 <div class='col-sm-8 col-xs-12'>
-                    <div class='text-center text-muted'>
+                    <div class='text-center'>
                         <p data-test-no-results-placeholder class='lead'>
                             {{t 'registries.discover.no_results'}}
                         </p>
@@ -93,7 +93,7 @@
             {{/if}}
         {{else if this.doSearch.isError}}
             <div class='col-sm-8 col-xs-12'>
-                <div class='text-center text-muted'>
+                <div class='text-center'>
                     <p class='lead'>
                         {{t 'registries.discover.error_loading'}}
                     </p>
diff --git a/lib/registries/addon/drafts/draft/route.ts b/lib/registries/addon/drafts/draft/route.ts
@@ -37,6 +37,9 @@ export default class DraftRegistrationRoute extends Route {
                 draftId,
                 { adapterOptions: { include: 'branched_from' } },
             );
+            if (draftRegistration.modelName === 'registration') {
+                this.transitionTo('overview', draftRegistration.id);
+            }
             const [subjects, provider]:
                 [SubjectModel[], ProviderModel] = await Promise.all([
                     draftRegistration.loadAll('subjects'),
diff --git a/mirage/factories/registration.ts b/mirage/factories/registration.ts
@@ -151,6 +151,7 @@ export default NodeFactory.extend<MirageRegistration & RegistrationTraits>({
             registrationSchema: newReg.registrationSchema,
             reviewsState: RevisionReviewStates.Unapproved,
             revisionResponses: newReg.registrationResponses,
+            isOriginalResponse: true,
         });
         newReg.update({ originalResponse: baseResponse });
         newReg.update({ latestResponse: baseResponse });
diff --git a/mirage/scenarios/registrations.ts b/mirage/scenarios/registrations.ts
@@ -293,6 +293,7 @@ export function registrationScenario(
     const wdrwn = server.create('registration', {
         id: 'wdrwn',
         title: 'Withdrawn Hermit',
+        withdrawn: true,
         registrationSchema: server.schema.registrationSchemas.find('testSchema'),
         provider: egap,
         reviewsState: RegistrationReviewStates.Withdrawn,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "21.10.0",
+  "version": "21.11.0",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",
diff --git a/tests/engines/registries/acceptance/branded/moderation/settings-test.ts b/tests/engines/registries/acceptance/branded/moderation/settings-test.ts
@@ -15,7 +15,7 @@ module('Registries | Acceptance | branded.moderation | settings', hooks => {
     setupMirage(hooks);
 
     hooks.beforeEach(() => {
-        server.create('registration-provider', { id: 'mdr8n' });
+        server.create('registration-provider', { id: 'mdr8n', allowBulkUploads: true });
         server.create('subscription', {
             id: 'mdr8n_new_pending_submissions',
             eventName: 'new_pending_submissions',
@@ -65,7 +65,7 @@ module('Registries | Acceptance | branded.moderation | settings', hooks => {
         assert.dom('[data-test-bulk-upload-widget]').doesNotExist();
     });
 
-    test('notifications list and bulk upload widget shows for admins', async assert => {
+    test('notifications list and bulk upload widget shows for admins when allowedBulkUploads is true', async assert => {
         const regProvider = server.schema.registrationProviders.find('mdr8n');
         const currentUser = server.create('user', 'loggedIn');
         server.create('moderator', { id: currentUser.id, user: currentUser, provider: regProvider }, 'asModerator');
@@ -86,6 +86,19 @@ module('Registries | Acceptance | branded.moderation | settings', hooks => {
         assert.dom('[data-test-bulk-upload-widget]').exists();
     });
 
+    test('bulk upload widget does not show for admins when allowedBulkUploads is false', async assert => {
+        const regProvider = server.schema.registrationProviders.find('mdr8n');
+        regProvider.update('allowBulkUploads', false);
+        regProvider.save();
+        const currentUser = server.create('user', 'loggedIn');
+        server.create('moderator', { id: currentUser.id, user: currentUser, provider: regProvider }, 'asModerator');
+        regProvider.update({ permissions: ['view_submissions', 'add_moderator'] });
+        await visit('/registries/mdr8n/moderation/settings');
+        assert.equal(currentRouteName(), 'registries.branded.moderation.settings',
+            'On the settings page of registries reviews');
+        assert.dom('[data-test-bulk-upload-widget]').doesNotExist();
+    });
+
     test('test bulk upload widget', async assert => {
         const filename = 'itzy.csv';
         const triggerFileUpload = () => triggerEvent(
@@ -153,6 +166,40 @@ module('Registries | Acceptance | branded.moderation | settings', hooks => {
             )));
         await click('[data-test-close-dialog]');
 
+        // duplicate column ids
+        const duplicateHeaders = ['Title', 'q1', 'q2'];
+        server.put(`/registries/mdr8n/bulk_create/${filename}`, () => ({
+            errors: [{ type: 'duplicateColumnId', duplicateHeaders }],
+        }), 400);
+        await triggerFileUpload();
+        await settled();
+        assert.dom('[data-test-error-modal-message-title]').exists({ count: 1 });
+        assert.dom('[data-test-error-modal-message-title]')
+            .hasText(t('registries.moderation.settings.duplicateColumnId.title'));
+        assert.dom('[data-test-error-modal-message-detail]').exists({ count: 1 });
+        assert.dom('[data-test-error-modal-message-detail]')
+            .hasText(stripHtmlTags(t(
+                'registries.moderation.settings.duplicateColumnId.detail',
+                {
+                    duplicateIds: duplicateHeaders.join(', '),
+                },
+            )));
+        await click('[data-test-close-dialog]');
+
+        // File upload not supported
+        server.put(`/registries/mdr8n/bulk_create/${filename}`, () => ({
+            errors: [{ type: 'fileUploadNotSupported'}],
+        }), 400);
+        await triggerFileUpload();
+        await settled();
+        assert.dom('[data-test-error-modal-message-title]').exists({ count: 1 });
+        assert.dom('[data-test-error-modal-message-title]')
+            .hasText(t('registries.moderation.settings.fileUploadNotSupported.title'));
+        assert.dom('[data-test-error-modal-message-detail]').exists({ count: 1 });
+        assert.dom('[data-test-error-modal-message-detail]')
+            .hasText(stripHtmlTags(t('registries.moderation.settings.fileUploadNotSupported.detail')));
+        await click('[data-test-close-dialog]');
+
         // size exceeds limit
         server.put(`/registries/mdr8n/bulk_create/${filename}`, () => ({
             errors: [{ type: 'sizeExceedsLimit'}],
diff --git a/tests/engines/registries/acceptance/overview/revision-test.ts b/tests/engines/registries/acceptance/overview/revision-test.ts
@@ -37,6 +37,7 @@ module('Registries | Acceptance | overview.revision', hooks => {
             revisionResponses: { q1: 'Super Man' },
             registration,
         });
+        registration.update({ latestResponse: revision });
         await visit(`/${registration.id}?revisionId=${revision.id}`);
         assert.dom('[data-test-version-metadata-title]')
             .exists('version metadata is shown when viewing a specific revision');
diff --git a/tests/integration/components/registries/update-dropdown/component-test.ts b/tests/integration/components/registries/update-dropdown/component-test.ts
@@ -52,7 +52,7 @@ module('Integration | Component  | update-dropdown', hooks => {
         `);
         assert.dom('[data-test-update-button]').containsText(t('registries.update_dropdown.latest'), 'Latest selected');
         await click('[data-test-update-button]');
-        assert.dom('[data-test-revision-link]').exists({ count: 3 }, '3 revisions shown');
+        assert.dom('[data-test-revision-link]').exists({ count: 4 }, '4 revisions shown');
 
         assert.dom('[data-test-update-dropdown-show-more]').doesNotExist('Show more element not shown');
         assert.dom('[data-test-update-dropdown-create-new-revision]').doesNotExist('New update button not shown');
@@ -86,7 +86,7 @@ module('Integration | Component  | update-dropdown', hooks => {
             .doesNotExist('Link to revision in progress not shown');
     });
 
-    test('update dropdown - 3 revisions, one in progress', async function(this: ComponentTestContext, assert) {
+    test('update dropdown - 3 extra revisions, one in progress', async function(this: ComponentTestContext, assert) {
         const mirageRegistration = server.create('registration', {
             id: 'cobalt',
             title: 'Outcome Reporting Testing',
@@ -114,7 +114,7 @@ module('Integration | Component  | update-dropdown', hooks => {
             <Registries::UpdateDropdown @registration={{this.registration}}/>
         `);
         await click('[data-test-update-button]');
-        assert.dom('[data-test-revision-link]').exists({ count: 2 }, 'revision in progress not listed');
+        assert.dom('[data-test-revision-link]').exists({ count: 3 }, 'revision in progress not listed');
 
         assert.dom('[data-test-update-dropdown-show-more]').doesNotExist('Show more element not shown');
         assert.dom('[data-test-update-dropdown-create-new-revision]').doesNotExist('New update button not shown');
diff --git a/tests/integration/components/registries/version-metadata/component-test.ts b/tests/integration/components/registries/version-metadata/component-test.ts
diff --git a/tests/integration/routes/meetings/detail/-components/meeting-detail-header/component-test.ts b/tests/integration/routes/meetings/detail/-components/meeting-detail-header/component-test.ts
diff --git a/translations/en-us.yml b/translations/en-us.yml

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`border: 1px dotted $color-border-gray-light;`
`24`	`24`	`padding: 4px 8px;`
`25`	`25`	`font-style: italic;`
`26`		`- color: $color-text-gray-dark;`
	`26`	`+ color: $color-text-black;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`.RemoveButton.RemoveButton {`