Fix type errors

* Continue to export decoded types without a qualifier * pull types used by hooks from their new location * Fix errors with usage of act()
elastic · Jun 25, 2020 · e7f5b86 · e7f5b86
1 parent 0f223aa
commit e7f5b86
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 21 deletions.
diff --git a/x-pack/plugins/lists/common/schemas/request/delete_list_schema.ts b/x-pack/plugins/lists/common/schemas/request/delete_list_schema.ts
@@ -16,5 +16,5 @@ export const deleteListSchema = t.exact(
   })
 );
 
-export type DeleteListSchemaDecoded = t.TypeOf<typeof deleteListSchema>;
+export type DeleteListSchema = t.TypeOf<typeof deleteListSchema>;
 export type DeleteListSchemaEncoded = t.OutputOf<typeof deleteListSchema>;
diff --git a/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.ts b/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.ts
@@ -17,5 +17,5 @@ export const exportListItemQuerySchema = t.exact(
   })
 );
 
-export type ExportListItemQuerySchemaDecoded = t.TypeOf<typeof exportListItemQuerySchema>;
+export type ExportListItemQuerySchema = t.TypeOf<typeof exportListItemQuerySchema>;
 export type ExportListItemQuerySchemaEncoded = t.OutputOf<typeof exportListItemQuerySchema>;
diff --git a/x-pack/plugins/lists/common/schemas/request/find_list_schema.ts b/x-pack/plugins/lists/common/schemas/request/find_list_schema.ts
@@ -22,7 +22,5 @@ export const findListSchema = t.exact(
   })
 );
 
-type FindListSchema = typeof findListSchema;
-
-export type FindListSchemaDecoded = t.TypeOf<FindListSchema>;
-export type FindListSchemaEncoded = t.OutputOf<FindListSchema>;
+export type FindListSchema = t.TypeOf<typeof findListSchema>;
+export type FindListSchemaEncoded = t.OutputOf<typeof findListSchema>;
diff --git a/x-pack/plugins/lists/common/schemas/request/import_list_item_query_schema.mock.ts b/x-pack/plugins/lists/common/schemas/request/import_list_item_query_schema.mock.ts
@@ -6,9 +6,9 @@
 
 import { LIST_ID, TYPE } from '../../constants.mock';
 
-import { ImportListItemQuerySchemaDecoded } from './import_list_item_query_schema';
+import { ImportListItemQuerySchema } from './import_list_item_query_schema';
 
-export const getImportListItemQuerySchemaMock = (): ImportListItemQuerySchemaDecoded => ({
+export const getImportListItemQuerySchemaMock = (): ImportListItemQuerySchema => ({
   list_id: LIST_ID,
   type: TYPE,
 });
diff --git a/x-pack/plugins/lists/common/schemas/request/import_list_item_query_schema.ts b/x-pack/plugins/lists/common/schemas/request/import_list_item_query_schema.ts
@@ -15,5 +15,5 @@ export const importListItemQuerySchema = t.exact(t.partial({ list_id, type }));
 
 export type ImportListItemQuerySchemaPartial = Identity<t.TypeOf<typeof importListItemQuerySchema>>;
 
-export type ImportListItemQuerySchemaDecoded = t.TypeOf<typeof importListItemQuerySchema>;
+export type ImportListItemQuerySchema = t.TypeOf<typeof importListItemQuerySchema>;
 export type ImportListItemQuerySchemaEncoded = t.OutputOf<typeof importListItemQuerySchema>;
diff --git a/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.ts b/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.ts
@@ -16,5 +16,5 @@ export const importListItemSchema = t.exact(
   })
 );
 
-export type ImportListItemSchemaDecoded = t.TypeOf<typeof importListItemSchema>;
+export type ImportListItemSchema = t.TypeOf<typeof importListItemSchema>;
 export type ImportListItemSchemaEncoded = t.OutputOf<typeof importListItemSchema>;
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
@@ -23,8 +23,11 @@ describe('useDeleteList', () => {
   });
 
   it('invokes Api.deleteList', async () => {
-    const { result } = renderHook(() => useDeleteList());
-    await act(() => result.current.start({ http: httpMock, id: 'list' }));
+    const { result, waitForNextUpdate } = renderHook(() => useDeleteList());
+    act(() => {
+      result.current.start({ http: httpMock, id: 'list' });
+    });
+    await waitForNextUpdate();
 
     expect(Api.deleteList).toHaveBeenCalledWith(
       expect.objectContaining({ http: httpMock, id: 'list' })

diff --git a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.ts b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.ts
@@ -5,7 +5,8 @@
  */
 
 import { useAsyncTask } from '../../common/hooks/use_async_task';
-import { DeleteListParams, deleteList } from '../api';
+import { DeleteListParams } from '../types';
+import { deleteList } from '../api';
 
 export type DeleteListTaskArgs = Omit<DeleteListParams, 'signal'>;
 

diff --git a/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
@@ -22,11 +22,14 @@ describe('useExportList', () => {
   });
 
   it('invokes Api.exportList', async () => {
-    const { result } = renderHook(() => useExportList());
-    await act(() => result.current.start({ http: httpMock, id: 'list' }));
+    const { result, waitForNextUpdate } = renderHook(() => useExportList());
+    act(() => {
+      result.current.start({ http: httpMock, listId: 'list' });
+    });
+    await waitForNextUpdate();
 
     expect(Api.exportList).toHaveBeenCalledWith(
-      expect.objectContaining({ http: httpMock, id: 'list' })
+      expect.objectContaining({ http: httpMock, listId: 'list' })
     );
   });
 });
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_export_list.ts b/x-pack/plugins/lists/public/lists/hooks/use_export_list.ts
@@ -5,7 +5,8 @@
  */
 
 import { useAsyncTask } from '../../common/hooks/use_async_task';
-import { ExportListParams, exportList } from '../api';
+import { ExportListParams } from '../types';
+import { exportList } from '../api';
 
 export type ExportListTaskArgs = Omit<ExportListParams, 'signal'>;
 

diff --git a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
@@ -23,8 +23,11 @@ describe('useFindLists', () => {
   });
 
   it('invokes Api.findLists', async () => {
-    const { result } = renderHook(() => useFindLists());
-    await act(() => result.current.start({ http: httpMock, pageIndex: 1, pageSize: 10 }));
+    const { result, waitForNextUpdate } = renderHook(() => useFindLists());
+    act(() => {
+      result.current.start({ http: httpMock, pageIndex: 1, pageSize: 10 });
+    });
+    await waitForNextUpdate();
 
     expect(Api.findLists).toHaveBeenCalledWith(
       expect.objectContaining({ http: httpMock, pageIndex: 1, pageSize: 10 })

diff --git a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.ts b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.ts
@@ -5,7 +5,8 @@
  */
 
 import { useAsyncTask } from '../../common/hooks/use_async_task';
-import { FindListsParams, findLists } from '../api';
+import { FindListsParams } from '../types';
+import { findLists } from '../api';
 
 export type FindListsTaskArgs = Omit<FindListsParams, 'signal'>;
 

diff --git a/x-pack/plugins/lists/public/lists/hooks/use_import_list.ts b/x-pack/plugins/lists/public/lists/hooks/use_import_list.ts
@@ -5,7 +5,8 @@
  */
 
 import { useAsyncTask } from '../../common/hooks/use_async_task';
-import { ImportListParams, importList } from '../api';
+import { ImportListParams } from '../types';
+import { importList } from '../api';
 
 export type ImportListTaskArgs = Omit<ImportListParams, 'signal'>;