[IMPROVE] Remove device-management banner and modal

apps/meteor/client/startup/banners.ts

@@ -5,37 +5,14 @@ import { Tracker } from 'meteor/tracker';
 
 import { Notifications } from '../../app/notifications/client';
 import { APIClient } from '../../app/utils/client';
-import DeviceManagementFeatureModal from '../../ee/client/deviceManagement/components/featureModal/DeviceManagementFeatureModal';
 import * as banners from '../lib/banners';
-import { imperativeModal } from '../lib/imperativeModal';
 
 const fetchInitialBanners = async (): Promise<void> => {
 	const response = await APIClient.get('/v1/banners', {
 		platform: BannerPlatform.Web,
 	});
 
 	for (const banner of response.banners) {
-		if (banner._id === 'device-management') {
-			Tracker.autorun((computation) => {
-				const user = Meteor.user();
-				if (!user?.username) {
-					return;
-				}
-
-				process.env.TEST_MODE &&
-					setTimeout(() => {
-						imperativeModal.open({
-							component: DeviceManagementFeatureModal,
-							props: {
-								close: imperativeModal.close,
-							},
-						});
-					}, 2000);
-				computation.stop();
-			});
-			continue;
-		}
-
 		banners.open({
 			...banner.view,
 			viewId: banner.view.viewId || banner._id,

apps/meteor/ee/server/lib/deviceManagement/startup.ts

@@ -1,5 +1,4 @@
-import { BannerPlatform } from '@rocket.chat/core-typings';
-import { Banners, Permissions } from '@rocket.chat/models';
+import { Permissions } from '@rocket.chat/models';
 
 import { settingsRegistry } from '../../../../app/settings/server/index';
 
@@ -30,31 +29,3 @@ export const createEmailTemplates = async (): Promise<void> => {
 		});
 	});
 };
-
-export const createDeviceManagementModal = async (): Promise<void> => {
-	const banner = await Banners.findOneById('device-management', { projection: { _id: 1 } });
-	if (!banner) {
-		const today = new Date();
-
-		const expire = new Date();
-		expire.setMonth(expire.getMonth() + 6);
-
-		Banners.insertOne({
-			_id: 'device-management',
-			platform: [BannerPlatform.Web],
-			roles: ['admin', 'user'],
-			createdAt: today,
-			startAt: today,
-			expireAt: expire,
-			active: true,
-			createdBy: {
-				_id: 'rocket.cat',
-			},
-			view: {
-				viewId: 'mdm',
-				appId: 'mdm',
-				blocks: [],
-			},
-		});
-	}
-};

apps/meteor/ee/server/startup/deviceManagement.ts

@@ -2,13 +2,11 @@ import { onToggledFeature } from '../../app/license/server/license';
 
 onToggledFeature('device-management', {
 	up: async () => {
-		const { createPermissions, createEmailTemplates, createDeviceManagementModal } = await import('../lib/deviceManagement/startup');
+		const { createPermissions, createEmailTemplates } = await import('../lib/deviceManagement/startup');
 		const { listenSessionLogin } = await import('../lib/deviceManagement/session');
 
 		await createPermissions();
 		await createEmailTemplates();
 		await listenSessionLogin();
-
-		await createDeviceManagementModal();
 	},
 });

apps/meteor/server/startup/migrations/index.ts

@@ -39,4 +39,5 @@ import './v277';
 import './v278';
 import './v279';
 import './v280';
+import './v281';
 import './xrun';

apps/meteor/server/startup/migrations/v281.ts

@@ -0,0 +1,11 @@
+import { Banners } from '@rocket.chat/models';
+
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 281,
+	async up() {
+		// TODO: remove device management records from banner_dismiss collection, incase we decide not to use it in future
+		await Banners.removeById('device-management');
+	},
+});