From 100bfdd56044bb27a9779ee03fe7fd6b0ccfac17 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Tue, 26 Mar 2019 16:04:32 +0100 Subject: [PATCH] Fix typos --- app/src/ErrorBoundary.tsx | 4 ++-- .../{PersistantStorage.ts => PersistentStorage.ts} | 8 ++++---- app/src/actions/ConnectionManager.ts | 12 ++++++------ app/src/actions/Settings.ts | 8 ++++---- .../ConnectionSetup/AdvancedConnectionSettings.tsx | 4 ++-- app/src/components/Settings.tsx | 2 +- backend/src/ConfigStorage.ts | 8 ++++---- events/StorageEvents.ts | 2 +- src/electron.ts | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) rename app/src/{PersistantStorage.ts => PersistentStorage.ts} (92%) diff --git a/app/src/ErrorBoundary.tsx b/app/src/ErrorBoundary.tsx index a47940a..245cf87 100644 --- a/app/src/ErrorBoundary.tsx +++ b/app/src/ErrorBoundary.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import PersistantStorage from './PersistantStorage' +import PersistentStorage from './PersistentStorage' import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied' import Warning from '@material-ui/icons/Warning' import { electronRendererTelementry } from 'electron-telemetry' @@ -40,7 +40,7 @@ class ErrorBoundary extends React.Component { } private clearStorage = () => { - PersistantStorage.clear() + PersistentStorage.clear() window.location = window.location } diff --git a/app/src/PersistantStorage.ts b/app/src/PersistentStorage.ts similarity index 92% rename from app/src/PersistantStorage.ts rename to app/src/PersistentStorage.ts index 0365986..bb42a57 100644 --- a/app/src/PersistantStorage.ts +++ b/app/src/PersistentStorage.ts @@ -6,20 +6,20 @@ import { makeStorageResponseEvent, storageLoadEvent, storageClearEvent, - makeStorageAcknoledgementEvent, + makeStorageAcknowledgementEvent, } from '../../events/StorageEvents' export interface StorageIdentifier { id: string } -export interface PersistantStorage { +export interface PersistentStorage { store(identifier: StorageIdentifier, data: Model): Promise load(identifier: StorageIdentifier): Promise clear(): Promise } -class RemoteStorage implements PersistantStorage { +class RemoteStorage implements PersistentStorage { private timeoutCallback(event: any, callback: any, reject: any) { setTimeout(() => { reject('remote storage timeout') @@ -28,7 +28,7 @@ class RemoteStorage implements PersistantStorage { } private expectAck(transactionId: string): Promise { - const ack = makeStorageAcknoledgementEvent(transactionId) + const ack = makeStorageAcknowledgementEvent(transactionId) return new Promise((resolve, reject) => { const callback = (msg: any) => { if (msg && msg.error) { diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts index 4230f54..fa45134 100644 --- a/app/src/actions/ConnectionManager.ts +++ b/app/src/actions/ConnectionManager.ts @@ -1,7 +1,7 @@ import { AppState } from '../reducers' import { clearLegacyConnectionOptions, loadLegacyConnectionOptions } from '../model/LegacyConnectionSettings' import { ConnectionOptions, createEmptyConnection, makeDefaultConnections, CertificateParameters } from '../model/ConnectionOptions' -import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage' +import { default as persistentStorage, StorageIdentifier } from '../PersistentStorage' import { Dispatch } from 'redux' import { showError } from './Global' import { remote } from 'electron' @@ -21,7 +21,7 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch, getS let connections try { await ensureConnectionsHaveBeenInitialized() - connections = await persistantStorage.load(storedConnectionsIdentifier) + connections = await persistentStorage.load(storedConnectionsIdentifier) } catch (error) { dispatch(showError(error)) } @@ -87,7 +87,7 @@ async function openCertificate(): Promise { export const saveConnectionSettings = () => async (dispatch: Dispatch, getState: () => AppState) => { try { console.log('store settings') - await persistantStorage.store(storedConnectionsIdentifier, getState().connectionManager.connections) + await persistentStorage.store(storedConnectionsIdentifier, getState().connectionManager.connections) } catch (error) { dispatch(showError(error)) } @@ -111,7 +111,7 @@ export const deleteSubscription = (subscription: string, connectionId: string): type: ActionTypes.CONNECTION_MANAGER_DELETE_SUBSCRIPTION, }) -export const createConnection = () => (dispatch: Dispatch, getState: () => AppState) => { +export const createConnection = () => (dispatch: Dispatch) => { const newConnection = createEmptyConnection() dispatch(addConnection(newConnection)) dispatch(selectConnection(newConnection.id)) @@ -155,12 +155,12 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch> = { export const loadSettings = () => async (dispatch: Dispatch, _getState: () => AppState) => { try { - const settings = await persistantStorage.load(settingsIdentifier) + const settings = await persistentStorage.load(settingsIdentifier) dispatch({ settings, type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS, @@ -37,7 +37,7 @@ export const storeSettings = () => async (dispatch: Dispatch, getState: () } try { - await persistantStorage.store(settingsIdentifier, settings) + await persistentStorage.store(settingsIdentifier, settings) } catch (error) { dispatch(showError(error)) } @@ -74,7 +74,7 @@ export const toggleSettingsVisibility = () => (dispatch: Dispatch, _getStat dispatch(storeSettings()) } -export const togglehighlightTopicUpdates = () => (dispatch: Dispatch, _getState: () => AppState) => { +export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch, _getState: () => AppState) => { dispatch({ type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY, }) diff --git a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx index 378353d..9ead89e 100644 --- a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx +++ b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx @@ -1,8 +1,9 @@ import * as React from 'react' import Add from '@material-ui/icons/Add' +import ClearAdornment from '../helper/ClearAdornment' import Delete from '@material-ui/icons/Delete' -import Undo from '@material-ui/icons/Undo' import Lock from '@material-ui/icons/Lock' +import Undo from '@material-ui/icons/Undo' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { connectionManagerActions } from '../../actions' @@ -20,7 +21,6 @@ import { Tooltip, Typography, } from '@material-ui/core' -import ClearAdornment from '../helper/ClearAdornment'; interface Props { connection: ConnectionOptions diff --git a/app/src/components/Settings.tsx b/app/src/components/Settings.tsx index 9fba92d..452f34b 100644 --- a/app/src/components/Settings.tsx +++ b/app/src/components/Settings.tsx @@ -130,7 +130,7 @@ class Settings extends React.Component { private renderHighlightTopicUpdates() { const { highlightTopicUpdates, actions } = this.props - return this.renderSwitch('Show Activity', highlightTopicUpdates, actions.togglehighlightTopicUpdates, 'Topics blink when a new message arrives') + return this.renderSwitch('Show Activity', highlightTopicUpdates, actions.toggleHighlightTopicUpdates, 'Topics blink when a new message arrives') } private renderSwitch(title: string, checked: boolean, action: any, tooltip: string) { diff --git a/backend/src/ConfigStorage.ts b/backend/src/ConfigStorage.ts index c55f245..41c6efb 100644 --- a/backend/src/ConfigStorage.ts +++ b/backend/src/ConfigStorage.ts @@ -6,7 +6,7 @@ import { storageClearEvent, storageLoadEvent, storageStoreEvent, - makeStorageAcknoledgementEvent, + makeStorageAcknowledgementEvent, } from '../../events/StorageEvents' export default class ConfigStorage { @@ -27,7 +27,7 @@ export default class ConfigStorage { public async init() { backendEvents.subscribe(storageStoreEvent, async (event) => { - const ack = makeStorageAcknoledgementEvent(event.transactionId) + const ack = makeStorageAcknowledgementEvent(event.transactionId) try { const db = await this.getDb() await db.set(event.store, event.data).write() @@ -57,9 +57,9 @@ export default class ConfigStorage { for (const key of keys) { await db.unset(key).write() } - backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), undefined) + backendEvents.emit(makeStorageAcknowledgementEvent(event.transactionId), undefined) } catch (error) { - backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), { error, transactionId: event.transactionId }) + backendEvents.emit(makeStorageAcknowledgementEvent(event.transactionId), { error, transactionId: event.transactionId }) throw error } }) diff --git a/events/StorageEvents.ts b/events/StorageEvents.ts index 83fefc8..d31762b 100644 --- a/events/StorageEvents.ts +++ b/events/StorageEvents.ts @@ -22,7 +22,7 @@ export const storageLoadEvent: Event = { topic: 'storage/load', } -export function makeStorageAcknoledgementEvent(transactionId: string): Event { +export function makeStorageAcknowledgementEvent(transactionId: string): Event { return { topic: `storage/ack/${transactionId}`, } diff --git a/src/electron.ts b/src/electron.ts index 2ef26ca..64732b6 100644 --- a/src/electron.ts +++ b/src/electron.ts @@ -4,11 +4,11 @@ import * as path from 'path' import ConfigStorage from '../backend/src/ConfigStorage' import { app, BrowserWindow, Menu } from 'electron' import { autoUpdater } from 'electron-updater' +import { BuildInfo } from 'electron-telemetry/build/Model' import { ConnectionManager, updateNotifier } from '../backend/src/index' import { electronTelemetryFactory } from 'electron-telemetry' import { menuTemplate } from './MenuTemplate' import { UpdateInfo } from '../events' -import { BuildInfo } from 'electron-telemetry/build/Model'; const isDev = require('electron-is-dev') if (!isDev) {