From 8568762a7413dbc15bcf462c8126b5dc27e1056c Mon Sep 17 00:00:00 2001 From: adcoelho Date: Fri, 9 Jun 2023 12:11:46 +0200 Subject: [PATCH] Removed some ts-ignores. --- .../all_cases/use_all_cases_state.test.tsx | 16 ++++++++-------- .../components/all_cases/use_all_cases_state.tsx | 9 ++++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx index 2a59cf25fd21c..967c8951f407a 100644 --- a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx @@ -55,8 +55,8 @@ const APP_ID = 'testAppId'; const LOCALSTORAGE_QUERY_PARAMS_KEY = getQueryParamsLocalStorageKey(APP_ID); const LOCALSTORAGE_FILTER_OPTIONS_KEY = getFilterOptionsLocalStorageKey(APP_ID); -// @ts-ignore -const stringify = (parsedParams) => new URLSearchParams(parsedParams).toString(); +const stringify = (parsedParams: Record) => + new URLSearchParams(parsedParams).toString(); describe('useAllCasesQueryParams', () => { beforeEach(() => { @@ -162,14 +162,14 @@ describe('useAllCasesQueryParams', () => { }; const expectedUrl = { ...URL_DEFAULTS, ...nonDefaultUrlParams }; - mockLocation.search = stringify(nonDefaultUrlParams); + mockLocation.search = stringify(nonDefaultUrlParams as unknown as Record); renderHook(() => useAllCasesState(), { wrapper: ({ children }) => {children}, }); expect(useHistory().replace).toHaveBeenCalledWith({ - search: stringify(expectedUrl), + search: stringify(expectedUrl as unknown as Record), }); }); @@ -209,7 +209,7 @@ describe('useAllCasesQueryParams', () => { perPage: DEFAULT_TABLE_LIMIT + 5, }; - mockLocation.search = stringify(nonDefaultUrlParams); + mockLocation.search = stringify(nonDefaultUrlParams as unknown as Record); localStorage.setItem( LOCALSTORAGE_QUERY_PARAMS_KEY, @@ -261,14 +261,14 @@ describe('useAllCasesQueryParams', () => { }); it('url perPage query param cannot be > 100', () => { - mockLocation.search = stringify({ perPage: 1000 }); + mockLocation.search = stringify({ perPage: '1000' }); renderHook(() => useAllCasesState(), { wrapper: ({ children }) => {children}, }); expect(useHistory().replace).toHaveBeenCalledWith({ - search: stringify({ ...URL_DEFAULTS, perPage: 100 }), + search: 'perPage=100&page=1&sortField=createdAt&sortOrder=desc&severity=all&status=all', }); mockLocation.search = ''; @@ -294,7 +294,7 @@ describe('useAllCasesQueryParams', () => { }); expect(useHistory().replace).toHaveBeenCalledWith({ - search: stringify({ ...URL_DEFAULTS }), + search: 'sortOrder=desc&page=1&perPage=10&sortField=createdAt&severity=all&status=all', }); }); }); diff --git a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.tsx b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.tsx index 50b8c524b75b0..91ceb382513d6 100644 --- a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.tsx @@ -37,8 +37,8 @@ export const getFilterOptionsLocalStorageKey = (appId: string) => { return `${appId}.${filteringKey}`; }; -// @ts-ignore -const stringify = (parsedParams) => new URLSearchParams(parsedParams).toString(); +const stringify = (parsedParams: Record) => + new URLSearchParams(parsedParams).toString(); const parse = (queryString: string) => Object.fromEntries(new URLSearchParams(queryString)); const getQueryParams = ( @@ -208,7 +208,10 @@ export function useAllCasesState( try { const newHistory = { ...location, - search: stringify({ ...parsedUrlParams, ...stateUrlParams }), + search: stringify({ ...parsedUrlParams, ...stateUrlParams } as unknown as Record< + string, + string + >), }; history.replace(newHistory); } catch {