From 01250a873f9d46043d121287f0d7ac34d113ad97 Mon Sep 17 00:00:00 2001
From: Mattia <matdtr@gmail.com>
Date: Mon, 16 Dec 2024 22:43:37 +0100
Subject: [PATCH] sort type by default

Signed-off-by: Mattia <matdtr@gmail.com>
---
 .changeset/heavy-lions-burn.md                |  2 +-
 .../EntityTypePicker.test.tsx                 | 30 -------------------
 .../EntityTypePicker/EntityTypePicker.tsx     | 13 ++++----
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/.changeset/heavy-lions-burn.md b/.changeset/heavy-lions-burn.md
index 7f5cdc9b66..1fb5baa384 100644
--- a/.changeset/heavy-lions-burn.md
+++ b/.changeset/heavy-lions-burn.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog-react': minor
 ---
 
-Added sorted prop in EntityTypePicker
+Sort EntityTypePicker by default
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
index 49e4287e9f..f7954f2604 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
@@ -189,34 +189,4 @@ describe('<EntityTypePicker/>', () => {
       type: new EntityTypeFilter(['tool']),
     });
   });
-
-  it('sorts the available entity types when sorted prop is true', async () => {
-    await renderInTestApp(
-      <ApiProvider apis={apis}>
-        <MockEntityListContextProvider
-          value={{ filters: { kind: new EntityKindFilter('component') } }}
-        >
-          <EntityTypePicker sorted />
-        </MockEntityListContextProvider>
-      </ApiProvider>,
-    );
-    expect(screen.getByText('Type')).toBeInTheDocument();
-
-    const input = screen.getByTestId('select');
-    fireEvent.mouseDown(within(input).getByRole('button'));
-
-    await waitFor(() => screen.getByText('library'));
-
-    const sortedEntities = entities
-      .map(e => e.spec!.type as string)
-      .sort((a, b) =>
-        a
-          .toLocaleLowerCase('en-US')
-          .localeCompare(b.toLocaleLowerCase('en-US')),
-      );
-
-    sortedEntities.forEach(entityType => {
-      expect(screen.getByText(entityType)).toBeInTheDocument();
-    });
-  });
 });
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index 1622607db4..ba39536d1e 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -31,12 +31,11 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 export interface EntityTypePickerProps {
   initialFilter?: string;
   hidden?: boolean;
-  sorted?: boolean;
 }
 
 /** @public */
 export const EntityTypePicker = (props: EntityTypePickerProps) => {
-  const { hidden, initialFilter, sorted } = props;
+  const { hidden, initialFilter } = props;
   const alertApi = useApi(alertApiRef);
   const { error, availableTypes, selectedTypes, setSelectedTypes } =
     useEntityTypeFilter();
@@ -55,11 +54,11 @@ export const EntityTypePicker = (props: EntityTypePickerProps) => {
   }, [error, alertApi, initialFilter, setSelectedTypes, t]);
 
   if (availableTypes.length === 0 || error) return null;
-  if (sorted) {
-    availableTypes.sort((a, b) =>
-      a.toLocaleLowerCase('en-US').localeCompare(b.toLocaleLowerCase('en-US')),
-    );
-  }
+
+  availableTypes.sort((a, b) =>
+    a.toLocaleLowerCase('en-US').localeCompare(b.toLocaleLowerCase('en-US')),
+  );
+
   const items = [
     { value: 'all', label: t('entityTypePicker.optionAllTitle') },
     ...availableTypes.map((type: string) => ({