Convert rocketchat-autotranslate to main module structure (#12530)

* Exposing ChatSubscription from rocketchat-ui * Convert rocketchat-autotranslate to main module structure
RocketChat · Nov 6, 2018 · b4debdc · b4debdc
1 parent cb5eb20
commit b4debdc
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 25 deletions.
diff --git a/packages/rocketchat-autotranslate/client/index.js b/packages/rocketchat-autotranslate/client/index.js
@@ -0,0 +1,6 @@
+import './stylesheets/autotranslate.css';
+import './lib/actionButton';
+import './lib/autotranslate';
+import './lib/tabBar';
+import './views/autoTranslateFlexTab.html';
+import './views/autoTranslateFlexTab';
diff --git a/packages/rocketchat-autotranslate/client/lib/actionButton.js b/packages/rocketchat-autotranslate/client/lib/actionButton.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 RocketChat.AutoTranslate = {

diff --git a/packages/rocketchat-autotranslate/client/lib/tabBar.js b/packages/rocketchat-autotranslate/client/lib/tabBar.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
@@ -1,8 +1,9 @@
-/* globals ChatSubscription */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatSubscription, t } from 'meteor/rocketchat:ui';
 import _ from 'underscore';
 import toastr from 'toastr';
 

diff --git a/packages/rocketchat-autotranslate/package.js b/packages/rocketchat-autotranslate/package.js
@@ -10,27 +10,8 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'ddp-rate-limiter',
 		'rocketchat:lib',
+		'templating',
 	]);
-
-	api.use('templating', 'client');
-
-	api.addFiles([
-		'client/stylesheets/autotranslate.css',
-		'client/lib/autotranslate.js',
-		'client/lib/actionButton.js',
-		'client/lib/tabBar.js',
-		'client/views/autoTranslateFlexTab.html',
-		'client/views/autoTranslateFlexTab.js',
-	], 'client');
-
-	api.addFiles([
-		'server/settings.js',
-		'server/autotranslate.js',
-		'server/permissions.js',
-		'server/models/Messages.js',
-		'server/models/Subscriptions.js',
-		'server/methods/saveSettings.js',
-		'server/methods/translateMessage.js',
-		'server/methods/getSupportedLanguages.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 import s from 'underscore.string';
 

diff --git a/packages/rocketchat-autotranslate/server/index.js b/packages/rocketchat-autotranslate/server/index.js
@@ -0,0 +1,8 @@
+import './models/Messages';
+import './models/Subscriptions';
+import './settings';
+import './permissions';
+import './autotranslate';
+import './methods/getSupportedLanguages';
+import './methods/saveSettings';
+import './methods/translateMessage';
diff --git a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js b/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	'autoTranslate.getSupportedLanguages'(targetLanguage) {

diff --git a/packages/rocketchat-autotranslate/server/methods/saveSettings.js b/packages/rocketchat-autotranslate/server/methods/saveSettings.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	'autoTranslate.saveSettings'(rid, field, value, options) {

diff --git a/packages/rocketchat-autotranslate/server/methods/translateMessage.js b/packages/rocketchat-autotranslate/server/methods/translateMessage.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	'autoTranslate.translateMessage'(message, targetLanguage) {

diff --git a/packages/rocketchat-autotranslate/server/models/Messages.js b/packages/rocketchat-autotranslate/server/models/Messages.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Messages.addTranslations = function(messageId, translations) {
 	const updateObj = {};
 	Object.keys(translations).forEach((key) => {

diff --git a/packages/rocketchat-autotranslate/server/models/Subscriptions.js b/packages/rocketchat-autotranslate/server/models/Subscriptions.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.models.Subscriptions.updateAutoTranslateById = function(_id, autoTranslate) {
 	const query = {

diff --git a/packages/rocketchat-autotranslate/server/permissions.js b/packages/rocketchat-autotranslate/server/permissions.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(() => {
 	if (RocketChat.models && RocketChat.models.Permissions) {

diff --git a/packages/rocketchat-autotranslate/server/settings.js b/packages/rocketchat-autotranslate/server/settings.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.settings.add('AutoTranslate_Enabled', false, { type: 'boolean', group: 'Message', section: 'AutoTranslate', public: true });

diff --git a/packages/rocketchat-ui/client/lib/collections.js b/packages/rocketchat-ui/client/lib/collections.js
@@ -8,15 +8,15 @@ this.CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' });
 ChatRoom = this.CachedChatRoom.collection;
 
 this.CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' });
-this.ChatSubscription = this.CachedChatSubscription.collection;
+ChatSubscription = this.CachedChatSubscription.collection; //eslint-disable-line
 this.UserRoles = new Mongo.Collection(null);
 RoomRoles = new Mongo.Collection(null); //eslint-disable-line
 this.UserAndRoom = new Mongo.Collection(null);
 this.CachedChannelList = new Mongo.Collection(null);
 this.CachedUserList = new Mongo.Collection(null);
 
 RocketChat.models.Users = _.extend({}, RocketChat.models.Users, Meteor.users);
-RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, this.ChatSubscription);
+RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, ChatSubscription); //eslint-disable-line
 RocketChat.models.Rooms = _.extend({}, RocketChat.models.Rooms, ChatRoom);
 RocketChat.models.Messages = _.extend({}, RocketChat.models.Messages, this.ChatMessage);
 

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