Remove dependency of RC namespace in rc-ui-master, ui-message- user-data-download and version-check

packages/rocketchat-models/client/index.js

@@ -17,6 +17,7 @@ import { RoomRoles } from './models/RoomRoles';
 import { UserAndRoom } from './models/UserAndRoom';
 import { UserRoles } from './models/UserRoles';
 import { AuthzCachedCollection, ChatPermissions } from './models/ChatPermissions';
+import { WebdavAccounts } from './models/WebdavAccounts';
 import CustomSounds from './models/CustomSounds';
 import EmojiCustom from './models/EmojiCustom';
 import _ from 'underscore';
@@ -51,4 +52,5 @@ export {
 	Rooms,
 	CustomSounds,
 	EmojiCustom,
+	WebdavAccounts,
 };

packages/rocketchat-models/client/models/WebdavAccounts.js

@@ -0,0 +1,3 @@
+import { Mongo } from 'meteor/mongo';
+
+export const WebdavAccounts = new Mongo.Collection('rocketchat_webdav_accounts');

packages/rocketchat-ui-account/client/account.js

@@ -1,6 +1,6 @@
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { SideNav } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui-utils';
 
 Template.account.onRendered(function() {
 	Tracker.afterFlush(function() {

packages/rocketchat-ui-account/client/accountFlex.js

@@ -1,6 +1,7 @@
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { SideNav } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
+import { SideNav, Layout } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 
 Template.accountFlex.events({
@@ -15,16 +16,16 @@ Template.accountFlex.events({
 
 Template.accountFlex.helpers({
 	allowUserProfileChange() {
-		return RocketChat.settings.get('Accounts_AllowUserProfileChange');
+		return settings.get('Accounts_AllowUserProfileChange');
 	},
 	accessTokensEnabled() {
-		return RocketChat.authz.hasAllPermission(['create-personal-access-tokens']);
+		return hasAllPermission(['create-personal-access-tokens']);
 	},
 	encryptionEnabled() {
-		return RocketChat.settings.get('E2E_Enable');
+		return settings.get('E2E_Enable');
 	},
 	webdavIntegrationEnabled() {
-		return RocketChat.settings.get('Webdav_Integration_Enabled');
+		return settings.get('Webdav_Integration_Enabled');
 	},
 	menuItem(name, icon, section, group) {
 		return {
@@ -36,6 +37,6 @@ Template.accountFlex.helpers({
 		};
 	},
 	embeddedVersion() {
-		return RocketChat.Layout.isEmbedded();
+		return Layout.isEmbedded();
 	},
 });

packages/rocketchat-ui-account/client/accountIntegrations.js

@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { modal } from 'meteor/rocketchat:ui';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
+import { modal } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 Template.accountIntegrations.helpers({
 	webdavAccounts() {
-		return RocketChat.models.WebdavAccounts.find().fetch();
+		return WebdavAccounts.find().fetch();
 	},
 	getOptionValue(account) {
 		return account.name || `${ account.username }@${ account.server_url.replace(/^https?\:\/\//i, '') }`;

packages/rocketchat-ui-account/client/accountPreferences.js

@@ -4,9 +4,11 @@ import { Tracker } from 'meteor/tracker';
 import { Reload } from 'meteor/reload';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal, SideNav, KonchatNotification } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { t, handleError, getUserPreference } from 'meteor/rocketchat:utils';
+import { modal, SideNav } from 'meteor/rocketchat:ui-utils';
+import { KonchatNotification } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { CustomSounds } from 'meteor/rocketchat:custom-sounds';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
@@ -26,21 +28,21 @@ function checkedSelected(property, value, defaultValue = undefined) {
 	if (defaultValue && defaultValue.hash) {
 		defaultValue = undefined;
 	}
-	return RocketChat.getUserPreference(Meteor.userId(), property, defaultValue) === value;
+	return getUserPreference(Meteor.userId(), property, defaultValue) === value;
 }
 
 Template.accountPreferences.helpers({
 	audioAssets() {
-		return (RocketChat.CustomSounds && RocketChat.CustomSounds.getList && RocketChat.CustomSounds.getList()) || [];
+		return (CustomSounds && CustomSounds.getList && CustomSounds.getList()) || [];
 	},
 	newMessageNotification() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'newMessageNotification');
+		return getUserPreference(Meteor.userId(), 'newMessageNotification');
 	},
 	newRoomNotification() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'newRoomNotification');
+		return getUserPreference(Meteor.userId(), 'newRoomNotification');
 	},
 	muteFocusedConversations() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'muteFocusedConversations');
+		return getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 	},
 	languages() {
 		const languages = TAPi18n.getLanguages();
@@ -68,7 +70,7 @@ Template.accountPreferences.helpers({
 		return checkedSelected(property, value, defaultValue);
 	},
 	highlights() {
-		const userHighlights = RocketChat.getUserPreference(Meteor.userId(), 'highlights');
+		const userHighlights = getUserPreference(Meteor.userId(), 'highlights');
 		return userHighlights ? userHighlights.join(',\n') : undefined;
 	},
 	desktopNotificationEnabled() {
@@ -78,38 +80,38 @@ Template.accountPreferences.helpers({
 		return KonchatNotification.notificationStatus.get() === 'denied' || (window.Notification && Notification.permission === 'denied');
 	},
 	desktopNotificationDuration() {
-		const userPref = RocketChat.getUserPreference(Meteor.userId(), 'desktopNotificationDuration', 'undefined');
+		const userPref = getUserPreference(Meteor.userId(), 'desktopNotificationDuration', 'undefined');
 		return userPref !== 'undefined' ? userPref : undefined;
 	},
 	defaultDesktopNotificationDuration() {
-		return RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotificationDuration');
+		return settings.get('Accounts_Default_User_Preferences_desktopNotificationDuration');
 	},
 	idleTimeLimit() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'idleTimeLimit');
+		return getUserPreference(Meteor.userId(), 'idleTimeLimit');
 	},
 	defaultIdleTimeLimit() {
-		return RocketChat.settings.get('Accounts_Default_User_Preferences_idleTimeLimit');
+		return settings.get('Accounts_Default_User_Preferences_idleTimeLimit');
 	},
 	defaultDesktopNotification() {
-		return notificationLabels[RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotifications')];
+		return notificationLabels[settings.get('Accounts_Default_User_Preferences_desktopNotifications')];
 	},
 	defaultMobileNotification() {
-		return notificationLabels[RocketChat.settings.get('Accounts_Default_User_Preferences_mobileNotifications')];
+		return notificationLabels[settings.get('Accounts_Default_User_Preferences_mobileNotifications')];
 	},
 	defaultEmailNotification() {
-		return emailLabels[RocketChat.settings.get('Accounts_Default_User_Preferences_emailNotificationMode')];
+		return emailLabels[settings.get('Accounts_Default_User_Preferences_emailNotificationMode')];
 	},
 	showRoles() {
-		return RocketChat.settings.get('UI_DisplayRoles');
+		return settings.get('UI_DisplayRoles');
 	},
 	userDataDownloadEnabled() {
-		return RocketChat.settings.get('UserData_EnableDownload') !== false;
+		return settings.get('UserData_EnableDownload') !== false;
 	},
 	notificationsSoundVolume() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'notificationsSoundVolume');
+		return getUserPreference(Meteor.userId(), 'notificationsSoundVolume');
 	},
 	dontAskAgainList() {
-		return RocketChat.getUserPreference(Meteor.userId(), 'dontAskAgainList');
+		return getUserPreference(Meteor.userId(), 'dontAskAgainList');
 	},
 });
 
@@ -122,7 +124,7 @@ Template.accountPreferences.onCreated(function() {
 
 	settingsTemplate.child.push(this);
 
-	this.useEmojis = new ReactiveVar(RocketChat.getUserPreference(Meteor.userId(), 'useEmojis'));
+	this.useEmojis = new ReactiveVar(getUserPreference(Meteor.userId(), 'useEmojis'));
 
 	let instance = this;
 
@@ -161,7 +163,7 @@ Template.accountPreferences.onCreated(function() {
 		data.sendOnEnter = $('#sendOnEnter').find('select').val();
 		data.autoImageLoad = JSON.parse($('input[name=autoImageLoad]:checked').val());
 		data.emailNotificationMode = $('select[name=emailNotificationMode]').val();
-		data.desktopNotificationDuration = $('input[name=desktopNotificationDuration]').val() === '' ? RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotificationDuration') : parseInt($('input[name=desktopNotificationDuration]').val());
+		data.desktopNotificationDuration = $('input[name=desktopNotificationDuration]').val() === '' ? settings.get('Accounts_Default_User_Preferences_desktopNotificationDuration') : parseInt($('input[name=desktopNotificationDuration]').val());
 		data.desktopNotifications = $('#desktopNotifications').find('select').val();
 		data.mobileNotifications = $('#mobileNotifications').find('select').val();
 		data.unreadAlert = JSON.parse($('#unreadAlert').find('input:checked').val());
@@ -174,12 +176,12 @@ Template.accountPreferences.onCreated(function() {
 
 		let reload = false;
 
-		if (RocketChat.settings.get('UI_DisplayRoles')) {
+		if (settings.get('UI_DisplayRoles')) {
 			data.hideRoles = JSON.parse($('#hideRoles').find('input:checked').val());
 		}
 
 		// if highlights changed we need page reload
-		const highlights = RocketChat.getUserPreference(Meteor.userId(), 'highlights');
+		const highlights = getUserPreference(Meteor.userId(), 'highlights');
 		if (highlights && highlights.join('\n') !== data.highlights.join('\n')) {
 			reload = true;
 		}
@@ -198,7 +200,7 @@ Template.accountPreferences.onCreated(function() {
 			reload = true;
 		}
 
-		const idleTimeLimit = $('input[name=idleTimeLimit]').val() === '' ? RocketChat.settings.get('Accounts_Default_User_Preferences_idleTimeLimit') : parseInt($('input[name=idleTimeLimit]').val());
+		const idleTimeLimit = $('input[name=idleTimeLimit]').val() === '' ? settings.get('Accounts_Default_User_Preferences_idleTimeLimit') : parseInt($('input[name=idleTimeLimit]').val());
 		data.idleTimeLimit = idleTimeLimit;
 		if (this.shouldUpdateLocalStorageSetting('idleTimeLimit', idleTimeLimit)) {
 			localStorage.setItem('idleTimeLimit', idleTimeLimit);

packages/rocketchat-ui-account/client/accountProfile.js

@@ -4,16 +4,18 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal, SideNav } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { modal, SideNav } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
+import { settings } from 'meteor/rocketchat:settings';
+import { Notifications } from 'meteor/rocketchat:notifications';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
 
 const validateEmail = (email) => /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(email);
 const validateUsername = (username) => {
-	const reg = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
+	const reg = new RegExp(`^${ settings.get('UTF8_Names_Validation') }$`);
 	return reg.test(username);
 };
 const validateName = (name) => name && name.length;
@@ -26,7 +28,7 @@ const validatePassword = (password, confirmationPassword) => {
 };
 
 const filterNames = (old) => {
-	const reg = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
+	const reg = new RegExp(`^${ settings.get('UTF8_Names_Validation') }$`);
 	return [...old.replace(' ', '')].filter((f) => reg.test(f)).join('');
 };
 const filterEmail = (old) => old.replace(' ', '');
@@ -83,7 +85,7 @@ Template.accountProfile.helpers({
 			return Object.keys(suggestions.avatars).map((service) => ({
 				name: service,
 				// TODO: improve this fix
-				service: !suggestions.avatars[service.toLowerCase()] ? RocketChat.settings.get(`Accounts_OAuth_${ s.capitalize(service.toLowerCase()) }`) : false,
+				service: !suggestions.avatars[service.toLowerCase()] ? settings.get(`Accounts_OAuth_${ s.capitalize(service.toLowerCase()) }`) : false,
 				suggestion: suggestions.avatars[service.toLowerCase()],
 			}))
 				.filter(({ service, suggestion }) => service || suggestion);
@@ -133,7 +135,7 @@ Template.accountProfile.helpers({
 		return;
 	},
 	allowDeleteOwnAccount() {
-		return RocketChat.settings.get('Accounts_AllowDeleteOwnAccount');
+		return settings.get('Accounts_AllowDeleteOwnAccount');
 	},
 	realname() {
 		return Meteor.user().name;
@@ -150,23 +152,23 @@ Template.accountProfile.helpers({
 		return isUserEmailVerified(user);
 	},
 	allowRealNameChange() {
-		return RocketChat.settings.get('Accounts_AllowRealNameChange');
+		return settings.get('Accounts_AllowRealNameChange');
 	},
 	allowUsernameChange() {
-		return RocketChat.settings.get('Accounts_AllowUsernameChange') && RocketChat.settings.get('LDAP_Enable') !== true;
+		return settings.get('Accounts_AllowUsernameChange') && settings.get('LDAP_Enable') !== true;
 	},
 	allowEmailChange() {
-		return RocketChat.settings.get('Accounts_AllowEmailChange');
+		return settings.get('Accounts_AllowEmailChange');
 	},
 	allowPasswordChange() {
-		return RocketChat.settings.get('Accounts_AllowPasswordChange');
+		return settings.get('Accounts_AllowPasswordChange');
 	},
 	canConfirmNewPassword() {
 		const password = Template.instance().password.get();
-		return RocketChat.settings.get('Accounts_AllowPasswordChange') && password && password !== '';
+		return settings.get('Accounts_AllowPasswordChange') && password && password !== '';
 	},
 	allowAvatarChange() {
-		return RocketChat.settings.get('Accounts_AllowUserAvatarChange');
+		return settings.get('Accounts_AllowUserAvatarChange');
 	},
 	customFields() {
 		return Meteor.user().customFields;
@@ -187,7 +189,7 @@ Template.accountProfile.onCreated(function() {
 	self.url = new ReactiveVar('');
 	self.usernameAvaliable = new ReactiveVar(true);
 
-	RocketChat.Notifications.onLogged('updateAvatar', () => self.avatar.set());
+	Notifications.onLogged('updateAvatar', () => self.avatar.set());
 	self.getSuggestions = function() {
 		self.suggestions.set(undefined);
 		Meteor.call('getAvatarSuggestion', function(error, avatars) {
@@ -207,7 +209,7 @@ Template.accountProfile.onCreated(function() {
 		const instance = this;
 		if (!newPassword) {
 			return callback();
-		} else if (!RocketChat.settings.get('Accounts_AllowPasswordChange')) {
+		} else if (!settings.get('Accounts_AllowPasswordChange')) {
 			toastr.remove();
 			toastr.error(t('Password_Change_Disabled'));
 			instance.clearForm();
@@ -229,7 +231,7 @@ Template.accountProfile.onCreated(function() {
 					}));
 				} else {
 					toastr.success(t('Avatar_changed_successfully'));
-					RocketChat.callbacks.run('userAvatarSet', avatar.service);
+					callbacks.run('userAvatarSet', avatar.service);
 				}
 			});
 		}
@@ -239,11 +241,11 @@ Template.accountProfile.onCreated(function() {
 		if (typedPassword) {
 			data.typedPassword = typedPassword;
 		}
-		if (s.trim(self.password.get()) && RocketChat.settings.get('Accounts_AllowPasswordChange')) {
+		if (s.trim(self.password.get()) && settings.get('Accounts_AllowPasswordChange')) {
 			data.newPassword = self.password.get();
 		}
 		if (s.trim(self.realname.get()) !== user.name) {
-			if (!RocketChat.settings.get('Accounts_AllowRealNameChange')) {
+			if (!settings.get('Accounts_AllowRealNameChange')) {
 				toastr.remove();
 				toastr.error(t('RealName_Change_Disabled'));
 				instance.clearForm();
@@ -253,7 +255,7 @@ Template.accountProfile.onCreated(function() {
 			}
 		}
 		if (s.trim(self.username.get()) !== user.username) {
-			if (!RocketChat.settings.get('Accounts_AllowUsernameChange')) {
+			if (!settings.get('Accounts_AllowUsernameChange')) {
 				toastr.remove();
 				toastr.error(t('Username_Change_Disabled'));
 				instance.clearForm();
@@ -263,7 +265,7 @@ Template.accountProfile.onCreated(function() {
 			}
 		}
 		if (s.trim(self.email.get()) !== getUserEmailAddress(user)) {
-			if (!RocketChat.settings.get('Accounts_AllowEmailChange')) {
+			if (!settings.get('Accounts_AllowEmailChange')) {
 				toastr.remove();
 				toastr.error(t('Email_Change_Disabled'));
 				instance.clearForm();
@@ -299,7 +301,7 @@ Template.accountProfile.onCreated(function() {
 
 Template.accountProfile.onRendered(function() {
 	Tracker.afterFlush(() => {
-		if (!RocketChat.settings.get('Accounts_AllowUserProfileChange')) {
+		if (!settings.get('Accounts_AllowUserProfileChange')) {
 			FlowRouter.go('home');
 		}
 		this.clearForm();
@@ -326,7 +328,7 @@ Template.accountProfile.events({
 				}));
 			} else {
 				toastr.success(t('Avatar_changed_successfully'));
-				RocketChat.callbacks.run('userAvatarSet', 'initials');
+				callbacks.run('userAvatarSet', 'initials');
 			}
 		});
 	},
@@ -527,7 +529,7 @@ Template.accountProfile.events({
 					contentType: blob.type,
 					blob: reader.result,
 				});
-				RocketChat.callbacks.run('userAvatarSet', 'upload');
+				callbacks.run('userAvatarSet', 'upload');
 			};
 		});
 	},