From 10a00818731c436336e6ee8c898c3bcfcc44250d Mon Sep 17 00:00:00 2001 From: Derek Worthen Date: Wed, 29 Nov 2023 07:42:10 -0800 Subject: [PATCH] fix formatting --- .vscode/settings.json | 2 +- src/renderer/src/components/DataLoader.tsx | 1 - src/renderer/src/components/SettingsForm.tsx | 7 +------ src/renderer/src/pages/Login.tsx | 1 - src/shared/lib/functions.ts | 5 ++++- src/shared/lib/records.ts | 13 +++++-------- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b391d60..b141c9a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -28,4 +28,4 @@ "files.watcherExclude": { "**/target": true }, -} +} \ No newline at end of file diff --git a/src/renderer/src/components/DataLoader.tsx b/src/renderer/src/components/DataLoader.tsx index b2088c7..edb9189 100644 --- a/src/renderer/src/components/DataLoader.tsx +++ b/src/renderer/src/components/DataLoader.tsx @@ -99,7 +99,6 @@ export const DataLoader: FC = function DataLoader() { return serialAsync(_getBallots) }, [_getBallots]) - const _getBallot = useCallback( async (e: CustomEvent<{ ballotId: string }>) => { try { diff --git a/src/renderer/src/components/SettingsForm.tsx b/src/renderer/src/components/SettingsForm.tsx index e0d3d6f..df9786f 100644 --- a/src/renderer/src/components/SettingsForm.tsx +++ b/src/renderer/src/components/SettingsForm.tsx @@ -1,9 +1,4 @@ -import { - Button, - Card, - Field, - Input, -} from '@fluentui/react-components' +import { Button, Card, Field, Input } from '@fluentui/react-components' import { useAtom, useAtomValue } from 'jotai' import { FC, FormEvent, useCallback, useState } from 'react' import { useNavigate } from 'react-router-dom' diff --git a/src/renderer/src/pages/Login.tsx b/src/renderer/src/pages/Login.tsx index c79771c..148d4de 100644 --- a/src/renderer/src/pages/Login.tsx +++ b/src/renderer/src/pages/Login.tsx @@ -1,6 +1,5 @@ import { SettingsForm } from '../components/index.js' export const LoginPage = function LoginPage() { - return } diff --git a/src/shared/lib/functions.ts b/src/shared/lib/functions.ts index 811a89c..a32d226 100644 --- a/src/shared/lib/functions.ts +++ b/src/shared/lib/functions.ts @@ -1,7 +1,10 @@ export function serialAsync Promise>( fn: X, ): (...args: Parameters) => Promise>> { - const existingPromises: Record> | null> = {} + const existingPromises: Record< + string, + Promise> | null + > = {} function generatePromise(...args: Parameters) { const key = JSON.stringify(args) // @ts-expect-error error diff --git a/src/shared/lib/records.ts b/src/shared/lib/records.ts index 941d86d..0f371a5 100644 --- a/src/shared/lib/records.ts +++ b/src/shared/lib/records.ts @@ -4,7 +4,6 @@ export function isRecord(obj: unknown): obj is Record { return obj != null && typeof obj === 'object' && !Array.isArray(obj) } - export function mergeDeep = any>( target: unknown, ...sources: unknown[] @@ -34,7 +33,6 @@ export function mergeDeep = any>( return mergeDeep(target, ...sources) as T } - export function hasRequiredKeys>( obj: T, keys: Array, @@ -43,12 +41,11 @@ export function hasRequiredKeys>( let pass = true for (const k of keys) { const p = Array.isArray(k) ? k : k.split('.') - const value = objectPath.get( - obj, - p, - undefined, - ) - if (value === undefined || (typeof value === 'string' && (value as string).trim() === '')) { + const value = objectPath.get(obj, p, undefined) + if ( + value === undefined || + (typeof value === 'string' && (value as string).trim() === '') + ) { pass = false missingKeys.push(p.join('#')) }