fix(ui): labels in report/archive should be sorted (#7009)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
argoproj · Oct 21, 2021 · 7f52623 · 7f52623
1 parent 50813da
commit 7f52623
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...app/archived-workflows/components/archived-workflow-filters/archived-workflow-filters.tsx b/...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
@@ -260,15 +260,15 @@ 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)) || []
                 });
             });
         }
     }
 
     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));
         });
     }