From 23f771deac746421462841f6bfe6c763264bab50 Mon Sep 17 00:00:00 2001 From: Marcos Spessatto Defendi Date: Mon, 3 Dec 2018 11:08:23 -0200 Subject: [PATCH] Convert rocketchat-mentions-flextab to main module structure (#12757) * Exposing RoomHistoryManager * Convert rocketchat-mentions-flextab to main module structure --- .../client/actionButton.js | 2 ++ .../client/index.js | 5 +++++ .../client/lib/MentionedMessage.js | 2 +- .../client/tabBar.js | 1 + .../client/views/mentionsFlexTab.js | 2 +- .../rocketchat-mentions-flextab/package.js | 18 +++--------------- .../server/index.js | 1 + .../server/publications/mentionedMessages.js | 1 + .../client/lib/RoomHistoryManager.js | 3 +-- packages/rocketchat-ui/package.js | 1 + 10 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 packages/rocketchat-mentions-flextab/client/index.js create mode 100644 packages/rocketchat-mentions-flextab/server/index.js diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js index 29f750de54ea9..58fd25e89e164 100644 --- a/packages/rocketchat-mentions-flextab/client/actionButton.js +++ b/packages/rocketchat-mentions-flextab/client/actionButton.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; +import { RoomHistoryManager } from 'meteor/rocketchat:ui'; Meteor.startup(function() { RocketChat.MessageAction.addButton({ diff --git a/packages/rocketchat-mentions-flextab/client/index.js b/packages/rocketchat-mentions-flextab/client/index.js new file mode 100644 index 0000000000000..db84017d48887 --- /dev/null +++ b/packages/rocketchat-mentions-flextab/client/index.js @@ -0,0 +1,5 @@ +import './views/stylesheets/mentionsFlexTab.less'; +import './views/mentionsFlexTab.html'; +import './views/mentionsFlexTab'; +import './actionButton'; +import './tabBar'; diff --git a/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js b/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js index 2f10c002b3b3c..563e2344c1029 100644 --- a/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js +++ b/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js @@ -1,3 +1,3 @@ import { Mongo } from 'meteor/mongo'; -this.MentionedMessage = new Mongo.Collection('rocketchat_mentioned_message'); +export const MentionedMessage = new Mongo.Collection('rocketchat_mentioned_message'); diff --git a/packages/rocketchat-mentions-flextab/client/tabBar.js b/packages/rocketchat-mentions-flextab/client/tabBar.js index 619c5dc51ae1c..e1b25e8c59bae 100644 --- a/packages/rocketchat-mentions-flextab/client/tabBar.js +++ b/packages/rocketchat-mentions-flextab/client/tabBar.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { return RocketChat.TabBar.addButton({ diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js index c08917cd7b9c1..0cd0b4c8fe174 100644 --- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js +++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js @@ -1,7 +1,7 @@ -/* globals MentionedMessage */ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; +import { MentionedMessage } from '../lib/MentionedMessage'; Template.mentionsFlexTab.helpers({ hasMessages() { diff --git a/packages/rocketchat-mentions-flextab/package.js b/packages/rocketchat-mentions-flextab/package.js index 28657ed7b0c40..d1c0d708edd57 100644 --- a/packages/rocketchat-mentions-flextab/package.js +++ b/packages/rocketchat-mentions-flextab/package.js @@ -11,20 +11,8 @@ Package.onUse(function(api) { 'ecmascript', 'less', 'rocketchat:lib', + 'templating', ]); - - api.use('templating', 'client'); - - api.addFiles([ - 'client/lib/MentionedMessage.js', - 'client/views/stylesheets/mentionsFlexTab.less', - 'client/views/mentionsFlexTab.html', - 'client/views/mentionsFlexTab.js', - 'client/actionButton.js', - 'client/tabBar.js', - ], 'client'); - - api.addFiles([ - 'server/publications/mentionedMessages.js', - ], 'server'); + api.mainModule('client/index.js', 'client'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-mentions-flextab/server/index.js b/packages/rocketchat-mentions-flextab/server/index.js new file mode 100644 index 0000000000000..65577aad4017a --- /dev/null +++ b/packages/rocketchat-mentions-flextab/server/index.js @@ -0,0 +1 @@ +import './publications/mentionedMessages'; diff --git a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js b/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js index ff854b33189bb..c26d68c4b5987 100644 --- a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js +++ b/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.publish('mentionedMessages', function(rid, limit = 50) { if (!this.userId) { diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index cc9970d3b02e6..42bf22cfb42b6 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -22,7 +22,7 @@ export const upsertMessage = ({ msg, subscription }) => { return ChatMessage.upsert({ _id: msg._id }, msg); }; -export const RoomHistoryManager = new class { +RoomHistoryManager = new class { //eslint-disable-line constructor() { this.defaultLimit = 50; this.histories = {}; @@ -273,4 +273,3 @@ export const RoomHistoryManager = new class { } } }; -this.RoomHistoryManager = RoomHistoryManager; diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index 0ac4021d77b00..b33a06eb147db 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -157,4 +157,5 @@ Package.onUse(function(api) { api.export('RoomManager', 'client'); api.export('getAvatarUrlFromUsername'); api.export('popout', 'client'); + api.export('RoomHistoryManager', 'client'); });