Merge branch 'release/20.9.0'

Author: fabmiz

.eslintignore

@@ -7,3 +7,4 @@
 /vendor/**
 /blueprints/*/files/**
 /blueprints/*/engine-files/**
+/config/local.js

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.9.0] - 2020-09-01
+### Added
+- branded registries submission
+
 ## [20.8.0] - 2020-07-29
 ### Added
 - `contributor-list` read-only to draft metadata page
@@ -1635,7 +1639,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.8.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.9.0...develop
+[20.9.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.9.0
 [20.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.8.0
 [20.7.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.7.1
 [20.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.7.0

app/adapters/brand.ts

@@ -0,0 +1,10 @@
+import OsfAdapter from './osf-adapter';
+
+export default class BrandAdapter extends OsfAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        brand: BrandAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/registration-provider.ts

@@ -2,7 +2,7 @@ import OsfAdapter from './osf-adapter';
 
 export default class RegistrationProviderAdapter extends OsfAdapter {
     pathForType(_: string): string {
-        return 'providers/registries';
+        return 'providers/registrations';
     }
 }
 

app/app.ts

@@ -1,4 +1,5 @@
 import Application from '@ember/application';
+import defineModifier from 'ember-concurrency-test-waiter/define-modifier';
 import config from 'ember-get-config';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from './resolver';
@@ -106,5 +107,6 @@ const App = Application.extend({
 });
 
 loadInitializers(App, modulePrefix);
+defineModifier();
 
 export default App;

app/application/-components/verify-email-modal/component.ts

@@ -71,7 +71,7 @@ export default class VerifyEmailModal extends Component {
         };
     }
 
-    @task
+    @task({ withTestWaiter: true })
     loadEmailsTask = task(function *(this: VerifyEmailModal) {
         const { user } = this.currentUser;
         if (user) {
@@ -85,7 +85,7 @@ export default class VerifyEmailModal extends Component {
         }
     });
 
-    @task({ drop: true })
+    @task({ withTestWaiter: true, drop: true })
     verifyTask = task(function *(this: VerifyEmailModal, emailAction: EmailActions) {
         const { userEmail } = this;
         if (!userEmail) {

app/dashboard/controller.ts

@@ -47,7 +47,7 @@ export default class Dashboard extends Controller {
     noteworthy!: QueryHasManyResult<Node>;
     popular!: QueryHasManyResult<Node>;
 
-    @task({ restartable: true })
+    @task({ withTestWaiter: true, restartable: true })
     setupTask = task(function *(this: Dashboard) {
         this.set('filter', null);
 
@@ -63,15 +63,15 @@ export default class Dashboard extends Controller {
         this.set('institutions', institutions.toArray());
     });
 
-    @task({ restartable: true })
+    @task({ withTestWaiter: true, restartable: true })
     filterNodes = task(function *(this: Dashboard, filter: string) {
         yield timeout(500);
         this.setProperties({ filter });
         this.analytics.track('list', 'filter', 'Dashboard - Search projects');
         yield this.findNodes.perform();
     });
 
-    @task({ restartable: true })
+    @task({ withTestWaiter: true, restartable: true })
     findNodes = task(function *(this: Dashboard, more?: boolean) {
         const indicatorProperty = more ? 'loadingMore' : 'loading';
         this.set(indicatorProperty, true);
@@ -96,7 +96,7 @@ export default class Dashboard extends Controller {
         this.set('initialLoad', false);
     });
 
-    @task
+    @task({ withTestWaiter: true })
     getPopularAndNoteworthy = task(function *(this: Dashboard, id: string, dest: 'noteworthy' | 'popular') {
         try {
             const node: Node = yield this.store.findRecord('node', id);

app/guid-file/controller.ts

@@ -97,7 +97,7 @@ export default class GuidFile extends Controller {
         return Boolean(this.file) && this.file.getContents();
     }
 
-    @task({ restartable: true })
+    @task({ withTestWaiter: true, restartable: true })
     updateFilter = task(function *(this: GuidFile, filter: string) {
         yield timeout(250);
         this.setProperties({ filter });

app/guid-file/route.ts

@@ -23,7 +23,7 @@ export default class GuidFile extends Route {
 
     headTags?: HeadTagDef[];
 
-    @task
+    @task({ withTestWaiter: true })
     setHeadTags = task(function *(this: GuidFile, model: any) {
         const blocker = this.get('ready').getBlocker();
         const dateCreated = model.file.get('dateCreated');

app/guid-node/forks/template.hbs

@@ -16,7 +16,7 @@
                 data-analytics-name='close_modal'
                 aria-label={{t 'general.close'}}
                 @class='close'
-                @onClick={{action (mut this.newModal false)}}
+                @onClick={{action (mut this.newModal) false}}
             >
                 {{fa-icon 'times' size='sm'}}
             </OsfButton>