Reorganized logic

elastic · Feb 4, 2021 · c69b184 · c69b184
1 parent 55dfa70
commit c69b184
Showing 1 changed file with 29 additions and 28 deletions.
diff --git a/...arch/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts b/...arch/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts
@@ -32,19 +32,19 @@ interface RelevanceTuningActions {
 interface RelevanceTuningValues {
   searchSettings: Partial<SearchSettings>;
   schema: Schema;
-  dataLoading: boolean;
+  schemaFields: string[];
+  schemaFieldsWithConflicts: string[];
+  filteredSchemaFields: string[];
+  filteredSchemaFieldsWithConflicts: string[];
   schemaConflicts: SchemaConflicts;
-  unsavedChanges: boolean;
+  showSchemaConflictCallout: boolean;
+  engineHasSchemaFields: boolean;
   filterInputValue: string;
   query: string;
+  unsavedChanges: boolean;
+  dataLoading: boolean;
   searchResults: object[] | null;
   resultsLoading: boolean;
-  showSchemaConflictCallout: boolean;
-  engineHasSchemaFields: boolean;
-  schemaFields: string[];
-  schemaFieldsWithConflicts: string[];
-  filteredSchemaFields: string[];
-  filteredSchemaFieldsWithConflicts: string[];
 }
 
 // If the user hasn't entered a filter, then we can skip filtering the array entirely
@@ -81,23 +81,16 @@ export const RelevanceTuningLogic = kea<
         onInitializeRelevanceTuning: (_, { schema }) => schema,
       },
     ],
-    dataLoading: [
-      true,
-      {
-        onInitializeRelevanceTuning: () => false,
-        resetSearchSettingsState: () => true,
-      },
-    ],
     schemaConflicts: [
       {},
       {
         onInitializeRelevanceTuning: (_, { schemaConflicts }) => schemaConflicts,
       },
     ],
-    unsavedChanges: [
-      false,
+    showSchemaConflictCallout: [
+      true,
       {
-        setSearchSettings: () => true,
+        dismissSchemaConflictCallout: () => false,
       },
     ],
     filterInputValue: [
@@ -112,11 +105,18 @@ export const RelevanceTuningLogic = kea<
         setSearchQuery: (_, query) => query,
       },
     ],
-    resultsLoading: [
+    unsavedChanges: [
       false,
       {
-        setResultsLoading: (_, resultsLoading) => resultsLoading,
-        setSearchResults: () => false,
+        setSearchSettings: () => true,
+      },
+    ],
+
+    dataLoading: [
+      true,
+      {
+        onInitializeRelevanceTuning: () => false,
+        resetSearchSettingsState: () => true,
       },
     ],
     searchResults: [
@@ -126,18 +126,15 @@ export const RelevanceTuningLogic = kea<
         setSearchResults: (_, searchResults) => searchResults,
       },
     ],
-    showSchemaConflictCallout: [
-      true,
+    resultsLoading: [
+      false,
       {
-        dismissSchemaConflictCallout: () => false,
+        setResultsLoading: (_, resultsLoading) => resultsLoading,
+        setSearchResults: () => false,
       },
     ],
   }),
   selectors: ({ selectors }) => ({
-    engineHasSchemaFields: [
-      () => [selectors.schema],
-      (schema: Schema): boolean => Object.keys(schema).length >= 2,
-    ],
     schemaFields: [() => [selectors.schema], (schema: Schema) => Object.keys(schema)],
     schemaFieldsWithConflicts: [
       () => [selectors.schemaConflicts],
@@ -153,5 +150,9 @@ export const RelevanceTuningLogic = kea<
       (schemaFieldsWithConflicts: string[], filterInputValue: string): string[] =>
         filterIfTerm(schemaFieldsWithConflicts, filterInputValue),
     ],
+    engineHasSchemaFields: [
+      () => [selectors.schema],
+      (schema: Schema): boolean => Object.keys(schema).length >= 2,
+    ],
   }),
 });