Tests for CoversationViewModel

src/api/entities/tutanota/TypeRefs.ts

@@ -1,9 +1,7 @@
 import {create} from "../../common/utils/EntityUtils.js"
 import {TypeRef} from "@tutao/tutanota-utils"
 import {typeModels} from "./TypeModels.js"
-import {Blob} from '../sys/TypeRefs.js'
-import {BucketKey} from '../sys/TypeRefs.js'
-import {BlobReferenceTokenWrapper} from '../sys/TypeRefs.js'
+import {Blob, BlobReferenceTokenWrapper, BucketKey} from '../sys/TypeRefs.js'
 
 export const AttachmentKeyDataTypeRef: TypeRef<AttachmentKeyData> = new TypeRef("tutanota", "AttachmentKeyData")
 
@@ -87,8 +85,8 @@ export type CalendarEvent = {
 
 	alarmInfos: IdTuple[];
 	attendees: CalendarEventAttendee[];
-	organizer:  null | EncryptedMailAddress;
-	repeatRule:  null | CalendarRepeatRule;
+	organizer: null | EncryptedMailAddress;
+	repeatRule: null | CalendarRepeatRule;
 }
 export const CalendarEventAttendeeTypeRef: TypeRef<CalendarEventAttendee> = new TypeRef("tutanota", "CalendarEventAttendee")
 
@@ -181,7 +179,7 @@ export type CalendarGroupRoot = {
 	_ownerGroup: null | Id;
 	_permissions: Id;
 
-	index:  null | CalendarEventIndexRef;
+	index: null | CalendarEventIndexRef;
 	longEvents: Id;
 	shortEvents: Id;
 }
@@ -232,9 +230,9 @@ export type Contact = {
 
 	addresses: ContactAddress[];
 	mailAddresses: ContactMailAddress[];
-	oldBirthdayAggregate:  null | Birthday;
+	oldBirthdayAggregate: null | Birthday;
 	phoneNumbers: ContactPhoneNumber[];
-	photo:  null | IdTuple;
+	photo: null | IdTuple;
 	socialIds: ContactSocialId[];
 }
 export const ContactAddressTypeRef: TypeRef<ContactAddress> = new TypeRef("tutanota", "ContactAddress")
@@ -270,7 +268,7 @@ export type ContactForm = {
 	languages: ContactFormLanguage[];
 	participantGroupInfos: IdTuple[];
 	targetGroup: Id;
-	targetGroupInfo:  null | IdTuple;
+	targetGroupInfo: null | IdTuple;
 }
 export const ContactFormAccountDataTypeRef: TypeRef<ContactFormAccountData> = new TypeRef("tutanota", "ContactFormAccountData")
 
@@ -353,7 +351,7 @@ export type ContactList = {
 	_permissions: Id;
 
 	contacts: Id;
-	photos:  null | PhotosRef;
+	photos: null | PhotosRef;
 }
 export const ContactMailAddressTypeRef: TypeRef<ContactMailAddress> = new TypeRef("tutanota", "ContactMailAddress")
 
@@ -413,8 +411,8 @@ export type ConversationEntry = {
 	conversationType: NumberString;
 	messageId: string;
 
-	mail:  null | IdTuple;
-	previous:  null | IdTuple;
+	mail: null | IdTuple;
+	previous: null | IdTuple;
 }
 export const CreateExternalUserGroupDataTypeRef: TypeRef<CreateExternalUserGroupData> = new TypeRef("tutanota", "CreateExternalUserGroupData")
 
@@ -447,7 +445,7 @@ export type CreateFileData = {
 	ownerEncSessionKey: Uint8Array;
 
 	fileData: Id;
-	parentFolder:  null | IdTuple;
+	parentFolder: null | IdTuple;
 }
 export const CreateGroupPostReturnTypeRef: TypeRef<CreateGroupPostReturn> = new TypeRef("tutanota", "CreateGroupPostReturn")
 
@@ -492,7 +490,7 @@ export type CreateMailFolderData = {
 	ownerEncSessionKey: Uint8Array;
 	ownerGroup: null | Id;
 
-	parentFolder:  null | IdTuple;
+	parentFolder: null | IdTuple;
 }
 export const CreateMailFolderReturnTypeRef: TypeRef<CreateMailFolderReturn> = new TypeRef("tutanota", "CreateMailFolderReturn")
 
@@ -563,7 +561,7 @@ export type CustomerContactFormGroupRoot = {
 	_ownerGroup: null | Id;
 	_permissions: Id;
 
-	contactFormConversations:  null | DeleteContactFormConversationIndex;
+	contactFormConversations: null | DeleteContactFormConversationIndex;
 	contactForms: Id;
 }
 export const DataBlockTypeRef: TypeRef<DataBlock> = new TypeRef("tutanota", "DataBlock")
@@ -631,7 +629,7 @@ export type DeleteMailData = {
 
 	_format: NumberString;
 
-	folder:  null | IdTuple;
+	folder: null | IdTuple;
 	mails: IdTuple[];
 }
 export const DeleteMailFolderDataTypeRef: TypeRef<DeleteMailFolderData> = new TypeRef("tutanota", "DeleteMailFolderData")
@@ -660,8 +658,8 @@ export type DraftAttachment = {
 	_id: Id;
 	ownerEncFileSessionKey: Uint8Array;
 
-	existingFile:  null | IdTuple;
-	newFile:  null | NewDraftAttachment;
+	existingFile: null | IdTuple;
+	newFile: null | NewDraftAttachment;
 }
 export const DraftCreateDataTypeRef: TypeRef<DraftCreateData> = new TypeRef("tutanota", "DraftCreateData")
 
@@ -879,9 +877,9 @@ export type File = {
 	size: NumberString;
 
 	blobs: Blob[];
-	data:  null | Id;
-	parent:  null | IdTuple;
-	subFiles:  null | Subfiles;
+	data: null | Id;
+	parent: null | IdTuple;
+	subFiles: null | Subfiles;
 }
 export const FileDataTypeRef: TypeRef<FileData> = new TypeRef("tutanota", "FileData")
 
@@ -1091,7 +1089,7 @@ export type ImapSyncConfiguration = {
 	port: NumberString;
 	user: string;
 
-	imapSyncState:  null | Id;
+	imapSyncState: null | Id;
 }
 export const ImapSyncStateTypeRef: TypeRef<ImapSyncState> = new TypeRef("tutanota", "ImapSyncState")
 
@@ -1139,7 +1137,7 @@ export type InternalGroupData = {
 	ownerEncGroupInfoSessionKey: Uint8Array;
 	publicKey: Uint8Array;
 
-	adminGroup:  null | Id;
+	adminGroup: null | Id;
 }
 export const InternalRecipientKeyDataTypeRef: TypeRef<InternalRecipientKeyData> = new TypeRef("tutanota", "InternalRecipientKeyData")
 
@@ -1234,16 +1232,16 @@ export type Mail = {
 
 	attachments: IdTuple[];
 	bccRecipients: MailAddress[];
-	body:  null | Id;
-	bucketKey:  null | BucketKey;
+	body: null | Id;
+	bucketKey: null | BucketKey;
 	ccRecipients: MailAddress[];
 	conversationEntry: IdTuple;
-	firstRecipient:  null | MailAddress;
-	headers:  null | Id;
-	mailDetails:  null | IdTuple;
-	mailDetailsDraft:  null | IdTuple;
+	firstRecipient: null | MailAddress;
+	headers: null | Id;
+	mailDetails: null | IdTuple;
+	mailDetailsDraft: null | IdTuple;
 	replyTos: EncryptedMailAddress[];
-	restrictions:  null | MailRestriction;
+	restrictions: null | MailRestriction;
 	sender: MailAddress;
 	toRecipients: MailAddress[];
 }
@@ -1260,7 +1258,7 @@ export type MailAddress = {
 	address: string;
 	name: string;
 
-	contact:  null | IdTuple;
+	contact: null | IdTuple;
 }
 export const MailAddressPropertiesTypeRef: TypeRef<MailAddressProperties> = new TypeRef("tutanota", "MailAddressProperties")
 
@@ -1313,12 +1311,12 @@ export type MailBox = {
 	lastInfoDate: Date;
 	symEncShareBucketKey: null | Uint8Array;
 
-	folders:  null | MailFolderRef;
-	mailDetailsDrafts:  null | MailDetailsDraftsRef;
+	folders: null | MailFolderRef;
+	mailDetailsDrafts: null | MailDetailsDraftsRef;
 	mails: Id;
 	receivedAttachments: Id;
 	sentAttachments: Id;
-	spamResults:  null | SpamResults;
+	spamResults: null | SpamResults;
 }
 export const MailDetailsTypeRef: TypeRef<MailDetails> = new TypeRef("tutanota", "MailDetails")
 
@@ -1334,7 +1332,7 @@ export type MailDetails = {
 	sentDate: Date;
 
 	body: Body;
-	headers:  null | Header;
+	headers: null | Header;
 	recipients: Recipients;
 	replyTos: EncryptedMailAddress[];
 }
@@ -1406,7 +1404,7 @@ export type MailFolder = {
 	name: string;
 
 	mails: Id;
-	parentFolder:  null | IdTuple;
+	parentFolder: null | IdTuple;
 	subFolders: Id;
 }
 export const MailFolderRefTypeRef: TypeRef<MailFolderRef> = new TypeRef("tutanota", "MailFolderRef")
@@ -1468,15 +1466,15 @@ export type MailboxGroupRoot = {
 	_ownerGroup: null | Id;
 	_permissions: Id;
 
-	calendarEventUpdates:  null | CalendarEventUpdateList;
-	contactFormUserContactForm:  null | IdTuple;
+	calendarEventUpdates: null | CalendarEventUpdateList;
+	contactFormUserContactForm: null | IdTuple;
 	mailbox: Id;
-	mailboxProperties:  null | Id;
-	outOfOfficeNotification:  null | Id;
-	outOfOfficeNotificationRecipientList:  null | OutOfOfficeNotificationRecipientList;
+	mailboxProperties: null | Id;
+	outOfOfficeNotification: null | Id;
+	outOfOfficeNotificationRecipientList: null | OutOfOfficeNotificationRecipientList;
 	participatingContactForms: IdTuple[];
 	serverProperties: Id;
-	targetMailGroupContactForm:  null | IdTuple;
+	targetMailGroupContactForm: null | IdTuple;
 	whitelistRequests: Id;
 }
 export const MailboxPropertiesTypeRef: TypeRef<MailboxProperties> = new TypeRef("tutanota", "MailboxProperties")
@@ -1541,7 +1539,7 @@ export type NewDraftAttachment = {
 	encFileName: Uint8Array;
 	encMimeType: Uint8Array;
 
-	fileData:  null | Id;
+	fileData: null | Id;
 	referenceTokens: BlobReferenceTokenWrapper[];
 }
 export const NewsIdTypeRef: TypeRef<NewsId> = new TypeRef("tutanota", "NewsId")
@@ -1979,7 +1977,7 @@ export type TutanotaProperties = {
 
 	imapSyncConfig: ImapSyncConfiguration[];
 	inboxRules: InboxRule[];
-	lastPushedMail:  null | IdTuple;
+	lastPushedMail: null | IdTuple;
 }
 export const UpdateMailFolderDataTypeRef: TypeRef<UpdateMailFolderData> = new TypeRef("tutanota", "UpdateMailFolderData")
 
@@ -1993,7 +1991,7 @@ export type UpdateMailFolderData = {
 	_format: NumberString;
 
 	folder: IdTuple;
-	newParent:  null | IdTuple;
+	newParent: null | IdTuple;
 }
 export const UserAccountCreateDataTypeRef: TypeRef<UserAccountCreateData> = new TypeRef("tutanota", "UserAccountCreateData")
 
@@ -2058,7 +2056,7 @@ export type UserAreaGroupData = {
 	groupInfoEncName: Uint8Array;
 	userEncGroupKey: Uint8Array;
 
-	adminGroup:  null | Id;
+	adminGroup: null | Id;
 }
 export const UserAreaGroupDeleteDataTypeRef: TypeRef<UserAreaGroupDeleteData> = new TypeRef("tutanota", "UserAreaGroupDeleteData")
 

src/api/main/MainLocator.ts

@@ -277,6 +277,7 @@ class MainLocator {
 			this.entityClient,
 			this.eventController,
 			deviceConfig,
+			this.mailModel,
 			m.redraw,
 		)
 	}

src/mail/view/ConversationViewModel.ts

@@ -10,6 +10,7 @@ import { ConversationType, MailFolderType, MailState, OperationType } from "../.
 import { NotFoundError } from "../../api/common/error/RestError.js"
 import { normalizeSubject } from "../model/MailUtils.js"
 import { isOfTypeOrSubfolderOf } from "../../api/common/mail/CommonMailUtils.js"
+import { MailModel } from "../model/MailModel.js"
 
 export type MailViewerViewModelFactory = (options: CreateMailViewerOptions) => MailViewerViewModel
 
@@ -18,7 +19,7 @@ export type SubjectItem = { type: "subject"; subject: string; id: string; entryI
 export type DeletedItem = { type: "deleted"; entryId: IdTuple }
 export type ConversationItem = MailItem | SubjectItem | DeletedItem
 
-interface ConversationPrefProvider {
+export interface ConversationPrefProvider {
 	getConversationViewShowOnlySelectedMail(): boolean
 }
 
@@ -36,6 +37,7 @@ export class ConversationViewModel {
 		private readonly entityClient: EntityClient,
 		private readonly eventController: EventController,
 		private readonly conversationPrefProvider: ConversationPrefProvider,
+		private readonly mailModel: MailModel,
 		private readonly onUiUpdate: () => unknown,
 	) {
 		this._primaryViewModel = viewModelFactory(options)
@@ -240,8 +242,8 @@ export class ConversationViewModel {
 	}
 
 	private async isInTrash(mail: Mail) {
-		const mailboxDetail = await this._primaryViewModel.mailModel.getMailboxDetailsForMail(mail)
-		const mailFolder = this._primaryViewModel.mailModel.getMailFolder(getListId(mail))
+		const mailboxDetail = await this.mailModel.getMailboxDetailsForMail(mail)
+		const mailFolder = this.mailModel.getMailFolder(getListId(mail))
 		return mailFolder && mailboxDetail && isOfTypeOrSubfolderOf(mailboxDetail.folders, mailFolder, MailFolderType.TRASH)
 	}
 

test/tests/Suite.ts

@@ -155,6 +155,7 @@ async function setupSuite() {
 		await import("./api/worker/offline/OfflineStorageMigratorTest.js")
 		await import("./api/worker/offline/OfflineStorageMigrationsTest.js")
 		await import("./api/worker/offline/OfflineStorageTest.js")
+		await import("./mail/view/CoversationViewModelTest.js")
 	}
 
 	// testdouble complains about certain mocking related code smells, and also prints a warning whenever you replace a property on an object.