From 06f6c8762d72de05bc833ed74b69d754e8bf6837 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Wed, 1 Nov 2023 14:15:32 +0700 Subject: [PATCH] Fix up lint errors and warnings --- frontend/src/lib/forms/MigrationStatusSelect.svelte | 2 +- frontend/src/routes/(authenticated)/admin/+page.svelte | 2 +- frontend/src/routes/(authenticated)/admin/+page.ts | 2 +- frontend/src/routes/(authenticated)/admin/ProjectTable.svelte | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/lib/forms/MigrationStatusSelect.svelte b/frontend/src/lib/forms/MigrationStatusSelect.svelte index dcc21df5e..e902c791d 100644 --- a/frontend/src/lib/forms/MigrationStatusSelect.svelte +++ b/frontend/src/lib/forms/MigrationStatusSelect.svelte @@ -2,7 +2,7 @@ import { ProjectMigrationStatus } from '$lib/gql/generated/graphql'; import Select from './Select.svelte'; - export let value: ProjectMigrationStatus | "UNMIGRATED" | undefined; + export let value: ProjectMigrationStatus | 'UNMIGRATED' | undefined; export let error: string | string[] | undefined = undefined; diff --git a/frontend/src/routes/(authenticated)/admin/+page.svelte b/frontend/src/routes/(authenticated)/admin/+page.svelte index a595ddfc6..e42dfe911 100644 --- a/frontend/src/routes/(authenticated)/admin/+page.svelte +++ b/frontend/src/routes/(authenticated)/admin/+page.svelte @@ -27,7 +27,7 @@ projectType: queryParam.string(undefined), userEmail: queryParam.string(undefined), projectSearch: queryParam.string(''), - migrationStatus: queryParam.string(undefined), + migrationStatus: queryParam.string(undefined), }); const { queryParamValues } = queryParams; diff --git a/frontend/src/routes/(authenticated)/admin/+page.ts b/frontend/src/routes/(authenticated)/admin/+page.ts index 45505d306..49f56e12b 100644 --- a/frontend/src/routes/(authenticated)/admin/+page.ts +++ b/frontend/src/routes/(authenticated)/admin/+page.ts @@ -15,7 +15,7 @@ export type AdminSearchParams = { projectType: ProjectType | undefined, userEmail: string | undefined, projectSearch: string, - migrationStatus: ProjectMigrationStatus | "UNMIGRATED" | undefined, + migrationStatus: ProjectMigrationStatus | 'UNMIGRATED' | undefined, }; export type Project = LoadAdminDashboardProjectsQuery['projects'][number]; diff --git a/frontend/src/routes/(authenticated)/admin/ProjectTable.svelte b/frontend/src/routes/(authenticated)/admin/ProjectTable.svelte index 8fcab0eb0..ea5b3d3d7 100644 --- a/frontend/src/routes/(authenticated)/admin/ProjectTable.svelte +++ b/frontend/src/routes/(authenticated)/admin/ProjectTable.svelte @@ -28,7 +28,7 @@ $: filters = queryParams.queryParamValues; $: defaultFilters = queryParams.defaultQueryParamValues; const projectFilterKeys = new Set(['projectSearch', 'projectType', 'migrationStatus', 'showDeletedProjects', 'userEmail'] as const) satisfies Set; -function matchMigrationStatus(filter: string|undefined, status: string): boolean { +function matchMigrationStatus(filter: ProjectMigrationStatus | 'UNMIGRATED' | undefined, status: ProjectMigrationStatus): boolean { return (!filter || filter === status || filter === 'UNMIGRATED' && ( @@ -74,7 +74,7 @@ async function softDeleteProject(project: Project): Promise { [ProjectMigrationStatus.PrivateRedmine]: 'i-mdi-checkbox-blank-circle-outline', [ProjectMigrationStatus.PublicRedmine]: 'i-mdi-checkbox-blank-circle-outline', } satisfies Record; - function migrationStatusIcon(migrationStatus?: ProjectMigrationStatus) { + function migrationStatusIcon(migrationStatus?: ProjectMigrationStatus): string { migrationStatus = migrationStatus ?? ProjectMigrationStatus.Unknown; return migrationStatusTable[migrationStatus] ?? migrationStatusTable[ProjectMigrationStatus.Unknown]; }