diff --git a/.eslintrc b/.eslintrc index b90540e2c8dc..c8a7583d7b80 100644 --- a/.eslintrc +++ b/.eslintrc @@ -7,17 +7,12 @@ "AgentUsers" : false, "Apps" : false, "Assets" : false, - "Blaze" : false, - "BlazeLayout" : false, "browser" : false, "ChatMessage" : false, "ChatMessages" : false, "ChatRoom" : false, "ChatSubscription" : false, - "CryptoJS" : false, "Department" : false, - "DDPRateLimiter" : false, - "FlowRouter" : false, "FileUpload" : false, "getNextAgent" : false, "handleError" : false, @@ -34,25 +29,20 @@ "Npm" : false, "Package" : false, "parentCall" : false, - "Promise" : false, - "Reload" : false, "RocketChat" : true, "RocketChatFile" : false, "RoomHistoryManager" : false, "RoomManager" : false, "ServiceConfiguration" : false, - "Session" : false, "Settings" : false, "SideNav" : false, "t" : false, "TAPi18n" : false, "TAPi18next" : false, - "Template" : false, "TimeSync" : false, "toastr" : false, "Trigger" : false, "Triggers" : false, - "UAParser" : false, "visitor" : false, "VideoRecorder" : false, "VRecDialog" : false diff --git a/client/helpers/escapeCssUrl.js b/client/helpers/escapeCssUrl.js index bc4344794d3a..fccb4e69a91e 100644 --- a/client/helpers/escapeCssUrl.js +++ b/client/helpers/escapeCssUrl.js @@ -1 +1,3 @@ +import { Template } from 'meteor/templating'; + Template.registerHelper('escapeCssUrl', (url) => url.replace(/(['"])/g, '\\$1')); diff --git a/client/helpers/log.js b/client/helpers/log.js index cdbd6fa466dc..748583b9a0db 100644 --- a/client/helpers/log.js +++ b/client/helpers/log.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.registerHelper('log', (...args) => { console.log.apply(console, args); }); diff --git a/client/helpers/not.js b/client/helpers/not.js index 9d5597e28f25..a47086b4468b 100644 --- a/client/helpers/not.js +++ b/client/helpers/not.js @@ -1 +1,3 @@ +import { Template } from 'meteor/templating'; + Template.registerHelper('not', (value) => !value); diff --git a/client/notifications/notification.js b/client/notifications/notification.js index e421ba11efe3..52d7083b2350 100644 --- a/client/notifications/notification.js +++ b/client/notifications/notification.js @@ -1,6 +1,8 @@ /* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; // Show notifications and play a sound for new messages. // We trust the server to only send notifications for interesting messages, e.g. direct messages or diff --git a/client/routes/adminRouter.js b/client/routes/adminRouter.js index 5f75a3733fa1..0c30a678f86a 100644 --- a/client/routes/adminRouter.js +++ b/client/routes/adminRouter.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router' ; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/admin/users', { name: 'admin-users', action() { diff --git a/client/routes/roomRoute.js b/client/routes/roomRoute.js index dc36397d3fb4..e9782bd6f460 100644 --- a/client/routes/roomRoute.js +++ b/client/routes/roomRoute.js @@ -1,3 +1,5 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; + FlowRouter.goToRoomById = (roomId) => { const subscription = ChatSubscription.findOne({ rid: roomId }); if (subscription) { diff --git a/client/routes/router.js b/client/routes/router.js index 147424decced..9d80c73ee9fd 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -2,6 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { Tracker } from 'meteor/tracker'; +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Session } from 'meteor/session'; import s from 'underscore.string'; Blaze.registerHelper('pathFor', function(path, kw) { diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js index 364b87e77ed8..8dccb0d1bd6c 100644 --- a/client/startup/emailVerification.js +++ b/client/startup/emailVerification.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/client/startup/loginViaQuery.js b/client/startup/loginViaQuery.js index 12d26001e458..b6fe6dc84774 100644 --- a/client/startup/loginViaQuery.js +++ b/client/startup/loginViaQuery.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; + Meteor.startup(() => { if (FlowRouter.getQueryParam('resumeToken')) { Meteor.loginWithToken(FlowRouter.getQueryParam('resumeToken'), () => { diff --git a/client/startup/roomObserve.js b/client/startup/roomObserve.js index 60fbd750ef39..4fcfedb26e3a 100644 --- a/client/startup/roomObserve.js +++ b/client/startup/roomObserve.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; + Meteor.startup(function() { ChatRoom.find().observe({ added(data) { diff --git a/client/startup/startup.js b/client/startup/startup.js index 80c6075e0fbb..9ee7fd2527ca 100644 --- a/client/startup/startup.js +++ b/client/startup/startup.js @@ -1,6 +1,7 @@ /* globals UserPresence, fireGlobalEvent */ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; import toastr from 'toastr'; import hljs from 'highlight.js'; import 'highlight.js/styles/github.css'; diff --git a/client/startup/unread.js b/client/startup/unread.js index 4b7f141db993..555a060a6834 100644 --- a/client/startup/unread.js +++ b/client/startup/unread.js @@ -1,6 +1,8 @@ /* globals fireGlobalEvent, readMessage, Favico, favico, menu */ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js index fa71c139b70d..0bbc53102b52 100644 --- a/client/startup/usersObserve.js +++ b/client/startup/usersObserve.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; + Meteor.startup(function() { Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({ added(user) { diff --git a/imports/message-read-receipt/client/main.js b/imports/message-read-receipt/client/main.js index a40a8b0a6190..5203d1bb11a0 100644 --- a/imports/message-read-receipt/client/main.js +++ b/imports/message-read-receipt/client/main.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.main.helpers({ readReceiptsEnabled() { if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) { diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js index 6a96df0e196b..7b350be120f0 100644 --- a/imports/message-read-receipt/client/readReceipts.js +++ b/imports/message-read-receipt/client/readReceipts.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import moment from 'moment'; import './readReceipts.css'; diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js index c7530530e9a4..348bc6ba9a8c 100644 --- a/imports/personal-access-tokens/client/personalAccessTokens.js +++ b/imports/personal-access-tokens/client/personalAccessTokens.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import moment from 'moment'; diff --git a/packages/chatpal-search/client/route.js b/packages/chatpal-search/client/route.js index bea46e84d930..202cdb929991 100644 --- a/packages/chatpal-search/client/route.js +++ b/packages/chatpal-search/client/route.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/admin/chatpal', { name: 'chatpal-admin', action() { diff --git a/packages/chatpal-search/client/template/admin.js b/packages/chatpal-search/client/template/admin.js index 6882d2bb5a3a..df7be6bf5ccc 100644 --- a/packages/chatpal-search/client/template/admin.js +++ b/packages/chatpal-search/client/template/admin.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.ChatpalAdmin.onCreated(function() { diff --git a/packages/chatpal-search/client/template/result.js b/packages/chatpal-search/client/template/result.js index 7041ea9879d8..bca2de535ec5 100644 --- a/packages/chatpal-search/client/template/result.js +++ b/packages/chatpal-search/client/template/result.js @@ -1,5 +1,7 @@ import { DateFormat } from 'meteor/rocketchat:lib'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.ChatpalSearchResultTemplate.onCreated(function() { this.badRequest = new ReactiveVar(false); diff --git a/packages/chatpal-search/client/template/suggestion.js b/packages/chatpal-search/client/template/suggestion.js index 85f07f26c18c..8cc3e7ee27c2 100644 --- a/packages/chatpal-search/client/template/suggestion.js +++ b/packages/chatpal-search/client/template/suggestion.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.ChatpalSuggestionItemTemplate.onCreated(function() { if (this.data.type === 'link') { this.data.action = () => { diff --git a/packages/chatpal-search/package.js b/packages/chatpal-search/package.js index b1191333b539..8dbde5d1dd2d 100644 --- a/packages/chatpal-search/package.js +++ b/packages/chatpal-search/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'rocketchat:logger', 'rocketchat:search', 'kadira:flow-router', + 'kadira:blaze-layout', 'meteorhacks:inject-initial', ]); diff --git a/packages/meteor-autocomplete/client/autocomplete-client.js b/packages/meteor-autocomplete/client/autocomplete-client.js index a861d5289a5b..2476c42db373 100755 --- a/packages/meteor-autocomplete/client/autocomplete-client.js +++ b/packages/meteor-autocomplete/client/autocomplete-client.js @@ -1,6 +1,7 @@ /* globals Deps, getCaretCoordinates*/ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; +import { Blaze } from 'meteor/blaze'; import _ from 'underscore'; import AutoCompleteRecords from './collection'; diff --git a/packages/meteor-autocomplete/client/templates.js b/packages/meteor-autocomplete/client/templates.js index 4ed6be7fca72..388bb5726b4f 100755 --- a/packages/meteor-autocomplete/client/templates.js +++ b/packages/meteor-autocomplete/client/templates.js @@ -1,4 +1,6 @@ /* globals AutoComplete */ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; // Events on template instances, sent to the autocomplete class diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js index dc61eebbface..ebd91024a9da 100644 --- a/packages/rocketchat-2fa/client/accountSecurity.js +++ b/packages/rocketchat-2fa/client/accountSecurity.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import qrcode from 'yaqrcode'; diff --git a/packages/rocketchat-action-links/client/init.js b/packages/rocketchat-action-links/client/init.js index 6ef0a25fc88f..bea7736137cb 100644 --- a/packages/rocketchat-action-links/client/init.js +++ b/packages/rocketchat-action-links/client/init.js @@ -1,4 +1,7 @@ /* globals fireGlobalEvent */ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; + Template.room.events({ 'click .action-link'(event, instance) { event.preventDefault(); diff --git a/packages/rocketchat-analytics/client/loadScript.js b/packages/rocketchat-analytics/client/loadScript.js index d07e263bafc5..214666bbb4bd 100644 --- a/packages/rocketchat-analytics/client/loadScript.js +++ b/packages/rocketchat-analytics/client/loadScript.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; Template.body.onRendered(() => { Tracker.autorun((c) => { diff --git a/packages/rocketchat-analytics/client/trackEvents.js b/packages/rocketchat-analytics/client/trackEvents.js index 4b4384154474..a1a704b9dc94 100644 --- a/packages/rocketchat-analytics/client/trackEvents.js +++ b/packages/rocketchat-analytics/client/trackEvents.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import { Tracker } from 'meteor/tracker'; function trackEvent(category, action, label) { diff --git a/packages/rocketchat-apps/client/admin/appInstall.js b/packages/rocketchat-apps/client/admin/appInstall.js index c89259fd9fe6..f5e15623ef51 100644 --- a/packages/rocketchat-apps/client/admin/appInstall.js +++ b/packages/rocketchat-apps/client/admin/appInstall.js @@ -8,6 +8,8 @@ // then it will be enabled by default for development reasons. The server prefers a url // over the passed in body, so if both are found it will only use the url. import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.appInstall.helpers({ appFile() { diff --git a/packages/rocketchat-apps/client/admin/appLogs.js b/packages/rocketchat-apps/client/admin/appLogs.js index d798d1349807..4212257aa03d 100644 --- a/packages/rocketchat-apps/client/admin/appLogs.js +++ b/packages/rocketchat-apps/client/admin/appLogs.js @@ -1,4 +1,6 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import moment from 'moment'; import hljs from 'highlight.js'; diff --git a/packages/rocketchat-apps/client/admin/appManage.js b/packages/rocketchat-apps/client/admin/appManage.js index 19078f9fb96c..f2114356932a 100644 --- a/packages/rocketchat-apps/client/admin/appManage.js +++ b/packages/rocketchat-apps/client/admin/appManage.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-apps/client/admin/appWhatIsIt.js b/packages/rocketchat-apps/client/admin/appWhatIsIt.js index c527d7416014..5da60b4b05b9 100644 --- a/packages/rocketchat-apps/client/admin/appWhatIsIt.js +++ b/packages/rocketchat-apps/client/admin/appWhatIsIt.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.appWhatIsIt.onCreated(function() { this.isLoading = new ReactiveVar(false); diff --git a/packages/rocketchat-apps/client/admin/apps.js b/packages/rocketchat-apps/client/admin/apps.js index 8e7166653300..d89aad367b92 100644 --- a/packages/rocketchat-apps/client/admin/apps.js +++ b/packages/rocketchat-apps/client/admin/apps.js @@ -1,5 +1,7 @@ import toastr from 'toastr'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import { AppEvents } from '../communication'; const ENABLED_STATUS = ['auto_enabled', 'manually_enabled']; diff --git a/packages/rocketchat-apps/client/orchestrator.js b/packages/rocketchat-apps/client/orchestrator.js index 07f79de35f6f..b861fe692813 100644 --- a/packages/rocketchat-apps/client/orchestrator.js +++ b/packages/rocketchat-apps/client/orchestrator.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { AppWebsocketReceiver } from './communication'; import { Utilities } from '../lib/misc/Utilities'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; class AppClientOrchestrator { constructor() { diff --git a/packages/rocketchat-apps/package.js b/packages/rocketchat-apps/package.js index 434209f02327..ce67fc50d3a7 100644 --- a/packages/rocketchat-apps/package.js +++ b/packages/rocketchat-apps/package.js @@ -11,7 +11,7 @@ Package.onUse(function(api) { 'templating', ]); - api.use(['reactive-var', 'kadira:flow-router', 'underscore'], 'client'); + api.use(['reactive-var', 'kadira:flow-router', 'kadira:blaze-layout', 'underscore'], 'client'); api.addFiles('lib/Apps.js', ['client', 'server']); diff --git a/packages/rocketchat-authorization/client/hasPermission.js b/packages/rocketchat-authorization/client/hasPermission.js index 4432af1e9342..745381d45535 100644 --- a/packages/rocketchat-authorization/client/hasPermission.js +++ b/packages/rocketchat-authorization/client/hasPermission.js @@ -1,5 +1,6 @@ /* globals ChatPermissions */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; function atLeastOne(permissions = [], scope) { return permissions.some((permissionId) => { diff --git a/packages/rocketchat-authorization/client/route.js b/packages/rocketchat-authorization/client/route.js index f4fa37fe0195..44d7c0d05b1c 100644 --- a/packages/rocketchat-authorization/client/route.js +++ b/packages/rocketchat-authorization/client/route.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/admin/permissions', { name: 'admin-permissions', action(/* params*/) { diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js index 4aa6d34850d7..0179dbb26a52 100644 --- a/packages/rocketchat-authorization/client/views/permissions.js +++ b/packages/rocketchat-authorization/client/views/permissions.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; Template.permissions.helpers({ role() { diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.js b/packages/rocketchat-authorization/client/views/permissionsRole.js index d7bb54a6609b..675f008f9b93 100644 --- a/packages/rocketchat-authorization/client/views/permissionsRole.js +++ b/packages/rocketchat-authorization/client/views/permissionsRole.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.permissionsRole.helpers({ diff --git a/packages/rocketchat-authorization/package.js b/packages/rocketchat-authorization/package.js index 94e59df87e2f..33d1f6051f21 100644 --- a/packages/rocketchat-authorization/package.js +++ b/packages/rocketchat-authorization/package.js @@ -14,6 +14,7 @@ Package.onUse(function(api) { api.use('mongo', ['client', 'server']); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.use('tracker', 'client'); api.use('templating', 'client'); diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js index c3a67f9378af..1c08c4e4b0ca 100644 --- a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js +++ b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js b/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js index eea0e5bb8072..fcdce980cb05 100644 --- a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js +++ b/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; Meteor.methods({ 'autoTranslate.getSupportedLanguages'(targetLanguage) { diff --git a/packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js b/packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js index a8493df545d0..ef62124d9c7c 100644 --- a/packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js +++ b/packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js @@ -1,3 +1,5 @@ +import { Blaze } from 'meteor/blaze'; + export default function resetSelection(reset) { const [el] = $('.messages-box'); if (!el) { diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js index 98919e4cb59b..492a30b28c3d 100644 --- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js +++ b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js @@ -1,6 +1,9 @@ /* global AutoComplete Deps */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import resetSelection from '../resetSelection'; diff --git a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js b/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js index 741944e4e47b..9cdad921cca8 100644 --- a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js +++ b/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; 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 index 43804f74b8c3..f19e0bb738ef 100644 --- a/packages/rocketchat-channel-settings/client/views/channelSettings.js +++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js @@ -1,6 +1,7 @@ /* globals popover */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import moment from 'moment'; import s from 'underscore.string'; diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js b/packages/rocketchat-custom-sounds/client/admin/adminSounds.js index fba5e8c831d5..8a6669d75a42 100644 --- a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js +++ b/packages/rocketchat-custom-sounds/client/admin/adminSounds.js @@ -1,7 +1,9 @@ -import s from 'underscore.string'; import { ReactiveVar } from 'meteor/reactive-var'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; +import s from 'underscore.string'; Template.adminSounds.helpers({ isReady() { diff --git a/packages/rocketchat-custom-sounds/client/admin/route.js b/packages/rocketchat-custom-sounds/client/admin/route.js index 1ddd3fbee27f..cf12f9949f6a 100644 --- a/packages/rocketchat-custom-sounds/client/admin/route.js +++ b/packages/rocketchat-custom-sounds/client/admin/route.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; FlowRouter.route('/admin/custom-sounds', { name: 'custom-sounds', diff --git a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js b/packages/rocketchat-custom-sounds/client/admin/soundEdit.js index db8306f9b4ae..0936ce7058df 100644 --- a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js +++ b/packages/rocketchat-custom-sounds/client/admin/soundEdit.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js b/packages/rocketchat-custom-sounds/client/admin/soundInfo.js index b4c05674aec3..20ace93335fc 100644 --- a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js +++ b/packages/rocketchat-custom-sounds/client/admin/soundInfo.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.soundInfo.helpers({ name() { diff --git a/packages/rocketchat-custom-sounds/package.js b/packages/rocketchat-custom-sounds/package.js index aa68853798c4..ff5f1505b424 100644 --- a/packages/rocketchat-custom-sounds/package.js +++ b/packages/rocketchat-custom-sounds/package.js @@ -16,6 +16,7 @@ Package.onUse(function(api) { ]); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.addFiles('server/startup/custom-sounds.js', 'server'); api.addFiles('server/startup/permissions.js', 'server'); diff --git a/packages/rocketchat-emoji-custom/admin/adminEmoji.js b/packages/rocketchat-emoji-custom/admin/adminEmoji.js index b248771e970d..2db75346b815 100644 --- a/packages/rocketchat-emoji-custom/admin/adminEmoji.js +++ b/packages/rocketchat-emoji-custom/admin/adminEmoji.js @@ -1,7 +1,9 @@ -import s from 'underscore.string'; import { ReactiveVar } from 'meteor/reactive-var'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; +import s from 'underscore.string'; Template.adminEmoji.helpers({ isReady() { diff --git a/packages/rocketchat-emoji-custom/admin/emojiEdit.js b/packages/rocketchat-emoji-custom/admin/emojiEdit.js index aab3c6847a07..db54ad90d871 100644 --- a/packages/rocketchat-emoji-custom/admin/emojiEdit.js +++ b/packages/rocketchat-emoji-custom/admin/emojiEdit.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/packages/rocketchat-emoji-custom/admin/emojiInfo.js b/packages/rocketchat-emoji-custom/admin/emojiInfo.js index 719645032b28..f1d37568ff9c 100644 --- a/packages/rocketchat-emoji-custom/admin/emojiInfo.js +++ b/packages/rocketchat-emoji-custom/admin/emojiInfo.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.emojiInfo.helpers({ name() { diff --git a/packages/rocketchat-emoji-custom/admin/route.js b/packages/rocketchat-emoji-custom/admin/route.js index 15a89cc609b1..7c45afaa4a03 100644 --- a/packages/rocketchat-emoji-custom/admin/route.js +++ b/packages/rocketchat-emoji-custom/admin/route.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; FlowRouter.route('/admin/emoji-custom', { name: 'emoji-custom', diff --git a/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js b/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js index c7e3af1786b0..f9073d2a33db 100644 --- a/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js +++ b/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js @@ -1,5 +1,7 @@ /* globals getEmojiUrlFromName:true, updateEmojiCustom:true, deleteEmojiCustom:true, isSetNotNull */ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; RocketChat.emoji.packages.emojiCustom = { emojiCategories: { rocket: 'Custom' }, diff --git a/packages/rocketchat-emoji-custom/package.js b/packages/rocketchat-emoji-custom/package.js index 07c245609109..df2e3f18b8e8 100644 --- a/packages/rocketchat-emoji-custom/package.js +++ b/packages/rocketchat-emoji-custom/package.js @@ -16,6 +16,7 @@ Package.onUse(function(api) { ]); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.addFiles('function-isSet.js'); diff --git a/packages/rocketchat-emoji/client/lib/emojiRenderer.js b/packages/rocketchat-emoji/client/lib/emojiRenderer.js index 6e70f4d28c74..a14d00c7819d 100644 --- a/packages/rocketchat-emoji/client/lib/emojiRenderer.js +++ b/packages/rocketchat-emoji/client/lib/emojiRenderer.js @@ -1,4 +1,7 @@ /* globals HTML, isSetNotNull, renderEmoji:true */ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; + renderEmoji = function(emoji) { if (isSetNotNull(() => RocketChat.emoji.list[emoji].emojiPackage)) { const { emojiPackage } = RocketChat.emoji.list[emoji]; diff --git a/packages/rocketchat-google-natural-language/client/index.js b/packages/rocketchat-google-natural-language/client/index.js index 54c142e259c4..87e98186e36d 100644 --- a/packages/rocketchat-google-natural-language/client/index.js +++ b/packages/rocketchat-google-natural-language/client/index.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.room.helpers({ sentimentSmile() { if (!RocketChat.settings.get('GoogleNaturalLanguage_Enabled')) { diff --git a/packages/rocketchat-iframe-login/iframe_client.js b/packages/rocketchat-iframe-login/iframe_client.js index 1de83f541cac..256cea0abb26 100644 --- a/packages/rocketchat-iframe-login/iframe_client.js +++ b/packages/rocketchat-iframe-login/iframe_client.js @@ -1,4 +1,4 @@ -/* globals Accounts, Tracker, ReactiveVar, FlowRouter, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */ +/* globals Accounts, Tracker, ReactiveVar, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js index f019dfb90105..3ece3a281ef6 100644 --- a/packages/rocketchat-importer/client/admin/adminImport.js +++ b/packages/rocketchat-importer/client/admin/adminImport.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Importers } from 'meteor/rocketchat:importer'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.adminImport.helpers({ isAdmin() { diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js index 74021bebe502..b121154e81b4 100644 --- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js +++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Importers } from 'meteor/rocketchat:importer'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.adminImportPrepare.helpers({ diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.js b/packages/rocketchat-importer/client/admin/adminImportProgress.js index aa9368442055..1a9d51c19c1c 100644 --- a/packages/rocketchat-importer/client/admin/adminImportProgress.js +++ b/packages/rocketchat-importer/client/admin/adminImportProgress.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Importers, ImporterWebsocketReceiver, ProgressStep } from 'meteor/rocketchat:importer'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; diff --git a/packages/rocketchat-integrations/client/route.js b/packages/rocketchat-integrations/client/route.js index 3801ae5b1dd5..2b8eac2d0574 100644 --- a/packages/rocketchat-integrations/client/route.js +++ b/packages/rocketchat-integrations/client/route.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; FlowRouter.route('/admin/integrations', { name: 'admin-integrations', diff --git a/packages/rocketchat-integrations/client/views/integrations.js b/packages/rocketchat-integrations/client/views/integrations.js index 9ab884d8d252..4bfc283894dc 100644 --- a/packages/rocketchat-integrations/client/views/integrations.js +++ b/packages/rocketchat-integrations/client/views/integrations.js @@ -1,4 +1,5 @@ /* global ChatIntegrations */ +import { Template } from 'meteor/templating'; import moment from 'moment'; Template.integrations.helpers({ diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/packages/rocketchat-integrations/client/views/integrationsIncoming.js index 7270b88b29d3..adefe458cfda 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.js +++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.js @@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import hljs from 'highlight.js'; import toastr from 'toastr'; diff --git a/packages/rocketchat-integrations/client/views/integrationsNew.js b/packages/rocketchat-integrations/client/views/integrationsNew.js index 400dde895506..c031de980058 100644 --- a/packages/rocketchat-integrations/client/views/integrationsNew.js +++ b/packages/rocketchat-integrations/client/views/integrationsNew.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.integrationsNew.helpers({ hasPermission() { return RocketChat.authz.hasAtLeastOnePermission(['manage-integrations', 'manage-own-integrations']); diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js index 2adf5c15d3e4..dad25ba99e29 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js +++ b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js @@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import hljs from 'highlight.js'; import toastr from 'toastr'; diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js index c69aeecc3605..f6a4e50db5a0 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js +++ b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import hljs from 'highlight.js'; import moment from 'moment'; diff --git a/packages/rocketchat-integrations/package.js b/packages/rocketchat-integrations/package.js index d9d3d52e22cd..d7d180cd7c07 100644 --- a/packages/rocketchat-integrations/package.js +++ b/packages/rocketchat-integrations/package.js @@ -17,6 +17,7 @@ Package.onUse(function(api) { api.use('rocketchat:logger'); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.use('templating', 'client'); api.addFiles('lib/rocketchat.js', ['server', 'client']); diff --git a/packages/rocketchat-katex/katex.js b/packages/rocketchat-katex/katex.js index bd233d87caa8..14a5bc4f0f81 100644 --- a/packages/rocketchat-katex/katex.js +++ b/packages/rocketchat-katex/katex.js @@ -4,6 +4,7 @@ */ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; +import { Blaze } from 'meteor/blaze'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-lazy-load/client/index.js b/packages/rocketchat-lazy-load/client/index.js index 46edfbc9f11f..884a7e46b5bd 100644 --- a/packages/rocketchat-lazy-load/client/index.js +++ b/packages/rocketchat-lazy-load/client/index.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; import _ from 'underscore'; import './lazyloadImage'; + export const fixCordova = function(url) { if (url && url.indexOf('data:image') === 0) { return url; diff --git a/packages/rocketchat-lazy-load/client/lazyloadImage.js b/packages/rocketchat-lazy-load/client/lazyloadImage.js index cf8b79664dc8..be94ca2ca11b 100644 --- a/packages/rocketchat-lazy-load/client/lazyloadImage.js +++ b/packages/rocketchat-lazy-load/client/lazyloadImage.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import './lazyloadImage.html'; import { addImage, fixCordova } from './'; diff --git a/packages/rocketchat-lib/client/CustomTranslations.js b/packages/rocketchat-lib/client/CustomTranslations.js index a3812d906863..7567aca52f9f 100644 --- a/packages/rocketchat-lib/client/CustomTranslations.js +++ b/packages/rocketchat-lib/client/CustomTranslations.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; import { Tracker } from 'meteor/tracker'; RocketChat.applyCustomTranslations = function applyCustomTranslations() { diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 9b787b07dbac..e2ccb736fe5d 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -3,9 +3,11 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; import _ from 'underscore'; import moment from 'moment'; import toastr from 'toastr'; + const call = (method, ...args) => new Promise((resolve, reject) => { Meteor.call(method, ...args, function(err, data) { if (err) { diff --git a/packages/rocketchat-lib/client/defaultTabBars.js b/packages/rocketchat-lib/client/defaultTabBars.js index 0ad49929e3d5..8ee2470b030d 100644 --- a/packages/rocketchat-lib/client/defaultTabBars.js +++ b/packages/rocketchat-lib/client/defaultTabBars.js @@ -1,3 +1,5 @@ +import { Session } from 'meteor/session'; + RocketChat.TabBar.addButton({ groups: ['channel', 'group', 'direct'], id: 'rocket-search', diff --git a/packages/rocketchat-lib/client/lib/ChannelActions.js b/packages/rocketchat-lib/client/lib/ChannelActions.js index 6818d9dc150e..4f2bbfd11383 100644 --- a/packages/rocketchat-lib/client/lib/ChannelActions.js +++ b/packages/rocketchat-lib/client/lib/ChannelActions.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { call, UiTextContext } from 'meteor/rocketchat:lib'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; export function hide(type, rid, name) { const warnText = RocketChat.roomTypes.roomTypes[type].getUiText(UiTextContext.HIDE_WARNING); diff --git a/packages/rocketchat-lib/client/lib/Layout.js b/packages/rocketchat-lib/client/lib/Layout.js index 385e6e12fad3..511f1d56adc9 100644 --- a/packages/rocketchat-lib/client/lib/Layout.js +++ b/packages/rocketchat-lib/client/lib/Layout.js @@ -1,4 +1,5 @@ import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; RocketChat.Layout = new (class RocketChatLayout { constructor() { diff --git a/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js b/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js index 4fd6d432abce..53235d45d4f1 100644 --- a/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js +++ b/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; export class RocketChatAnnouncement { constructor(args = {}) { diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js index c602aefbf301..4514a5f0ee21 100644 --- a/packages/rocketchat-lib/client/lib/openRoom.js +++ b/packages/rocketchat-lib/client/lib/openRoom.js @@ -1,6 +1,9 @@ /* globals fireGlobalEvent readMessage currentTracker*/ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Session } from 'meteor/session'; import _ from 'underscore'; currentTracker = undefined; diff --git a/packages/rocketchat-lib/client/lib/roomExit.js b/packages/rocketchat-lib/client/lib/roomExit.js index ff9bc87c509c..df61dc33d58a 100644 --- a/packages/rocketchat-lib/client/lib/roomExit.js +++ b/packages/rocketchat-lib/client/lib/roomExit.js @@ -1,4 +1,7 @@ /* globals currentTracker */ +import { Blaze } from 'meteor/blaze'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + this.roomExit = function() { // 7370 - Close flex-tab when opening a room on mobile UI if (window.matchMedia('(max-width: 500px)').matches) { diff --git a/packages/rocketchat-lib/client/lib/roomTypes.js b/packages/rocketchat-lib/client/lib/roomTypes.js index d21803e8a483..e2a39a360484 100644 --- a/packages/rocketchat-lib/client/lib/roomTypes.js +++ b/packages/rocketchat-lib/client/lib/roomTypes.js @@ -1,6 +1,6 @@ -import _ from 'underscore'; - +import { FlowRouter } from 'meteor/kadira:flow-router'; import { RoomTypesCommon } from '../../lib/RoomTypesCommon'; +import _ from 'underscore'; RocketChat.roomTypes = new class RocketChatRoomTypes extends RoomTypesCommon { checkCondition(roomType) { diff --git a/packages/rocketchat-lib/client/views/customFieldsForm.js b/packages/rocketchat-lib/client/views/customFieldsForm.js index 40b4f4873eba..52949d9eb722 100644 --- a/packages/rocketchat-lib/client/views/customFieldsForm.js +++ b/packages/rocketchat-lib/client/views/customFieldsForm.js @@ -1,5 +1,6 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; Template.customFieldsForm.helpers({ new() { diff --git a/packages/rocketchat-lib/lib/RoomTypesCommon.js b/packages/rocketchat-lib/lib/RoomTypesCommon.js index e5fcfbd33169..e80c0f90464a 100644 --- a/packages/rocketchat-lib/lib/RoomTypesCommon.js +++ b/packages/rocketchat-lib/lib/RoomTypesCommon.js @@ -1,6 +1,7 @@ /* globals roomExit */ import { Meteor } from 'meteor/meteor'; import { RoomTypeConfig } from './RoomTypeConfig'; +import { FlowRouter } from 'meteor/kadira:flow-router'; export class RoomTypesCommon { constructor() { diff --git a/packages/rocketchat-lib/lib/roomTypes/direct.js b/packages/rocketchat-lib/lib/roomTypes/direct.js index a631fc22ab6a..b3d201578181 100644 --- a/packages/rocketchat-lib/lib/roomTypes/direct.js +++ b/packages/rocketchat-lib/lib/roomTypes/direct.js @@ -1,5 +1,6 @@ /* globals openRoom */ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig'; export class DirectMessageRoomRoute extends RoomTypeRouteConfig { diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js index 7f3e15c5fd0c..a1d90238e416 100644 --- a/packages/rocketchat-lib/package.js +++ b/packages/rocketchat-lib/package.js @@ -35,6 +35,7 @@ Package.onUse(function(api) { api.use('templating', 'client'); api.use('kadira:flow-router'); + api.use('kadira:blaze-layout', 'client'); api.addFiles('lib/core.js'); diff --git a/packages/rocketchat-lib/server/lib/RateLimiter.js b/packages/rocketchat-lib/server/lib/RateLimiter.js index 327dc65c812a..001ad9d57eef 100644 --- a/packages/rocketchat-lib/server/lib/RateLimiter.js +++ b/packages/rocketchat-lib/server/lib/RateLimiter.js @@ -1,5 +1,6 @@ /* globals RateLimiter */ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import _ from 'underscore'; RocketChat.RateLimiter = new class { diff --git a/packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js b/packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js index 1c9001e880d6..e29c73662321 100644 --- a/packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js +++ b/packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import * as Mailer from 'meteor/rocketchat:mailer'; Meteor.methods({ diff --git a/packages/rocketchat-livechat/.app/client/lib/commands.js b/packages/rocketchat-livechat/.app/client/lib/commands.js index 8fdc0dc0bd88..71462d0ba35e 100644 --- a/packages/rocketchat-livechat/.app/client/lib/commands.js +++ b/packages/rocketchat-livechat/.app/client/lib/commands.js @@ -1,5 +1,7 @@ /* globals LivechatVideoCall, Livechat */ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; import swal from 'sweetalert2'; import visitor from '../../imports/client/visitor'; diff --git a/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js b/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js index dabc2282d6ba..aec7846d3ddc 100644 --- a/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js +++ b/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Blaze } from 'meteor/blaze'; import visitor from '../../../imports/client/visitor'; import _ from 'underscore'; diff --git a/packages/rocketchat-livechat/.app/client/lib/fromApp/avatar.js b/packages/rocketchat-livechat/.app/client/lib/fromApp/avatar.js index 616627dac694..d998561288da 100644 --- a/packages/rocketchat-livechat/.app/client/lib/fromApp/avatar.js +++ b/packages/rocketchat-livechat/.app/client/lib/fromApp/avatar.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; this.getAvatarUrlFromUsername = (username) => { const key = `avatar_random_${ username }`; diff --git a/packages/rocketchat-livechat/.app/client/lib/triggers.js b/packages/rocketchat-livechat/.app/client/lib/triggers.js index ceb0d9b928a0..bdd46364e4ac 100644 --- a/packages/rocketchat-livechat/.app/client/lib/triggers.js +++ b/packages/rocketchat-livechat/.app/client/lib/triggers.js @@ -1,6 +1,7 @@ /* globals Livechat */ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; +import { Session } from 'meteor/session'; import visitor from '../../imports/client/visitor'; const firedTriggers = JSON.parse(localStorage.getItem('rocketChatFiredTriggers')) || []; diff --git a/packages/rocketchat-livechat/.app/client/routes/router.js b/packages/rocketchat-livechat/.app/client/routes/router.js index a18955493f47..ae4fca721122 100644 --- a/packages/rocketchat-livechat/.app/client/routes/router.js +++ b/packages/rocketchat-livechat/.app/client/routes/router.js @@ -1,4 +1,6 @@ import visitor from '../../imports/client/visitor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; BlazeLayout.setRoot('body'); diff --git a/packages/rocketchat-livechat/.app/client/views/avatar.js b/packages/rocketchat-livechat/.app/client/views/avatar.js index ec393892b0e7..3fc7c01b6638 100644 --- a/packages/rocketchat-livechat/.app/client/views/avatar.js +++ b/packages/rocketchat-livechat/.app/client/views/avatar.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import visitor from '../../imports/client/visitor'; Template.avatar.helpers({ diff --git a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js index d34646294912..29b7ac220e54 100644 --- a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js +++ b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js @@ -1,5 +1,8 @@ /* globals Department, Livechat, LivechatVideoCall */ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import visitor from '../../imports/client/visitor'; function showDepartments() { diff --git a/packages/rocketchat-livechat/.app/client/views/message.js b/packages/rocketchat-livechat/.app/client/views/message.js index b10a98ff15bc..0ded2996ce6e 100644 --- a/packages/rocketchat-livechat/.app/client/views/message.js +++ b/packages/rocketchat-livechat/.app/client/views/message.js @@ -1,4 +1,6 @@ /* globals Livechat, t, tr, livechatAutolinker */ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; import moment from 'moment'; import visitor from '../../imports/client/visitor'; import s from 'underscore.string'; diff --git a/packages/rocketchat-livechat/.app/client/views/messageAttachment.js b/packages/rocketchat-livechat/.app/client/views/messageAttachment.js index 1a26665917de..0312aef32837 100644 --- a/packages/rocketchat-livechat/.app/client/views/messageAttachment.js +++ b/packages/rocketchat-livechat/.app/client/views/messageAttachment.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.messageAttachment.helpers({ getImageHeight(height = 200) { diff --git a/packages/rocketchat-livechat/.app/client/views/messages.js b/packages/rocketchat-livechat/.app/client/views/messages.js index c4ea12aa4201..593bbeb595a7 100644 --- a/packages/rocketchat-livechat/.app/client/views/messages.js +++ b/packages/rocketchat-livechat/.app/client/views/messages.js @@ -1,6 +1,7 @@ /* globals Livechat, LivechatVideoCall, MsgTyping, fileUpload */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import visitor from '../../imports/client/visitor'; import _ from 'underscore'; import mime from 'mime-type/with-db'; diff --git a/packages/rocketchat-livechat/.app/client/views/offlineForm.js b/packages/rocketchat-livechat/.app/client/views/offlineForm.js index dcff90237085..0243ecef6d20 100644 --- a/packages/rocketchat-livechat/.app/client/views/offlineForm.js +++ b/packages/rocketchat-livechat/.app/client/views/offlineForm.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-livechat/.app/client/views/options.js b/packages/rocketchat-livechat/.app/client/views/options.js index 61ec20f8a1f9..b8ba4742642b 100644 --- a/packages/rocketchat-livechat/.app/client/views/options.js +++ b/packages/rocketchat-livechat/.app/client/views/options.js @@ -1,5 +1,6 @@ /* globals Department, Livechat */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import swal from 'sweetalert2'; import visitor from '../../imports/client/visitor'; diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js index d31f76c75158..6eef0bf169e9 100644 --- a/packages/rocketchat-livechat/.app/client/views/register.js +++ b/packages/rocketchat-livechat/.app/client/views/register.js @@ -1,6 +1,7 @@ /* globals Department, Livechat, LivechatVideoCall */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import visitor from '../../imports/client/visitor'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-livechat/.app/client/views/survey.js b/packages/rocketchat-livechat/.app/client/views/survey.js index a5506238abec..1bf5b1a11687 100644 --- a/packages/rocketchat-livechat/.app/client/views/survey.js +++ b/packages/rocketchat-livechat/.app/client/views/survey.js @@ -1,5 +1,6 @@ /* globals */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import swal from 'sweetalert2'; import visitor from '../../imports/client/visitor'; diff --git a/packages/rocketchat-livechat/.app/client/views/switchDepartment.js b/packages/rocketchat-livechat/.app/client/views/switchDepartment.js index b170dcd43667..c31e5b6a68c7 100644 --- a/packages/rocketchat-livechat/.app/client/views/switchDepartment.js +++ b/packages/rocketchat-livechat/.app/client/views/switchDepartment.js @@ -1,6 +1,7 @@ /* globals Department, Livechat */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import swal from 'sweetalert2'; import visitor from '../../imports/client/visitor'; diff --git a/packages/rocketchat-livechat/.app/client/views/videoCall.js b/packages/rocketchat-livechat/.app/client/views/videoCall.js index 95d817a04a84..2b912481d492 100644 --- a/packages/rocketchat-livechat/.app/client/views/videoCall.js +++ b/packages/rocketchat-livechat/.app/client/views/videoCall.js @@ -1,5 +1,6 @@ /* globals LivechatVideoCall */ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.videoCall.helpers({ visible() { diff --git a/packages/rocketchat-livechat/.app/imports/client/visitor.js b/packages/rocketchat-livechat/.app/imports/client/visitor.js index 8b20645f85ac..545036f45546 100644 --- a/packages/rocketchat-livechat/.app/imports/client/visitor.js +++ b/packages/rocketchat-livechat/.app/imports/client/visitor.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { Session } from 'meteor/session'; const msgStream = new Meteor.Streamer('room-messages'); diff --git a/packages/rocketchat-livechat/client/route.js b/packages/rocketchat-livechat/client/route.js index 35c41475945e..f0a32e8c51ad 100644 --- a/packages/rocketchat-livechat/client/route.js +++ b/packages/rocketchat-livechat/client/route.js @@ -1,3 +1,5 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; + livechatManagerRoutes = FlowRouter.group({ prefix: '/livechat-manager', name: 'livechat-manager', diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js index 5511dafb5ae4..7f534af0d56e 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; import moment from 'moment'; import { drawLineChart } from '../../../lib/chartHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js index 12e9f4f99567..f904ef5db745 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js @@ -1,5 +1,5 @@ /* globals popover */ - +import { Template } from 'meteor/templating'; import moment from 'moment'; import { setDateRange } from '../../../lib/dateHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js index d551d62d16d2..d18e5a05572e 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js @@ -1,5 +1,5 @@ /* globals popover */ - +import { Template } from 'meteor/templating'; import moment from 'moment'; import { setDateRange } from '../../../lib/dateHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js index b1a085b06218..a1e02fd97fea 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js @@ -1,4 +1,5 @@ import { Mongo } from 'meteor/mongo'; +import { Template } from 'meteor/templating'; import moment from 'moment'; import { ReactiveVar } from 'meteor/reactive-var'; import { drawLineChart, drawDoughnutChart, updateChart } from '../../../lib/chartHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js index 19feab3b1033..d25a5ae524ba 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.livechatIntegrationFacebook.helpers({ pages() { diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js index 8a4ad736ff87..db3fc1f14524 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js @@ -1,6 +1,7 @@ /* globals LivechatIntegration */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js index 2b9c6c173dfb..76e6b6108eeb 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js +++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js @@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { Template } from 'meteor/templating'; import s from 'underscore.string'; import moment from 'moment'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js index bd0d4545cd66..57bf67d90715 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js index 0696a41193f5..e5182a0a6219 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.livechatCustomFieldForm.helpers({ diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js index e1f7a2b01249..ba1fba1727c7 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.livechatCustomFields.helpers({ customFields() { diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js index 7038571b20a1..b6c202e74533 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js b/packages/rocketchat-livechat/client/views/app/livechatDepartments.js index d36c5ee21677..ddb32c2f8c07 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js +++ b/packages/rocketchat-livechat/client/views/app/livechatDepartments.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.livechatDepartments.helpers({ departments() { diff --git a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js index 71e9a0efa3bc..0392b4c56b66 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js +++ b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js @@ -1,3 +1,4 @@ +import { Template } from 'meteor/templating'; import s from 'underscore.string'; Template.livechatInstallation.helpers({ diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js index 7b4200a3dba4..e6d29bc9b7c2 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js +++ b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; /* globals LivechatOfficeHour */ import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.js b/packages/rocketchat-livechat/client/views/app/livechatQueue.js index f7808fa73e62..4ee081e7126c 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatQueue.js +++ b/packages/rocketchat-livechat/client/views/app/livechatQueue.js @@ -1,6 +1,7 @@ /* globals LivechatQueueUser */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.livechatQueue.helpers({ departments() { diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js b/packages/rocketchat-livechat/client/views/app/livechatTriggers.js index 8d987cf50b52..731ee19c6894 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js +++ b/packages/rocketchat-livechat/client/views/app/livechatTriggers.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.livechatTriggers.helpers({ triggers() { diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js b/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js index 565df148412f..45beac6c6a10 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js @@ -1,5 +1,8 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; + Template.livechatTriggersForm.helpers({ name() { const trigger = LivechatTrigger.findOne(FlowRouter.getParam('_id')); diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/packages/rocketchat-livechat/client/views/app/livechatUsers.js index 483115261542..f523bafafea7 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatUsers.js +++ b/packages/rocketchat-livechat/client/views/app/livechatUsers.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; let ManagerUsers; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js b/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js index 259a0cf06fb1..6d4a403a9664 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.externalSearch.helpers({ messages() { return RocketChat.models.LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 }); diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js index c2d69c8e0594..629250a1647b 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js @@ -1,6 +1,7 @@ /* globals LivechatVisitor */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.visitorEdit.helpers({ diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js index 74a7bc01ba93..f874f91258a0 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.visitorForward.helpers({ diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js index 9f9b7ae7dec7..e6bed4e55f74 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import { Mongo } from 'meteor/mongo'; import moment from 'moment'; const visitorHistory = new Mongo.Collection('visitor_history'); diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js index 147d0818eb71..29cfd11204f0 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js @@ -2,6 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js index acc3307d16cc..1a37193f6bc6 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js @@ -1,4 +1,5 @@ import { Mongo } from 'meteor/mongo'; +import { Template } from 'meteor/templating'; import moment from 'moment'; const visitorNavigationHistory = new Mongo.Collection('visitor_navigation_history'); diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js index 5394dd09204a..9169d74b0d97 100644 --- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js +++ b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.livechatTriggerAction.helpers({ hiddenValue(current) { diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js index 4a05c79d4509..5e0aa9b068c7 100644 --- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js +++ b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.livechatTriggerCondition.helpers({ hiddenValue(current) { if (this.name === undefined && Template.instance().firstCondition) { diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js index 6a8841129120..26f7554c835d 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js +++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js @@ -1,6 +1,9 @@ /* globals LivechatInquiry, KonchatNotification */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.livechat.helpers({ isActive() { diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js index 30c4155825da..dc3e5cd3025e 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js +++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.livechatFlex.helpers({ menuItem(name, icon, section) { return { diff --git a/packages/rocketchat-livechat/imports/LivechatRoomType.js b/packages/rocketchat-livechat/imports/LivechatRoomType.js index 8a8994648c1a..4bb9600ed436 100644 --- a/packages/rocketchat-livechat/imports/LivechatRoomType.js +++ b/packages/rocketchat-livechat/imports/LivechatRoomType.js @@ -1,4 +1,5 @@ /* globals openRoom, LivechatInquiry */ +import { Session } from 'meteor/session'; import { RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from 'meteor/rocketchat:lib'; class LivechatRoomRoute extends RoomTypeRouteConfig { diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js index 2ed90991e7bd..e6708afa22bf 100644 --- a/packages/rocketchat-livechat/package.js +++ b/packages/rocketchat-livechat/package.js @@ -32,6 +32,7 @@ Package.onUse(function(api) { api.use('konecty:user-presence'); api.use('rocketchat:ui'); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.use('templating', 'client'); api.use('http'); api.use('check'); diff --git a/packages/rocketchat-livestream/client/tabBar.js b/packages/rocketchat-livestream/client/tabBar.js index 28a3d45e3a69..4832c439b162 100644 --- a/packages/rocketchat-livestream/client/tabBar.js +++ b/packages/rocketchat-livestream/client/tabBar.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/packages/rocketchat-livestream/client/views/broadcastView.js b/packages/rocketchat-livestream/client/views/broadcastView.js index 3c1c3c613389..578e041f3f05 100644 --- a/packages/rocketchat-livestream/client/views/broadcastView.js +++ b/packages/rocketchat-livestream/client/views/broadcastView.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; const getMedia = () => navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia; const createAndConnect = (url) => { diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/packages/rocketchat-livestream/client/views/liveStreamTab.js index f0bbce9d51af..a8e61533db17 100644 --- a/packages/rocketchat-livestream/client/views/liveStreamTab.js +++ b/packages/rocketchat-livestream/client/views/liveStreamTab.js @@ -1,6 +1,9 @@ /* globals popout */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import { auth } from '../oauth.js'; import { RocketChatAnnouncement } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.js b/packages/rocketchat-livestream/client/views/liveStreamView.js index 93011ba3b0f7..588a6e2d1b90 100644 --- a/packages/rocketchat-livestream/client/views/liveStreamView.js +++ b/packages/rocketchat-livestream/client/views/liveStreamView.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; this.onYouTubePlayerAPIReady = function() { const playerReadyEvent = new Event('playerReady'); diff --git a/packages/rocketchat-logger/client/viewLogs.js b/packages/rocketchat-logger/client/viewLogs.js index d2acf944e079..81df547fa397 100644 --- a/packages/rocketchat-logger/client/viewLogs.js +++ b/packages/rocketchat-logger/client/viewLogs.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; this.stdout = new Mongo.Collection('stdout'); diff --git a/packages/rocketchat-logger/client/views/viewLogs.js b/packages/rocketchat-logger/client/views/viewLogs.js index b0ed5591b388..72a62d105a9a 100644 --- a/packages/rocketchat-logger/client/views/viewLogs.js +++ b/packages/rocketchat-logger/client/views/viewLogs.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import moment from 'moment'; // TODO: remove this globals diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js index c0fc69979354..8362406f63fb 100644 --- a/packages/rocketchat-logger/package.js +++ b/packages/rocketchat-logger/package.js @@ -13,7 +13,7 @@ Package.onUse(function(api) { api.use('raix:eventemitter'); api.use('templating', 'client'); api.use('kadira:flow-router', 'client'); - + api.use('kadira:blaze-layout', 'client'); api.addFiles('client/ansispan.js', 'client'); api.addFiles('client/logger.js', 'client'); api.addFiles('client/viewLogs.js', 'client'); diff --git a/packages/rocketchat-mail-messages/client/router.js b/packages/rocketchat-mail-messages/client/router.js index a9a4c21e6265..3302b6a56fd1 100644 --- a/packages/rocketchat-mail-messages/client/router.js +++ b/packages/rocketchat-mail-messages/client/router.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; FlowRouter.route('/mailer', { name: 'mailer', diff --git a/packages/rocketchat-mail-messages/client/views/mailer.js b/packages/rocketchat-mail-messages/client/views/mailer.js index cb9abc1f3abe..b6f1829ca54c 100644 --- a/packages/rocketchat-mail-messages/client/views/mailer.js +++ b/packages/rocketchat-mail-messages/client/views/mailer.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.mailer.helpers({ diff --git a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js b/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js index 8012c4deb519..b17122c8542d 100644 --- a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js +++ b/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.mailerUnsubscribe.onRendered(function() { return $('#initial-page-loading').remove(); }); diff --git a/packages/rocketchat-mail-messages/package.js b/packages/rocketchat-mail-messages/package.js index 44a975dc2f5b..6d48442ddd22 100644 --- a/packages/rocketchat-mail-messages/package.js +++ b/packages/rocketchat-mail-messages/package.js @@ -9,6 +9,7 @@ Package.onUse(function(api) { 'ecmascript', 'ddp-rate-limiter', 'kadira:flow-router', + 'kadira:blaze-layout', 'rocketchat:lib', 'rocketchat:authorization', ]); diff --git a/packages/rocketchat-mail-messages/server/functions/sendMail.js b/packages/rocketchat-mail-messages/server/functions/sendMail.js index 05c6aedd70f8..c8d95d48860b 100644 --- a/packages/rocketchat-mail-messages/server/functions/sendMail.js +++ b/packages/rocketchat-mail-messages/server/functions/sendMail.js @@ -1,6 +1,7 @@ /* globals */ import { Meteor } from 'meteor/meteor'; import { EJSON } from 'meteor/ejson'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import s from 'underscore.string'; import * as Mailer from 'meteor/rocketchat:mailer'; diff --git a/packages/rocketchat-mail-messages/server/methods/unsubscribe.js b/packages/rocketchat-mail-messages/server/methods/unsubscribe.js index dfbb586f5773..9cf5ff4f1265 100644 --- a/packages/rocketchat-mail-messages/server/methods/unsubscribe.js +++ b/packages/rocketchat-mail-messages/server/methods/unsubscribe.js @@ -1,5 +1,6 @@ /* globals Mailer */ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; Meteor.methods({ 'Mailer:unsubscribe'(_id, createdAt) { diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js index c6c55d355077..29f750de54ea 100644 --- a/packages/rocketchat-mentions-flextab/client/actionButton.js +++ b/packages/rocketchat-mentions-flextab/client/actionButton.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Meteor.startup(function() { RocketChat.MessageAction.addButton({ diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js index eee8673de2c9..c08917cd7b9c 100644 --- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js +++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js @@ -1,6 +1,7 @@ /* globals MentionedMessage */ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.mentionsFlexTab.helpers({ hasMessages() { diff --git a/packages/rocketchat-message-action/client/messageAction.js b/packages/rocketchat-message-action/client/messageAction.js index e1ab79e05ff7..8ec8fcee03c3 100644 --- a/packages/rocketchat-message-action/client/messageAction.js +++ b/packages/rocketchat-message-action/client/messageAction.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.messageAction.helpers({ isButton() { return this.type === 'button'; diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js index b4a504bbce12..90f09703bfcd 100644 --- a/packages/rocketchat-message-attachments/client/messageAttachment.js +++ b/packages/rocketchat-message-attachments/client/messageAttachment.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { DateFormat } from 'meteor/rocketchat:lib'; import { fixCordova } from 'meteor/rocketchat:lazy-load'; +import { Template } from 'meteor/templating'; const colors = { good: '#35AC19', warning: '#FCB316', diff --git a/packages/rocketchat-message-mark-as-unread/client/actionButton.js b/packages/rocketchat-message-mark-as-unread/client/actionButton.js index f5b610396fea..498c332838a2 100644 --- a/packages/rocketchat-message-mark-as-unread/client/actionButton.js +++ b/packages/rocketchat-message-mark-as-unread/client/actionButton.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; Meteor.startup(() => { RocketChat.MessageAction.addButton({ diff --git a/packages/rocketchat-message-pin/client/actionButton.js b/packages/rocketchat-message-pin/client/actionButton.js index 49e1d977810d..42c349cb7a17 100644 --- a/packages/rocketchat-message-pin/client/actionButton.js +++ b/packages/rocketchat-message-pin/client/actionButton.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/packages/rocketchat-message-pin/client/views/pinnedMessages.js index eafb34ce2bce..314242cdb9ec 100644 --- a/packages/rocketchat-message-pin/client/views/pinnedMessages.js +++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.js @@ -1,6 +1,7 @@ /* globals PinnedMessage */ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.pinnedMessages.helpers({ hasMessages() { diff --git a/packages/rocketchat-message-snippet/client/page/snippetPage.js b/packages/rocketchat-message-snippet/client/page/snippetPage.js index 9851dafbe84d..8e7089fb7ac8 100644 --- a/packages/rocketchat-message-snippet/client/page/snippetPage.js +++ b/packages/rocketchat-message-snippet/client/page/snippetPage.js @@ -1,6 +1,8 @@ /* global SnippetedMessages */ import { Meteor } from 'meteor/meteor'; import { DateFormat } from 'meteor/rocketchat:lib'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import moment from 'moment'; Template.snippetPage.helpers({ diff --git a/packages/rocketchat-message-snippet/client/router.js b/packages/rocketchat-message-snippet/client/router.js index d921f8110120..b9b230227d34 100644 --- a/packages/rocketchat-message-snippet/client/router.js +++ b/packages/rocketchat-message-snippet/client/router.js @@ -1,4 +1,6 @@ -/* global FlowRouter, BlazeLayout */ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/snippet/:snippetId/:snippetName', { name: 'snippetView', action() { diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js index 8f5ceb0a915b..bce0a5a976f7 100644 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js +++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js @@ -1,5 +1,6 @@ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; /* global SnippetedMessages */ Template.snippetedMessages.helpers({ diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js index 5292dba032cb..09d17d77e599 100644 --- a/packages/rocketchat-message-snippet/package.js +++ b/packages/rocketchat-message-snippet/package.js @@ -22,6 +22,7 @@ Package.onUse(function(api) { api.use([ 'templating', 'kadira:flow-router', + 'kadira:blaze-layout', ], 'client'); diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js index 82f69ecd44e5..1158b999a780 100644 --- a/packages/rocketchat-message-star/client/actionButton.js +++ b/packages/rocketchat-message-star/client/actionButton.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js index ddfa2cdc3366..8bc3b838b06e 100644 --- a/packages/rocketchat-message-star/client/views/starredMessages.js +++ b/packages/rocketchat-message-star/client/views/starredMessages.js @@ -1,6 +1,7 @@ /* globals StarredMessage */ import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.starredMessages.helpers({ hasMessages() { diff --git a/packages/rocketchat-oauth2-server-config/admin/client/route.js b/packages/rocketchat-oauth2-server-config/admin/client/route.js index 020435333ef6..dc1433a0479c 100644 --- a/packages/rocketchat-oauth2-server-config/admin/client/route.js +++ b/packages/rocketchat-oauth2-server-config/admin/client/route.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router' ; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/admin/oauth-apps', { name: 'admin-oauth-apps', action() { diff --git a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js index e7729e638a8b..545e78849bc6 100644 --- a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js +++ b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.oauthApp.onCreated(function() { diff --git a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApps.js b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApps.js index 7cd4dda76ab7..fd7eead8b6e1 100644 --- a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApps.js +++ b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApps.js @@ -1,4 +1,5 @@ /* globals ChatOAuthApps */ +import { Template } from 'meteor/templating'; import moment from 'moment'; Template.oauthApps.onCreated(function() { diff --git a/packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js b/packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js index 0955de0b3e70..3c4df1b89f4b 100644 --- a/packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js +++ b/packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js @@ -1,6 +1,9 @@ // @ChatOAuthApps = new Mongo.Collection 'rocketchat_oauth_apps' /* globals ChatOAuthApps */ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router' ; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Template } from 'meteor/templating'; FlowRouter.route('/oauth/authorize', { action(params, queryParams) { diff --git a/packages/rocketchat-oauth2-server-config/package.js b/packages/rocketchat-oauth2-server-config/package.js index 3a3381fb447e..cad6a769f8bd 100644 --- a/packages/rocketchat-oauth2-server-config/package.js +++ b/packages/rocketchat-oauth2-server-config/package.js @@ -15,6 +15,7 @@ Package.onUse(function(api) { api.use('templating', 'client'); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); // // General // // Server diff --git a/packages/rocketchat-oembed/client/baseWidget.js b/packages/rocketchat-oembed/client/baseWidget.js index e95d8c00fa06..66263dcf5992 100644 --- a/packages/rocketchat-oembed/client/baseWidget.js +++ b/packages/rocketchat-oembed/client/baseWidget.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.oembedBaseWidget.helpers({ template() { let contentType; diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.js b/packages/rocketchat-oembed/client/oembedAudioWidget.js index d315532323a9..194b00ae3b81 100644 --- a/packages/rocketchat-oembed/client/oembedAudioWidget.js +++ b/packages/rocketchat-oembed/client/oembedAudioWidget.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.oembedAudioWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.js b/packages/rocketchat-oembed/client/oembedFrameWidget.js index e6a084b6c803..3f5c69792c39 100644 --- a/packages/rocketchat-oembed/client/oembedFrameWidget.js +++ b/packages/rocketchat-oembed/client/oembedFrameWidget.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.oembedFrameWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.js b/packages/rocketchat-oembed/client/oembedImageWidget.js index 6f5b5fc1f8e7..cf80d8087a19 100644 --- a/packages/rocketchat-oembed/client/oembedImageWidget.js +++ b/packages/rocketchat-oembed/client/oembedImageWidget.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.oembedImageWidget.helpers({ loadImage() { diff --git a/packages/rocketchat-oembed/client/oembedSandstormGrain.js b/packages/rocketchat-oembed/client/oembedSandstormGrain.js index 385279f66d8b..bbb24b9503fb 100644 --- a/packages/rocketchat-oembed/client/oembedSandstormGrain.js +++ b/packages/rocketchat-oembed/client/oembedSandstormGrain.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.oembedSandstormGrain.helpers({ token() { diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.js b/packages/rocketchat-oembed/client/oembedUrlWidget.js index d814522b0720..e486a97c5293 100644 --- a/packages/rocketchat-oembed/client/oembedUrlWidget.js +++ b/packages/rocketchat-oembed/client/oembedUrlWidget.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const getTitle = function(self) { diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.js b/packages/rocketchat-oembed/client/oembedVideoWidget.js index 77fac8d1621d..e12ddd2790d6 100644 --- a/packages/rocketchat-oembed/client/oembedVideoWidget.js +++ b/packages/rocketchat-oembed/client/oembedVideoWidget.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; const getTitle = function(self) { if (self.meta == null) { diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.js b/packages/rocketchat-oembed/client/oembedYoutubeWidget.js index 15f019843134..2312f2bf0445 100644 --- a/packages/rocketchat-oembed/client/oembedYoutubeWidget.js +++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.oembedYoutubeWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js index 2a68e0a31de7..71dd7a9a02f0 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.room.js +++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js @@ -3,6 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { EJSON } from 'meteor/ejson'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import _ from 'underscore'; import toastr from 'toastr'; /* globals crypto */ diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.js b/packages/rocketchat-otr/client/views/otrFlexTab.js index ed9ab087b82c..8503015e855e 100644 --- a/packages/rocketchat-otr/client/views/otrFlexTab.js +++ b/packages/rocketchat-otr/client/views/otrFlexTab.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.otrFlexTab.helpers({ otrAvailable() { diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js index 258afd68eb2b..1577b1957466 100644 --- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js +++ b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js @@ -1,6 +1,8 @@ /* globals ChatSubscription popover */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; const notificationLabels = { all: 'All_messages', diff --git a/packages/rocketchat-reactions/client/init.js b/packages/rocketchat-reactions/client/init.js index 0ecbc81c3f41..c5a0b9fffb6a 100644 --- a/packages/rocketchat-reactions/client/init.js +++ b/packages/rocketchat-reactions/client/init.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; Template.room.events({ 'click .add-reaction, click [data-message-action="reaction-message"]'(event) { diff --git a/packages/rocketchat-sandstorm/client/setPath.js b/packages/rocketchat-sandstorm/client/setPath.js index 92e374cca5e6..3a9868c7e6b4 100644 --- a/packages/rocketchat-sandstorm/client/setPath.js +++ b/packages/rocketchat-sandstorm/client/setPath.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; function updateSandstormMetaData(msg) { return window.parent.postMessage(msg, '*'); diff --git a/packages/rocketchat-search/client/provider/result.js b/packages/rocketchat-search/client/provider/result.js index f82b12d4351d..bc1074046f5b 100644 --- a/packages/rocketchat-search/client/provider/result.js +++ b/packages/rocketchat-search/client/provider/result.js @@ -1,6 +1,9 @@ -/* globals FlowRouter, RoomHistoryManager */ +/* globals RoomHistoryManager */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; Meteor.startup(function() { diff --git a/packages/rocketchat-search/client/search/search.js b/packages/rocketchat-search/client/search/search.js index 2bd250f5d0e8..3238c2c6ccd5 100644 --- a/packages/rocketchat-search/client/search/search.js +++ b/packages/rocketchat-search/client/search/search.js @@ -1,5 +1,7 @@ /* globals ReactiveVar, TAPi18n */ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import _ from 'underscore'; diff --git a/packages/rocketchat-setup-wizard/client/final.js b/packages/rocketchat-setup-wizard/client/final.js index 79f4a06fd392..20c7b7ebc40d 100644 --- a/packages/rocketchat-setup-wizard/client/final.js +++ b/packages/rocketchat-setup-wizard/client/final.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; Template.setupWizardFinal.onCreated(function() { const isSetupWizardDone = localStorage.getItem('wizardFinal'); diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js index 52d251078553..d5ad717ea636 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.js +++ b/packages/rocketchat-setup-wizard/client/setupWizard.js @@ -1,6 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveDict } from 'meteor/reactive-dict'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; const cannotSetup = () => { const showSetupWizard = RocketChat.settings.get('Show_Setup_Wizard'); diff --git a/packages/rocketchat-slashcommands-open/client/client.js b/packages/rocketchat-slashcommands-open/client/client.js index 35257e71aabb..b61c47e7ea6d 100644 --- a/packages/rocketchat-slashcommands-open/client/client.js +++ b/packages/rocketchat-slashcommands-open/client/client.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; +import { FlowRouter } from 'meteor/kadira:flow-router'; function Open(command, params /* , item*/) { const dict = { diff --git a/packages/rocketchat-slider/rocketchat-slider.js b/packages/rocketchat-slider/rocketchat-slider.js index 49341e759006..098146dac1d5 100644 --- a/packages/rocketchat-slider/rocketchat-slider.js +++ b/packages/rocketchat-slider/rocketchat-slider.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.slider.onRendered(function() { const params = this.data; diff --git a/packages/rocketchat-spotify/lib/client/widget.js b/packages/rocketchat-spotify/lib/client/widget.js index d66f38a31eb1..d5678ed1e96b 100644 --- a/packages/rocketchat-spotify/lib/client/widget.js +++ b/packages/rocketchat-spotify/lib/client/widget.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.registerHelper('replace', function(source, find, replace, option) { if (option.hash.regex === true) { find = new RegExp(find); diff --git a/packages/rocketchat-token-login/client/login_token_client.js b/packages/rocketchat-token-login/client/login_token_client.js index d0c17e718b27..4809a81f241d 100644 --- a/packages/rocketchat-token-login/client/login_token_client.js +++ b/packages/rocketchat-token-login/client/login_token_client.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; Meteor.loginWithLoginToken = function(token) { Accounts.callLoginMethod({ diff --git a/packages/rocketchat-token-login/package.js b/packages/rocketchat-token-login/package.js index 785e5f333618..858c93028426 100644 --- a/packages/rocketchat-token-login/package.js +++ b/packages/rocketchat-token-login/package.js @@ -10,6 +10,7 @@ Package.onUse(function(api) { api.use('rocketchat:logger', 'server'); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.use('rocketchat:lib'); api.use('accounts-base'); diff --git a/packages/rocketchat-tokenpass/client/tokenChannelsList.js b/packages/rocketchat-tokenpass/client/tokenChannelsList.js index 9ca7ba12ec70..63e7306c4e22 100644 --- a/packages/rocketchat-tokenpass/client/tokenChannelsList.js +++ b/packages/rocketchat-tokenpass/client/tokenChannelsList.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; Template.tokenChannelsList.helpers({ rooms() { diff --git a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js b/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js index 8050e871b77a..082993b45cc9 100644 --- a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js +++ b/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.channelSettings__tokenpass.helpers({ addDisabled() { diff --git a/packages/rocketchat-tooltip/client/init.js b/packages/rocketchat-tooltip/client/init.js index 96dd52e7835b..7ccc3f3ca1fb 100644 --- a/packages/rocketchat-tooltip/client/init.js +++ b/packages/rocketchat-tooltip/client/init.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.main.onCreated(function() { RocketChat.tooltip.init(); }); diff --git a/packages/rocketchat-tooltip/client/rocketchat-tooltip.js b/packages/rocketchat-tooltip/client/rocketchat-tooltip.js index eea7f3f6689b..69499047aa00 100644 --- a/packages/rocketchat-tooltip/client/rocketchat-tooltip.js +++ b/packages/rocketchat-tooltip/client/rocketchat-tooltip.js @@ -1,4 +1,6 @@ /* globals Blaze, RocketChat */ +import { Template } from 'meteor/templating'; + RocketChat.tooltip = { source: null, initiated: false, diff --git a/packages/rocketchat-ui-account/client/account.js b/packages/rocketchat-ui-account/client/account.js index 561564d499d9..40a0e36da2aa 100644 --- a/packages/rocketchat-ui-account/client/account.js +++ b/packages/rocketchat-ui-account/client/account.js @@ -1,4 +1,5 @@ import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; Template.account.onRendered(function() { Tracker.afterFlush(function() { diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js index 40fca5532992..8d38234ebf28 100644 --- a/packages/rocketchat-ui-account/client/accountFlex.js +++ b/packages/rocketchat-ui-account/client/accountFlex.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.accountFlex.events({ 'click [data-action="close"]'() { SideNav.closeFlex(); diff --git a/packages/rocketchat-ui-account/client/accountIntegrations.js b/packages/rocketchat-ui-account/client/accountIntegrations.js index 1ae306dca61c..115f43c814f2 100644 --- a/packages/rocketchat-ui-account/client/accountIntegrations.js +++ b/packages/rocketchat-ui-account/client/accountIntegrations.js @@ -1,6 +1,7 @@ /* global */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.accountIntegrations.helpers({ diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js index c9af7737e24a..e75932e174c7 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.js +++ b/packages/rocketchat-ui-account/client/accountPreferences.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Reload } from 'meteor/reload'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js index b59c68541dde..fa70e6cbb4b7 100644 --- a/packages/rocketchat-ui-account/client/accountProfile.js +++ b/packages/rocketchat-ui-account/client/accountProfile.js @@ -2,6 +2,8 @@ import { SHA256 } from 'meteor/sha'; import { ReactiveVar } from 'meteor/reactive-var'; import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.js b/packages/rocketchat-ui-account/client/avatar/avatar.js index ecfc3de4c4d8..e35c1012dd1e 100644 --- a/packages/rocketchat-ui-account/client/avatar/avatar.js +++ b/packages/rocketchat-ui-account/client/avatar/avatar.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.avatar.helpers({ src() { diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/packages/rocketchat-ui-account/client/avatar/prompt.js index bd1e8a9cbde6..a3f550635ec4 100644 --- a/packages/rocketchat-ui-account/client/avatar/prompt.js +++ b/packages/rocketchat-ui-account/client/avatar/prompt.js @@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import s from 'underscore.string'; import toastr from 'toastr'; import mime from 'mime-type/with-db'; diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 13316d65b8de..9add604c1220 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -4,6 +4,8 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js index dc961f734a4c..8a2a2e9f795f 100644 --- a/packages/rocketchat-ui-admin/client/adminFlex.js +++ b/packages/rocketchat-ui-admin/client/adminFlex.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-admin/client/adminInfo.js b/packages/rocketchat-ui-admin/client/adminInfo.js index 578ea470c4b4..b17154612294 100644 --- a/packages/rocketchat-ui-admin/client/adminInfo.js +++ b/packages/rocketchat-ui-admin/client/adminInfo.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js index 9b14332a5ecc..776d2a417944 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js @@ -1,7 +1,10 @@ /* globals AdminChatRoom */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; + Template.adminRoomInfo.helpers({ selectedRoom() { return Session.get('adminRoomsSelected'); diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js index 34ea97fb89cd..1bde31301941 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js @@ -1,8 +1,11 @@ /* globals AdminChatRoom, RocketChat */ import { Mongo } from 'meteor/mongo'; import { Tracker } from 'meteor/tracker'; -import _ from 'underscore'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; +import _ from 'underscore'; import s from 'underscore.string'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js b/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js index 4358bde620e6..19dad7a04db3 100644 --- a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js +++ b/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; /* globals AdminChatRoom */ diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js index f77303e9341a..5462bf83a400 100644 --- a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js +++ b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-admin/client/users/adminUserChannels.js b/packages/rocketchat-ui-admin/client/users/adminUserChannels.js index e27952c97307..ccc6101cd16f 100644 --- a/packages/rocketchat-ui-admin/client/users/adminUserChannels.js +++ b/packages/rocketchat-ui-admin/client/users/adminUserChannels.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; + Template.adminUserChannels.helpers({ type() { if (this.t === 'd') { diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/packages/rocketchat-ui-admin/client/users/adminUsers.js index 4be5e52da3aa..83a117541c3a 100644 --- a/packages/rocketchat-ui-admin/client/users/adminUsers.js +++ b/packages/rocketchat-ui-admin/client/users/adminUsers.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-clean-history/client/lib/startup.js b/packages/rocketchat-ui-clean-history/client/lib/startup.js index f1a790d5a0b6..e0c1c268288b 100644 --- a/packages/rocketchat-ui-clean-history/client/lib/startup.js +++ b/packages/rocketchat-ui-clean-history/client/lib/startup.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; Meteor.startup(() => { RocketChat.TabBar.addButton({ diff --git a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js b/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js index 054f345129bb..f277e5741d89 100644 --- a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js +++ b/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js @@ -1,7 +1,10 @@ /* globals AutoComplete */ import { Tracker } from 'meteor/tracker'; -import moment from 'moment'; +import { Blaze } from 'meteor/blaze'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; +import moment from 'moment'; import { call } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js index 1193c6c5ca25..75bf308dca4d 100644 --- a/packages/rocketchat-ui-flextab/client/flexTabBar.js +++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js @@ -1,6 +1,8 @@ /* globals popover */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const commonHelpers = { diff --git a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js index ada8c736badc..d9e1b34e6b8e 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js +++ b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js @@ -1,5 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; const acEvents = { diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js index 4d89e826a417..7566899fc779 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import { getActions } from './userActions'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js index 7d677fd9f203..197364bac188 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js @@ -2,6 +2,7 @@ import { Mongo } from 'meteor/mongo'; import { fixCordova } from 'meteor/rocketchat:lazy-load'; import { ReactiveVar } from 'meteor/reactive-var'; import { DateFormat } from 'meteor/rocketchat:lib'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const roomFiles = new Mongo.Collection('room_files'); diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js index 8ea0bde799c1..adfa26b11c67 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js @@ -1,5 +1,7 @@ /* globals RoomRoles, WebRTC*/ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js index ca4b53e15963..422c79587b8c 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js index a9de0a497364..302e313c44d9 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js @@ -1,6 +1,8 @@ /* globals RoomRoles UserRoles popover */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui-login/client/login/footer.js b/packages/rocketchat-ui-login/client/login/footer.js index 77ebc79fcbaf..6d93a1e0ab5a 100644 --- a/packages/rocketchat-ui-login/client/login/footer.js +++ b/packages/rocketchat-ui-login/client/login/footer.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.loginFooter.onCreated(function() { this.suggestedLanguage = new ReactiveVar(); diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js index 077a23ae85fe..a0a63bf421ea 100644 --- a/packages/rocketchat-ui-login/client/login/form.js +++ b/packages/rocketchat-ui-login/client/login/form.js @@ -2,6 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-login/client/login/header.js b/packages/rocketchat-ui-login/client/login/header.js index a6f6ad226769..3b91ad9116ca 100644 --- a/packages/rocketchat-ui-login/client/login/header.js +++ b/packages/rocketchat-ui-login/client/login/header.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.loginHeader.helpers({ logoUrl() { const asset = RocketChat.settings.get('Assets_logo'); diff --git a/packages/rocketchat-ui-login/client/login/layout.js b/packages/rocketchat-ui-login/client/login/layout.js index ed697b814771..81b047c54694 100644 --- a/packages/rocketchat-ui-login/client/login/layout.js +++ b/packages/rocketchat-ui-login/client/login/layout.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.loginLayout.onRendered(function() { $('#initial-page-loading').remove(); }); diff --git a/packages/rocketchat-ui-login/client/login/services.js b/packages/rocketchat-ui-login/client/login/services.js index 77a60249a6b3..dde41ea3d059 100644 --- a/packages/rocketchat-ui-login/client/login/services.js +++ b/packages/rocketchat-ui-login/client/login/services.js @@ -1,5 +1,6 @@ /* globals CustomOAuth */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js index 73dc8ad1697b..8c554cb1de9c 100644 --- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js +++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.resetPassword.helpers({ diff --git a/packages/rocketchat-ui-login/client/routes.js b/packages/rocketchat-ui-login/client/routes.js index 6dd7d4fa2ebe..95b6a7ca7c4c 100644 --- a/packages/rocketchat-ui-login/client/routes.js +++ b/packages/rocketchat-ui-login/client/routes.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; + FlowRouter.route('/reset-password/:token', { name: 'resetPassword', action() { diff --git a/packages/rocketchat-ui-login/client/username/layout.js b/packages/rocketchat-ui-login/client/username/layout.js index 288aae5138a0..52c080c85c44 100644 --- a/packages/rocketchat-ui-login/client/username/layout.js +++ b/packages/rocketchat-ui-login/client/username/layout.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.usernameLayout.helpers({ backgroundUrl() { const asset = RocketChat.settings.get('Assets_background'); diff --git a/packages/rocketchat-ui-login/client/username/username.js b/packages/rocketchat-ui-login/client/username/username.js index f7c9c9a31270..f819ad641250 100644 --- a/packages/rocketchat-ui-login/client/username/username.js +++ b/packages/rocketchat-ui-login/client/username/username.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; Template.username.onCreated(function() { diff --git a/packages/rocketchat-ui-login/package.js b/packages/rocketchat-ui-login/package.js index f634590410c9..ae23b30d3973 100644 --- a/packages/rocketchat-ui-login/package.js +++ b/packages/rocketchat-ui-login/package.js @@ -20,6 +20,7 @@ Package.onUse(function(api) { ]); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.addFiles('client/routes.js', 'client'); diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index fad29e6f8480..05d6c9e33e00 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -3,6 +3,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import Clipboard from 'clipboard'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js index 75e81fba3382..ae68e6995742 100644 --- a/packages/rocketchat-ui-message/client/message.js +++ b/packages/rocketchat-ui-message/client/message.js @@ -1,5 +1,8 @@ /* globals renderEmoji renderMessageBody */ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import moment from 'moment'; import { DateFormat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js index 01bd0041f1a0..befbc14ebec1 100644 --- a/packages/rocketchat-ui-message/client/messageBox.js +++ b/packages/rocketchat-ui-message/client/messageBox.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; import moment from 'moment'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js index 8d44708cf0f3..f0ea02323d0a 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopup.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js @@ -5,6 +5,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js b/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js index 64b5d8ef15c6..13fd69bb2c05 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.messagePopupChannel.helpers({ channelIcon() { return RocketChat.roomTypes.getIcon(this.t); diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js index c56ecbccec4a..9a9b8085c1c9 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js @@ -1,6 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { Tracker } from 'meteor/tracker'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const usersFromRoomMessages = new Mongo.Collection(null); diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js b/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js index 588945bed93e..5b7f97b11cfe 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.messagePopupEmoji.helpers({ value() { const { length } = this.data; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js b/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js index 4a809f0756b3..5c4acba9aa7a 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js @@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const keys = { diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js index acf630abce83..82c9275ddee2 100644 --- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js +++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js @@ -1,4 +1,6 @@ import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.chatRoomItem.helpers({ roomData() { diff --git a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js index e9f932bb41b5..18961020c182 100644 --- a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js +++ b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; Template.createCombinedFlex.helpers({ diff --git a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js index 8952e7a8c295..db48950e7152 100644 --- a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js index 8dd2cc5df7dc..e2e0003a19e3 100644 --- a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js index f7d707c80ee6..e5052de26abf 100644 --- a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js @@ -1,6 +1,7 @@ import _ from 'underscore'; import s from 'underscore.string'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.listPrivateGroupsFlex.helpers({ groups() { diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index c25669a019b2..558eff571379 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -1,6 +1,7 @@ /* globals RocketChat */ import { Meteor } from 'meteor/meteor'; import { UiTextContext } from 'meteor/rocketchat:lib'; +import { Template } from 'meteor/templating'; Template.roomList.helpers({ rooms() { diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js index 6d345faee18e..0474135186ad 100644 --- a/packages/rocketchat-ui-sidenav/client/sideNav.js +++ b/packages/rocketchat-ui-sidenav/client/sideNav.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; /* globals menu*/ diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js index 1707830d0ecc..d9fdb8d17399 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js @@ -1,5 +1,7 @@ /* globals popover menu */ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; const setStatus = (status) => { AccountBox.setStatus(status); diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js index 5f90c7c31c33..cf649d83dedb 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js @@ -1,6 +1,8 @@ /* globals menu popover renderMessageBody */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import moment from 'moment'; Template.sidebarItem.helpers({ diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.js b/packages/rocketchat-ui-sidenav/client/sortlist.js index 9b083c6e6e5c..fc381364b3e4 100644 --- a/packages/rocketchat-ui-sidenav/client/sortlist.js +++ b/packages/rocketchat-ui-sidenav/client/sortlist.js @@ -1,5 +1,6 @@ /* globals popover */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; const checked = function(prop, field) { const userId = Meteor.userId(); diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/packages/rocketchat-ui-sidenav/client/toolbar.js index da1e23689453..cf8cd7aa6858 100644 --- a/packages/rocketchat-ui-sidenav/client/toolbar.js +++ b/packages/rocketchat-ui-sidenav/client/toolbar.js @@ -3,6 +3,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; let isLoading; diff --git a/packages/rocketchat-ui-vrecord/client/VRecDialog.js b/packages/rocketchat-ui-vrecord/client/VRecDialog.js index b9f0b347d3f7..776ec0c0389c 100644 --- a/packages/rocketchat-ui-vrecord/client/VRecDialog.js +++ b/packages/rocketchat-ui-vrecord/client/VRecDialog.js @@ -1,3 +1,5 @@ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; export const VRecDialog = new class { diff --git a/packages/rocketchat-ui-vrecord/client/vrecord.js b/packages/rocketchat-ui-vrecord/client/vrecord.js index 7a9bba19b124..c88b3890f7b4 100644 --- a/packages/rocketchat-ui-vrecord/client/vrecord.js +++ b/packages/rocketchat-ui-vrecord/client/vrecord.js @@ -1,5 +1,6 @@ /* globals VideoRecorder, fileUpload */ import { VRecDialog } from './VRecDialog'; +import { Template } from 'meteor/templating'; Template.vrecDialog.helpers({ recordIcon() { diff --git a/packages/rocketchat-ui/client/components/contextualBar.js b/packages/rocketchat-ui/client/components/contextualBar.js index c72c53f9ade9..d8e52e5b4917 100644 --- a/packages/rocketchat-ui/client/components/contextualBar.js +++ b/packages/rocketchat-ui/client/components/contextualBar.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.contextualBar.events({ 'click .js-close'(e, t) { t.tabBar.close(); diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js index 325f83b0b8cc..e2a1fd576a36 100644 --- a/packages/rocketchat-ui/client/components/header/header.js +++ b/packages/rocketchat-ui/client/components/header/header.js @@ -1,5 +1,7 @@ /* globals fireGlobalEvent*/ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0; diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js index 2858c36a8c92..bf942d44cd1e 100644 --- a/packages/rocketchat-ui/client/components/icon.js +++ b/packages/rocketchat-ui/client/components/icon.js @@ -1,4 +1,6 @@ /* globals isFirefox, isChrome */ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`; diff --git a/packages/rocketchat-ui/client/components/popupList.js b/packages/rocketchat-ui/client/components/popupList.js index a7636771fb44..4fa3a349b56b 100644 --- a/packages/rocketchat-ui/client/components/popupList.js +++ b/packages/rocketchat-ui/client/components/popupList.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.popupList.helpers({ config() { return { diff --git a/packages/rocketchat-ui/client/components/selectDropdown.js b/packages/rocketchat-ui/client/components/selectDropdown.js index a8b239ef3826..71937cd6a558 100644 --- a/packages/rocketchat-ui/client/components/selectDropdown.js +++ b/packages/rocketchat-ui/client/components/selectDropdown.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.selectDropdown.events({ 'focus input'(e, i) { diff --git a/packages/rocketchat-ui/client/components/table.js b/packages/rocketchat-ui/client/components/table.js index 89da6164b86d..1e3bd67c0763 100644 --- a/packages/rocketchat-ui/client/components/table.js +++ b/packages/rocketchat-ui/client/components/table.js @@ -1,3 +1,4 @@ +import { Template } from 'meteor/templating'; import _ from 'underscore'; Template.table.onRendered(function() { diff --git a/packages/rocketchat-ui/client/components/tabs.js b/packages/rocketchat-ui/client/components/tabs.js index f9752e569698..ab49fa82d191 100644 --- a/packages/rocketchat-ui/client/components/tabs.js +++ b/packages/rocketchat-ui/client/components/tabs.js @@ -1,4 +1,5 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; Template.tabs.onCreated(function() { this.activeTab = new ReactiveVar(this.data.tabs.tabs.find((tab) => tab.active).value); diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index c8a4a14b84d6..cc9970d3b02e 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -1,6 +1,7 @@ /* globals readMessage UserRoles RoomRoles*/ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Blaze } from 'meteor/blaze'; import _ from 'underscore'; export const upsertMessage = ({ msg, subscription }) => { diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 7868698be264..54e6c9897ad5 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -1,6 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import { upsertMessage } from './RoomHistoryManager'; diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js index 9895a948e12f..36a27f2873af 100644 --- a/packages/rocketchat-ui/client/lib/accountBox.js +++ b/packages/rocketchat-ui/client/lib/accountBox.js @@ -1,6 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Session } from 'meteor/session'; import _ from 'underscore'; this.AccountBox = (function() { diff --git a/packages/rocketchat-ui/client/lib/avatar.js b/packages/rocketchat-ui/client/lib/avatar.js index becdf58db651..5c7f6378bca8 100644 --- a/packages/rocketchat-ui/client/lib/avatar.js +++ b/packages/rocketchat-ui/client/lib/avatar.js @@ -1,3 +1,6 @@ +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; + Blaze.registerHelper('avatarUrlFromUsername', getAvatarUrlFromUsername); this.getAvatarAsPng = function(username, cb) { diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index 7eec56942814..48a89f1f1108 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js b/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js index a8875e37bbfd..193a5a8a209a 100644 --- a/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js +++ b/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js @@ -2,6 +2,8 @@ CodeMirrors = {}; import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import 'codemirror/lib/codemirror.css'; import CodeMirror from 'codemirror/lib/codemirror.js'; diff --git a/packages/rocketchat-ui/client/lib/cordova/push.js b/packages/rocketchat-ui/client/lib/cordova/push.js index ca0416d1e380..d3f8b02b88ba 100644 --- a/packages/rocketchat-ui/client/lib/cordova/push.js +++ b/packages/rocketchat-ui/client/lib/cordova/push.js @@ -1,6 +1,7 @@ /* globals Push Servers*/ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; if (Meteor.isCordova) { // Push.addListener 'token', (token) -> diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js index 6b405a3c9178..bf9dc1669254 100644 --- a/packages/rocketchat-ui/client/lib/fileUpload.js +++ b/packages/rocketchat-ui/client/lib/fileUpload.js @@ -2,6 +2,7 @@ /* exported fileUpload */ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; import s from 'underscore.string'; const readAsDataURL = (file, callback) => { diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/packages/rocketchat-ui/client/lib/iframeCommands.js index b6a0224e98c9..099443e15612 100644 --- a/packages/rocketchat-ui/client/lib/iframeCommands.js +++ b/packages/rocketchat-ui/client/lib/iframeCommands.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; import s from 'underscore.string'; const commands = { diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js index 87fc141f8d35..2ebabfd3f197 100644 --- a/packages/rocketchat-ui/client/lib/menu.js +++ b/packages/rocketchat-ui/client/lib/menu.js @@ -1,3 +1,4 @@ +import { Session } from 'meteor/session'; import _ from 'underscore'; import EventEmitter from 'wolfy87-eventemitter'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; diff --git a/packages/rocketchat-ui/client/lib/modal.js b/packages/rocketchat-ui/client/lib/modal.js index 32d72453fa9a..f09195e9b0e5 100644 --- a/packages/rocketchat-ui/client/lib/modal.js +++ b/packages/rocketchat-ui/client/lib/modal.js @@ -1,3 +1,5 @@ +import { Blaze } from 'meteor/blaze'; + this.Modal = (function() { const self = {}; diff --git a/packages/rocketchat-ui/client/lib/msgTyping.js b/packages/rocketchat-ui/client/lib/msgTyping.js index d942c812d229..85dede240bcc 100644 --- a/packages/rocketchat-ui/client/lib/msgTyping.js +++ b/packages/rocketchat-ui/client/lib/msgTyping.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; import _ from 'underscore'; export const MsgTyping = (function() { diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js index 50f847114de8..afdfdf183433 100644 --- a/packages/rocketchat-ui/client/lib/notification.js +++ b/packages/rocketchat-ui/client/lib/notification.js @@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Tracker } from 'meteor/tracker'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; import _ from 'underscore'; import s from 'underscore.string'; import { e2e } from 'meteor/rocketchat:e2e'; diff --git a/packages/rocketchat-ui/client/lib/parentTemplate.js b/packages/rocketchat-ui/client/lib/parentTemplate.js index b7c24c25b62b..fb2d2a03569b 100644 --- a/packages/rocketchat-ui/client/lib/parentTemplate.js +++ b/packages/rocketchat-ui/client/lib/parentTemplate.js @@ -1,3 +1,5 @@ +import { Blaze } from 'meteor/blaze'; + /** * Get the parent template instance * @param {Number} [levels] How many levels to go up. Default is 1 diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js index 4693ea2ed9f4..b35db6edb2d2 100644 --- a/packages/rocketchat-ui/client/lib/readMessages.js +++ b/packages/rocketchat-ui/client/lib/readMessages.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; import _ from 'underscore'; /* DEFINITIONS diff --git a/packages/rocketchat-ui/client/lib/sideNav.js b/packages/rocketchat-ui/client/lib/sideNav.js index 4224c2e79c49..4003a2337cec 100644 --- a/packages/rocketchat-ui/client/lib/sideNav.js +++ b/packages/rocketchat-ui/client/lib/sideNav.js @@ -1,3 +1,6 @@ +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; + this.SideNav = new class { constructor() { this.initiated = false; diff --git a/packages/rocketchat-ui/client/views/404/roomNotFound.js b/packages/rocketchat-ui/client/views/404/roomNotFound.js index 04685b1382e4..da7ebe9704ca 100644 --- a/packages/rocketchat-ui/client/views/404/roomNotFound.js +++ b/packages/rocketchat-ui/client/views/404/roomNotFound.js @@ -1,4 +1,7 @@ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.roomNotFound.helpers({ data() { diff --git a/packages/rocketchat-ui/client/views/app/alerts.js b/packages/rocketchat-ui/client/views/app/alerts.js index 679b5f06567c..9558678857fe 100644 --- a/packages/rocketchat-ui/client/views/app/alerts.js +++ b/packages/rocketchat-ui/client/views/app/alerts.js @@ -1,4 +1,7 @@ /* globals alerts */ +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; + this.alerts = { renderedAlert: null, open(config) { diff --git a/packages/rocketchat-ui/client/views/app/burger.js b/packages/rocketchat-ui/client/views/app/burger.js index 649bdf1f516c..a3c61d480528 100644 --- a/packages/rocketchat-ui/client/views/app/burger.js +++ b/packages/rocketchat-ui/client/views/app/burger.js @@ -1,3 +1,6 @@ +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; + Template.burger.helpers({ unread() { return Session.get('unread'); diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js index 980ea64b7421..4cf0a907e6b4 100644 --- a/packages/rocketchat-ui/client/views/app/createChannel.js +++ b/packages/rocketchat-ui/client/views/app/createChannel.js @@ -1,6 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; const acEvents = { diff --git a/packages/rocketchat-ui/client/views/app/directory.js b/packages/rocketchat-ui/client/views/app/directory.js index fbb1847c34fc..3ac767a92cdd 100644 --- a/packages/rocketchat-ui/client/views/app/directory.js +++ b/packages/rocketchat-ui/client/views/app/directory.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import { timeAgo } from './helpers'; diff --git a/packages/rocketchat-ui/client/views/app/fullModal.js b/packages/rocketchat-ui/client/views/app/fullModal.js index ca8046f1e275..21674210c290 100644 --- a/packages/rocketchat-ui/client/views/app/fullModal.js +++ b/packages/rocketchat-ui/client/views/app/fullModal.js @@ -1,3 +1,7 @@ +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Template } from 'meteor/templating'; let oldRoute = ''; const parent = document.querySelector('.main-content'); diff --git a/packages/rocketchat-ui/client/views/app/home.js b/packages/rocketchat-ui/client/views/app/home.js index 8f45898cf590..07f79aa9cce2 100644 --- a/packages/rocketchat-ui/client/views/app/home.js +++ b/packages/rocketchat-ui/client/views/app/home.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.home.helpers({ title() { return RocketChat.settings.get('Layout_Home_Title'); diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js index 6851f811b945..7f3be4e93977 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -1,5 +1,7 @@ /* globals modal */ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { Template } from 'meteor/templating'; this.modal = { renderedModal: null, diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js index eb704e739007..7c51e0421947 100644 --- a/packages/rocketchat-ui/client/views/app/popout.js +++ b/packages/rocketchat-ui/client/views/app/popout.js @@ -1,5 +1,7 @@ /* globals popout */ +import { Blaze } from 'meteor/blaze'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; this.popout = { context: null, diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js index c91ee1af0827..d2a3cf87de1d 100644 --- a/packages/rocketchat-ui/client/views/app/popover.js +++ b/packages/rocketchat-ui/client/views/app/popover.js @@ -1,5 +1,8 @@ /* globals popover isRtl */ import { Meteor } from 'meteor/meteor'; +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import { hide, leave } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index a02a70f3511c..7d152c81c546 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -3,7 +3,11 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Tracker } from 'meteor/tracker'; +import { Blaze } from 'meteor/blaze'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import moment from 'moment'; diff --git a/packages/rocketchat-ui/client/views/app/roomSearch.js b/packages/rocketchat-ui/client/views/app/roomSearch.js index 32b27cadd701..26c451fbf364 100644 --- a/packages/rocketchat-ui/client/views/app/roomSearch.js +++ b/packages/rocketchat-ui/client/views/app/roomSearch.js @@ -1,3 +1,5 @@ +import { Template } from 'meteor/templating'; + Template.roomSearch.helpers({ roomIcon() { if (this.type === 'u') { diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js index 5b67c656c43f..6a9e7cf89421 100644 --- a/packages/rocketchat-ui/client/views/app/secretURL.js +++ b/packages/rocketchat-ui/client/views/app/secretURL.js @@ -1,6 +1,9 @@ /* globals KonchatNotification */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.secretURL.helpers({ registrationAllowed() { diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js b/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js index a6427676028b..f43a0fcad29d 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js @@ -1,4 +1,7 @@ /* globals WebRTC */ +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; + Template.videoButtons.helpers({ videoAvaliable() { return WebRTC.getInstanceByRoomId(Session.get('openedRoom')) != null; diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js index cbde903391a5..3a76a2176b1d 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js @@ -1,6 +1,8 @@ /* globals WebRTC */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.videoCall.onCreated(function() { return this.mainVideo = new ReactiveVar('$auto'); diff --git a/packages/rocketchat-ui/client/views/cmsPage.js b/packages/rocketchat-ui/client/views/cmsPage.js index f18b53d751e0..27d1d4b37a3a 100644 --- a/packages/rocketchat-ui/client/views/cmsPage.js +++ b/packages/rocketchat-ui/client/views/cmsPage.js @@ -1,4 +1,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; import { Tracker } from 'meteor/tracker'; Template.cmsPage.onCreated(function() { diff --git a/packages/rocketchat-ui/client/views/fxos.js b/packages/rocketchat-ui/client/views/fxos.js index 975d66c8375a..fef0a8167cd2 100644 --- a/packages/rocketchat-ui/client/views/fxos.js +++ b/packages/rocketchat-ui/client/views/fxos.js @@ -1,3 +1,6 @@ +import { BlazeLayout } from 'meteor/kadira:blaze-layout'; +import { Template } from 'meteor/templating'; + Template.fxOsInstallPrompt.onRendered(function() { const showPrompt = function() { diff --git a/packages/rocketchat-ui/client/views/modal.js b/packages/rocketchat-ui/client/views/modal.js index a13b6eeb7622..fecf7b82f473 100644 --- a/packages/rocketchat-ui/client/views/modal.js +++ b/packages/rocketchat-ui/client/views/modal.js @@ -1 +1,3 @@ +import { Template } from 'meteor/templating'; + Template.modal.rendered = function() {}; diff --git a/packages/rocketchat-ui/getAvatarUrlFromUsername.js b/packages/rocketchat-ui/getAvatarUrlFromUsername.js index 629e2b5e1ef6..ebe5eb47127b 100644 --- a/packages/rocketchat-ui/getAvatarUrlFromUsername.js +++ b/packages/rocketchat-ui/getAvatarUrlFromUsername.js @@ -1,5 +1,6 @@ // TODO: remove global import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; this.getAvatarUrlFromUsername = function(username) { const key = `avatar_random_${ username }`; diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index 0a246d6db4d1..a2cff069c5d7 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -29,6 +29,7 @@ Package.onUse(function(api) { ]); api.use('kadira:flow-router', 'client'); + api.use('kadira:blaze-layout', 'client'); api.addFiles('getAvatarUrlFromUsername.js'); diff --git a/packages/rocketchat-videobridge/client/actionLink.js b/packages/rocketchat-videobridge/client/actionLink.js index dfb978495cc2..0603aa2e8111 100644 --- a/packages/rocketchat-videobridge/client/actionLink.js +++ b/packages/rocketchat-videobridge/client/actionLink.js @@ -1,4 +1,6 @@ +import { Session } from 'meteor/session'; import toastr from 'toastr'; + RocketChat.actionLinks.register('joinJitsiCall', function(message, params, instance) { if (Session.get('openedRoom')) { const rid = Session.get('openedRoom'); diff --git a/packages/rocketchat-videobridge/client/tabBar.js b/packages/rocketchat-videobridge/client/tabBar.js index 0de3bd29e685..77458686f127 100644 --- a/packages/rocketchat-videobridge/client/tabBar.js +++ b/packages/rocketchat-videobridge/client/tabBar.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { Session } from 'meteor/session'; Meteor.startup(function() { diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js index 5e70ef627b16..a4374626d96c 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js @@ -1,6 +1,8 @@ /* globals JitsiMeetExternalAPI */ /* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ import { Meteor } from 'meteor/meteor'; +import { Session } from 'meteor/session'; +import { Template } from 'meteor/templating'; Template.videoFlexTab.helpers({ openInNewWindow() { diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js index fb2bc9819cf6..26de77736168 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js @@ -1,6 +1,7 @@ /* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ /* globals popout */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; Template.videoFlexTabBbb.helpers({ openInNewWindow() { diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/packages/rocketchat-webdav/client/addWebdavAccount.js index d32572c005f7..c3c5d1e6ca3e 100644 --- a/packages/rocketchat-webdav/client/addWebdavAccount.js +++ b/packages/rocketchat-webdav/client/addWebdavAccount.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.js b/packages/rocketchat-webdav/client/selectWebdavAccount.js index aa5c51eb65a9..3485c9abdec9 100644 --- a/packages/rocketchat-webdav/client/selectWebdavAccount.js +++ b/packages/rocketchat-webdav/client/selectWebdavAccount.js @@ -1,5 +1,6 @@ /* global */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import toastr from 'toastr'; Template.selectWebdavAccount.helpers({ diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.js b/packages/rocketchat-webdav/client/webdavFilePicker.js index 1f207c3cb38f..c9896421b96e 100644 --- a/packages/rocketchat-webdav/client/webdavFilePicker.js +++ b/packages/rocketchat-webdav/client/webdavFilePicker.js @@ -1,5 +1,6 @@ /* global fileUploadHandler, Handlebars */ import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; import { Session } from 'meteor/session'; diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js index c2157b0572e2..79e296e7b5ed 100644 --- a/packages/rocketchat-webrtc/client/WebRTCClass.js +++ b/packages/rocketchat-webrtc/client/WebRTCClass.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; +import { FlowRouter } from 'meteor/kadira:flow-router' ; class WebRTCTransportClass { constructor(webrtcInstance) { diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js index af09de6580af..f5af3264aaee 100644 --- a/server/methods/browseChannels.js +++ b/server/methods/browseChannels.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import s from 'underscore.string'; const sortChannels = function(field, direction) { diff --git a/server/methods/resetAvatar.js b/server/methods/resetAvatar.js index f5064b478acb..aca806f46656 100644 --- a/server/methods/resetAvatar.js +++ b/server/methods/resetAvatar.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; Meteor.methods({ resetAvatar() { diff --git a/server/methods/setAvatarFromService.js b/server/methods/setAvatarFromService.js index 7cac0ccfe5ae..1bc249bd5aa4 100644 --- a/server/methods/setAvatarFromService.js +++ b/server/methods/setAvatarFromService.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; Meteor.methods({ setAvatarFromService(dataURI, contentType, service) { diff --git a/server/methods/userSetUtcOffset.js b/server/methods/userSetUtcOffset.js index 5b82d3ff61d8..941950e0877b 100644 --- a/server/methods/userSetUtcOffset.js +++ b/server/methods/userSetUtcOffset.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; Meteor.methods({ userSetUtcOffset(utcOffset) { diff --git a/server/publications/spotlight.js b/server/publications/spotlight.js index e5241346106c..602cc3ffb125 100644 --- a/server/publications/spotlight.js +++ b/server/publications/spotlight.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import s from 'underscore.string'; function fetchRooms(userId, rooms) { diff --git a/tests/end-to-end/ui/00-login.js b/tests/end-to-end/ui/00-login.js index 9e23ba22fd5b..cd720b6a1f83 100644 --- a/tests/end-to-end/ui/00-login.js +++ b/tests/end-to-end/ui/00-login.js @@ -1,5 +1,5 @@ /* eslint-env mocha */ -/* globals Meteor */ +/* globals Meteor, FlowRouter */ import loginPage from '../../pageobjects/login.page'; import setupWizard from '../../pageobjects/setup-wizard.page';