feat(config): sw-2402 activate rhel for x86 payg addon

public/locales/en-US.json

@@ -337,7 +337,8 @@
     "label_groupVariant_RHEL for IBM Power": "RHEL for IBM Power",
     "label_groupVariant_RHEL for IBM z": "RHEL for IBM z",
     "label_groupVariant_RHEL for x86": "RHEL for x86",
-    "label_groupVariant_rhel-for-x86-els-payg": "RHEL for x86 ELS On-Demand",
+    "label_groupVariant_rhel-for-x86-els-payg": "RHEL for x86 ELS On-Demand for Third Party Linux Migration",
+    "label_groupVariant_rhel-for-x86-els-payg-addon": "RHEL for x86 ELS On-Demand",
     "label_groupVariant_rhel-for-x86-eus": "RHEL for x86 EUS",
     "label_groupVariant_rhel-for-x86-ha": "RHEL for x86 HA",
     "label_groupVariant_rhel-for-x86-rs": "RHEL for x86 Resilient Storage",
@@ -445,9 +446,12 @@
     "title_RHEL for x86": "$t(curiosity-view.title_RHEL)",
     "subtitle_RHEL for x86": "$t(curiosity-view.subtitle_RHEL)",
     "description_RHEL for x86": "$t(curiosity-view.description_RHEL)",
-    "title_rhel-for-x86-els-payg": "Red Hat Enterprise Linux for x86 ELS On-Demand",
+    "title_rhel-for-x86-els-payg": "Red Hat Enterprise Linux for x86 ELS On-Demand for Third Party Linux Migration",
     "subtitle_rhel-for-x86-els-payg": "$t(curiosity-view.subtitle_rhacs)",
     "description_rhel-for-x86-els-payg": "$t(curiosity-view.description_rhacs)",
+    "title_rhel-for-x86-els-payg-addon": "Red Hat Enterprise Linux for x86 ELS On-Demand",
+    "subtitle_rhel-for-x86-els-payg-addon": "$t(curiosity-view.subtitle_rhacs)",
+    "description_rhel-for-x86-els-payg-addon": "$t(curiosity-view.description_rhacs)",
     "title_rhel-for-x86-eus": "$t(curiosity-view.title_RHEL)",
     "subtitle_rhel-for-x86-eus": "$t(curiosity-view.subtitle_RHEL)",
     "description_rhel-for-x86-eus": "$t(curiosity-view.description_RHEL)",

src/components/router/__tests__/__snapshots__/routerContext.test.js.snap

@@ -13,7 +13,7 @@ exports[`RouterContext should apply a hook for useNavigate: navigation dispatch
 [
   [
     {
-      "config": "rhods",
+      "config": "rhel",
       "type": "SET_PRODUCT",
     },
   ],
@@ -34,7 +34,7 @@ exports[`RouterContext should apply a hook for useNavigate: navigation dispatch
 
 exports[`RouterContext should apply a hook for useNavigate: navigation push 1`] = `
 [
-  "./rhods?lorem=ipsum",
+  "./rhel?lorem=ipsum",
   "./rhel?lorem=ipsum",
   "./rhel?lorem=ipsum",
 ]

src/components/router/__tests__/routerContext.test.js

@@ -38,6 +38,7 @@ describe('RouterContext', () => {
 
     /**
      * Note: Snapshots for first "mockNavigationSet" are aimed at being what Levenshtein denotes as a "closest match"
+     * It is expected that this will alter as products are added to configuration.
      */
     mockNavigationSet('/dolor/sit');
     mockNavigationSet('rhel');

src/config/product.rhelElsPayg.js

@@ -17,7 +17,8 @@ import {
   RHSM_API_RESPONSE_SUBSCRIPTIONS_DATA_TYPES as SUBSCRIPTIONS_INVENTORY_TYPES,
   RHSM_API_RESPONSE_SUBSCRIPTIONS_META_TYPES as SUBSCRIPTIONS_INVENTORY_META_TYPES,
   RHSM_API_RESPONSE_INSTANCES_DATA_TYPES as INVENTORY_TYPES,
-  RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES as DISPLAY_TYPES
+  RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES as DISPLAY_TYPES,
+  RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES
 } from '../services/rhsm/rhsmConstants';
 import { ChartTypeVariant } from '../components/chart/chart';
 import { dateHelpers, helpers } from '../common';
@@ -50,25 +51,26 @@ const productId = RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86_ELS_PAYG;
  *
  * @type {string}
  */
-const productLabel = RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86_ELS_PAYG;
+const productLabel = 'RHEL';
 
 /**
  * Product configuration
  *
  * @type {{productLabel: string, productPath: string, aliases: string[], productId: string, inventorySubscriptionsQuery:
  *     object, query: object, initialSubscriptionsInventoryFilters: Array, initialInventorySettings: object, viewId:
  *     string, initialToolbarFilters: Array, productGroup: string, graphTallyQuery: object, inventoryHostsQuery:
- *     object, productDisplay: string, initialGraphFilters: Array, initialGraphSettings: object,
- *     initialInventoryFilters: Array}}
+ *     object, productDisplay: string, productVariants: string[], initialGraphFilters: Array, initialGraphSettings:
+ *     object, initialInventoryFilters: Array}}
  */
 const config = {
-  aliases: [],
+  aliases: ['els'],
   productGroup,
   productId,
   productLabel,
   productPath: productGroup.toLowerCase(),
   productDisplay: DISPLAY_TYPES.HOURLY,
   viewId: `view${productGroup}-${productId}`,
+  productVariants: [...Object.values(RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES)],
   query: {
     [RHSM_API_QUERY_SET_TYPES.START_DATE]: dateHelpers.getRangedMonthDateTime('current').value.startDate.toISOString(),
     [RHSM_API_QUERY_SET_TYPES.END_DATE]: dateHelpers.getRangedMonthDateTime('current').value.endDate.toISOString()

src/services/README.md

@@ -614,6 +614,7 @@ Parse platform getUserPermissions response.
 
 * [RhsmConstants](#Rhsm.module_RhsmConstants)
     * [~RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES](#Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES) : <code>Object</code>
+    * [~RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES](#Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES) : <code>Object</code>
     * [~RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES](#Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES) : <code>Object</code>
     * [~RHSM_API_PATH_PRODUCT_TYPES](#Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_TYPES) : <code>Object</code>
     * [~RHSM_API_PATH_METRIC_TYPES](#Rhsm.module_RhsmConstants..RHSM_API_PATH_METRIC_TYPES) : <code>Object</code>
@@ -649,6 +650,12 @@ Parse platform getUserPermissions response.
 ### RhsmConstants~RHSM\_API\_PATH\_PRODUCT\_VARIANT\_RHEL\_TYPES : <code>Object</code>
 RHSM path IDs for product RHEL variants.
 
+**Kind**: inner constant of [<code>RhsmConstants</code>](#Rhsm.module_RhsmConstants)  
+<a name="Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES"></a>
+
+### RhsmConstants~RHSM\_API\_PATH\_PRODUCT\_VARIANT\_RHEL\_ELS\_TYPES : <code>Object</code>
+RHSM path IDs for product RHEL ELS PAYG variants.
+
 **Kind**: inner constant of [<code>RhsmConstants</code>](#Rhsm.module_RhsmConstants)  
 <a name="Rhsm.module_RhsmConstants..RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES"></a>
 

src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap

@@ -24,6 +24,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
     "RHEL_WORKSTATION": "RHEL Workstation",
     "RHEL_X86": "RHEL for x86",
     "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+    "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
     "RHEL_X86_EUS": "rhel-for-x86-eus",
     "RHEL_X86_HA": "rhel-for-x86-ha",
     "RHEL_X86_RS": "rhel-for-x86-rs",
@@ -33,6 +34,10 @@ exports[`RHSM Constants should have specific properties: all exported constants
     "SATELLITE_CAPSULE": "Satellite Capsule",
     "SATELLITE_SERVER": "Satellite Server",
   },
+  "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES": {
+    "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+    "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
+  },
   "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES": {
     "RHEL_ARM": "RHEL for ARM",
     "RHEL_IBM_POWER": "RHEL for IBM Power",
@@ -282,6 +287,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
       "RHEL_WORKSTATION": "RHEL Workstation",
       "RHEL_X86": "RHEL for x86",
       "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+      "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
       "RHEL_X86_EUS": "rhel-for-x86-eus",
       "RHEL_X86_HA": "rhel-for-x86-ha",
       "RHEL_X86_RS": "rhel-for-x86-rs",
@@ -291,6 +297,10 @@ exports[`RHSM Constants should have specific properties: all exported constants
       "SATELLITE_CAPSULE": "Satellite Capsule",
       "SATELLITE_SERVER": "Satellite Server",
     },
+    "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES": {
+      "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+      "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
+    },
     "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES": {
       "RHEL_ARM": "RHEL for ARM",
       "RHEL_IBM_POWER": "RHEL for IBM Power",
@@ -541,6 +551,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
       "RHEL_WORKSTATION": "RHEL Workstation",
       "RHEL_X86": "RHEL for x86",
       "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+      "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
       "RHEL_X86_EUS": "rhel-for-x86-eus",
       "RHEL_X86_HA": "rhel-for-x86-ha",
       "RHEL_X86_RS": "rhel-for-x86-rs",
@@ -550,6 +561,10 @@ exports[`RHSM Constants should have specific properties: all exported constants
       "SATELLITE_CAPSULE": "Satellite Capsule",
       "SATELLITE_SERVER": "Satellite Server",
     },
+    "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES": {
+      "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+      "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
+    },
     "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES": {
       "RHEL_ARM": "RHEL for ARM",
       "RHEL_IBM_POWER": "RHEL for IBM Power",
@@ -804,6 +819,7 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
     "RHEL_WORKSTATION": "RHEL Workstation",
     "RHEL_X86": "RHEL for x86",
     "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+    "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
     "RHEL_X86_EUS": "rhel-for-x86-eus",
     "RHEL_X86_HA": "rhel-for-x86-ha",
     "RHEL_X86_RS": "rhel-for-x86-rs",
@@ -813,6 +829,10 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
     "SATELLITE_CAPSULE": "Satellite Capsule",
     "SATELLITE_SERVER": "Satellite Server",
   },
+  "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES": {
+    "RHEL_X86_ELS_PAYG": "rhel-for-x86-els-payg",
+    "RHEL_X86_ELS_PAYG_ADDON": "rhel-for-x86-els-payg-addon",
+  },
   "RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES": {
     "RHEL_ARM": "RHEL for ARM",
     "RHEL_IBM_POWER": "RHEL for IBM Power",

src/services/rhsm/rhsmConstants.js

@@ -20,6 +20,16 @@
   RHEL_X86_SAP: 'rhel-for-sap-x86'
 };
 
+/**
+ * RHSM path IDs for product RHEL ELS PAYG variants.
+ *
+ * @type {{RHEL_X86_ELS_PAYG_ADDON: string, RHEL_X86_ELS_PAYG: string}}
+ */
+const RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES = {
+  RHEL_X86_ELS_PAYG: 'rhel-for-x86-els-payg',
+  RHEL_X86_ELS_PAYG_ADDON: 'rhel-for-x86-els-payg-addon'
+};
+
 /**
  * RHSM path IDs for product Satellite variants.
  *
@@ -43,15 +53,16 @@
  * @type {{RHEL_ARM: string, OPENSHIFT_METRICS: string, RHEL_X86_EUS: string, RHEL_WORKSTATION: string,
  *     RHEL_X86_SAP: string, RHODS: string, ROSA: string, RHEL_X86: string, RHEL_COMPUTE_NODE: string,
  *     RHEL_X86_ELS_PAYG: string, OPENSHIFT: string, RHEL_X86_RS: string, SATELLITE_SERVER: string,
- *     OPENSHIFT_DEDICATED_METRICS: string, RHEL_X86_HA: string, SATELLITE_CAPSULE: string, RHEL_IBM_Z: string,
- *     RHEL_IBM_POWER: string, RHACS: string}}
+ *     RHEL_X86_ELS_PAYG_ADDON: string, OPENSHIFT_DEDICATED_METRICS: string, RHEL_X86_HA: string, SATELLITE_CAPSULE:
+ *     string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHACS:
+ *     string}}
  */
 const RHSM_API_PATH_PRODUCT_TYPES = {
   ...RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES,
+  ...RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES,
   ...RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES,
   RHACS: 'rhacs',
   RHEL_COMPUTE_NODE: 'RHEL Compute Node',
-  RHEL_X86_ELS_PAYG: 'rhel-for-x86-els-payg',
   RHEL_WORKSTATION: 'RHEL Workstation',
   RHODS: 'rhods',
   ROSA: 'rosa',
@@ -244,7 +255,7 @@
   AWS: 'aws',
   // GCP: 'gcp',
   AZURE: 'azure'
   // ORACLE: 'oracle',
   // NONE: ''
 };
 
@@ -429,6 +440,7 @@
  *     BILLING_ACCOUNT_ID: string, CATEGORY: string, SUBSCRIPTION_MANAGER_ID: string, INVENTORY_ID: string,
  *     NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string, DISPLAY_NAME: string, CLOUD_PROVIDER: string, INSTANCE_ID:
  *     string, LAST_SEEN: string}, RHSM_API_RESPONSE_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD:
+ *     string}, RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES: {RHEL_X86_ELS_PAYG_ADDON: string, RHEL_X86_ELS_PAYG:
  *     string}, RHSM_API_RESPONSE_META_TYPES: {PRODUCT: string, COUNT: string}, RHSM_API_RESPONSE_ERRORS_CODE_TYPES:
  *     {GENERIC: string, OPTIN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY:
  *     string, MONTHLY: string}, RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES: {RHEL_ARM: string, RHEL_X86_SAP: string,
@@ -445,10 +457,10 @@
  *     BILLING_PROVIDER: string, STORAGE_GIBIBYTE_MONTHS: string, LAST_SEEN: string}, RHSM_API_PATH_PRODUCT_TYPES:
  *     {RHEL_ARM: string, OPENSHIFT_METRICS: string, RHEL_X86_EUS: string, RHEL_WORKSTATION: string, RHEL_X86_SAP:
  *     string, RHODS: string, ROSA: string, RHEL_X86: string, RHEL_COMPUTE_NODE: string, RHEL_X86_ELS_PAYG: string,
- *     OPENSHIFT: string, RHEL_X86_RS: string, SATELLITE_SERVER: string, OPENSHIFT_DEDICATED_METRICS: string,
- *     RHEL_X86_HA: string, SATELLITE_CAPSULE: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHACS: string},
- *     RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS:
- *     string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string},
+ *     OPENSHIFT: string, RHEL_X86_RS: string, SATELLITE_SERVER: string, RHEL_X86_ELS_PAYG_ADDON: string,
+ *     OPENSHIFT_DEDICATED_METRICS: string, RHEL_X86_HA: string, SATELLITE_CAPSULE: string, RHEL_IBM_Z: string,
+ *     RHEL_IBM_POWER: string, RHACS: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string,
+ *     RED_HAT: string, NONE: string, AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string},
  *     RHSM_API_RESPONSE_TALLY_CAPACITY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string,
  *     HAS_INFINITE_QUANTITY: string}, RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE:
  *     string, PRODUCT: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string,
@@ -474,6 +486,7 @@
 const rhsmConstants = {
   RHSM_API_PATH_PRODUCT_TYPES,
   RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES,
+  RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES,
   RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES,
   RHSM_API_PATH_METRIC_TYPES,
   RHSM_API_RESPONSE_DATA,
@@ -512,6 +525,7 @@
   rhsmConstants,
   RHSM_API_PATH_PRODUCT_TYPES,
   RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES,
+  RHSM_API_PATH_PRODUCT_VARIANT_RHEL_ELS_TYPES,
   RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES,
   RHSM_API_PATH_METRIC_TYPES,
   RHSM_API_RESPONSE_DATA,