Convert rocketchat-channel-settings to main module structure (#12594)

* Exposing RoomManager variable * Convert rocketchat-channel-settings to main module structure * Remove commented code
RocketChat · Nov 14, 2018 · 750e217 · 750e217
1 parent 9997087
commit 750e217
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 28 deletions.
diff --git a/packages/rocketchat-channel-settings/client/index.js b/packages/rocketchat-channel-settings/client/index.js
@@ -0,0 +1,7 @@
+import './stylesheets/channel-settings.css';
+import './startup/messageTypes';
+import './startup/tabBar';
+import './startup/trackSettingsChange';
+import './lib/ChannelSettings';
+import './views/channelSettings.html';
+import './views/channelSettings';
diff --git a/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js b/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
@@ -1,5 +1,6 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 RocketChat.ChannelSettings = new class {

diff --git a/packages/rocketchat-channel-settings/client/startup/messageTypes.js b/packages/rocketchat-channel-settings/client/startup/messageTypes.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 import s from 'underscore.string';
 
 Meteor.startup(function() {

diff --git a/packages/rocketchat-channel-settings/client/startup/tabBar.js b/packages/rocketchat-channel-settings/client/startup/tabBar.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(() => {
 	RocketChat.TabBar.addButton({

diff --git a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js b/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js
@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatRoom, RoomManager } from 'meteor/rocketchat:ui';
 
 Meteor.startup(function() {
 	const roomSettingsChangedCallback = (msg) => {

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -7,6 +7,7 @@ import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';
 import { call, erase, hide, leave, RocketChat, RoomSettingsEnum } from 'meteor/rocketchat:lib';
+import { modal, t, ChatRoom } from 'meteor/rocketchat:ui';
 
 const common = {
 	canLeaveRoom() {

diff --git a/packages/rocketchat-channel-settings/package.js b/packages/rocketchat-channel-settings/package.js
@@ -13,30 +13,6 @@ Package.onUse(function(api) {
 		'templating',
 		'rocketchat:lib',
 	]);
-
-	api.addFiles([
-		'client/lib/ChannelSettings.js',
-		'client/startup/messageTypes.js',
-		'client/startup/tabBar.js',
-		'client/startup/trackSettingsChange.js',
-		'client/views/channelSettings.html',
-		'client/views/channelSettings.js',
-		'client/stylesheets/channel-settings.css',
-	], 'client');
-
-	api.addFiles([
-		'server/functions/saveReactWhenReadOnly.js',
-		'server/functions/saveRoomType.js',
-		'server/functions/saveRoomTopic.js',
-		'server/functions/saveRoomCustomFields.js',
-		'server/functions/saveRoomAnnouncement.js',
-		'server/functions/saveRoomName.js',
-		'server/functions/saveRoomReadOnly.js',
-		'server/functions/saveRoomDescription.js',
-		'server/functions/saveRoomSystemMessages.js',
-		'server/methods/saveRoomSettings.js',
-		'server/models/Messages.js',
-		'server/models/Rooms.js',
-		'server/startup.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js b/packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveReactWhenReadOnly = function(rid, allowReact) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js b/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomAnnouncement = function(rid, roomAnnouncement, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js b/packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomCustomFields = function(rid, roomCustomFields) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js b/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomDescription = function(rid, roomDescription, user) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomName.js b/packages/rocketchat-channel-settings/server/functions/saveRoomName.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomName = function(rid, displayName, user, sendMessage = true) {
 	const room = RocketChat.models.Rooms.findOneById(rid);

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js b/packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomReadOnly = function(rid, readOnly) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js b/packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomSystemMessages = function(rid, systemMessages) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js b/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomTopic = function(rid, roomTopic, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomType.js b/packages/rocketchat-channel-settings/server/functions/saveRoomType.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomType = function(rid, roomType, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

diff --git a/packages/rocketchat-channel-settings/server/index.js b/packages/rocketchat-channel-settings/server/index.js
@@ -0,0 +1,13 @@
+import './startup';
+import './models/Messages';
+import './models/Rooms';
+import './functions/saveReactWhenReadOnly';
+import './functions/saveRoomAnnouncement';
+import './functions/saveRoomCustomFields';
+import './functions/saveRoomDescription';
+import './functions/saveRoomName';
+import './functions/saveRoomReadOnly';
+import './functions/saveRoomSystemMessages';
+import './functions/saveRoomTopic';
+import './functions/saveRoomType';
+import './methods/saveRoomSettings';
diff --git a/packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js b/packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 const fields = ['roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted'];
 Meteor.methods({

diff --git a/packages/rocketchat-channel-settings/server/models/Messages.js b/packages/rocketchat-channel-settings/server/models/Messages.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser = function(type, roomId, message, user, extraData) {
 	return this.createWithTypeRoomIdMessageAndUser(type, roomId, message, user, extraData);
 };

diff --git a/packages/rocketchat-channel-settings/server/models/Rooms.js b/packages/rocketchat-channel-settings/server/models/Rooms.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Rooms.setDescriptionById = function(_id, description) {
 	const query = {
 		_id,

diff --git a/packages/rocketchat-channel-settings/server/startup.js b/packages/rocketchat-channel-settings/server/startup.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.models.Permissions.upsert('post-readonly', { $setOnInsert: { roles: ['admin', 'owner', 'moderator'] } });

diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -19,7 +19,7 @@ const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, users }) => {
 	ChatMessage.remove(query);
 };
 
-const RoomManager = new function() {
+RoomManager = new function() { //eslint-disable-line
 	const openedRooms = {};
 	const msgStream = new Meteor.Streamer('room-messages');
 	const onlineUsers = new ReactiveVar({});
@@ -310,7 +310,6 @@ Tracker.autorun(function() {
 });
 
 export { RoomManager };
-this.RoomManager = RoomManager;
 RocketChat.callbacks.add('afterLogoutCleanUp', () => RoomManager.closeAllRooms(), RocketChat.callbacks.priority.MEDIUM, 'roommanager-after-logout-cleanup');
 
 RocketChat.CachedCollectionManager.onLogin(() => {

diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
@@ -152,4 +152,5 @@ Package.onUse(function(api) {
 	api.export('ChatRoom', 'client');
 	api.export('ChatSubscription', 'client');
 	api.export('RoomRoles', 'client');
+	api.export('RoomManager', 'client');
 });