From 7f526233824c5065c7a9ee63dac59f168f04f95d Mon Sep 17 00:00:00 2001
From: Tianchu Zhao <evantczhao@gmail.com>
Date: Fri, 22 Oct 2021 03:28:28 +1100
Subject: [PATCH] fix(ui): labels in report/archive should be sorted (#7009)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
---
 .../archived-workflow-filters/archived-workflow-filters.tsx   | 4 ++--
 ui/src/app/reports/components/reports.tsx                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx b/ui/src/app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx
index 6e7fdcfc78f9..70b333d76487 100644
--- a/ui/src/app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx
+++ b/ui/src/app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx
@@ -194,14 +194,14 @@ export class ArchivedWorkflowFilters extends React.Component<ArchivedWorkflowFil
     private fetchArchivedWorkflowsLabelKeys(): void {
         services.archivedWorkflows.listLabelKeys().then(list => {
             this.setState({
-                labels: list.items || []
+                labels: list.items.sort((a, b) => a.localeCompare(b)) || []
             });
         });
     }
 
     private fetchArchivedWorkflowsLabels(key: string): Promise<any> {
         return services.archivedWorkflows.listLabelValues(key).then(list => {
-            return list.items.map(i => key + '=' + i);
+            return list.items.map(i => key + '=' + i).sort((a, b) => a.localeCompare(b));
         });
     }
 }
diff --git a/ui/src/app/reports/components/reports.tsx b/ui/src/app/reports/components/reports.tsx
index 0fa26b50f6cd..6d6f92549098 100644
--- a/ui/src/app/reports/components/reports.tsx
+++ b/ui/src/app/reports/components/reports.tsx
@@ -260,7 +260,7 @@ export class Reports extends BasePage<RouteComponentProps<any>, State> {
         if (isArchivedWorkflows) {
             services.archivedWorkflows.listLabelKeys().then(list => {
                 this.setState({
-                    autocompleteLabels: list.items || []
+                    autocompleteLabels: list.items.sort((a, b) => a.localeCompare(b)) || []
                 });
             });
         }
@@ -268,7 +268,7 @@ export class Reports extends BasePage<RouteComponentProps<any>, State> {
 
     private fetchArchivedWorkflowsLabels(key: string): Promise<any> {
         return services.archivedWorkflows.listLabelValues(key).then(list => {
-            return list.items.map(i => key + '=' + i);
+            return list.items.map(i => key + '=' + i).sort((a, b) => a.localeCompare(b));
         });
     }