Convert rocketchat-ui-master to main module structure

.meteor/packages

@@ -209,3 +209,4 @@ rocketchat:callbacks
 rocketchat:notifications
 rocketchat:promises
 rocketchat:ui-utils
+rocketchat:ui-cached-collection

.meteor/versions

@@ -249,6 +249,7 @@ rocketchat:tooltip@0.0.1
 rocketchat:ui@0.1.0
 rocketchat:ui-account@0.1.0
 rocketchat:ui-admin@0.1.0
+rocketchat:ui-cached-collection@0.0.1
 rocketchat:ui-clean-history@0.0.1
 rocketchat:ui-flextab@0.1.0
 rocketchat:ui-login@0.1.0

packages/rocketchat-authorization/client/startup.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { CachedCollectionManager } from 'meteor/rocketchat:models';
+import { CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
 import { hasAllPermission } from './hasPermission';
 
 Meteor.startup(async() => {

packages/rocketchat-authorization/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
 		'rocketchat:utils',
 		'rocketchat:models',
 		'rocketchat:notifications',
+		'rocketchat:ui-cached-collection',
 	]);
 	api.use([
 		'templating',

packages/rocketchat-iframe-login/client/iframe_client.js

@@ -1,10 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { Match } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';
 import { Accounts } from 'meteor/accounts-base';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import { HTTP } from 'meteor/http';
+import { IframeLogin } from 'meteor/rocketchat:ui-utils';
 import { OAuth } from 'meteor/oauth';
 import _ from 'underscore';
 
@@ -14,109 +11,6 @@ Accounts._unstoreLoginToken = function(...args) {
 	_unstoreLoginToken.apply(Accounts, args);
 };
 
-class IframeLogin {
-	constructor() {
-		this.enabled = false;
-		this.reactiveIframeUrl = new ReactiveVar();
-		this.reactiveEnabled = new ReactiveVar();
-		this.iframeUrl = undefined;
-		this.apiUrl = undefined;
-		this.apiMethod = undefined;
-
-		Tracker.autorun((c) => {
-			this.enabled = RocketChat.settings.get('Accounts_iframe_enabled');
-			this.reactiveEnabled.set(this.enabled);
-
-			this.iframeUrl = RocketChat.settings.get('Accounts_iframe_url');
-			this.apiUrl = RocketChat.settings.get('Accounts_Iframe_api_url');
-			this.apiMethod = RocketChat.settings.get('Accounts_Iframe_api_method');
-
-			if (this.enabled === false) {
-				return c.stop();
-			}
-
-			if (this.enabled === true && this.iframeUrl && this.apiUrl && this.apiMethod) {
-				c.stop();
-				if (!Accounts._storedLoginToken()) {
-					this.tryLogin(() => {});
-				}
-			}
-		});
-	}
-
-	tryLogin(callback) {
-		if (!this.enabled) {
-			return;
-		}
-
-		if (!this.iframeUrl || !this.apiUrl || !this.apiMethod) {
-			return;
-		}
-
-		console.log('tryLogin');
-		const options = {
-			beforeSend: (xhr) => {
-				xhr.withCredentials = true;
-			},
-		};
-
-		let { iframeUrl } = this;
-		let separator = '?';
-		if (iframeUrl.indexOf('?') > -1) {
-			separator = '&';
-		}
-
-		if (window.cordova) {
-			iframeUrl += `${ separator }client=cordova`;
-		} else if (navigator.userAgent.indexOf('Electron') > -1) {
-			iframeUrl += `${ separator }client=electron`;
-		}
-
-		HTTP.call(this.apiMethod, this.apiUrl, options, (error, result) => {
-			console.log(error, result);
-			if (result && result.data && (result.data.token || result.data.loginToken)) {
-				this.loginWithToken(result.data, (error, result) => {
-					if (error) {
-						this.reactiveIframeUrl.set(iframeUrl);
-					} else {
-						this.reactiveIframeUrl.set();
-					}
-					callback(error, result);
-				});
-			} else {
-				this.reactiveIframeUrl.set(iframeUrl);
-				callback(error, result);
-			}
-		});
-	}
-
-	loginWithToken(tokenData, callback) {
-		if (!this.enabled) {
-			return;
-		}
-
-		if (Match.test(tokenData, String)) {
-			tokenData = {
-				token: tokenData,
-			};
-		}
-
-		console.log('loginWithToken');
-
-		if (tokenData.loginToken) {
-			return Meteor.loginWithToken(tokenData.loginToken, callback);
-		}
-
-		Accounts.callLoginMethod({
-			methodArguments: [{
-				iframe: true,
-				token: tokenData.token,
-			}],
-			userCallback: callback,
-		});
-	}
-}
-
 RocketChat.iframeLogin = new IframeLogin();
 
 const requestCredential = (serviceName, options = {}, callback) => {

packages/rocketchat-iframe-login/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 		'rocketchat:logger',
 		'kadira:flow-router',
 		'rocketchat:lib',
+		'rocketchat:ui-utils',
 		'accounts-base',
 		'ecmascript',
 		'reactive-var',

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

@@ -1,14 +1,4 @@
-import { Tracker } from 'meteor/tracker';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Layout } from 'meteor/rocketchat:ui-utils';
 
-RocketChat.Layout = new (class RocketChatLayout {
-	constructor() {
-		Tracker.autorun(() => {
-			this.layout = FlowRouter.getQueryParam('layout');
-		});
-	}
+RocketChat.Layout = Layout;
 
-	isEmbedded() {
-		return this.layout === 'embedded';
-	}
-});

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

@@ -1,4 +1,4 @@
-import { CachedCollection, CachedCollectionManager } from 'meteor/rocketchat:models';
+import { CachedCollection, CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
 
 RocketChat.CachedCollectionManager = CachedCollectionManager;
 RocketChat.CachedCollection = CachedCollection;

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

@@ -1,54 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { ReactiveDict } from 'meteor/reactive-dict';
 import { t } from 'meteor/rocketchat:utils';
 
-/*
-* RocketChat.settings holds all packages settings
-* @namespace RocketChat.settings
-*/
-
-RocketChat.settings.cachedCollection = new RocketChat.CachedCollection({
-	name: 'public-settings',
-	eventType: 'onAll',
-	userRelated: false,
-	listenChangesForLoggedUsersOnly: true,
-});
-
-RocketChat.settings.collection = RocketChat.settings.cachedCollection.collection;
-
-RocketChat.settings.cachedCollection.init();
-
-RocketChat.settings.dict = new ReactiveDict('settings');
-
-RocketChat.settings.get = function(_id) {
-	return RocketChat.settings.dict.get(_id);
-};
-
-RocketChat.settings.init = function() {
-	let initialLoad = true;
-	RocketChat.settings.collection.find().observe({
-		added(record) {
-			Meteor.settings[record._id] = record.value;
-			RocketChat.settings.dict.set(record._id, record.value);
-			RocketChat.settings.load(record._id, record.value, initialLoad);
-		},
-		changed(record) {
-			Meteor.settings[record._id] = record.value;
-			RocketChat.settings.dict.set(record._id, record.value);
-			RocketChat.settings.load(record._id, record.value, initialLoad);
-		},
-		removed(record) {
-			delete Meteor.settings[record._id];
-			RocketChat.settings.dict.set(record._id, null);
-			RocketChat.settings.load(record._id, null, initialLoad);
-		},
-	});
-	initialLoad = false;
-};
-
-RocketChat.settings.init();
-
 Meteor.startup(function() {
 	if (Meteor.isCordova === true) {
 		return;

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

@@ -0,0 +1,3 @@
+import { tooltip } from 'meteor/rocketchat:tooltip';
+
+RocketChat.tooltip = tooltip;

packages/rocketchat-lib/package.js

@@ -32,6 +32,7 @@ Package.onUse(function(api) {
 	api.use('rocketchat:notifications');
 	api.use('rocketchat:promises');
 	api.use('rocketchat:ui-utils');
+	api.use('rocketchat:tooltip');
 	api.use('rocketchat:accounts');
 	api.use('modules');
 	api.use('rocketchat:i18n');
@@ -235,6 +236,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/lib/Layout.js', 'client');
 	api.addFiles('client/lib/handleError.js', 'client');
 	api.addFiles('client/lib/authorization.js', 'client');
+	api.addFiles('client/lib/tooltip.js', 'client');
 
 	// CLIENT LIB STARTUP
 	api.addFiles('client/lib/startup/commands.js', 'client');

packages/rocketchat-metrics/package.js

@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:settings',
 		'rocketchat:migrations',
 		'rocketchat:version',
 	]);

packages/rocketchat-metrics/server/lib/metrics.js

@@ -1,5 +1,4 @@
 import { Meteor } from 'meteor/meteor';
-import { settings } from 'meteor/rocketchat:settings';
 import { Migrations } from 'meteor/rocketchat:migrations';
 import client from 'prom-client';
 import connect from 'connect';
@@ -77,12 +76,12 @@ metrics.totalPrivateGroupMessages = new client.Gauge({ name: 'rocketchat_private
 metrics.totalDirectMessages = new client.Gauge({ name: 'rocketchat_direct_messages_total', help: 'total of messages in direct rooms' });
 metrics.totalLivechatMessages = new client.Gauge({ name: 'rocketchat_livechat_messages_total', help: 'total of messages in livechat rooms' });
 
-client.register.setDefaultLabels({
-	uniqueId: settings.get('uniqueID'),
-	siteUrl: settings.get('Site_Url'),
-});
-
 const setPrometheusData = async() => {
+	const { settings } = await import('meteor/rocketchat:settings');
+	client.register.setDefaultLabels({
+		uniqueId: settings.get('uniqueID'),
+		siteUrl: settings.get('Site_Url'),
+	});
 	const date = new Date();
 	if (!Info) {
 		const Utils = await import('meteor/rocketchat:utils');
@@ -167,7 +166,8 @@ app.use('/', (req, res) => {
 const server = http.createServer(app);
 
 let timer;
-const updatePrometheusConfig = () => {
+const updatePrometheusConfig = async() => {
+	const { settings } = await import('meteor/rocketchat:settings');
 	const port = settings.get('Prometheus_Port');
 	const enabled = settings.get('Prometheus_Enabled');
 	if (port == null || enabled == null) {
@@ -186,5 +186,8 @@ const updatePrometheusConfig = () => {
 	}
 };
 
-settings.get('Prometheus_Enabled', updatePrometheusConfig);
-settings.get('Prometheus_Port', updatePrometheusConfig);
+Meteor.startup(async() => {
+	const { settings } = await import('meteor/rocketchat:settings');
+	settings.get('Prometheus_Enabled', updatePrometheusConfig);
+	settings.get('Prometheus_Port', updatePrometheusConfig);
+});

packages/rocketchat-models/client/index.js

@@ -3,7 +3,6 @@ import { Base } from './models/_Base';
 import Avatars from './models/Avatars';
 import Uploads from './models/Uploads';
 import UserDataFiles from './models/UserDataFiles';
-import { CachedCollection, CachedCollectionManager } from './models/CachedCollection';
 import { Roles } from './models/Roles';
 import { Subscriptions as subscriptions } from './models/Subscriptions';
 import { Users as users } from './models/Users';
@@ -31,8 +30,6 @@ export {
 	Avatars,
 	Uploads,
 	UserDataFiles,
-	CachedCollection,
-	CachedCollectionManager,
 	Roles,
 	Subscriptions,
 	Users,

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

@@ -1,3 +1,3 @@
-import { CachedCollection } from './CachedCollection';
+import { CachedCollection } from 'meteor/rocketchat:ui-cached-collection';
 
 export const CachedChatRoom = new CachedCollection({ name: 'rooms' });

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

@@ -1,3 +1,3 @@
-import { CachedCollection } from './CachedCollection';
+import { CachedCollection } from 'meteor/rocketchat:ui-cached-collection';
 
 export const CachedChatSubscription = new CachedCollection({ name: 'subscriptions' });

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

@@ -1,4 +1,4 @@
-import { CachedCollection } from './CachedCollection';
+import { CachedCollection } from 'meteor/rocketchat:ui-cached-collection';
 
 export const AuthzCachedCollection = new CachedCollection({
 	name: 'permissions',

packages/rocketchat-models/package.js

@@ -10,6 +10,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:settings',
 		'rocketchat:callbacks',
+		'rocketchat:ui-cached-collection',
 		'konecty:multiple-instances-status',
 	]);
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-settings/client/index.js

@@ -1,4 +1,4 @@
-import { settings } from '../lib/settings';
+import { settings } from './lib/settings';
 
 export {
 	settings,