Skip to content

Commit

Permalink
Lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
justinwilaby committed Apr 24, 2019
1 parent 2c4ca36 commit f4d1167
Show file tree
Hide file tree
Showing 21 changed files with 26 additions and 42 deletions.
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/azureAuthSaga.ts
Expand Up @@ -31,6 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import { SharedConstants } from '@bfemulator/app-shared';
import { call, ForkEffect, put, select, takeEvery } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { DialogService } from '../../ui/dialogs';
Expand All @@ -43,8 +44,6 @@ import {
import { AzureAuthState } from '../reducer/azureAuthReducer';
import { RootState } from '../store';

import { call, ForkEffect, put, select, takeEvery } from 'redux-saga/effects';

const getArmTokenFromState = (state: RootState) => state.azureAuth;

export function* getArmToken(action: AzureAuthAction<AzureAuthWorkflow>): IterableIterator<any> {
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/botSagas.spec.ts
Expand Up @@ -33,6 +33,7 @@

import { newNotification, SharedConstants } from '@bfemulator/app-shared';
import { BotConfigWithPath, ConversationService } from '@bfemulator/sdk-shared';
import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { ActiveBotHelper } from '../../ui/helpers/activeBotHelper';
import {
Expand All @@ -48,8 +49,6 @@ import { generateHash } from '../botHelpers';
import { botSagas, browseForBot, generateHashForActiveBot, openBotViaFilePath, openBotViaUrl } from './botSagas';
import { refreshConversationMenu } from './sharedSagas';

import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

jest.mock('../../ui/dialogs', () => ({}));

jest.mock('../store', () => ({
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/botSagas.ts
Expand Up @@ -33,6 +33,7 @@

import { newNotification, UserSettings } from '@bfemulator/app-shared';
import { ConversationService, StartConversationParams } from '@bfemulator/sdk-shared';
import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { ActiveBotHelper } from '../../ui/helpers/activeBotHelper';
import { BotAction, BotActionType, BotConfigWithPathPayload, botHashGenerated } from '../action/botActions';
Expand All @@ -42,8 +43,6 @@ import { RootState } from '../store';

import { refreshConversationMenu } from './sharedSagas';

import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

/** Opens up native open file dialog to browse for a .bot file */
export function* browseForBot(): IterableIterator<any> {
yield call([ActiveBotHelper, ActiveBotHelper.confirmAndOpenBotFromFile]);
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/chatSagas.ts
Expand Up @@ -39,6 +39,7 @@ import { diff } from 'deep-diff';
import { IEndpointService } from 'botframework-config/lib/schema';
import { createCognitiveServicesBingSpeechPonyfillFactory } from 'botframework-webchat';
import { createStore as createWebChatStore } from 'botframework-webchat-core';
import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import {
ChatAction,
Expand All @@ -56,8 +57,6 @@ import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { RootState } from '../store';
import { isSpeechEnabled } from '../../utils';

import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

const getConversationIdFromDocumentId = (state: RootState, documentId: string) => {
return (state.chat.chats[documentId] || {}).conversationId;
};
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/editorSagas.spec.ts
Expand Up @@ -32,14 +32,13 @@
//

import { SharedConstants } from '@bfemulator/app-shared';
import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { EditorActions, removeDocPendingChange } from '../action/editorActions';

import { checkActiveDocForPendingChanges, editorSagas, promptUserToReloadDocument } from './editorSagas';
import { refreshConversationMenu, editorSelector } from './sharedSagas';

import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

jest.mock('../store', () => ({
get store() {
return {};
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/editorSagas.ts
Expand Up @@ -32,14 +32,13 @@
//

import { isChatFile, isTranscriptFile, SharedConstants } from '@bfemulator/app-shared';
import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { EditorActions, removeDocPendingChange } from '../action/editorActions';

import { editorSelector, refreshConversationMenu } from './sharedSagas';

import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

export function* promptUserToReloadDocument(filename: string): IterableIterator<any> {
const { Commands } = SharedConstants;
const options = {
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/endpointSagas.ts
Expand Up @@ -34,6 +34,7 @@
import { SharedConstants } from '@bfemulator/app-shared';
import { IBotService, IEndpointService, ServiceTypes } from 'botframework-config/lib/schema';
import { ComponentClass } from 'react';
import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { DialogService } from '../../ui/dialogs/service';
Expand All @@ -48,8 +49,6 @@ import {
} from '../action/endpointServiceActions';
import { RootState } from '../store';

import { call, ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

const getConnectedAbs = (state: RootState, endpointAppId: string) => {
return (state.bot.activeBot.services || []).find(service => {
return service.type === ServiceTypes.Bot && (service as IBotService).appId === endpointAppId;
Expand Down
Expand Up @@ -33,6 +33,7 @@
import { SharedConstants, newNotification } from '@bfemulator/app-shared';
import { applyMiddleware, combineReducers, createStore } from 'redux';
import sagaMiddlewareFactory from 'redux-saga';
import { call, put, takeEvery, select } from 'redux-saga/effects';

import { CONTENT_TYPE_APP_SETTINGS, DOCUMENT_ID_APP_SETTINGS } from '../../constants';
import * as EditorActions from '../action/editorActions';
Expand All @@ -58,8 +59,6 @@ import {
saveFrameworkSettings,
} from './frameworkSettingsSagas';

import { call, put, takeEvery, select } from 'redux-saga/effects';

jest.mock(
'../../ui/dialogs/',
() =>
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/frameworkSettingsSagas.ts
Expand Up @@ -31,6 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import { frameworkDefault, FrameworkSettings, newNotification, SharedConstants } from '@bfemulator/app-shared';
import { call, ForkEffect, put, select, takeEvery } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import * as EditorActions from '../action/editorActions';
Expand All @@ -46,8 +47,6 @@ import { generateHash } from '../botHelpers';
import { Document } from '../reducer/editor';
import { RootState } from '../store';

import { call, ForkEffect, put, select, takeEvery } from 'redux-saga/effects';

export const normalizeSettingsData = async (settings: FrameworkSettings): Promise<FrameworkSettings> => {
// trim keys that do not belong and generate a hash
const keys = Object.keys(frameworkDefault).sort();
Expand Down
4 changes: 2 additions & 2 deletions packages/app/client/src/data/sagas/navBarSagas.spec.ts
Expand Up @@ -31,14 +31,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

import { put } from 'redux-saga/effects';

import { select } from '../action/navBarActions';
import * as Constants from '../../constants';
import { markAllAsRead } from '../action/notificationActions';

import { markNotificationsAsRead } from './navBarSagas';

import { put } from 'redux-saga/effects';

jest.mock('../../ui/dialogs', () => ({
AzureLoginPromptDialogContainer: function mock() {
return undefined;
Expand Down
4 changes: 2 additions & 2 deletions packages/app/client/src/data/sagas/navBarSagas.ts
Expand Up @@ -31,12 +31,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

import * as Constants from '../../constants';
import { NavBarActions, SelectNavBarAction } from '../action/navBarActions';
import { markAllAsRead } from '../action/notificationActions';

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

/** Marks all notifications as read if the notifications pane is opened */
export function* markNotificationsAsRead(action: SelectNavBarAction): IterableIterator<any> {
const navBarSelection = action.payload.selection;
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/notificationSagas.spec.ts
Expand Up @@ -32,14 +32,13 @@
//

import { newNotification, NotificationType } from '@bfemulator/app-shared';
import { put } from 'redux-saga/effects';

import { NotificationManager } from '../../notificationManager';
import { beginAdd, finishAdd, finishClear, beginRemove, finishRemove } from '../action/notificationActions';

import { addNotification, clearNotifications, removeNotification, markAllAsRead } from './notificationSagas';

import { put } from 'redux-saga/effects';

describe('Notification sagas', () => {
test('addNotification()', () => {
const notification = newNotification('someMessage', NotificationType.Info);
Expand Down
4 changes: 2 additions & 2 deletions packages/app/client/src/data/sagas/notificationSagas.ts
Expand Up @@ -31,6 +31,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

import { NotificationManager } from '../../notificationManager';
import {
BeginAddNotificationAction,
Expand All @@ -41,8 +43,6 @@ import {
NotificationActions,
} from '../action/notificationActions';

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

/** Adds a notification to the notification manager then
* adds it to the state store
*/
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/resourcesSagas.ts
Expand Up @@ -34,6 +34,7 @@ import { BotInfo, isChatFile, isTranscriptFile, NotificationType, SharedConstant
import { newNotification } from '@bfemulator/app-shared/built';
import { IFileService } from 'botframework-config/lib/schema';
import { ComponentClass } from 'react';
import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { DialogService } from '../../ui/dialogs/service';
Expand All @@ -47,8 +48,6 @@ import {
ResourcesAction,
} from '../action/resourcesAction';

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

function* openContextMenuForResource(action: ResourcesAction<IFileService>): IterableIterator<any> {
const menuItems = [{ label: 'Open file location', id: 0 }, { label: 'Rename', id: 1 }, { label: 'Delete', id: 2 }];

Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/servicesExplorerSagas.ts
Expand Up @@ -42,6 +42,7 @@ import {
IQnAService,
ServiceTypes,
} from 'botframework-config/lib/schema';
import { ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { DialogService } from '../../ui/dialogs/service';
Expand All @@ -64,8 +65,6 @@ import { RootState } from '../store';

import { getArmToken } from './azureAuthSaga';

import { ForkEffect, put, select, takeEvery, takeLatest } from 'redux-saga/effects';

declare interface ServicesPayload {
services: IConnectedService[];
code: ServiceCodes;
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/sharedSagas.spec.ts
Expand Up @@ -32,13 +32,12 @@
//

import { SharedConstants } from '@bfemulator/app-shared';
import { select } from 'redux-saga/effects';

import { RootState } from '../store';

import { editorSelector, refreshConversationMenu } from './sharedSagas';

import { select } from 'redux-saga/effects';

let mockRemoteCommandsCalled = [];
jest.mock('../../platform/commands/commandServiceImpl', () => ({
CommandServiceImpl: {
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/sharedSagas.ts
Expand Up @@ -32,12 +32,11 @@
//

import { SharedConstants } from '@bfemulator/app-shared';
import { select } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { RootState } from '../store';

import { select } from 'redux-saga/effects';

export function editorSelector(state: RootState) {
return state.editor;
}
Expand Down
3 changes: 1 addition & 2 deletions packages/app/client/src/data/sagas/welcomePageSagas.ts
Expand Up @@ -31,13 +31,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import { BotInfo, newNotification, SharedConstants } from '@bfemulator/app-shared';
import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';
import { beginAdd } from '../action/notificationActions';
import { OPEN_CONTEXT_MENU_FOR_BOT, WelcomePageAction } from '../action/welcomePageActions';

import { ForkEffect, put, takeEvery } from 'redux-saga/effects';

function* openContextMenuForBot(action: WelcomePageAction<BotInfo>): IterableIterator<any> {
const menuItems = [
{ label: 'Move...', id: 0 },
Expand Down
4 changes: 2 additions & 2 deletions packages/app/client/src/ui/helpers/activeBotHelper.ts
Expand Up @@ -49,7 +49,7 @@ import { CommandServiceImpl } from '../../platform/commands/commandServiceImpl';

const { Bot, Electron, Telemetry } = SharedConstants.Commands;

export const ActiveBotHelper = new class {
export const ActiveBotHelper = new (class {
async confirmSwitchBot(): Promise<any> {
if (hasNonGlobalTabs()) {
return await CommandServiceImpl.remoteCall(Electron.ShowMessageBox, true, {
Expand Down Expand Up @@ -314,4 +314,4 @@ export const ActiveBotHelper = new class {
throw new Error(errMsg);
});
}
}();
})();
4 changes: 2 additions & 2 deletions packages/app/main/src/protocolHandler.ts
Expand Up @@ -91,7 +91,7 @@ export interface ProtocolHandler {
performBotAction: (protocol: Protocol) => void;
}

export const ProtocolHandler = new class ProtocolHandlerImpl implements ProtocolHandler {
export const ProtocolHandler = new (class ProtocolHandlerImpl implements ProtocolHandler {
/** Extracts useful information out of a protocol URL */
public parseProtocolUrl(url: string): Protocol {
const validProtocol = /^bfemulator:\/\//;
Expand Down Expand Up @@ -359,7 +359,7 @@ export const ProtocolHandler = new class ProtocolHandlerImpl implements Protocol
numOfServices,
});
}
}();
})();

/**
* Takes the list of parsed protocol URI query params and constructs an endpoint service
Expand Down
3 changes: 1 addition & 2 deletions packages/app/main/src/settingsData/sagas/settingsSagas.ts
Expand Up @@ -33,6 +33,7 @@
import { DebugMode, FrameworkSettings, Settings, SharedConstants } from '@bfemulator/app-shared';
import { Users } from '@bfemulator/emulator-core';
import { ClientAwareSettings } from '@bfemulator/app-shared';
import { call, ForkEffect, select, takeEvery } from 'redux-saga/effects';

import { Emulator } from '../../emulator';
import { mainWindow } from '../../main';
Expand All @@ -44,8 +45,6 @@ import {
WindowStateAction,
} from '../actions/windowStateActions';

import { call, ForkEffect, select, takeEvery } from 'redux-saga/effects';

const getAvailableThemes = (state: Settings) => state.windowState.availableThemes;
const getCurrentTheme = (state: Settings) => state.windowState.theme;
const getState = (state: Settings) => state;
Expand Down

0 comments on commit f4d1167

Please sign in to comment.