Merge pull request #9092 from RocketChat/rc-modal

[NEW] Modal

.eslintrc

@@ -122,6 +122,7 @@
 		"Logger"                      : false,
 		"Match"                       : false,
 		"Meteor"                      : false,
+		"modal"                       : false,
 		"moment"                      : false,
 		"Mongo"                       : false,
 		"Npm"                         : false,
@@ -139,7 +140,6 @@
 		"Settings"                    : false,
 		"SHA256"                      : false,
 		"SideNav"                     : false,
-		"swal"                        : false,
 		"t"                           : false,
 		"TAPi18n"                     : false,
 		"TAPi18next"                  : false,

.meteor/packages

@@ -173,7 +173,6 @@ percolate:synced-cron
 raix:handlebar-helpers
 raix:push
 raix:ui-dropped-event
-smoral:sweetalert
 steffo:meteor-accounts-saml
 todda00:friendly-slugs
 yasaricli:slugify

.meteor/versions

@@ -236,7 +236,6 @@ session@1.1.7
 sha@1.0.9
 shell-server@0.3.1
 simple:json-routes@2.1.0
-smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10

packages/rocketchat-2fa/client/TOTPPassword.js

@@ -45,7 +45,7 @@ Meteor.loginWithPassword = function(email, password, cb) {
 			return cb(error);
 		}
 
-		swal({
+		modal.open({
 			title: t('Two-factor_authentication'),
 			text: t('Open_your_authentication_app_and_enter_the_code'),
 			type: 'input',

packages/rocketchat-2fa/client/accountSecurity.js

@@ -42,7 +42,7 @@ Template.accountSecurity.events({
 	},
 
 	'click .disable-2fa'() {
-		swal({
+		modal.open({
 			title: t('Two-factor_authentication'),
 			text: t('Open_your_authentication_app_and_enter_the_code'),
 			type: 'input',
@@ -64,7 +64,7 @@ Template.accountSecurity.events({
 				if (result) {
 					toastr.success(t('Two-factor_authentication_disabled'));
 				} else {
-					return toastr.error(t('Invalid_two_factor_code'));
+					toastr.error(t('Invalid_two_factor_code'));
 				}
 			});
 		});
@@ -87,7 +87,7 @@ Template.accountSecurity.events({
 	},
 
 	'click .regenerate-codes'(event, instance) {
-		swal({
+		modal.open({
 			title: t('Two-factor_authentication'),
 			text: t('Open_your_authentication_app_and_enter_the_code'),
 			type: 'input',
@@ -109,7 +109,7 @@ Template.accountSecurity.events({
 				if (result) {
 					instance.showBackupCodes(result.codes);
 				} else {
-					return toastr.error(t('Invalid_two_factor_code'));
+					toastr.error(t('Invalid_two_factor_code'));
 				}
 			});
 		});
@@ -130,7 +130,7 @@ Template.accountSecurity.onCreated(function() {
 			return (index + 1) % 4 === 0 && index < 11 ? `${ value }\n` : `${ value } `;
 		}).join('');
 		const codes = `<code class="text-center allow-text-selection">${ backupCodes }</code>`;
-		swal({
+		modal.open({
 			title: t('Backup_codes'),
 			text: `${ t('Make_sure_you_have_a_copy_of_your_codes', { codes }) }`,
 			html: true

packages/rocketchat-authorization/client/views/permissionsRole.js

@@ -105,7 +105,7 @@ Template.permissionsRole.helpers({
 Template.permissionsRole.events({
 	'click .remove-user'(e, instance) {
 		e.preventDefault();
-		swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			type: 'warning',
 			showCancelButton: true,
@@ -120,7 +120,7 @@ Template.permissionsRole.events({
 					return handleError(error);
 				}
 
-				swal({
+				modal.open({
 					title: t('Removed'),
 					text: t('User_removed'),
 					type: 'success',

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -83,7 +83,7 @@ Template.channelSettings.helpers({
 
 Template.channelSettings.events({
 	'click .delete'() {
-		return swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			text: t('Delete_Room_Warning'),
 			type: 'warning',
@@ -94,13 +94,11 @@ Template.channelSettings.events({
 			closeOnConfirm: false,
 			html: false
 		}, () => {
-			swal.disableButtons();
 			Meteor.call('eraseRoom', this.rid, function(error) {
 				if (error) {
-					handleError(error);
-					return swal.enableButtons();
+					return handleError(error);
 				}
-				swal({
+				modal.open({
 					title: t('Deleted'),
 					text: t('Room_has_been_deleted'),
 					type: 'success',
@@ -309,7 +307,7 @@ Template.channelSettings.onCreated(function() {
 				};
 				if (room['default']) {
 					if (RocketChat.authz.hasRole(Meteor.userId(), 'admin')) {
-						swal({
+						modal.open({
 							title: t('Room_default_change_to_private_will_be_default_no_more'),
 							type: 'warning',
 							showCancelButton: true,
@@ -388,7 +386,7 @@ Template.channelSettings.onCreated(function() {
 				return RocketChat.authz.hasAtLeastOnePermission(['archive-room', 'unarchive-room'], room._id);
 			},
 			save(value, room) {
-				return swal({
+				modal.open({
 					title: t('Are_you_sure'),
 					type: 'warning',
 					showCancelButton: true,
@@ -398,24 +396,22 @@ Template.channelSettings.onCreated(function() {
 					closeOnConfirm: false,
 					html: false
 				}, function(confirmed) {
-					swal.disableButtons();
 					if (confirmed) {
 						const action = value ? 'archiveRoom' : 'unarchiveRoom';
-						return Meteor.call(action, room._id, function(err) {
+						Meteor.call(action, room._id, function(err) {
 							if (err) {
-								swal.enableButtons();
 								handleError(err);
 							}
 
-							swal({
+							modal.open({
 								title: value ? t('Room_archived') : t('Room_has_been_archived'),
 								text: value ? t('Room_has_been_archived') : t('Room_has_been_unarchived'),
 								type: 'success',
 								timer: 2000,
 								showConfirmButton: false
 							});
 
-							return RocketChat.callbacks.run(action, room);
+							RocketChat.callbacks.run(action, room);
 						});
 					} else {
 						return $('.channel-settings form [name=\'archived\']').prop('checked', !!room.archived);

packages/rocketchat-custom-sounds/client/admin/soundInfo.js

@@ -39,7 +39,7 @@ Template.soundInfo.events({
 		const sound = instance.sound.get();
 		if (sound != null) {
 			const _id = sound._id;
-			swal({
+			modal.open({
 				title: t('Are_you_sure'),
 				text: t('Custom_Sound_Delete_Warning'),
 				type: 'warning',
@@ -50,14 +50,11 @@ Template.soundInfo.events({
 				closeOnConfirm: false,
 				html: false
 			}, function() {
-				swal.disableButtons();
-
 				Meteor.call('deleteCustomSound', _id, (error/*, result*/) => {
 					if (error) {
 						handleError(error);
-						swal.enableButtons();
 					} else {
-						swal({
+						modal.open({
 							title: t('Deleted'),
 							text: t('Custom_Sound_Has_Been_Deleted'),
 							type: 'success',

packages/rocketchat-emoji-custom/admin/emojiInfo.js

@@ -47,7 +47,7 @@ Template.emojiInfo.events({
 		const emoji = instance.emoji.get();
 		if (emoji != null) {
 			const _id = emoji._id;
-			swal({
+			modal.open({
 				title: t('Are_you_sure'),
 				text: t('Custom_Emoji_Delete_Warning'),
 				type: 'warning',
@@ -58,14 +58,11 @@ Template.emojiInfo.events({
 				closeOnConfirm: false,
 				html: false
 			}, function() {
-				swal.disableButtons();
-
 				Meteor.call('deleteEmojiCustom', _id, (error/*, result*/) => {
 					if (error) {
-						handleError(error);
-						swal.enableButtons();
+						return handleError(error);
 					} else {
-						swal({
+						modal.open({
 							title: t('Deleted'),
 							text: t('Custom_Emoji_Has_Been_Deleted'),
 							type: 'success',

packages/rocketchat-integrations/client/views/integrationsIncoming.js

@@ -159,7 +159,7 @@ Template.integrationsIncoming.events({
 	'click .submit > .delete': () => {
 		const params = Template.instance().data.params();
 
-		swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			text: t('You_will_not_be_able_to_recover'),
 			type: 'warning',
@@ -172,9 +172,9 @@ Template.integrationsIncoming.events({
 		}, () => {
 			Meteor.call('deleteIncomingIntegration', params.id, (err) => {
 				if (err) {
-					handleError(err);
+					return handleError(err);
 				} else {
-					swal({
+					modal.open({
 						title: t('Deleted'),
 						text: t('Your_entry_has_been_deleted'),
 						type: 'success',

packages/rocketchat-integrations/client/views/integrationsOutgoing.js

@@ -224,7 +224,7 @@ Template.integrationsOutgoing.events({
 	'click .submit > .delete': () => {
 		const params = Template.instance().data.params();
 
-		swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			text: t('You_will_not_be_able_to_recover'),
 			type: 'warning',
@@ -239,7 +239,7 @@ Template.integrationsOutgoing.events({
 				if (err) {
 					handleError(err);
 				} else {
-					swal({
+					modal.open({
 						title: t('Deleted'),
 						text: t('Your_entry_has_been_deleted'),
 						type: 'success',

packages/rocketchat-lib/client/lib/settings.js

@@ -61,7 +61,7 @@ Meteor.startup(function() {
 		Meteor.setTimeout(function() {
 			const currentUrl = location.origin + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
 			if (__meteor_runtime_config__.ROOT_URL.replace(/\/$/, '') !== currentUrl) {
-				swal({
+				modal.open({
 					type: 'warning',
 					title: t('Warning'),
 					text: `${ t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl) }<br/><br/>${ t('Do_you_want_to_change_to_s_question', currentUrl) }`,
@@ -72,7 +72,7 @@ Meteor.startup(function() {
 					html: true
 				}, function() {
 					Meteor.call('saveSetting', 'Site_Url', currentUrl, function() {
-						swal({
+						modal.open({
 							title: t('Saved'),
 							type: 'success',
 							timer: 1000,

packages/rocketchat-livechat/app/client/lib/commands.js

@@ -1,4 +1,4 @@
-/* globals LivechatVideoCall, Livechat */
+/* globals LivechatVideoCall, Livechat, swal */
 // Functions to call on messages of type 'command'
 this.Commands = {
 	survey() {

packages/rocketchat-livechat/app/client/views/options.js

@@ -1,4 +1,4 @@
-/* globals Department, Livechat */
+/* globals Department, Livechat, swal */
 
 Template.options.helpers({
 	showDepartments() {

packages/rocketchat-livechat/app/client/views/survey.js

@@ -1,3 +1,5 @@
+/* globals swal */
+
 Template.survey.events({
 	'click button.skip'(e, instance) {
 		instance.$('#survey').remove();

packages/rocketchat-livechat/app/client/views/switchDepartment.js

@@ -1,4 +1,4 @@
-/* globals Department, Livechat */
+/* globals Department, Livechat, swal */
 
 Template.switchDepartment.helpers({
 	departments() {

packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js

@@ -1,3 +1,5 @@
+/* globals swal */
+
 Template.livechatIntegrationFacebook.helpers({
 	pages() {
 		return Template.instance().pages.get();

packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js

@@ -47,7 +47,11 @@ Template.livechatIntegrationWebhook.events({
 				if (err) {
 					return handleError(err);
 				}
-				swal(t('It_works'), null, 'success');
+				modal.open({
+					title: t('It_works'),
+					type: 'success',
+					timer: 2000
+				});
 			});
 		}
 	},

packages/rocketchat-livechat/client/views/app/livechatCustomFields.js

@@ -9,7 +9,7 @@ Template.livechatCustomFields.events({
 		e.preventDefault();
 		e.stopPropagation();
 
-		swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			type: 'warning',
 			showCancelButton: true,
@@ -23,7 +23,7 @@ Template.livechatCustomFields.events({
 				if (error) {
 					return handleError(error);
 				}
-				swal({
+				modal.open({
 					title: t('Removed'),
 					text: t('Field_removed'),
 					type: 'success',

packages/rocketchat-livechat/client/views/app/livechatDepartments.js

@@ -9,7 +9,7 @@ Template.livechatDepartments.events({
 		e.preventDefault();
 		e.stopPropagation();
 
-		swal({
+		modal.open({
 			title: t('Are_you_sure'),
 			type: 'warning',
 			showCancelButton: true,
@@ -23,7 +23,7 @@ Template.livechatDepartments.events({
 				if (error) {
 					return handleError(error);
 				}
-				swal({
+				modal.open({
 					title: t('Removed'),
 					text: t('Department_removed'),
 					type: 'success',