fix(rhosak): ent-4689 none, unknown billing provider (#936)

* config, rhosak, none context for empty provider * rhsmConstants, disable unused gcp, azure, oracle
RedHatInsights · May 25, 2022 · 6d8bdc6 · 6d8bdc6
1 parent 1996de2
commit 6d8bdc6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 77 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -153,10 +153,11 @@
     "header_Transfer-gibibytes": "Data transfer",
     "header_tooltip_Storage-gibibytes": "Measurements in binary gigabyte hours",
     "header_tooltip_Transfer-gibibytes": "Measurements in binary gigabytes",
-    "measurement_billing_provider": "{{context}}",
+    "measurement_billing_provider": "Unknown",
     "measurement_billing_provider_aws": "AWS",
     "measurement_billing_provider_azure": "Azure",
     "measurement_billing_provider_gcp": "GCP",
+    "measurement_billing_provider_none": "None",
     "measurement_billing_provider_oracle": "Oracle",
     "measurement_billing_provider_red hat": "Red Hat",
     "measurement_Instance-hours": "{{total}} hours",

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -650,7 +650,7 @@ Array [
       },
       Object {
         "key": "",
-        "match": "translate(\`curiosity-inventory.measurement_\${INVENTORY_TYPES.BILLING_PROVIDER}\`, { context: provider?.value })",
+        "match": "translate(\`curiosity-inventory.measurement_\${INVENTORY_TYPES.BILLING_PROVIDER}\`, { context: provider?.value || 'none' })",
       },
       Object {
         "key": "curiosity-inventory.header",

diff --git a/src/components/toolbar/__tests__/__snapshots__/toolbarFieldBillingProvider.test.js.snap b/src/components/toolbar/__tests__/__snapshots__/toolbarFieldBillingProvider.test.js.snap
@@ -12,21 +12,6 @@ Array [
     "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"aws\\"})",
     "value": "aws",
   },
-  Object {
-    "selected": false,
-    "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"gcp\\"})",
-    "value": "gcp",
-  },
-  Object {
-    "selected": false,
-    "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"azure\\"})",
-    "value": "azure",
-  },
-  Object {
-    "selected": false,
-    "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"oracle\\"})",
-    "value": "oracle",
-  },
   Object {
     "selected": false,
     "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"none\\"})",
@@ -96,21 +81,6 @@ exports[`ToolbarFieldBillingProvider Component should render a basic component:
         "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"aws\\"})",
         "value": "aws",
       },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"gcp\\"})",
-        "value": "gcp",
-      },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"azure\\"})",
-        "value": "azure",
-      },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"oracle\\"})",
-        "value": "oracle",
-      },
       Object {
         "selected": false,
         "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"none\\"})",

diff --git a/src/components/toolbar/__tests__/__snapshots__/toolbarFieldSelectCategory.test.js.snap b/src/components/toolbar/__tests__/__snapshots__/toolbarFieldSelectCategory.test.js.snap
@@ -182,21 +182,6 @@ Array [
         "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"aws\\"})",
         "value": "aws",
       },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"gcp\\"})",
-        "value": "gcp",
-      },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"azure\\"})",
-        "value": "azure",
-      },
-      Object {
-        "selected": false,
-        "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"oracle\\"})",
-        "value": "oracle",
-      },
       Object {
         "selected": false,
         "title": "t(curiosity-toolbar.billing_provider, {\\"context\\":\\"none\\"})",

diff --git a/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap b/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap
@@ -7,7 +7,7 @@ Object {
       "title": "lorem ipsum",
     },
     Object {
-      "title": "t(curiosity-inventory.measurement_billing_provider, {})",
+      "title": "t(curiosity-inventory.measurement_billing_provider, {\\"context\\":\\"none\\"})",
     },
     Object {
       "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Transfer-gibibytes\\",\\"total\\":\\"0.00035\\"})",
@@ -119,7 +119,7 @@ Object {
       </Button>,
     },
     Object {
-      "title": "t(curiosity-inventory.measurement_billing_provider, {})",
+      "title": "t(curiosity-inventory.measurement_billing_provider, {\\"context\\":\\"none\\"})",
     },
     Object {
       "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Transfer-gibibytes\\",\\"total\\":\\"0.00035\\"})",

diff --git a/src/config/product.rhosak.js b/src/config/product.rhosak.js
@@ -144,7 +144,7 @@ const config = {
       id: INVENTORY_TYPES.BILLING_PROVIDER,
       cell: ({ [INVENTORY_TYPES.BILLING_PROVIDER]: provider }) =>
         translate(`curiosity-inventory.measurement_${INVENTORY_TYPES.BILLING_PROVIDER}`, {
-          context: provider?.value
+          context: provider?.value || 'none'
         }),
       isSortable: true,
       isWrappable: false,

diff --git a/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap b/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap
@@ -30,10 +30,7 @@ Object {
   },
   "RHSM_API_QUERY_BILLING_PROVIDER_TYPES": Object {
     "AWS": "aws",
-    "AZURE": "azure",
-    "GCP": "gcp",
     "NONE": "",
-    "ORACLE": "oracle",
     "RED_HAT": "red hat",
   },
   "RHSM_API_QUERY_GRANULARITY_TYPES": Object {
@@ -122,10 +119,7 @@ Object {
   },
   "RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES": Object {
     "AWS": "aws",
-    "AZURE": "azure",
-    "GCP": "gcp",
     "NONE": "",
-    "ORACLE": "oracle",
     "RED_HAT": "red hat",
   },
   "RHSM_API_RESPONSE_DATA": "data",
@@ -224,10 +218,7 @@ Object {
     },
     "RHSM_API_QUERY_BILLING_PROVIDER_TYPES": Object {
       "AWS": "aws",
-      "AZURE": "azure",
-      "GCP": "gcp",
       "NONE": "",
-      "ORACLE": "oracle",
       "RED_HAT": "red hat",
     },
     "RHSM_API_QUERY_GRANULARITY_TYPES": Object {
@@ -316,10 +307,7 @@ Object {
     },
     "RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES": Object {
       "AWS": "aws",
-      "AZURE": "azure",
-      "GCP": "gcp",
       "NONE": "",
-      "ORACLE": "oracle",
       "RED_HAT": "red hat",
     },
     "RHSM_API_RESPONSE_DATA": "data",
@@ -419,10 +407,7 @@ Object {
     },
     "RHSM_API_QUERY_BILLING_PROVIDER_TYPES": Object {
       "AWS": "aws",
-      "AZURE": "azure",
-      "GCP": "gcp",
       "NONE": "",
-      "ORACLE": "oracle",
       "RED_HAT": "red hat",
     },
     "RHSM_API_QUERY_GRANULARITY_TYPES": Object {
@@ -511,10 +496,7 @@ Object {
     },
     "RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES": Object {
       "AWS": "aws",
-      "AZURE": "azure",
-      "GCP": "gcp",
       "NONE": "",
-      "ORACLE": "oracle",
       "RED_HAT": "red hat",
     },
     "RHSM_API_RESPONSE_DATA": "data",
@@ -618,10 +600,7 @@ Object {
   },
   "RHSM_API_QUERY_BILLING_PROVIDER_TYPES": Object {
     "AWS": "aws",
-    "AZURE": "azure",
-    "GCP": "gcp",
     "NONE": "",
-    "ORACLE": "oracle",
     "RED_HAT": "red hat",
   },
   "RHSM_API_QUERY_GRANULARITY_TYPES": Object {
@@ -710,10 +689,7 @@ Object {
   },
   "RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES": Object {
     "AWS": "aws",
-    "AZURE": "azure",
-    "GCP": "gcp",
     "NONE": "",
-    "ORACLE": "oracle",
     "RED_HAT": "red hat",
   },
   "RHSM_API_RESPONSE_DATA": "data",

diff --git a/src/services/rhsm/rhsmConstants.js b/src/services/rhsm/rhsmConstants.js
@@ -167,6 +167,10 @@ const RHSM_API_RESPONSE_GRANULARITY_TYPES = {
   QUARTERLY: 'Quarterly'
 };
 
+/**
+ * ToDo: Activate available provider type as it becomes available 202205
+ * (just uncomment)
+ */
 /**
  * RHSM response, query parameters for BILLING_PROVIDER
  *
@@ -175,9 +179,9 @@ const RHSM_API_RESPONSE_GRANULARITY_TYPES = {
 const RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES = {
   RED_HAT: 'red hat',
   AWS: 'aws',
-  GCP: 'gcp',
-  AZURE: 'azure',
-  ORACLE: 'oracle',
+  // GCP: 'gcp',
+  // AZURE: 'azure',
+  // ORACLE: 'oracle',
   NONE: ''
 };