Address CR comments

app/services/osf-router.ts

@@ -35,7 +35,7 @@ export default class OsfRouterService extends Service {
 
             this.set('currentTransitionTargetFragment', fragment);
         }
-        return this.router.transitionTo(routeName, ...args) as Transition;
+        return this.router.transitionTo(routeName, ...args);
     }
 }
 

blueprints/osf-model/files/__root__/models/__name__.ts

@@ -2,11 +2,11 @@ import { attr, belongsTo, hasMany } from '@ember-data/model';
 
 import OsfModel from './osf-model';
 
-export default class <%= classifiedModuleName % > Model; extends OsfModel; {
+export default class <%= classifiedModuleName %>Model extends OsfModel {
 }
 
 declare module 'ember-data/types/registries/model' {
     export default interface ModelRegistry {
-        '<%= dasherizedModuleName %>': <%= classifiedModuleName;  % > Model;
+        '<%= dasherizedModuleName %>': <%= classifiedModuleName %>Model;
     } // eslint-disable-line semi
 }

handbook-docs/components/validated-model-form/route.ts

@@ -6,18 +6,11 @@ import ConfirmationMixin from 'ember-onbeforeunload/mixins/confirmation';
 import ValidatedModelFormController from './controller';
 
 export default class ValidatedModelFormRoute extends Route.extend(ConfirmationMixin) {
-<<<<<<< HEAD
-    @task({ withTestWaiter: true })
-    modelTask = task(function *(this: ValidatedModelFormRoute) {
-        return yield this.store.findRecord('node', 'extng');
-    });
-=======
     @task
     async modelTask() {
         const node = await this.store.findRecord('node', 'extng');
         return node;
     }
->>>>>>> 74cd086b7... Remove withTestWaiter flag
 
     model() {
         return {

lib/collections/addon/guid/edit/controller.ts

@@ -15,7 +15,7 @@ export default class GuidEdit extends Controller {
 
     isPageDirty = false;
 
-    @computed('collectedMetadatum.hasDirtyAttributes', 'this.collectedMetadatum.hasDirtyAttributes')
+    @computed('collectedMetadatum.hasDirtyAttributes')
     get isCollectedMetadatumDirty() {
         return this.collectedMetadatum.hasDirtyAttributes;
     }

lib/collections/addon/guid/route.ts

@@ -50,7 +50,7 @@ export default class Guid extends Route {
         }
 
         try {
-            const collectedMetadatum: CollectedMetadatum = await this.store.findRecord('collected-metadatum', cgmId);
+            const collectedMetadatum = await this.store.findRecord('collected-metadatum', cgmId);
             const collectionItem = this.store.peekRecord('node', collectedItemId)!;
 
             if (!collectionItem.userHasAdminPermission) {

lib/osf-components/addon/components/ancestry-display/component.ts

@@ -56,9 +56,11 @@ export default class AncestryDisplay extends Component {
 
         // Results might have undefined `value` if ancestors are private
         if (ancestors.length > 1) {
-            const parent = (results[1] as { state: 'fulfilled', value: NodeModel }).value;
-            if (parent && parent.belongsTo('parent').id() !== rootId) {
-                ancestors.insertAt(1, { id: '', title: this.intl.t('general.ellipsis') });
+            if ('value' in results[1]) {
+                const parent = results[1].value;
+                if (parent && parent.belongsTo('parent').id() !== rootId) {
+                    ancestors.insertAt(1, { id: '', title: this.intl.t('general.ellipsis') });
+                }
             }
         }
         return ancestors;

lib/osf-components/addon/components/editable-field/template.hbs

@@ -57,7 +57,7 @@
                     data-test-discard-edits
                     data-analytics-name='Discard'
                     disabled={{@manager.isSaving}}
-                    @onClick={{action @manager.cancel}}
+                    {{on 'click' @manager.cancel}}
                 >
                     {{t 'general.cancel'}}
                 </BsButton>

lib/registries/addon/components/registries-license-picker/template.hbs

@@ -84,7 +84,6 @@
                         @type='primary'
                         {{on 'click' @manager.save}}
                     >
-                        {{!-- type='submit' --}}
                         {{t 'general.save'}}
                     </BsButton>
                 </div>

lib/registries/addon/components/registries-states/is-public/template.hbs

@@ -53,9 +53,8 @@
         <BsButton
             data-analytics-name='Withdraw registration'
             disabled={{or this.submitDisabled this.submitWithdrawal.isRunning}}
-            @buttonType='submit'
             @type='danger'
-            @onClick={{action modal.submit}}
+            {{on 'click' modal.submit}}
         >
             {{t 'registries.overview.withdraw.withdraw'}}
         </BsButton>

mirage/factories/node.ts

@@ -100,7 +100,9 @@ export default Factory.extend<MirageNode & NodeTraits>({
                         server.schema.registrationSchemas.all().models,
                     ),
                 });
-                reg.update({ contributors: node.contributors.models });
+                node.contributors.models.forEach(
+                    contributor => server.create('contributor', { node: reg, users: contributor.users }),
+                );
             }
         },
     }),