diff --git a/lib/gui/app/components/settings/settings.tsx b/lib/gui/app/components/settings/settings.tsx index c4c2ae65..066a07ca 100644 --- a/lib/gui/app/components/settings/settings.tsx +++ b/lib/gui/app/components/settings/settings.tsx @@ -23,7 +23,6 @@ import { Badge, Checkbox, Modal } from 'rendition'; import styled from 'styled-components'; import { version } from '../../../../../package.json'; -import { Dictionary } from '../../../../shared/utils'; import * as settings from '../../models/settings'; import { store } from '../../models/store'; import * as analytics from '../../modules/analytics'; @@ -122,8 +121,8 @@ interface SettingsModalProps { export const SettingsModal: any = styled( ({ toggleModal }: SettingsModalProps) => { const [currentSettings, setCurrentSettings]: [ - Dictionary, - React.Dispatch>>, + _.Dictionary, + React.Dispatch>>, ] = useState(settings.getAll()); const [warning, setWarning]: [ any, diff --git a/lib/gui/app/models/settings.ts b/lib/gui/app/models/settings.ts index bf6db9c7..5b3725b4 100644 --- a/lib/gui/app/models/settings.ts +++ b/lib/gui/app/models/settings.ts @@ -19,12 +19,11 @@ import * as _ from 'lodash'; import * as packageJSON from '../../../../package.json'; import * as errors from '../../../shared/errors'; -import { Dictionary } from '../../../shared/utils'; import * as localSettings from './local-settings'; const debug = _debug('etcher:models:settings'); -const DEFAULT_SETTINGS: Dictionary = { +const DEFAULT_SETTINGS: _.Dictionary = { unsafeMode: false, errorReporting: true, unmountOnSuccess: true, @@ -53,7 +52,7 @@ export async function reset(): Promise { /** * @summary Extend the current settings */ -export async function assign(value: Dictionary): Promise { +export async function assign(value: _.Dictionary): Promise { debug('assign', value); if (_.isNil(value)) { throw errors.createError({ diff --git a/lib/gui/app/models/store.ts b/lib/gui/app/models/store.ts index d28deb4a..e7575997 100644 --- a/lib/gui/app/models/store.ts +++ b/lib/gui/app/models/store.ts @@ -30,7 +30,7 @@ import * as settings from './settings'; * @summary Verify and throw if any state fields are nil */ function verifyNoNilFields( - object: utils.Dictionary, + object: _.Dictionary, fields: string[], name: string, ) { diff --git a/lib/shared/permissions.ts b/lib/shared/permissions.ts index dfa542da..dddb176c 100755 --- a/lib/shared/permissions.ts +++ b/lib/shared/permissions.ts @@ -26,7 +26,7 @@ import { promisify } from 'util'; import { sudo as catalinaSudo } from './catalina-sudo/sudo'; import * as errors from './errors'; -import { Dictionary, tmpFileDisposer } from './utils'; +import { tmpFileDisposer } from './utils'; const execAsync = promisify(childProcess.exec); const execFileAsync = promisify(childProcess.execFile); @@ -88,7 +88,7 @@ function setEnvVarCmd(value: any, name: string): string { export function createLaunchScript( command: string, argv: string[], - environment: Dictionary, + environment: _.Dictionary, ): string { const isWindows = os.platform() === 'win32'; const lines = []; @@ -144,7 +144,7 @@ async function elevateScriptCatalina( export async function elevateCommand( command: string[], options: { - environment: Dictionary; + environment: _.Dictionary; applicationName: string; }, ): Promise<{ cancelled: boolean }> { diff --git a/lib/shared/utils.ts b/lib/shared/utils.ts index c9e873c5..899d596f 100755 --- a/lib/shared/utils.ts +++ b/lib/shared/utils.ts @@ -24,10 +24,6 @@ import * as errors from './errors'; const getAsync = promisify(request.get); -export interface Dictionary { - [key: string]: T; -} - export function isValidPercentage(percentage: any): boolean { return _.every([_.isNumber(percentage), percentage >= 0, percentage <= 100]); }