Skip to content

Commit

Permalink
Convert rocketchat:ui to main module structure (#13132)
Browse files Browse the repository at this point in the history
* Move rocketchat settings to specific package

* WIP: Move models from rocketchat-lib to a specific package (server)

* Move function from rocketchat:lib to rocketchat:utils to use it in rocketchat:models

* Move client models from rocketchat:lib to rocketchat:models

* Fix lint

* Move rocketchat.info from lib to utils

* Remove directly dependency between lib and migrations

* Move statistics Model to rocketchat:models

* Create rocketchat:metrics to be able to depacking rocketchat callbacks

* Move  callbacks to specific package

* Remove unused dependency

* Move rocketchat-notifications to a specific package

* Move rocketchat-promises to a specific package

* remove directly dependency from metrics and models

* Move CachedCollection from lib to models

* Move ui models/collections from ui to models

* Move authorization client/ui models to rocketchat:models to be able to remove lib dependency

* Creation of rocketchat:ui-utils to help decouple rocketchat:lib and rocketchat:authz

* Move some common functions to rocketchat:utils

* Change imports to dynamic imports to avoid directly dependency between some packages

* Move authz models to rocketchat:models

* Remove directly dependency between rocketchat:authz and rocketchat:lib

* Move some functions from rocketchat:lib to rocketchat:utils

* Add functions to settings package

* Convert rocketchat:file-upload to main module structure

* Import FileUpload where it is being used

* Remove FileUpload and fileUploadHandler from globals eslintrc

* Move some  functions to rocketchat:ui-utils

* Remove directly dependency between rocketchat:authorization and rocketchat:ui-utils

* Remove dependency between lazy-load and lib

* Change imports of renderMessageBody from ui-message to ui-utils

* Add import of main ready from ui-utils

* Convert rocketchat-ui-sidenav to main module structure

* Add imports of toolbarSearch from ui-sidenav

* Remove toolbarSearch from eslintrc globals

* Move CachedCollection to a specific package

* Change imports of CachedCollection to new package

* Move some functions to rocketchat:ui-utils

* Remove directly dependency between tooltip and lib

*  Remove directly dependency between settings and metrics

* Move some settings client function from lib to settings

* Convert rocketchat-ui-master to main module structure

* Remove directly dependency between rocketchat:e2e and rocketchat:lib

* Fix wrong import and lint

* Convert rocketchat-webrtc to main module structure

* Fix missing export

* Remove directly dependency between rocketchat:emoji and lib

* Add emoji dependencies inside RocketChat namespace

* Merge branch 'develop' into globals/move-rocketchat-callbacks

* Move some functions to utils

* Fix lint

* Move some ui functions to ui-utils

* Fix import missed objects inside RocketChat namespace

* Fix lint

* Remove rocketchat:ui package dependency of RocketChat namespace

* Remove lib dependency in rocketchat:ui-sidenav

* Remove dependency between lib and ui-vrecord

* Add logger dependency in file-upload

* Convert rocketchat:ui to main module structure

* import variables that was broken due to conversion of rocketchat:ui

* Remove globals variables from eslintrc and add some to the eslintrc of livechat app

* Revert commented test file

* Add missed files

* Fix lint
  • Loading branch information
MarcosSpessatto authored and rodrigok committed Jan 16, 2019
1 parent fb54664 commit a71e78d
Show file tree
Hide file tree
Showing 65 changed files with 205 additions and 260 deletions.
27 changes: 0 additions & 27 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,30 @@
"globals": {
"__meteor_bootstrap__" : false,
"__meteor_runtime_config__" : false,
"AccountBox" : false,
"alerts" : false,
"Apps" : false,
"Assets" : false,
"AudioRecorder" : false,
"CachedChatSubscription" : false,
"ChatMessage" : false,
"ChatMessages" : false,
"chatMessages" : false,
"ChatRoom" : false,
"ChatSubscription" : false,
"chrome" : false,
"cordova" : false,
"device" : false,
"DynamicCss" : false,
"facebookConnectPlugin" : false,
"fileUpload" : false,
"fireGlobalEvent" : false,
"handleError" : false,
"getAvatarUrlFromUsername" : false,
"getAvatarSuggestionForUser" : false,
"globals" : true,
"JitsiMeetExternalAPI" : false,
"jscolor" : false,
"KonchatNotification" : false,
"language_names" : true,
"msgStream" : false,
"MsgTyping" : false,
"modal" : false,
"Modernizr" : false,
"menu" : false,
"Npm" : false,
"openRoom" : false,
"OnePassword" : false,
"Package" : false,
"popout" : false,
"popover" : false,
"readMessage" : false,
"RocketChat" : true,
"roomExit" : true,
"RoomHistoryManager" : false,
"RoomManager" : false,
"RoomRoles" : false,
"Servers" : false,
"Settings" : false,
"SideNav" : false,
"TAPi18next" : false,
"TwitterConnect" : false,
"updateAvatarOfUsername" : false,
"UserRoles" : false,
"VideoRecorder" : false,
"VRecDialog" : false
}
}
1 change: 1 addition & 0 deletions client/methods/deleteMessage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { ChatMessage } from 'meteor/rocketchat:models';
import _ from 'underscore';
import moment from 'moment';

Expand Down
2 changes: 2 additions & 0 deletions client/methods/hideRoom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { ChatSubscription } from 'meteor/rocketchat:models';

Meteor.methods({
hideRoom(rid) {
if (!Meteor.userId()) {
Expand Down
2 changes: 2 additions & 0 deletions client/methods/openRoom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { ChatSubscription } from 'meteor/rocketchat:models';

Meteor.methods({
openRoom(rid) {
if (!Meteor.userId()) {
Expand Down
2 changes: 2 additions & 0 deletions client/methods/toggleFavorite.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { ChatSubscription } from 'meteor/rocketchat:models';

Meteor.methods({
toggleFavorite(rid, f) {
if (!Meteor.userId()) {
Expand Down
1 change: 1 addition & 0 deletions client/methods/updateMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { TimeSync } from 'meteor/mizzao:timesync';
import { t } from 'meteor/rocketchat:utils';
import { ChatMessage } from 'meteor/rocketchat:models';
import _ from 'underscore';
import moment from 'moment';
import toastr from 'toastr';
Expand Down
1 change: 1 addition & 0 deletions client/routes/roomRoute.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { FlowRouter } from 'meteor/kadira:flow-router';
import { ChatSubscription } from 'meteor/rocketchat:models';

FlowRouter.goToRoomById = (roomId) => {
const subscription = ChatSubscription.findOne({ rid: roomId });
Expand Down
1 change: 1 addition & 0 deletions client/startup/roomObserve.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { ChatRoom } from 'meteor/rocketchat:models';

Meteor.startup(function() {
ChatRoom.find().observe({
Expand Down
3 changes: 2 additions & 1 deletion client/startup/unread.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { Tracker } from 'meteor/tracker';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Session } from 'meteor/session';
import { Favico } from 'meteor/rocketchat:favico';
import { fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui';
import { ChatSubscription } from 'meteor/rocketchat:models';
import { RoomManager, menu, fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui-utils';

Meteor.startup(function() {
Tracker.autorun(function() {
Expand Down
1 change: 1 addition & 0 deletions client/startup/usersObserve.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { RoomManager } from 'meteor/rocketchat:ui-utils';

Meteor.startup(function() {
Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({
Expand Down
1 change: 1 addition & 0 deletions imports/message-read-receipt/client/room.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { t } from 'meteor/rocketchat:utils';
import { modal } from 'meteor/rocketchat:ui-utils';

RocketChat.MessageAction.addButton({
id: 'receipt-detail',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
import { Template } from 'meteor/templating';
import { t } from 'meteor/rocketchat:utils';
import { modal, SideNav } from 'meteor/rocketchat:ui-utils';
import toastr from 'toastr';
import moment from 'moment';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { Tracker } from 'meteor/tracker';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Session } from 'meteor/session';
import { RocketChat } from 'meteor/rocketchat:lib';
import { ChatRoom, RoomManager } from 'meteor/rocketchat:ui';
import { RoomManager } from 'meteor/rocketchat:ui-utils';
import { ChatRoom, ChatSubscription } from 'meteor/rocketchat:models';

Meteor.startup(function() {
const roomSettingsChangedCallback = (msg) => {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-channel-settings/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ Package.onUse(function(api) {
'rocketchat:lib',
'rocketchat:authorization',
'rocketchat:ui',
'rocketchat:ui-utils',
'rocketchat:utils',
'rocketchat:models',
]);
api.addFiles('client/stylesheets/channel-settings.css', 'client');
api.mainModule('client/index.js', 'client');
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-e2e/client/rocketchat.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Rooms, Subscriptions, Messages } from 'meteor/rocketchat:models';
import { promises } from 'meteor/rocketchat:promises';
import { settings } from 'meteor/rocketchat:settings';
import { Notifications } from 'meteor/rocketchat:notifications';
import { Layout, call } from 'meteor/rocketchat:ui-utils';
import { Layout, call, modal, alerts } from 'meteor/rocketchat:ui-utils';
import { TAPi18n } from 'meteor/tap:i18n';
import { E2ERoom } from './rocketchat.e2e.room';
import {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/client/UserDeleted.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { ChatMessage } from 'meteor/rocketchat:models';

Meteor.startup(function() {
RocketChat.Notifications.onLogged('Users:Deleted', ({ userId }) =>
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-lib/client/lib/openRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ 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 { RoomManager } from 'meteor/rocketchat:ui-utils';
import { RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from 'meteor/rocketchat:ui-utils';
import { ChatSubscription } from 'meteor/rocketchat:models';
import _ from 'underscore';

export let currentTracker = undefined;
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/client/lib/settings.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { t } from 'meteor/rocketchat:utils';
import { modal } from 'meteor/rocketchat:ui-utils';

Meteor.startup(function() {
if (Meteor.isCordova === true) {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/client/lib/userRoles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { UserRoles, RoomRoles, ChatMessage } from 'meteor/rocketchat:models';

Meteor.startup(function() {
Tracker.autorun(function() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/client/methods/sendMessage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { TimeSync } from 'meteor/mizzao:timesync';
import { ChatMessage } from 'meteor/rocketchat:models';
import s from 'underscore.string';

Meteor.methods({
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/lib/roomTypes/direct.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig';
import { ChatRoom } from 'meteor/rocketchat:models';

export class DirectMessageRoomRoute extends RoomTypeRouteConfig {
constructor() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/lib/roomTypes/private.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from '../RoomTypeConfig';
import { ChatRoom } from 'meteor/rocketchat:models';

export class PrivateRoomRoute extends RoomTypeRouteConfig {
constructor() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/lib/roomTypes/public.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig';
import { ChatRoom } from 'meteor/rocketchat:models';

export class PublicRoomRoute extends RoomTypeRouteConfig {
constructor() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Package.onUse(function(api) {
api.use('rocketchat:emoji');
api.use('rocketchat:ui');
api.use('rocketchat:accounts');
api.use('rocketchat:ui');
api.use('modules');
api.use('rocketchat:i18n');
api.use('rocketchat:streamer');
Expand Down
9 changes: 9 additions & 0 deletions packages/rocketchat-livechat/.app/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
"parser": "babel-eslint",
"globals": {
"AgentUsers" : false,
"CachedChatSubscription" : false,
"ChatMessage" : false,
"ChatMessages" : false,
"chatMessages" : false,
"ChatRoom" : false,
"ChatSubscription" : false,
"Department" : false,
"getAvatarUrlFromUsername" : false,
"getNextAgent" : false,
"LivechatCustomField" : false,
"LivechatDepartment" : false,
Expand All @@ -13,6 +20,8 @@
"LivechatPageVisited" : false,
"LivechatTrigger" : false,
"parentCall" : false,
"RoomHistoryManager" : false,
"RoomManager" : false,
"t" : false,
"Trigger" : false,
"Triggers" : false,
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-logger/client/views/viewLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { ansispan } from '../ansispan';
import { stdout } from '../viewLogs';
import { readMessage } from 'meteor/rocketchat:ui-utils';
import _ from 'underscore';
import moment from 'moment';

Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-logger/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Package.onUse(function(api) {
'raix:eventemitter',
'templating',
'rocketchat:utils',
'rocketchat:ui-utils',
'kadira:flow-router',
'kadira:blaze-layout',
]);
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-message-pin/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Package.onUse(function(api) {
'mongo',
'ecmascript',
'rocketchat:lib',
'rocketchat:utils',
'templating',
]);
api.addFiles('client/views/stylesheets/messagepin.css', 'client');
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-message-pin/server/pinMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils';

const recursiveRemove = (msg, deep = 1) => {
if (!msg) {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-oembed/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Package.onUse(function(api) {
'ecmascript',
'konecty:change-case',
'rocketchat:lib',
'rocketchat:utils',
]);
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-oembed/server/jumpToMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils';
import _ from 'underscore';
import URL from 'url';
import QueryString from 'querystring';
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-slackbridge/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Package.onUse(function(api) {
api.use([
'ecmascript',
'rocketchat:lib',
'rocketchat:utils',
'rocketchat:logger',
'rocketchat:file-upload',
]);
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-slackbridge/server/SlackAdapter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { HTTP } from 'meteor/http';
import { RocketChat } from 'meteor/rocketchat:lib';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils';
import { FileUpload } from 'meteor/rocketchat:file-upload';
import { logger } from './logger';
import _ from 'underscore';
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-account/client/avatar/avatar.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui';
import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils';

Template.avatar.helpers({
src() {
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/messageBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { RocketChat } from 'meteor/rocketchat:lib';
import { fileUploadHandler } from 'meteor/rocketchat:file-upload';
import { ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages } from 'meteor/rocketchat:ui';
import { ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages, MsgTyping } from 'meteor/rocketchat:ui';
import { t } from 'meteor/rocketchat:utils';
import toastr from 'toastr';
import moment from 'moment';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { RocketChat } from 'meteor/rocketchat:lib';
import { RoomManager } from 'meteor/rocketchat:ui-utils';
import { t } from 'meteor/rocketchat:utils';
import _ from 'underscore';

Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui-message/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Package.onUse(function(api) {
'rocketchat:ui-utils',
'rocketchat:emoji',
'rocketchat:lib',
'rocketchat:ui',
'rocketchat:ui-account',
'rocketchat:ui-vrecord',
'rocketchat:ui-sidenav',
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui-utils/client/lib/openedRoom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export let openedRoom; //eslint-disable-line
Loading

0 comments on commit a71e78d

Please sign in to comment.