Enable labels based on Customer customizations

tutao · Nov 11, 2024 · 938ce86 · 938ce86
1 parent e0871d1
commit 938ce86
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/common/api/common/TutanotaConstants.ts b/src/common/api/common/TutanotaConstants.ts
@@ -515,8 +515,8 @@ export enum FeatureType {
 	AffiliatePartner = "12",
 	KnowledgeBase = "13",
 	Newsletter = "14",
-	Blobs = "15", // enables blob attachments for mails
-	MailDetails = "16", // enable new mail model support
+	Labels = "15", // enables blob attachments for mails
+	Unused16 = "16",
 	MultipleUsers = "17", // Multi-user support for new personal plans.
 }
 

diff --git a/src/mail-app/app.ts b/src/mail-app/app.ts
@@ -141,7 +141,7 @@ import("./translations/en.js")
 				async onFullLoginSuccess() {
 					await mailLocator.groupManagementFacade.migrateLocalAdminsToGlobalAdmins()
 
-					if (!mailLocator.logins.getUserController().props.defaultLabelCreated) {
+					if (mailLocator.mailModel.canManageLabels() && !mailLocator.logins.getUserController().props.defaultLabelCreated) {
 						const mailboxDetail = await mailLocator.mailboxModel.getMailboxDetails()
 
 						mailLocator.mailFacade

diff --git a/src/mail-app/mail/model/MailModel.ts b/src/mail-app/mail/model/MailModel.ts
@@ -411,8 +411,12 @@ export class MailModel {
 		return this.logins.getUserController().isInternalUser()
 	}
 
+	canManageLabels(): boolean {
+		return this.logins.getUserController().isInternalUser() && this.logins.isEnabled(FeatureType.Labels)
+	}
+
 	canAssignLabels(): boolean {
-		return this.logins.getUserController().isInternalUser()
+		return this.logins.getUserController().isInternalUser() && this.logins.isEnabled(FeatureType.Labels)
 	}
 
 	isExportingMailsAllowed(): boolean {

diff --git a/src/mail-app/mail/view/MailView.ts b/src/mail-app/mail/view/MailView.ts
@@ -616,9 +616,11 @@ export class MailView extends BaseTopLevelView implements TopLevelView<MailViewA
 					this.createMailboxFolderItems(mailboxDetail, inEditMode, () => {
 						EditFoldersDialog.showEdit(() => this.renderFoldersAndLabels(mailboxDetail.mailGroup._id))
 					}),
-					this.renderMailboxLabelItems(mailboxDetail, inEditMode, () => {
-						EditFoldersDialog.showEdit(() => this.renderFoldersAndLabels(mailboxDetail.mailGroup._id))
-					}),
+					mailLocator.mailModel.canManageLabels()
+						? this.renderMailboxLabelItems(mailboxDetail, inEditMode, () => {
+								EditFoldersDialog.showEdit(() => this.renderFoldersAndLabels(mailboxDetail.mailGroup._id))
+						  })
+						: null,
 				],
 			)
 		}