From c6a17d8a3ed7ed6450eb4bf4ab6bee194bcc5adc Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Wed, 8 Jun 2022 12:27:21 -0400 Subject: [PATCH] chore: single letter variables (#4848) --- .../src/button/async-button.tsx | 2 +- packages/insomnia-components/src/card.tsx | 8 +-- .../src/dropdown/dropdown.tsx | 4 +- .../src/radio-button-group.tsx | 4 +- .../src/sidebar/sidebar-header.tsx | 4 +- packages/insomnia-components/src/switch.tsx | 2 +- packages/insomnia-components/src/tooltip.tsx | 4 +- packages/insomnia-cookies/src/cookies.ts | 4 +- .../src/importers/insomnia-2.ts | 2 +- .../src/importers/insomnia-3.ts | 2 +- .../src/importers/insomnia-4.ts | 2 +- .../src/importers/postman-env.ts | 2 +- .../insomnia-importers/src/importers/wsdl.ts | 2 +- .../src/commands/generate-config.ts | 4 +- .../src/commands/lint-specification.ts | 8 +-- .../src/db/adapters/insomnia-adapter.ts | 4 +- .../src/db/models/environment.ts | 10 +-- packages/insomnia-inso/src/get-options.ts | 4 +- packages/insomnia-inso/src/write-file.ts | 4 +- .../insomnia-testing/src/generate/generate.ts | 12 ++-- packages/insomnia-url/src/querystring.ts | 4 +- .../src/__jest__/mock-code-editor.tsx | 2 +- packages/insomnia/src/__mocks__/node-forge.ts | 4 +- packages/insomnia/src/account/session.ts | 4 +- packages/insomnia/src/common/har.ts | 4 +- packages/insomnia/src/main.development.ts | 6 +- packages/insomnia/src/main/grpc-ipc-main.ts | 8 +-- packages/insomnia/src/main/local-storage.ts | 12 ++-- packages/insomnia/src/main/updates.ts | 4 +- packages/insomnia/src/main/window-utils.ts | 16 ++--- packages/insomnia/src/models/request.ts | 6 +- packages/insomnia/src/network/grpc/index.ts | 4 +- .../src/network/grpc/proto-manager/index.tsx | 20 +++--- .../src/network/grpc/response-callbacks.ts | 4 +- .../insomnia/src/network/libcurl-promise.ts | 6 +- packages/insomnia/src/network/network.ts | 4 +- .../insomnia/src/network/o-auth-2/misc.ts | 4 +- packages/insomnia/src/plugins/install.ts | 6 +- packages/insomnia/src/sync/git/mem-client.ts | 2 +- packages/insomnia/src/sync/git/utils.ts | 5 +- .../src/ui/components/base/button.tsx | 10 +-- .../src/ui/components/base/copy-button.tsx | 6 +- .../ui/components/base/debounced-input.tsx | 20 +++--- .../base/dropdown/dropdown-item.tsx | 8 +-- .../ui/components/base/dropdown/dropdown.tsx | 24 +++---- .../src/ui/components/base/editable.tsx | 4 +- .../base/indeterminate-checkbox.tsx | 4 +- .../insomnia/src/ui/components/base/link.tsx | 6 +- .../insomnia/src/ui/components/base/modal.tsx | 8 +-- .../src/ui/components/base/prompt-button.tsx | 6 +- .../ui/components/codemirror/code-editor.tsx | 56 ++++++++-------- .../codemirror/extensions/autocomplete.ts | 10 +-- .../codemirror/extensions/clickable.ts | 6 +- .../codemirror/extensions/nunjucks-tags.ts | 4 +- .../components/codemirror/one-line-editor.tsx | 36 +++++------ .../dropdowns/environments-dropdown.tsx | 8 +-- .../dropdowns/git-sync-dropdown.tsx | 4 +- .../components/dropdowns/method-dropdown.tsx | 4 +- .../dropdowns/request-actions-dropdown.tsx | 4 +- .../request-group-actions-dropdown.tsx | 4 +- .../dropdowns/workspace-dropdown.tsx | 4 +- .../components/editors/body/file-editor.tsx | 2 +- .../editors/body/graph-ql-editor.tsx | 2 +- .../components/editors/environment-editor.tsx | 4 +- .../export-requests/request-group-row.tsx | 4 +- .../graph-ql-explorer/graph-ql-explorer.tsx | 8 +-- .../ui/components/html-element-wrapper.tsx | 8 +-- .../key-value-editor/key-value-editor.tsx | 20 +++--- .../ui/components/key-value-editor/row.tsx | 64 ++++++++----------- .../src/ui/components/keydown-binder.ts | 16 ++--- .../src/ui/components/markdown-editor.tsx | 4 +- .../src/ui/components/markdown-preview.tsx | 10 +-- .../modals/add-key-combination-modal.tsx | 22 +++---- .../src/ui/components/modals/alert-modal.tsx | 12 ++-- .../src/ui/components/modals/ask-modal.tsx | 8 +-- .../components/modals/code-prompt-modal.tsx | 4 +- .../components/modals/cookie-modify-modal.tsx | 4 +- .../ui/components/modals/cookies-modal.tsx | 14 ++-- .../modals/environment-edit-modal.tsx | 8 +-- .../src/ui/components/modals/error-modal.tsx | 4 +- .../components/modals/filter-help-modal.tsx | 4 +- .../components/modals/generate-code-modal.tsx | 12 ++-- .../modals/generate-config-modal.tsx | 4 +- .../components/modals/git-branches-modal.tsx | 8 +-- .../custom-repository-settings-form-group.tsx | 6 +- .../git-repository-settings-modal.tsx | 4 +- .../github-repository-settings-form-group.tsx | 24 +++---- .../gitlab-repository-settings-form-group.tsx | 26 ++++---- .../components/modals/git-staging-modal.tsx | 8 +-- .../src/ui/components/modals/login-modal.tsx | 20 +++--- .../ui/components/modals/nunjucks-modal.tsx | 8 +-- .../modals/project-settings-modal.tsx | 4 +- .../src/ui/components/modals/prompt-modal.tsx | 18 +++--- .../components/modals/proto-files-modal.tsx | 4 +- .../modals/request-group-settings-modal.tsx | 12 ++-- .../modals/request-render-error-modal.tsx | 4 +- .../modals/request-settings-modal.tsx | 24 +++---- .../modals/request-switcher-modal.tsx | 16 ++--- .../modals/response-debug-modal.tsx | 4 +- .../ui/components/modals/settings-modal.tsx | 4 +- .../components/modals/sync-branches-modal.tsx | 12 ++-- .../components/modals/sync-delete-modal.tsx | 16 ++--- .../components/modals/sync-history-modal.tsx | 4 +- .../ui/components/modals/sync-merge-modal.tsx | 8 +-- .../components/modals/sync-staging-modal.tsx | 16 ++--- .../workspace-environments-edit-modal.tsx | 10 +-- .../modals/workspace-settings-modal.tsx | 20 +++--- .../ui/components/modals/wrapper-modal.tsx | 4 +- .../src/ui/components/panes/request-pane.tsx | 2 +- .../src/ui/components/panes/response-pane.tsx | 4 +- .../proto-file/proto-directory-list-item.tsx | 4 +- .../proto-file/proto-file-list-item.tsx | 8 +-- .../src/ui/components/request-url-bar.tsx | 32 +++++----- .../src/ui/components/settings/account.tsx | 24 +++---- .../src/ui/components/settings/plugins.tsx | 10 +-- .../ui/components/sidebar/sidebar-filter.tsx | 8 +-- .../sidebar/sidebar-request-group-row.tsx | 4 +- .../sidebar/sidebar-request-row.tsx | 10 +-- .../spec-editor/spec-editor-sidebar.tsx | 2 +- .../ui/components/templating/tag-editor.tsx | 30 ++++----- .../components/templating/variable-editor.tsx | 9 ++- packages/insomnia/src/ui/components/toast.tsx | 2 +- .../insomnia/src/ui/components/tooltip.tsx | 8 +-- .../ui/components/viewers/response-viewer.tsx | 8 +-- .../src/ui/components/wrapper-home.tsx | 8 +-- .../src/ui/components/wrapper-unit-test.tsx | 4 +- .../insomnia/src/ui/components/wrapper.tsx | 2 +- packages/insomnia/src/ui/containers/app.tsx | 26 ++++---- packages/insomnia/src/ui/dnd-backend.ts | 20 +++--- .../insomnia/src/ui/redux/modules/global.tsx | 10 +-- packages/insomnia/src/ui/redux/selectors.ts | 14 ++-- .../src/deploy-to-portal.tsx | 12 ++-- 132 files changed, 605 insertions(+), 627 deletions(-) diff --git a/packages/insomnia-components/src/button/async-button.tsx b/packages/insomnia-components/src/button/async-button.tsx index f3658b1c27..053cddbd86 100644 --- a/packages/insomnia-components/src/button/async-button.tsx +++ b/packages/insomnia-components/src/button/async-button.tsx @@ -14,7 +14,7 @@ function isPromise(obj: unknown) { } export interface AsyncButtonProps extends ButtonProps { - onClick: (e: React.MouseEvent) => Promise | undefined; + onClick: (event: React.MouseEvent) => Promise | undefined; loadingNode?: ReactNode; } diff --git a/packages/insomnia-components/src/card.tsx b/packages/insomnia-components/src/card.tsx index c9e2665b8e..7349d157b4 100644 --- a/packages/insomnia-components/src/card.tsx +++ b/packages/insomnia-components/src/card.tsx @@ -11,8 +11,8 @@ export interface CardProps { docVersion?: ReactNode; tagLabel: ReactNode; docFormat?: ReactNode; - onChange?: (e: React.SyntheticEvent) => any; - onClick?: (e: React.SyntheticEvent) => any; + onChange?: (event: React.SyntheticEvent) => any; + onClick?: (event: React.SyntheticEvent) => any; selectable?: boolean; } @@ -234,13 +234,13 @@ export class Card extends PureComponent { selectable: false, }; - _handleOnChange(e: React.SyntheticEvent) { + _handleOnChange(event: React.SyntheticEvent) { this.setState({ selected: !this.state.selected, }); if (this.props.onChange) { - this.props.onChange(e); + this.props.onChange(event); } } diff --git a/packages/insomnia-components/src/dropdown/dropdown.tsx b/packages/insomnia-components/src/dropdown/dropdown.tsx index 23f7a8958d..54e66a8e34 100644 --- a/packages/insomnia-components/src/dropdown/dropdown.tsx +++ b/packages/insomnia-components/src/dropdown/dropdown.tsx @@ -200,8 +200,8 @@ export class Dropdown extends PureComponent { } } - _handleCheckFilterSubmit(e: React.KeyboardEvent) { - if (e.key === 'Enter') { + _handleCheckFilterSubmit(event: React.KeyboardEvent) { + if (event.key === 'Enter') { // Listen for the Enter key and "click" on the active list item const selector = `li[data-filter-index="${this.state.filterActiveIndex}"] button`; this._dropdownList?.querySelector(selector)?.click(); diff --git a/packages/insomnia-components/src/radio-button-group.tsx b/packages/insomnia-components/src/radio-button-group.tsx index bbc836eab0..6f6d384602 100644 --- a/packages/insomnia-components/src/radio-button-group.tsx +++ b/packages/insomnia-components/src/radio-button-group.tsx @@ -53,12 +53,12 @@ export const RadioButtonGroup: FunctionComponent = ({ className, selectedValue, }) => { - const handleChange = useCallback(e => { + const handleChange = useCallback(event => { if (typeof onChange !== 'function') { return; } - onChange(e.currentTarget.value); + onChange(event.currentTarget.value); }, [onChange]); return ( diff --git a/packages/insomnia-components/src/sidebar/sidebar-header.tsx b/packages/insomnia-components/src/sidebar/sidebar-header.tsx index dac592be12..883a175916 100644 --- a/packages/insomnia-components/src/sidebar/sidebar-header.tsx +++ b/packages/insomnia-components/src/sidebar/sidebar-header.tsx @@ -65,8 +65,8 @@ export const SidebarHeader: FunctionComponent = ({ }) => { const handleFilterClick: React.MouseEventHandler | undefined = sectionVisible && toggleFilter // only handle a click if the section is open - ? e => { - e.stopPropagation(); // Prevent a parent from also handling the click + ? event => { + event.stopPropagation(); // Prevent a parent from also handling the click toggleFilter(); } diff --git a/packages/insomnia-components/src/switch.tsx b/packages/insomnia-components/src/switch.tsx index e9274f3dc2..1e3b9c9f97 100644 --- a/packages/insomnia-components/src/switch.tsx +++ b/packages/insomnia-components/src/switch.tsx @@ -8,7 +8,7 @@ export interface SwitchItem { export interface SwitchProps { className?: string; - onClick?: (e: React.SyntheticEvent) => any; + onClick?: (event: React.SyntheticEvent) => any; optionItems?: SwitchItem[]; } diff --git a/packages/insomnia-components/src/tooltip.tsx b/packages/insomnia-components/src/tooltip.tsx index f80ac9722f..f27e85ae27 100644 --- a/packages/insomnia-components/src/tooltip.tsx +++ b/packages/insomnia-components/src/tooltip.tsx @@ -71,8 +71,8 @@ export class Tooltip extends PureComponent { movedToBody: false, }; - _handleStopClick(e: MouseEvent) { - e.stopPropagation(); + _handleStopClick(event: MouseEvent) { + event.stopPropagation(); } _handleMouseEnter() { diff --git a/packages/insomnia-cookies/src/cookies.ts b/packages/insomnia-cookies/src/cookies.ts index 6796c4b1ef..4774eb01a3 100644 --- a/packages/insomnia-cookies/src/cookies.ts +++ b/packages/insomnia-cookies/src/cookies.ts @@ -28,8 +28,8 @@ export const jarFromCookies = (cookies: Cookie[]) => { // Create a copy first just to be sure. const copy = JSON.stringify({ cookies }); jar = CookieJar.fromJSON(copy); - } catch (e) { - console.log('[cookies] Failed to initialize cookie jar', e); + } catch (error) { + console.log('[cookies] Failed to initialize cookie jar', error); jar = new CookieJar() as CookieJar; } diff --git a/packages/insomnia-importers/src/importers/insomnia-2.ts b/packages/insomnia-importers/src/importers/insomnia-2.ts index dc74868146..3d89353a74 100644 --- a/packages/insomnia-importers/src/importers/insomnia-2.ts +++ b/packages/insomnia-importers/src/importers/insomnia-2.ts @@ -15,7 +15,7 @@ export const convert: Converter = rawData => { try { data = JSON.parse(rawData) as Insomnia2Data; - } catch (e) { + } catch (error) { return null; } diff --git a/packages/insomnia-importers/src/importers/insomnia-3.ts b/packages/insomnia-importers/src/importers/insomnia-3.ts index e1acecd7f7..a6c156ca0e 100644 --- a/packages/insomnia-importers/src/importers/insomnia-3.ts +++ b/packages/insomnia-importers/src/importers/insomnia-3.ts @@ -14,7 +14,7 @@ export const convert: Converter = rawData => { try { data = JSON.parse(rawData) as Insomnia3Data; - } catch (e) { + } catch (error) { return null; } diff --git a/packages/insomnia-importers/src/importers/insomnia-4.ts b/packages/insomnia-importers/src/importers/insomnia-4.ts index 2a9873b8f6..99575342de 100644 --- a/packages/insomnia-importers/src/importers/insomnia-4.ts +++ b/packages/insomnia-importers/src/importers/insomnia-4.ts @@ -16,7 +16,7 @@ export const convert: Converter = rawData => { try { data = YAML.parse(rawData); - } catch (e) { + } catch (error) { return null; } diff --git a/packages/insomnia-importers/src/importers/postman-env.ts b/packages/insomnia-importers/src/importers/postman-env.ts index bfc20d085a..5bcfab417a 100644 --- a/packages/insomnia-importers/src/importers/postman-env.ts +++ b/packages/insomnia-importers/src/importers/postman-env.ts @@ -46,7 +46,7 @@ export const convert: Converter = rawData => { }, {}), }, ]; - } catch (e) { + } catch (error) { // Nothing } diff --git a/packages/insomnia-importers/src/importers/wsdl.ts b/packages/insomnia-importers/src/importers/wsdl.ts index c855298faf..1a84690748 100644 --- a/packages/insomnia-importers/src/importers/wsdl.ts +++ b/packages/insomnia-importers/src/importers/wsdl.ts @@ -96,7 +96,7 @@ export const convert: Converter = async rawData => { const postmanJson = JSON.stringify(postmanData); return postman.convert(postmanJson); } - } catch (e) { + } catch (error) { // Nothing } diff --git a/packages/insomnia-inso/src/commands/generate-config.ts b/packages/insomnia-inso/src/commands/generate-config.ts index ff7a1c5b17..9890b0d71f 100644 --- a/packages/insomnia-inso/src/commands/generate-config.ts +++ b/packages/insomnia-inso/src/commands/generate-config.ts @@ -88,8 +88,8 @@ export const generateConfig = async ( logger.trace(`Generating config from file \`${fileName}\``); result = await generate(fileName, conversionType, generationTags); } - } catch (e) { - throw new InsoError('There was an error while generating configuration', e); + } catch (error) { + throw new InsoError('There was an error while generating configuration', error); } if (!result?.documents || !Array.isArray(result.documents)) { diff --git a/packages/insomnia-inso/src/commands/lint-specification.ts b/packages/insomnia-inso/src/commands/lint-specification.ts index d4e5247a99..23a1fee46f 100644 --- a/packages/insomnia-inso/src/commands/lint-specification.ts +++ b/packages/insomnia-inso/src/commands/lint-specification.ts @@ -38,15 +38,15 @@ export async function lintSpecification( try { specContent = (await fs.promises.readFile(fileName)).toString(); - } catch (e) { - throw new InsoError(`Failed to read "${fileName}"`, e); + } catch (error) { + throw new InsoError(`Failed to read "${fileName}"`, error); } } else { logger.fatal('Specification not found.'); return false; } - } catch (e) { - logger.fatal(e.message); + } catch (error) { + logger.fatal(error.message); return false; } diff --git a/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts b/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts index 304864ee1c..404329fd33 100644 --- a/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts +++ b/packages/insomnia-inso/src/db/adapters/insomnia-adapter.ts @@ -85,8 +85,8 @@ const insomniaAdapter: DbAdapter = async (filePath, filterTypes) => { } | undefined; try { parsed = YAML.parse(content); - } catch (e) { - throw new InsoError(`Failed to parse ${fileName}.`, e); + } catch (error) { + throw new InsoError(`Failed to parse ${fileName}.`, error); } // We are supporting only v4 files diff --git a/packages/insomnia-inso/src/db/models/environment.ts b/packages/insomnia-inso/src/db/models/environment.ts index 79ee8907a6..e75ee9c372 100644 --- a/packages/insomnia-inso/src/db/models/environment.ts +++ b/packages/insomnia-inso/src/db/models/environment.ts @@ -11,7 +11,7 @@ const loadBaseEnvironmentForWorkspace = (db: Database, workspaceId: string): Env 'Load base environment for the workspace `%s` from data store', workspaceId, ); - const items = db.Environment.filter(e => e.parentId === workspaceId); + const items = db.Environment.filter(environment => environment.parentId === workspaceId); logger.trace('Found %d.', items.length); return ensureSingle(items, 'base environment'); }; @@ -59,11 +59,11 @@ export const promptEnvironment = async ( // Get the sub environments const baseWorkspaceEnv = loadBaseEnvironmentForWorkspace(db, workspaceId); - const subEnvs = db.Environment.filter( - e => e.parentId === baseWorkspaceEnv._id, + const subEnvironments = db.Environment.filter( + subEnv => subEnv.parentId === baseWorkspaceEnv._id, ); - if (!subEnvs.length) { + if (!subEnvironments.length) { logger.trace('No sub environments found, using base environment'); return baseWorkspaceEnv; } @@ -71,7 +71,7 @@ export const promptEnvironment = async ( const prompt = new AutoComplete({ name: 'environment', message: 'Select an environment', - choices: subEnvs.map(e => getDbChoice(generateIdIsh(e, 14), e.name)), + choices: subEnvironments.map(subEnv => getDbChoice(generateIdIsh(subEnv, 14), subEnv.name)), }); logger.trace('Prompt for environment'); const [idIsh] = (await prompt.run()).split(' - ').reverse(); diff --git a/packages/insomnia-inso/src/get-options.ts b/packages/insomnia-inso/src/get-options.ts index bae9bab544..70d2e21e22 100644 --- a/packages/insomnia-inso/src/get-options.ts +++ b/packages/insomnia-inso/src/get-options.ts @@ -52,11 +52,11 @@ export const loadCosmiConfig = (configFile?: string): Partial }, }; } - } catch (e) { + } catch (error) { // Report fatal error when loading from explicitly defined config file if (configFile) { console.log(`Could not find config file at ${configFile}.`); - console.error(e); + console.error(error); } } diff --git a/packages/insomnia-inso/src/write-file.ts b/packages/insomnia-inso/src/write-file.ts index 84c79c8ff9..2ad21ac792 100644 --- a/packages/insomnia-inso/src/write-file.ts +++ b/packages/insomnia-inso/src/write-file.ts @@ -15,7 +15,7 @@ export async function writeFileWithCliOptions( await mkdirp.sync(path.dirname(outputPath)); await fs.promises.writeFile(outputPath, contents); return outputPath; - } catch (e) { - throw new InsoError(`Failed to write to "${outputPath}"`, e); + } catch (error) { + throw new InsoError(`Failed to write to "${outputPath}"`, error); } } diff --git a/packages/insomnia-testing/src/generate/generate.ts b/packages/insomnia-testing/src/generate/generate.ts index 20fba277fe..3e98bd6435 100644 --- a/packages/insomnia-testing/src/generate/generate.ts +++ b/packages/insomnia-testing/src/generate/generate.ts @@ -83,7 +83,7 @@ const generateSuiteLines = ( return lines; }; -const generateTestLines = (n: number, test?: Test | null) => { +const generateTestLines = (num: number, test?: Test | null) => { if (!test) { return []; } @@ -91,22 +91,22 @@ const generateTestLines = (n: number, test?: Test | null) => { const lines: string[] = []; // Define test it() block (all test cases are async by default) - lines.push(indent(n, `it('${escapeJsStr(test.name)}', async () => {`)); + lines.push(indent(num, `it('${escapeJsStr(test.name)}', async () => {`)); // Add helper variables that are necessary const { defaultRequestId } = test; if (typeof defaultRequestId === 'string') { - lines.push(indent(n, '// Set active request on global insomnia object')); + lines.push(indent(num, '// Set active request on global insomnia object')); lines.push( - indent(n, `insomnia.setActiveRequestId('${defaultRequestId}');`), + indent(num, `insomnia.setActiveRequestId('${defaultRequestId}');`), ); } // Add user-defined test source - test.code && lines.push(indent(n + 1, test.code)); + test.code && lines.push(indent(num + 1, test.code)); // Close the it() block - lines.push(indent(n, '});')); + lines.push(indent(num, '});')); return lines; }; diff --git a/packages/insomnia-url/src/querystring.ts b/packages/insomnia-url/src/querystring.ts index 56a315bf48..15002b99e0 100644 --- a/packages/insomnia-url/src/querystring.ts +++ b/packages/insomnia-url/src/querystring.ts @@ -143,7 +143,7 @@ export const deconstructQueryStringToParams = ( let name = ''; try { name = decodeURIComponent(encodedName || ''); - } catch (e) { + } catch (error) { // Just leave it name = encodedName; } @@ -151,7 +151,7 @@ export const deconstructQueryStringToParams = ( let value = ''; try { value = decodeURIComponent(encodedValue || ''); - } catch (e) { + } catch (error) { // Just leave it value = encodedValue; } diff --git a/packages/insomnia/src/__jest__/mock-code-editor.tsx b/packages/insomnia/src/__jest__/mock-code-editor.tsx index 5193e41061..e71b1efffb 100644 --- a/packages/insomnia/src/__jest__/mock-code-editor.tsx +++ b/packages/insomnia/src/__jest__/mock-code-editor.tsx @@ -14,7 +14,7 @@ export class MockCodeEditor extends PureComponent { return