fixes

Author: adlius

app/models/registration.ts

@@ -151,7 +151,7 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     originalResponse!: AsyncBelongsTo<SchemaResponseModel> | SchemaResponseModel;
 
     @belongsTo('schema-response', { inverse: null })
-    latestResponse!: AsyncBelongsTo<SchemaResponseModel> | SchemaResponseModel; // Latest accepted response
+    latestResponse!: AsyncBelongsTo<SchemaResponseModel> & SchemaResponseModel; // Latest accepted response
 
     // Write-only relationships
     @belongsTo('draft-registration', { inverse: null })

lib/registries/addon/drafts/draft/draft-registration-manager.ts

@@ -27,7 +27,7 @@ import {
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
 import RouterService from '@ember/routing/router-service';
 
-type LoadDraftModelTask = TaskInstance<{
+export type LoadDraftModelTask = TaskInstance<{
     draftRegistration: DraftRegistration,
     provider: ProviderModel,
 }>;

lib/registries/addon/drafts/draft/route.ts

@@ -14,7 +14,7 @@ import ProviderModel from 'ember-osf-web/models/provider';
 import SubjectModel from 'ember-osf-web/models/subject';
 import Analytics from 'ember-osf-web/services/analytics';
 import captureException from 'ember-osf-web/utils/capture-exception';
-import DraftRegistrationManager from 'registries/drafts/draft/draft-registration-manager';
+import DraftRegistrationManager, { LoadDraftModelTask } from 'registries/drafts/draft/draft-registration-manager';
 import NavigationManager from 'registries/drafts/draft/navigation-manager';
 
 export interface DraftRouteModel {
@@ -59,7 +59,7 @@ export default class DraftRegistrationRoute extends Route {
 
     model(params: { id: string }): DraftRouteModel {
         const { id: draftId } = params;
-        const draftRegistrationTask = taskFor(this.loadDraftRegistrationAndNode).perform(draftId);
+        const draftRegistrationTask = taskFor(this.loadDraftRegistrationAndNode).perform(draftId) as LoadDraftModelTask;
         const draftRegistrationManager = new DraftRegistrationManager(getOwner(this), draftRegistrationTask);
         const navigationManager = new NavigationManager(draftRegistrationManager);
         return {

mirage/factories/file.ts

@@ -26,7 +26,7 @@ export default Factory.extend<MirageFile & FileTraits>({
     afterCreate: guidAfterCreate,
 
     name() {
-        return faker.system.commonFileName(faker.system.commonFileExt(), faker.system.commonFileType());
+        return faker.system.commonFileName(faker.system.commonFileExt());
     },
     extra: {
         hashes: {
@@ -39,7 +39,7 @@ export default Factory.extend<MirageFile & FileTraits>({
         return faker.date.past(2, new Date(2018, 0, 0));
     },
     materializedPath(): string {
-        return `/${faker.system.commonFileName(faker.system.commonFileExt(), faker.system.commonFileType())}`;
+        return `/${faker.system.commonFileName(faker.system.commonFileExt())}`;
     },
     dateModified() {
         return faker.date.past(2, new Date(2018, 0, 0));

mirage/factories/utils.ts

@@ -9,6 +9,7 @@ import { Answer, Question, RegistrationMetadata, Subquestion } from 'ember-osf-w
 import {
     FileReference, getSchemaBlockGroups, RegistrationResponse, SchemaBlockGroup,
 } from 'ember-osf-web/packages/registration-schema';
+import SchemaBlockModel from 'ember-osf-web/models/schema-block';
 import { MirageRegistrationSchema } from './registration-schema';
 
 export function guid(referentType: string) {
@@ -58,7 +59,6 @@ function fakeAnswer(question: Question | Subquestion, answerIfRequired: boolean)
             answer.extra = Array.from({ length: numFiles }).map(() => ({
                 selectedFileName: faker.system.commonFileName(
                     faker.system.commonFileExt(),
-                    faker.system.commonFileType(),
                 ),
                 viewUrl: '/',
             }));
@@ -163,7 +163,10 @@ export function createRegistrationResponses(
     registrationSchema: ModelInstance<MirageRegistrationSchema>,
 ) {
     const { schemaBlocks } = registrationSchema;
-    const schemaBlockGroups = getSchemaBlockGroups(schemaBlocks);
+    // The strange type casting here is to silence TS linting errors
+    // `getSchemaBlockGroups` was supposed take in the FE `SchemaBlockModel` as argument
+    // Here it takes in a Mirage BE model, hence the type mismatch
+    const schemaBlockGroups = getSchemaBlockGroups(schemaBlocks as unknown as SchemaBlockModel[]);
     const registrationResponses = {} as RegistrationResponse;
     if (schemaBlockGroups) {
         for (const group of schemaBlockGroups) {