Merge pull request #897 from dlabrecq/254-sources-of-spend

UI to show new sources of spend
RedHatInsights · Dec 5, 2023 · 0e793c0 · 0e793c0
2 parents 1f68894 + f7023cc
commit 0e793c0
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/locales/data.json b/locales/data.json
@@ -1263,6 +1263,14 @@
               }
             ]
           },
+          "embedded": {
+            "value": [
+              {
+                "type": 0,
+                "value": "Embedded"
+              }
+            ]
+          },
           "gcp": {
             "value": [
               {
@@ -1287,6 +1295,14 @@
               }
             ]
           },
+          "oem": {
+            "value": [
+              {
+                "type": 0,
+                "value": "OEM"
+              }
+            ]
+          },
           "on_demand": {
             "value": [
               {
@@ -1298,6 +1314,14 @@
           "other": {
             "value": []
           },
+          "svp": {
+            "value": [
+              {
+                "type": 0,
+                "value": "SVP"
+              }
+            ]
+          },
           "training": {
             "value": [
               {

diff --git a/locales/translations.json b/locales/translations.json
@@ -76,7 +76,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} gcp {Google Cloud Platform} miscellaneous {Miscellaneous} oci {Oracle Cloud Infrastructure} on_demand {On-demand subscriptions} 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} 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 {}}",
   "suggestions": "Suggestions",
   "viewDetails": "View details"
 }
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -470,10 +470,13 @@ export default defineMessages({
       '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 {}}',

diff --git a/src/routes/details/DetailsHeaderToolbar.tsx b/src/routes/details/DetailsHeaderToolbar.tsx
@@ -204,6 +204,9 @@ const DetailsHeaderToolbar: React.FC<DetailsToolbarProps> = ({
           case SourceOfSpendType.consulting:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.consulting });
             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;
@@ -213,9 +216,15 @@ const DetailsHeaderToolbar: React.FC<DetailsToolbarProps> = ({
           case SourceOfSpendType.on_demand:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.on_demand });
             break;
+          case SourceOfSpendType.oem:
+            newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.oem });
+            break;
           case SourceOfSpendType.oci:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.oci });
             break;
+          case SourceOfSpendType.svp:
+            newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.svp });
+            break;
           case SourceOfSpendType.training:
             newOptions.push({ label: messages.sourceOfSpendValues, value: SourceOfSpendType.training });
             break;

diff --git a/src/routes/details/types.ts b/src/routes/details/types.ts
@@ -17,11 +17,14 @@ export enum SourceOfSpendType {
   azure = 'azure',
   ccsp = 'ccsp',
   consulting = 'consulting',
+  embedded = 'embedded',
   gcp = 'gcp',
   miscellaneous = 'miscellaneous',
   none = 'none',
   oci = 'oci',
+  oem = 'oem',
   on_demand = 'on_demand',
+  svp = 'svp',
   training = 'training',
   yearlySubscriptions = 'yearly_subscriptions',
 }