From 1370bc6c3465f4baecea11298069c78225427fa9 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aurelio.saraiva@creditas.com.br>
Date: Mon, 8 Apr 2024 14:23:19 +0200
Subject: [PATCH 1/3] feat(plugins/catalog): added custom sort on
 createLabelColumn

Signed-off-by: Aurelio Saraiva <aurelio.saraiva@creditas.com.br>
---
 .../catalog/src/components/CatalogTable/columns.tsx   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/catalog/src/components/CatalogTable/columns.tsx b/plugins/catalog/src/components/CatalogTable/columns.tsx
index 86e8ced86a..d5362badda 100644
--- a/plugins/catalog/src/components/CatalogTable/columns.tsx
+++ b/plugins/catalog/src/components/CatalogTable/columns.tsx
@@ -184,12 +184,23 @@ export const columnFactories = Object.freeze({
     key: string,
     options?: { title?: string; defaultValue?: string },
   ): TableColumn<CatalogTableRow> {
+    function formatContent(keyLabel: string, entity: Entity): string {
+      const labels: Record<string, string> | undefined =
+        entity.metadata?.labels;
+      return (labels && labels[keyLabel]) || '';
+    }
+
     return {
       title: options?.title || 'Label',
       field: 'entity.metadata.labels',
       cellStyle: {
         padding: '0px 16px 0px 20px',
       },
+      customSort({ entity: entity1 }, { entity: entity2 }) {
+        return formatContent(key, entity1).localeCompare(
+          formatContent(key, entity2),
+        );
+      },
       render: ({ entity }: { entity: Entity }) => {
         const labels: Record<string, string> | undefined =
           entity.metadata?.labels;

From 7495b3618ee928d3762e6ae849eeb762695559e8 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aurelio.saraiva@creditas.com.br>
Date: Mon, 8 Apr 2024 14:34:20 +0200
Subject: [PATCH 2/3] chore: added changelog

Signed-off-by: Aurelio Saraiva <aurelio.saraiva@creditas.com.br>
---
 .changeset/slow-cows-worry.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/slow-cows-worry.md

diff --git a/.changeset/slow-cows-worry.md b/.changeset/slow-cows-worry.md
new file mode 100644
index 0000000000..472b33ab69
--- /dev/null
+++ b/.changeset/slow-cows-worry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': minor
+---
+
+added custom sort on createLabelColumn

From 165f1738801297d96912e261580cb0d969b686dc Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 14 Apr 2024 17:51:23 +0200
Subject: [PATCH 3/3] Update .changeset/slow-cows-worry.md

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/slow-cows-worry.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/slow-cows-worry.md b/.changeset/slow-cows-worry.md
index 472b33ab69..2dc57e97b2 100644
--- a/.changeset/slow-cows-worry.md
+++ b/.changeset/slow-cows-worry.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-catalog': minor
+'@backstage/plugin-catalog': patch
 ---
 
-added custom sort on createLabelColumn
+Fixed sorting of columns created with `CatalogTable.columns.createLabelColumn`.