From 15abcf59929ca0b9b29d861c7749934b3c86dec2 Mon Sep 17 00:00:00 2001 From: Marcos Spessatto Defendi Date: Tue, 4 Dec 2018 10:54:18 -0200 Subject: [PATCH] Convert rocketchat-message-star to main module structure (#12770) * Convert rocketchat-message-star to main module structure * Fixed export StarredMessage --- .../client/actionButton.js | 2 ++ .../rocketchat-message-star/client/index.js | 6 +++++ .../client/lib/StarredMessage.js | 2 +- .../client/starMessage.js | 2 ++ .../rocketchat-message-star/client/tabBar.js | 1 + .../client/views/starredMessages.js | 2 +- packages/rocketchat-message-star/package.js | 23 +++---------------- .../rocketchat-message-star/server/index.js | 5 ++++ .../server/models/Rooms.js | 2 ++ .../server/publications/starredMessages.js | 1 + .../server/settings.js | 1 + .../server/starMessage.js | 1 + .../server/startup/indexes.js | 1 + 13 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 packages/rocketchat-message-star/client/index.js create mode 100644 packages/rocketchat-message-star/server/index.js diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js index 38275236fb45..097f4a26d410 100644 --- a/packages/rocketchat-message-star/client/actionButton.js +++ b/packages/rocketchat-message-star/client/actionButton.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; +import { RocketChat, handleError } from 'meteor/rocketchat:lib'; +import { RoomHistoryManager } from 'meteor/rocketchat:ui'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/packages/rocketchat-message-star/client/index.js b/packages/rocketchat-message-star/client/index.js new file mode 100644 index 000000000000..0bd6d93a1d0a --- /dev/null +++ b/packages/rocketchat-message-star/client/index.js @@ -0,0 +1,6 @@ +import './views/stylesheets/messagestar.css'; +import './actionButton'; +import './starMessage'; +import './tabBar'; +import './views/starredMessages.html'; +import './views/starredMessages'; diff --git a/packages/rocketchat-message-star/client/lib/StarredMessage.js b/packages/rocketchat-message-star/client/lib/StarredMessage.js index 083be7cd3070..f68d4de90428 100644 --- a/packages/rocketchat-message-star/client/lib/StarredMessage.js +++ b/packages/rocketchat-message-star/client/lib/StarredMessage.js @@ -1,3 +1,3 @@ import { Mongo } from 'meteor/mongo'; -this.StarredMessage = new Mongo.Collection('rocketchat_starred_message'); +export const StarredMessage = new Mongo.Collection('rocketchat_starred_message'); diff --git a/packages/rocketchat-message-star/client/starMessage.js b/packages/rocketchat-message-star/client/starMessage.js index d476d7fb6d4e..349470f09986 100644 --- a/packages/rocketchat-message-star/client/starMessage.js +++ b/packages/rocketchat-message-star/client/starMessage.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; +import { ChatMessage } from 'meteor/rocketchat:ui'; Meteor.methods({ starMessage(message) { diff --git a/packages/rocketchat-message-star/client/tabBar.js b/packages/rocketchat-message-star/client/tabBar.js index 11c82757e402..f93f2701654e 100644 --- a/packages/rocketchat-message-star/client/tabBar.js +++ b/packages/rocketchat-message-star/client/tabBar.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { RocketChat.TabBar.addButton({ diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js index 8bc3b838b06e..17da2652de03 100644 --- a/packages/rocketchat-message-star/client/views/starredMessages.js +++ b/packages/rocketchat-message-star/client/views/starredMessages.js @@ -1,7 +1,7 @@ -/* globals StarredMessage */ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; +import { StarredMessage } from '../lib/StarredMessage'; Template.starredMessages.helpers({ hasMessages() { diff --git a/packages/rocketchat-message-star/package.js b/packages/rocketchat-message-star/package.js index 1a8f1bbe5b78..21a8c106756b 100644 --- a/packages/rocketchat-message-star/package.js +++ b/packages/rocketchat-message-star/package.js @@ -10,25 +10,8 @@ Package.onUse(function(api) { 'mongo', 'ecmascript', 'rocketchat:lib', + 'templating', ]); - - api.use('templating', 'client'); - - api.addFiles([ - 'client/lib/StarredMessage.js', - 'client/actionButton.js', - 'client/starMessage.js', - 'client/tabBar.js', - 'client/views/starredMessages.html', - 'client/views/starredMessages.js', - 'client/views/stylesheets/messagestar.css', - ], 'client'); - - api.addFiles([ - 'server/models/Rooms.js', - 'server/settings.js', - 'server/starMessage.js', - 'server/publications/starredMessages.js', - 'server/startup/indexes.js', - ], 'server'); + api.mainModule('client/index.js', 'client'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-message-star/server/index.js b/packages/rocketchat-message-star/server/index.js new file mode 100644 index 000000000000..9b347ac8584a --- /dev/null +++ b/packages/rocketchat-message-star/server/index.js @@ -0,0 +1,5 @@ +import './models/Rooms'; +import './settings'; +import './starMessage'; +import './publications/starredMessages'; +import './startup/indexes'; diff --git a/packages/rocketchat-message-star/server/models/Rooms.js b/packages/rocketchat-message-star/server/models/Rooms.js index bd457526d6f7..f011f8968925 100644 --- a/packages/rocketchat-message-star/server/models/Rooms.js +++ b/packages/rocketchat-message-star/server/models/Rooms.js @@ -1,3 +1,5 @@ +import { RocketChat } from 'meteor/rocketchat:lib'; + RocketChat.models.Rooms.updateLastMessageStar = function(roomId, userId, starred) { let update; const query = { _id: roomId }; diff --git a/packages/rocketchat-message-star/server/publications/starredMessages.js b/packages/rocketchat-message-star/server/publications/starredMessages.js index ef1eebe3249f..20795c449227 100644 --- a/packages/rocketchat-message-star/server/publications/starredMessages.js +++ b/packages/rocketchat-message-star/server/publications/starredMessages.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.publish('starredMessages', function(rid, limit = 50) { if (!this.userId) { diff --git a/packages/rocketchat-message-star/server/settings.js b/packages/rocketchat-message-star/server/settings.js index 1bdd83841f57..f83b9f82d435 100644 --- a/packages/rocketchat-message-star/server/settings.js +++ b/packages/rocketchat-message-star/server/settings.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { return RocketChat.settings.add('Message_AllowStarring', true, { diff --git a/packages/rocketchat-message-star/server/starMessage.js b/packages/rocketchat-message-star/server/starMessage.js index 2f49cac9dc40..7cad3581642a 100644 --- a/packages/rocketchat-message-star/server/starMessage.js +++ b/packages/rocketchat-message-star/server/starMessage.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.methods({ starMessage(message) { diff --git a/packages/rocketchat-message-star/server/startup/indexes.js b/packages/rocketchat-message-star/server/startup/indexes.js index cf66635a235b..6b45c173eac7 100644 --- a/packages/rocketchat-message-star/server/startup/indexes.js +++ b/packages/rocketchat-message-star/server/startup/indexes.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { return Meteor.defer(function() {