Add support for direct and indirect sources of spend

RedHatInsights · Sep 11, 2024 · d1486d0 · d1486d0
1 parent 14ba42a
commit d1486d0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/locales/data.json b/locales/data.json
@@ -1287,6 +1287,14 @@
               }
             ]
           },
+          "direct": {
+            "value": [
+              {
+                "type": 0,
+                "value": "Direct"
+              }
+            ]
+          },
           "embedded": {
             "value": [
               {
@@ -1303,6 +1311,14 @@
               }
             ]
           },
+          "indirect": {
+            "value": [
+              {
+                "type": 0,
+                "value": "Indirect"
+              }
+            ]
+          },
           "miscellaneous": {
             "value": [
               {

diff --git a/locales/translations.json b/locales/translations.json
@@ -80,7 +80,7 @@
   "percent": "{value} %",
   "secondaryGroupByLabel": "Secondary group by",
   "sourceOfSpendLabel": "View",
-  "sourceOfSpendValues": "{value, select, all {All sources of spend} aws {Amazon Web Services} azure {Azure} ccsp {CCSP} consulting {Consulting} embedded {Embedded} gcp {Google Cloud Platform} miscellaneous {Miscellaneous} oci {Oracle Cloud Infrastructure} oem {OEM} on_demand {On-demand subscriptions} svp {SVP} training {Training} yearly_subscriptions {Yearly subscriptions} other {}}",
+  "sourceOfSpendValues": "{value, select, all {All sources of spend} aws {Amazon Web Services} azure {Azure} ccsp {CCSP} consulting {Consulting} direct {Direct} embedded {Embedded} gcp {Google Cloud Platform} indirect {Indirect} miscellaneous {Miscellaneous} oci {Oracle Cloud Infrastructure} oem {OEM} on_demand {On-demand subscriptions} svp {SVP} training {Training} yearly_subscriptions {Yearly subscriptions} other {}}",
   "suggestions": "Suggestions",
   "viewDetails": "View details"
 }
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -490,8 +490,10 @@ export default defineMessages({
       'azure {Azure} ' +
       'ccsp {CCSP} ' +
       'consulting {Consulting} ' +
+      'direct {Direct} ' +
       'embedded {Embedded} ' +
       'gcp {Google Cloud Platform} ' +
+      'indirect {Indirect} ' +
       'miscellaneous {Miscellaneous} ' +
       'oci {Oracle Cloud Infrastructure} ' +
       'oem {OEM} ' +

diff --git a/src/routes/details/DetailsHeaderToolbar.tsx b/src/routes/details/DetailsHeaderToolbar.tsx
@@ -192,7 +192,7 @@ const DetailsHeaderToolbar: React.FC<DetailsToolbarProps> = ({
 
     if (options?.data?.source_of_spend) {
       options.data.source_of_spend.forEach(item => {
-        switch (item.code) {
+        switch (item.code.toLowerCase()) {
           case SourceOfSpendType.aws:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.aws });
             break;
@@ -205,12 +205,18 @@ const DetailsHeaderToolbar: React.FC<DetailsToolbarProps> = ({
           case SourceOfSpendType.consulting:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.consulting });
             break;
+          case SourceOfSpendType.direct:
+            newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.direct });
+            break;
           case SourceOfSpendType.embedded:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.embedded });
             break;
           case SourceOfSpendType.gcp:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.gcp });
             break;
+          case SourceOfSpendType.indirect:
+            newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.indirect });
+            break;
           case SourceOfSpendType.miscellaneous:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.miscellaneous });
             break;

diff --git a/src/routes/details/types.ts b/src/routes/details/types.ts
@@ -15,8 +15,10 @@ export enum SourceOfSpendType {
   azure = 'azure',
   ccsp = 'ccsp',
   consulting = 'consulting',
+  direct = 'direct',
   embedded = 'embedded',
   gcp = 'gcp',
+  indirect = 'indirect',
   miscellaneous = 'miscellaneous',
   none = 'none',
   oci = 'oci',