From c202e2477d91adf778bfed26fb22e820cd8f0aa0 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 28 Aug 2020 10:46:25 -0300 Subject: [PATCH] imports to ee last --- app/reducers/index.js | 3 ++- app/sagas/index.js | 1 + app/sagas/login.js | 3 ++- app/sagas/selectServer.js | 1 + app/stacks/InsideStack.js | 3 ++- app/stacks/MasterDetailStack/index.js | 3 ++- app/views/RoomView/index.js | 1 + app/views/RoomsListView/ListHeader/index.js | 1 + app/views/RoomsListView/index.js | 1 + 9 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/reducers/index.js b/app/reducers/index.js index 5e18dece3..d047450a6 100644 --- a/app/reducers/index.js +++ b/app/reducers/index.js @@ -16,9 +16,10 @@ import activeUsers from './activeUsers'; import usersTyping from './usersTyping'; import inviteLinks from './inviteLinks'; import createDiscussion from './createDiscussion'; -import inquiry from '../ee/omnichannel/reducers/inquiry'; import enterpriseModules from './enterpriseModules'; +import inquiry from '../ee/omnichannel/reducers/inquiry'; + export default combineReducers({ settings, login, diff --git a/app/sagas/index.js b/app/sagas/index.js index 86ee17cbe..af339c743 100644 --- a/app/sagas/index.js +++ b/app/sagas/index.js @@ -10,6 +10,7 @@ import state from './state'; import deepLinking from './deepLinking'; import inviteLinks from './inviteLinks'; import createDiscussion from './createDiscussion'; + import inquiry from '../ee/omnichannel/sagas/inquiry'; const root = function* root() { diff --git a/app/sagas/login.js b/app/sagas/login.js index cee9e81d6..d1a6a5b50 100644 --- a/app/sagas/login.js +++ b/app/sagas/login.js @@ -14,7 +14,6 @@ import { loginFailure, loginSuccess, setUser, logout } from '../actions/login'; import { roomsRequest } from '../actions/rooms'; -import { inquiryRequest, inquiryReset } from '../ee/omnichannel/actions/inquiry'; import { toMomentLocale } from '../utils/moment'; import RocketChat from '../lib/rocketchat'; import log, { logEvent, events } from '../utils/log'; @@ -26,6 +25,8 @@ import { showErrorAlert } from '../utils/info'; import { localAuthenticate } from '../utils/localAuthentication'; import { setActiveUsers } from '../actions/activeUsers'; import UserPreferences from '../lib/userPreferences'; + +import { inquiryRequest, inquiryReset } from '../ee/omnichannel/actions/inquiry'; import { isOmnichannelStatusAvailable } from '../ee/omnichannel/lib'; const getServer = state => state.server.server; diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js index 547eacac9..3b777777a 100644 --- a/app/sagas/selectServer.js +++ b/app/sagas/selectServer.js @@ -18,6 +18,7 @@ import I18n from '../i18n'; import { BASIC_AUTH_KEY, setBasicAuth } from '../utils/fetch'; import { appStart, ROOT_INSIDE, ROOT_OUTSIDE } from '../actions/app'; import UserPreferences from '../lib/userPreferences'; + import { inquiryReset } from '../ee/omnichannel/actions/inquiry'; const getServerInfo = function* getServerInfo({ server, raiseError = true }) { diff --git a/app/stacks/InsideStack.js b/app/stacks/InsideStack.js index c365ae609..82e9f8ad4 100644 --- a/app/stacks/InsideStack.js +++ b/app/stacks/InsideStack.js @@ -30,7 +30,6 @@ import PickerView from '../views/PickerView'; import ThreadMessagesView from '../views/ThreadMessagesView'; import MarkdownTableView from '../views/MarkdownTableView'; import ReadReceiptsView from '../views/ReadReceiptView'; -import QueueListView from '../ee/omnichannel/views/QueueListView'; // Profile Stack import ProfileView from '../views/ProfileView'; @@ -59,6 +58,8 @@ import StatusView from '../views/StatusView'; import ShareView from '../views/ShareView'; import CreateDiscussionView from '../views/CreateDiscussionView'; +import QueueListView from '../ee/omnichannel/views/QueueListView'; + // ChatsStackNavigator const ChatsStack = createStackNavigator(); const ChatsStackNavigator = () => { diff --git a/app/stacks/MasterDetailStack/index.js b/app/stacks/MasterDetailStack/index.js index 3bfe1e63b..bf97cd2ac 100644 --- a/app/stacks/MasterDetailStack/index.js +++ b/app/stacks/MasterDetailStack/index.js @@ -41,7 +41,6 @@ import ScreenLockConfigView from '../../views/ScreenLockConfigView'; import AdminPanelView from '../../views/AdminPanelView'; import NewMessageView from '../../views/NewMessageView'; import CreateChannelView from '../../views/CreateChannelView'; -import QueueListView from '../../ee/omnichannel/views/QueueListView'; import UserPreferencesView from '../../views/UserPreferencesView'; import UserNotificationPrefView from '../../views/UserNotificationPreferencesView'; @@ -55,6 +54,8 @@ import CreateDiscussionView from '../../views/CreateDiscussionView'; import { setKeyCommands, deleteKeyCommands } from '../../commands'; import ShareView from '../../views/ShareView'; +import QueueListView from '../../ee/omnichannel/views/QueueListView'; + // ChatsStackNavigator const ChatsStack = createStackNavigator(); const ChatsStackNavigator = React.memo(() => { diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index 4624d5b4b..ece024a0f 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -55,6 +55,7 @@ import Navigation from '../../lib/Navigation'; import SafeAreaView from '../../containers/SafeAreaView'; import { withDimensions } from '../../dimensions'; import { getHeaderTitlePosition } from '../../containers/Header'; + import { takeInquiry } from '../../ee/omnichannel/lib'; const stateAttrsUpdate = [ diff --git a/app/views/RoomsListView/ListHeader/index.js b/app/views/RoomsListView/ListHeader/index.js index cd2fd0815..0ce38d079 100644 --- a/app/views/RoomsListView/ListHeader/index.js +++ b/app/views/RoomsListView/ListHeader/index.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Sort from './Sort'; + import OmnichannelStatus from '../../../ee/omnichannel/containers/OmnichannelStatus'; const ListHeader = React.memo(({ diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js index c0b6efdec..099b94bf1 100644 --- a/app/views/RoomsListView/index.js +++ b/app/views/RoomsListView/index.js @@ -63,6 +63,7 @@ import SafeAreaView from '../../containers/SafeAreaView'; import Header, { getHeaderTitlePosition } from '../../containers/Header'; import { withDimensions } from '../../dimensions'; import { showErrorAlert, showConfirmationAlert } from '../../utils/info'; + import { getInquiryQueueSelector } from '../../ee/omnichannel/selectors/inquiry'; import { changeLivechatStatus, isOmnichannelStatusAvailable } from '../../ee/omnichannel/lib';