From a2887a687f505e76c0009af56bd9713fca02adc6 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Fri, 26 Jul 2024 11:20:50 -0400
Subject: [PATCH] Update AWS EC2 instances table to support account_alias sort
 and instance_name exclude filter

---
 src/api/resources/resource.ts                                  | 2 +-
 src/routes/details/awsBreakdown/instances/instancesTable.tsx   | 2 +-
 src/routes/details/awsBreakdown/instances/instancesToolbar.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/resources/resource.ts b/src/api/resources/resource.ts
index 6d1066e02..aa74a20c0 100644
--- a/src/api/resources/resource.ts
+++ b/src/api/resources/resource.ts
@@ -14,7 +14,7 @@ export interface Resource extends PagedResponse<ResourceData, PagedMetaData> {}
 export const enum ResourceType {
   account = 'account',
   aws_category = 'aws_category',
-  aws_ec2_instance = 'instance',
+  aws_ec2_instance = 'instance_name',
   aws_ec2_os = 'operating_system',
   cluster = 'cluster',
   gcpProject = 'gcp_project',
diff --git a/src/routes/details/awsBreakdown/instances/instancesTable.tsx b/src/routes/details/awsBreakdown/instances/instancesTable.tsx
index b6fd92d0d..07d2f85ad 100644
--- a/src/routes/details/awsBreakdown/instances/instancesTable.tsx
+++ b/src/routes/details/awsBreakdown/instances/instancesTable.tsx
@@ -78,7 +78,7 @@ const InstancesTable: React.FC<InstancesTableProps> = ({
         ...(computedItems.length && { isSortable: true }),
       },
       {
-        orderBy: 'account', // Todo: sort by account_alias
+        orderBy: 'account_alias',
         name: intl.formatMessage(messages.detailsResourceNames, { value: 'account' }),
         ...(computedItems.length && { isSortable: true }),
       },
diff --git a/src/routes/details/awsBreakdown/instances/instancesToolbar.tsx b/src/routes/details/awsBreakdown/instances/instancesToolbar.tsx
index fd3d60f96..0f899d2df 100644
--- a/src/routes/details/awsBreakdown/instances/instancesToolbar.tsx
+++ b/src/routes/details/awsBreakdown/instances/instancesToolbar.tsx
@@ -100,7 +100,7 @@ export class InstancesToolbarBase extends React.Component<InstancesToolbarProps,
     const options = [
       {
         name: intl.formatMessage(messages.filterByValues, { value: 'instance' }),
-        key: 'instance',
+        key: 'instance_name',
         resourceKey: 'instance_name',
       },
       {