diff --git a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts index a9a1541df21f8..fad143572f570 100644 --- a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts +++ b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts @@ -155,11 +155,13 @@ export const propertyDefinitionsTableLogic = kea ({ - setFilters: () => { + setFilters: async (_, breakpoint) => { + await breakpoint(500) actions.loadPropertyDefinitions( normalizePropertyDefinitionEndpointUrl( values.propertyDefinitions.current, { + offset: 0, search: values.filters.property, type: values.filters.type, group_type_index: values.filters.group_type_index, @@ -200,9 +202,12 @@ export const propertyDefinitionsTableLogic = kea ({ [urls.propertyDefinitions()]: (_, searchParams) => { + if (values.propertyDefinitionsLoading) { + return + } if (!objectsEqual(cleanFilters(values.filters), cleanFilters(router.values.searchParams))) { actions.setFilters(searchParams as Filters) - } else if (!values.propertyDefinitions.results.length && !values.propertyDefinitionsLoading) { + } else if (!values.propertyDefinitions.results.length) { actions.loadPropertyDefinitions() } },