Improve code styling

RocketChat · Mar 20, 2020 · 5ca73cb · 5ca73cb
1 parent a1de24b
commit 5ca73cb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/ee/app/livechat-enterprise/client/index.js b/ee/app/livechat-enterprise/client/index.js
@@ -1,8 +1,16 @@
+import { hasLicense } from '../../license/client';
 import './views/livechatMonitors';
 import './views/livechatUnits';
 import './views/livechatUnitForm';
-import './views/livechatSideNavItems';
+import './route';
 import './views/livechatTags';
 import './views/livechatTagForm';
-import './route';
-import './views/app/registerCustomTemplates.js';
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	if (!enabled) {
+		return;
+	}
+
+	require('./views/app/registerCustomTemplates');
+	require('./views/livechatSideNavItems');
+});
diff --git a/ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js b/ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js
@@ -2,12 +2,7 @@ import { addCustomFormTemplate } from '../../../../../../app/livechat/client/vie
 import './customTemplates/livechatDepartmentCustomFieldsForm';
 import './customTemplates/livechatAgentEditCustomFieldsForm';
 import './customTemplates/livechatAgentInfoCustomFieldsForm';
-import { hasLicense } from '../../../../license/client';
 
-hasLicense('livechat-enterprise').then((enabled) => {
-	if (enabled) {
-		addCustomFormTemplate('livechatDepartmentForm', 'livechatDepartmentCustomFieldsForm');
-		addCustomFormTemplate('livechatAgentEditForm', 'livechatAgentEditCustomFieldsForm');
-		addCustomFormTemplate('livechatAgentInfoForm', 'livechatAgentInfoCustomFieldsForm');
-	}
-});
+addCustomFormTemplate('livechatDepartmentForm', 'livechatDepartmentCustomFieldsForm');
+addCustomFormTemplate('livechatAgentEditForm', 'livechatAgentEditCustomFieldsForm');
+addCustomFormTemplate('livechatAgentInfoForm', 'livechatAgentInfoCustomFieldsForm');
diff --git a/ee/app/livechat-enterprise/client/views/livechatSideNavItems.js b/ee/app/livechat-enterprise/client/views/livechatSideNavItems.js
@@ -1,10 +1,5 @@
 import { addSidebarItem } from '../../../../../app/livechat/client/views/sideNav/livechatSideNavItems';
-import { hasLicense } from '../../../license/client';
 
-hasLicense('livechat-enterprise').then((enabled) => {
-	if (enabled) {
-		addSidebarItem('Monitors', 'livechat-monitors', 'manage-livechat-monitors');
-		addSidebarItem('Units', 'livechat-units', 'manage-livechat-units');
-		addSidebarItem('Tags', 'livechat-tags', 'manage-livechat-tags');
-	}
-});
+addSidebarItem('Monitors', 'livechat-monitors', 'manage-livechat-monitors');
+addSidebarItem('Units', 'livechat-units', 'manage-livechat-units');
+addSidebarItem('Tags', 'livechat-tags', 'manage-livechat-tags');
diff --git a/ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js b/ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js
@@ -1,6 +1,6 @@
 import { callbacks } from '../../../../../app/callbacks';
 import LivechatRooms from '../../../../../app/models/server/models/LivechatRooms';
-import { LivechatDepartment } from '../../../../../app/models/server/models/LivechatDepartment';
+import LivechatDepartment from '../../../../../app/models/server/models/LivechatDepartment';
 
 callbacks.add('livechat.newRoom', (room) => {
 	if (!room.departmentId) {

diff --git a/ee/app/livechat-enterprise/server/permissions.js b/ee/app/livechat-enterprise/server/permissions.js
@@ -36,6 +36,7 @@ export const createPermissions = () => {
 		'manage-livechat-agents',
 	];
 
+
 	permissions.map((p) => Permissions.addRole(p, livechatMonitorRole));
 
 	Permissions.createOrUpdate('manage-livechat-units', [adminRole, livechatManagerRole]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ export const createPermissions = () => { @@
     		'manage-livechat-agents',
     	];
     	permissions.map((p) => Permissions.addRole(p, livechatMonitorRole));
     	Permissions.createOrUpdate('manage-livechat-units', [adminRole, livechatManagerRole]);
@@ Expand Down @@