Merge pull request #1242 from dlabrecq/source-of-spend2

Omit unsupported query param
RedHatInsights · Sep 11, 2024 · f83fc3a · f83fc3a
2 parents e11028d + b60ceab
commit f83fc3a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/routes/details/DetailsHeaderToolbar.tsx b/src/routes/details/DetailsHeaderToolbar.tsx
@@ -190,7 +190,7 @@ const DetailsHeaderToolbar: React.FC<DetailsToolbarProps> = ({
   const getSourceOfSpendOptions = () => {
     const newOptions = cloneDeep(sourceOfSpendOptions);
 
-    if (options?.data?.source_of_spend) {
+    if (options?.data?.source_of_spend.length > 0) {
       options.data.source_of_spend.forEach(item => {
         switch (item.code.toLowerCase()) {
           case SourceOfSpendType.aws:

diff --git a/src/routes/details/types.ts b/src/routes/details/types.ts
@@ -86,8 +86,12 @@ export function getSourceOfSpendFilter(sourceOfSpendType): string {
       return 'CCSP';
     case SourceOfSpendType.consulting:
       return 'Consulting';
+    case SourceOfSpendType.direct:
+      return 'Direct';
     case SourceOfSpendType.gcp:
       return 'Google Cloud Platform';
+    case SourceOfSpendType.indirect:
+      return 'Indirect';
     case SourceOfSpendType.miscellaneous:
       return 'Miscellaneous';
     case SourceOfSpendType.oci:
@@ -100,7 +104,7 @@ export function getSourceOfSpendFilter(sourceOfSpendType): string {
       return 'Yearly subscriptions';
     case SourceOfSpendType.all:
     default:
-      return 'All sources of spend';
+      return undefined;
   }
 }
 
@@ -114,8 +118,12 @@ export function getSourceOfSpendType(sourceOfSpendType: SourceOfSpendType): stri
       return 'ccsp';
     case SourceOfSpendType.consulting:
       return 'consulting';
+    case SourceOfSpendType.direct:
+      return 'direct';
     case SourceOfSpendType.gcp:
       return 'gcp';
+    case SourceOfSpendType.indirect:
+      return 'indirect';
     case SourceOfSpendType.miscellaneous:
       return 'miscellaneous';
     case SourceOfSpendType.oci:

diff --git a/src/routes/details/utils.ts b/src/routes/details/utils.ts
@@ -126,6 +126,7 @@ export const useDetailsMapToProps = ({
     },
     orderBy: query.orderBy,
     ...(startDate && endDate && { ...formatDate({ startDate, endDate }) }),
+    sourceOfSpend: undefined, // Not supported by API
   };
 
   // Add secondaryGroupBy for export API request