[Behavioral Analytics] Reduce search function in logic

elastic · Apr 21, 2023 · 05a258e · 05a258e
1 parent 828e3c7
commit 05a258e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/...ublic/applications/analytics/components/analytics_overview/analytics_collections_logic.ts b/...ublic/applications/analytics/components/analytics_overview/analytics_collections_logic.ts
@@ -16,9 +16,8 @@ import {
 } from '../../api/index/fetch_analytics_collections_api_logic';
 
 export interface AnalyticsCollectionsActions {
- fetchAnalyticsCollections(): void;
+ fetchAnalyticsCollections(query?: string): { query: string };
  makeRequest: Actions<{}, FetchAnalyticsCollectionsApiLogicResponse>['makeRequest'];
- searchAnalyticsCollections(query?: string): { query: string };
 }
 export interface AnalyticsCollectionsValues {
  analyticsCollections: AnalyticsCollection[];
@@ -35,8 +34,7 @@ export const AnalyticsCollectionsLogic = kea<
  MakeLogicType<AnalyticsCollectionsValues, AnalyticsCollectionsActions>
 >({
  actions: {
- fetchAnalyticsCollections: true,
- searchAnalyticsCollections: (query) => ({
+ fetchAnalyticsCollections: (query) => ({
  query,
  }),
  },
@@ -45,10 +43,7 @@ export const AnalyticsCollectionsLogic = kea<
  values: [FetchAnalyticsCollectionsAPILogic, ['data', 'status']],
  },
  listeners: ({ actions }) => ({
- fetchAnalyticsCollections: () => {
- actions.makeRequest({});
- },
- searchAnalyticsCollections: async ({ query }, breakpoint) => {
+ fetchAnalyticsCollections: async ({ query }, breakpoint) => {
  if (query) {
  await breakpoint(200);
  }
@@ -60,13 +55,13 @@ export const AnalyticsCollectionsLogic = kea<
  isSearchRequest: [
  false,
  {
- searchAnalyticsCollections: () => true,
+ fetchAnalyticsCollections: (_, { query }) => query !== undefined,
  },
  ],
  searchQuery: [
  '',
  {
- searchAnalyticsCollections: (_, { query }) => query,
+ fetchAnalyticsCollections: (_, { query }) => (query ? query : ''),
  },
  ],
  },

diff --git a/...search/public/applications/analytics/components/analytics_overview/analytics_overview.tsx b/...search/public/applications/analytics/components/analytics_overview/analytics_overview.tsx
@@ -28,8 +28,7 @@ import { AnalyticsCollectionsLogic } from './analytics_collections_logic';
 import { AnalyticsOverviewEmptyPage } from './analytics_overview_empty_page';
 
 export const AnalyticsOverview: React.FC = () => {
- const { fetchAnalyticsCollections, searchAnalyticsCollections } =
- useActions(AnalyticsCollectionsLogic);
+ const { fetchAnalyticsCollections } = useActions(AnalyticsCollectionsLogic);
  const { analyticsCollections, hasNoAnalyticsCollections, isFetching, isSearching } =
  useValues(AnalyticsCollectionsLogic);
 
@@ -76,7 +75,7 @@ export const AnalyticsOverview: React.FC = () => {
  <AnalyticsCollectionTable
  collections={analyticsCollections}
  isSearching={isSearching}
- onSearch={searchAnalyticsCollections}
+ onSearch={fetchAnalyticsCollections}
  />
  )}
  </EnterpriseSearchAnalyticsPageTemplate>