Merge branch 'release/21.7.0'

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,8 +7,8 @@
   Ticketd PRs should be prefixed with the ticket id, e.g. `[FOO-123] some really great stuff`
 -->
 
-- Ticket: []
-- Feature flag: n/a
+-   Ticket: []
+-   Feature flag: n/a
 
 ## Purpose
 
@@ -18,6 +18,10 @@
 
 <!-- Briefly describe or list your changes. -->
 
+## Screenshot(s)
+
+<!-- Attach screenshots if applicable. -->
+
 ## Side Effects
 
 <!-- Any possible side effects? (https://en.wikipedia.org/wiki/Side_effect_%28computer_science%29) -->

.github/dependabot.yml

@@ -0,0 +1,18 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  target-branch: dependency_upgrades
+  versioning-strategy: increase-if-necessary
+  ignore:
+  - dependency-name: ember-cli
+  - dependency-name: ember-source
+  - dependency-name: ember-data
+  - dependency-name: ember-cli-htmlbars
+  - dependency-name: ember-cli-typescript
+  - dependency-name: ember-cli-babel
+  - dependency-name: ember-auto-import
+  - dependency-name: ember-resolver

.github/workflows/CI.yml

@@ -161,54 +161,20 @@ jobs:
         PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
       timeout-minutes: 10
 
-  # Coverage disabled while these are worked out:
-  # https://github.com/babel/ember-cli-babel/issues/350
-  # https://github.com/ember-cli/babel-plugin-ember-modules-api-polyfill/issues/112
-  # test-with-coverage:
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 10
-  #   needs: build
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: volta-cli/action@v1
-  #   - uses: actions/download-artifact@v2
-  #     with:
-  #       name: dist
-  #       path: ./dist
-  #   - id: cache-node-modules
-  #     uses: actions/cache@v2
-  #     with:
-  #       path: ./node_modules
-  #       key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
-  #       restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-  #   - run: yarn test:cover --path ./dist
-  #   - name: Save code coverage artifact
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: coverage-info
-  #       path: ./coverage/lcov.info
-  #
-  # send-coverage:
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 10
-  #   needs: test
-  #   steps:
-  #   - uses: volta-cli/action@v1
-  #   - uses: actions/download-artifact@v2
-  #     with:
-  #       name: coverage-info
-  #       path: ./lcov.info
-  #   - uses: actions/cache@v2
-  #     with:
-  #       path: ./node_modules
-  #       key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
-  #       restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-  #   - name: Generate coverage report
-  #     env:
-  #       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-  #     run: yarn coveralls
-  #
-  #   - name: Send coverage report to coveralls
-  #     uses: coverallsapp/github-action@master
-  #     with:
-  #       github-token: ${{ secrets.GITHUB_TOKEN }}
+  test-with-coverage:
+    needs: fetch-dependencies
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: volta-cli/action@v1
+    - id: cache-node-modules
+      uses: actions/cache@v2
+      with:
+        path: ./node_modules
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
+    - run: yarn test:ember:cover
+    - name: Send coverage report to coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,26 @@ 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.6.3] - 2021-09-14
+### Fixed
+- A11y: Draft Registration Metadata Page - Critical WCAG 2A Rule Violations - Third Party Libraries
+- A11y: Draft Registration Metadata Page - Serious WCAG 2AA Rule Violation
+- autosave failed message for draft registrations page
+- ensure users are properly logged out when using Log Out link from User Dropdown menu
+- clicking "Leave this view" on the VOL of Registration doesn't clear VOL hash from url
+
+### Added
+- collection provider description on provider's discover page
+- sorting meeting submissions by download count
+- add data test locators to elements on My Registrations Page
+
+### Removed
+- Feedback button on quickfiles page
+
+### Changed
+- (IA/IMLS) update registration creation modal language
+- (IA/IMLS) update registration completion modal language
+
 ## [21.6.3] - 2021-07-09
 ### Fixed
 - [hotfix] Do not serialize empty node-license
@@ -1770,7 +1790,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/21.6.3...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.7.0...develop
+[21.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.7.0
 [21.6.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.3
 [21.6.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.2
 [21.6.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.1

app/guid-user/quickfiles/template.hbs

@@ -27,5 +27,3 @@
         />
     </div>
 </div>
-
-<FeedbackButton @text={{t 'quickfiles.feedback_dialog_text'}} @pageName={{this.pageName}} />

app/meetings/detail/-components/meeting-submissions-list/template.hbs

@@ -41,6 +41,7 @@
                 </div>
                 <div data-test-submissions-list-header-download local-class='HeaderNarrow'>
                     {{t 'meetings.detail.meeting-submissions-list.downloads'}}
+                    <SortButton @sortBy='download_count' />
                 </div>
             {{/let}}
         </list.header>

app/models/collection-provider.ts

@@ -1,3 +1,5 @@
+import { computed } from '@ember/object';
+import { htmlSafe } from '@ember/string';
 import { belongsTo, AsyncBelongsTo } from '@ember-data/model';
 
 import CollectionModel from './collection';
@@ -6,6 +8,14 @@ import ProviderModel from './provider';
 export default class CollectionProviderModel extends ProviderModel {
     @belongsTo('collection')
     primaryCollection!: AsyncBelongsTo<CollectionModel> & CollectionModel;
+
+    @computed('description')
+    get htmlSafeDescription() {
+        if (this.description) {
+            return htmlSafe(this.description);
+        }
+        return '';
+    }
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/registration.ts

@@ -85,7 +85,6 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
 
     // Write-only attributes
     @attr('array') includedNodeIds?: string[];
-    @attr('boolean') createDoi?: boolean;
     @attr('fixstring') draftRegistrationId?: string;
 
     @belongsTo('node', { inverse: 'registrations' })

app/services/current-user.ts

@@ -79,7 +79,7 @@ export default class CurrentUserService extends Service {
 
     constructor(...args: any[]) {
         super(...args);
-        this.session.on('invalidationSucceeded', this, this.logout);
+        this.session.on('invalidationSucceeded', this, this._authRedirect.bind(this, AuthRoute.Logout));
     }
 
     /**
@@ -92,14 +92,12 @@ export default class CurrentUserService extends Service {
     }
 
     /**
-     * Invalidate the current session and cookie, then redirect to the given URL (or back to the current page).
-     * Returns a promise that never resolves.
+     * Invalidate the current session and cookie
      */
-    async logout(nextUrl?: string) {
+    async logout() {
         if (this.session.isAuthenticated) {
             await this.session.invalidate();
         }
-        return this._authRedirect(AuthRoute.Logout, nextUrl);
     }
 
     _authRedirect(authRoute: AuthRoute, nextUrl?: string) {

config/environment.d.ts

@@ -56,14 +56,6 @@ declare const config: {
         };
     }>;
     FB_APP_ID?: string;
-    microfeedback: {
-        enabled: boolean;
-        url: string | null;
-        pageParams: { [index: string]: {
-            componentID?: string;
-            priorityID?: string;
-        } | undefined };
-    };
     OSF: {
         clientId?: string;
         scope?: string;

config/environment.js

@@ -126,21 +126,6 @@ module.exports = function(environment) {
             },
         ],
         FB_APP_ID,
-        microfeedback: {
-            enabled: true,
-            url: null,
-            pageParams: {
-                // Mapping of pageName to query params to add
-                // to the base MicroFeedback URL
-                // e.g. {
-                //    QuickFiles: {
-                //        componentID: '13836',
-                //        priorityID: '10100',
-                //    }
-                // }
-                QuickFiles: {},
-            },
-        },
         OSF: {
             clientId,
             scope,

lib/app-components/addon/components/branded-navbar/template.hbs

@@ -66,7 +66,6 @@
                     <OsfNavbar::AuthDropdown
                         @signupUrl={{@signupUrl}}
                         @loginAction={{@loginAction}}
-                        @redirectUrl={{@redirectUrl}}
                         @onLinkClicked={{action (mut this.showNavLinks) false}}
                         @headline={{t 'app_components.branded_navbar.on_the_osf'}}
                         @externalLink={{true}}

lib/app-components/addon/components/project-metadata/template.hbs

@@ -42,7 +42,8 @@
                     @removeTagAtIndex={{action this.removeTagAtIndex}}
                     @allowSpacesInTags={{true}}
                     @placeholder={{t 'osf-components.tags-widget.add_tag'}}
-                    @aria_label={{t 'file_detail.tags'}}
+                    @ariaLabel={{t 'osf-components.tags-widget.add_tag'}}
+                    aria-label={{t 'file_detail.tags'}}
                     @readOnly={{false}}
                     local-class='tagInput'
                     as |tag|

lib/collections/addon/components/discover-page/styles.scss

@@ -82,3 +82,104 @@
     height: 140px;
     background-position-x: right;
 }
+
+.ProviderDescription {
+    position: relative;
+    margin: 0 65px;
+    padding-top: 10px;
+
+    :global(.ColorBlack) {
+        color: $color-text-black;
+    }
+
+    :global(.ColorPureBlack) {
+        color: $color-black;
+    }
+
+    :global(.ColorBlue) {
+        color: $color-blue;
+    }
+
+    :global(.ColorPureBlue) {
+        color: $color-pure-blue;
+    }
+
+    :global(.ColorGrey) {
+        color: $color-text-gray;
+    }
+
+    :global(.ColorRed) {
+        color: $color-red;
+    }
+
+    :global(.ColorGreen) {
+        color: $color-green;
+    }
+
+    :global(.ColorYellow) {
+        color: $color-yellow;
+    }
+
+    :global(.ColorTurquoise) {
+        color: $color-turquoise;
+    }
+
+    :global(.ColorPurple) {
+        color: $color-purple;
+    }
+
+    :global(.LinkColorBlack) {
+        a {
+            color: $color-link-black;
+        }
+    }
+
+    :global(.LinkColorBlue) {
+        a {
+            color: $color-link-blue;
+        }
+    }
+
+    :global(.LinkColorPureBlue) {
+        a {
+            color: $color-pure-blue;
+        }
+    }
+
+    :global(.LinkColorGrey) {
+        a {
+            color: $color-grey;
+        }
+    }
+
+    :global(.LinkColorRed) {
+        a {
+            color: $color-red;
+        }
+    }
+
+    :global(.LinkColorGreen) {
+        a {
+            color: $color-green;
+        }
+    }
+
+    :global(.LinkColorYellow) {
+        a {
+            color: $color-yellow;
+        }
+    }
+
+    :global(.LinkColorTurquoise) {
+        a {
+            color: $color-turquoise;
+        }
+    }
+
+    :global(.LinkColorPurple) {
+        a {
+            color: $color-purple;
+        }
+    }
+
+}

lib/collections/addon/components/discover-page/template.hbs

@@ -93,7 +93,13 @@
                 {{/unless}}
             </div>
         </div>
-
+        {{#if (and this.theme.isProvider this.theme.provider.htmlSafeDescription)}}
+            <div local-class='ProviderDescription' class='row m-t-md m-b-lg'>
+                <div data-test-provider-description class='col-xs-12 col-sm-8 col-sm-offset-2'>
+                    {{this.theme.provider.htmlSafeDescription}}
+                </div>
+            </div>
+        {{/if}}
         <div class='row p-v-sm'>
             <div class='col-sm-6 pull-right'>
                 <BsDropdown class='dropdown pull-right' as |dd|>