sorting fields in dropdowns

elastic · May 26, 2022 · c69a52d · c69a52d
1 parent 4966b58
commit c69a52d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/x-pack/plugins/ml/public/application/components/job_messages/job_messages.tsx b/x-pack/plugins/ml/public/application/components/job_messages/job_messages.tsx
@@ -27,7 +27,7 @@ interface JobMessagesProps {
   messages: JobMessage[];
   loading: boolean;
   error: string;
-  refreshMessage?: React.MouseEventHandler<HTMLButtonElement>;
+  refreshMessage?: () => Promise<void>;
   actionHandler?: (message: JobMessage) => void;
 }
 
@@ -51,7 +51,7 @@ export const JobMessages: FC<JobMessagesProps> = ({
           })}
         >
           <EuiButtonIcon
-            onClick={refreshMessage}
+            onClick={() => refreshMessage()}
             iconType="refresh"
             aria-label={i18n.translate('xpack.ml.jobMessages.refreshAriaLabel', {
               defaultMessage: 'Refresh',

diff --git a/...plication/jobs/new_job/pages/components/pick_fields_step/components/by_field/by_field.tsx b/...plication/jobs/new_job/pages/components/pick_fields_step/components/by_field/by_field.tsx
@@ -25,7 +25,10 @@ export const ByFieldSelector: FC<Props> = ({ detectorIndex }) => {
 
   const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
   const allCategoryFields = useMemo(
-    () => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
+    () =>
+      [...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
+        a.name.localeCompare(b.name)
+      ),
     []
   );
 

diff --git a/...ew_job/pages/components/pick_fields_step/components/population_field/population_field.tsx b/...ew_job/pages/components/pick_fields_step/components/population_field/population_field.tsx
@@ -25,7 +25,10 @@ export const PopulationFieldSelector: FC = () => {
 
   const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
   const allCategoryFields = useMemo(
-    () => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
+    () =>
+      [...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
+        a.name.localeCompare(b.name)
+      ),
     []
   );
   const categoryFields = useFilteredCategoryFields(

diff --git a/...ation/jobs/new_job/pages/components/pick_fields_step/components/rare_field/rare_field.tsx b/...ation/jobs/new_job/pages/components/pick_fields_step/components/rare_field/rare_field.tsx
@@ -21,7 +21,10 @@ export const RareFieldSelector: FC = () => {
 
   const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
   const allCategoryFields = useMemo(
-    () => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
+    () =>
+      [...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
+        a.name.localeCompare(b.name)
+      ),
     []
   );
   const categoryFields = useFilteredCategoryFields(

diff --git a/...ion/jobs/new_job/pages/components/pick_fields_step/components/split_field/split_field.tsx b/...ion/jobs/new_job/pages/components/pick_fields_step/components/split_field/split_field.tsx
@@ -25,7 +25,10 @@ export const SplitFieldSelector: FC = () => {
 
   const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
   const allCategoryFields = useMemo(
-    () => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
+    () =>
+      [...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
+        a.name.localeCompare(b.name)
+      ),
     []
   );
   const categoryFields = useFilteredCategoryFields(