fix(rhsmServices): ent-3352 api response props, mock and tests (#786)

* inventorySubscriptions, test updates * productViewRHEL, OpenShiftContainer, Satellite, initial query, test * rhsmServices, types, redux, response constants update
RedHatInsights · Sep 14, 2021 · fcca73c · fcca73c
1 parent 00dfdaf
commit fcca73c
Show file tree

Hide file tree

Showing 17 changed files with 189 additions and 154 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -108,9 +108,10 @@
     "header_sockets_OpenShift-metrics": "Sockets",
     "header_sockets_OpenShift-dedicated-metrics": "Sockets",
     "header_lastSeen": "Last seen",
+    "header_nextEventDate": "Next renewal",
     "header_productName": "Product",
+    "header_quantity": "Quantity",
     "header_serviceLevel": "Service level",
-    "header_upcomingEventDate": "Next renewal",
     "measurementType": "{{context}}",
     "measurementType_cloud": "Public cloud",
     "measurementType_alibaba": "Public cloud",

diff --git a/...onents/inventorySubscriptions/__tests__/__snapshots__/inventorySubscriptions.test.js.snap b/...onents/inventorySubscriptions/__tests__/__snapshots__/inventorySubscriptions.test.js.snap
@@ -71,7 +71,7 @@ Array [
         "viewId": "lorem",
       },
       Object {
-        "sort": "product_name",
+        "sort": "next_event_date",
         "type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_sort",
         "viewId": "lorem",
       },
@@ -85,7 +85,7 @@ Array [
         "viewId": "lorem",
       },
       Object {
-        "sort": "product_name",
+        "sort": "next_event_date",
         "type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_sort",
         "viewId": "lorem",
       },
@@ -99,7 +99,7 @@ Array [
         "viewId": "lorem",
       },
       Object {
-        "sort": "product_name",
+        "sort": "next_event_date",
         "type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_sort",
         "viewId": "lorem",
       },

diff --git a/src/components/inventorySubscriptions/__tests__/inventorySubscriptions.test.js b/src/components/inventorySubscriptions/__tests__/inventorySubscriptions.test.js
@@ -89,10 +89,10 @@ describe('InventorySubscriptions Component', () => {
     const component = shallow(<InventorySubscriptions {...props} />);
     const componentInstance = component.instance();
 
-    componentInstance.onColumnSort({}, { direction: SortByDirection.asc, id: 'productName' });
-    componentInstance.onColumnSort({}, { direction: SortByDirection.desc, id: 'productName' });
+    componentInstance.onColumnSort({}, { direction: SortByDirection.asc, id: 'nextEventDate' });
+    componentInstance.onColumnSort({}, { direction: SortByDirection.desc, id: 'nextEventDate' });
     componentInstance.onColumnSort({}, { direction: SortByDirection.asc, id: 'loremIpsumBrokenOnPurpose' });
-    componentInstance.onColumnSort({}, { direction: SortByDirection.asc, id: 'productName' });
+    componentInstance.onColumnSort({}, { direction: SortByDirection.asc, id: 'nextEventDate' });
 
     expect(mockDispatch.mock.calls).toMatchSnapshot('dispatch filter');
   });

diff --git a/...components/productView/__tests__/__snapshots__/productViewOpenShiftContainer.test.js.snap b/...components/productView/__tests__/__snapshots__/productViewOpenShiftContainer.test.js.snap
@@ -239,7 +239,7 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
                 Object {
                   "cell": [Function],
                   "cellWidth": 15,
-                  "id": "upcomingEventDate",
+                  "id": "nextEventDate",
                   "isSortable": true,
                   "isWrappable": true,
                 },
@@ -254,7 +254,7 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
                 "ending": "2019-07-20T23:59:59.999Z",
                 "limit": 100,
                 "offset": 0,
-                "sort": "upcoming_event_date",
+                "sort": "next_event_date",
                 "uom": "cores",
               }
             }

diff --git a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap
@@ -127,7 +127,7 @@ Object {
         Object {
           "cell": [Function],
           "cellWidth": 15,
-          "id": "upcomingEventDate",
+          "id": "nextEventDate",
           "isSortable": true,
           "isWrappable": true,
         },
@@ -147,7 +147,7 @@ Object {
         "dir": "desc",
         "limit": 100,
         "offset": 0,
-        "sort": "upcoming_event_date",
+        "sort": "next_event_date",
       },
       "productContextFilterUom": true,
       "productGroup": "OpenShift Container Platform",

diff --git a/src/config/__tests__/__snapshots__/product.openshiftContainer.test.js.snap b/src/config/__tests__/__snapshots__/product.openshiftContainer.test.js.snap
@@ -296,13 +296,17 @@ Object {
       ],
     },
     Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
       "transforms": Array [
         [Function],
       ],
     },
   ],
   "data": Object {
+    "nextEventDate": Object {
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
+      "value": "lorem date obj",
+    },
     "productName": Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"productName\\"})",
       "value": "lorem",
@@ -311,10 +315,6 @@ Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"serviceLevel\\"})",
       "value": "hello world",
     },
-    "upcomingEventDate": Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
-      "value": "lorem date obj",
-    },
   },
 }
 `;
@@ -342,13 +342,17 @@ Object {
       ],
     },
     Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
       "transforms": Array [
         [Function],
       ],
     },
   ],
   "data": Object {
+    "nextEventDate": Object {
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
+      "value": null,
+    },
     "productName": Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"productName\\"})",
       "value": "lorem",
@@ -357,10 +361,6 @@ Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"serviceLevel\\"})",
       "value": null,
     },
-    "upcomingEventDate": Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
-      "value": null,
-    },
   },
 }
 `;
diff --git a/src/config/__tests__/__snapshots__/product.rhel.test.js.snap b/src/config/__tests__/__snapshots__/product.rhel.test.js.snap
@@ -328,13 +328,17 @@ Object {
       ],
     },
     Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
       "transforms": Array [
         [Function],
       ],
     },
   ],
   "data": Object {
+    "nextEventDate": Object {
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
+      "value": "lorem date obj",
+    },
     "productName": Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"productName\\"})",
       "value": "lorem",
@@ -343,10 +347,6 @@ Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"serviceLevel\\"})",
       "value": "hello world",
     },
-    "upcomingEventDate": Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
-      "value": "lorem date obj",
-    },
   },
 }
 `;
@@ -374,13 +374,17 @@ Object {
       ],
     },
     Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
       "transforms": Array [
         [Function],
       ],
     },
   ],
   "data": Object {
+    "nextEventDate": Object {
+      "title": "t(curiosity-inventory.header, {\\"context\\":\\"nextEventDate\\"})",
+      "value": null,
+    },
     "productName": Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"productName\\"})",
       "value": "lorem",
@@ -389,10 +393,6 @@ Object {
       "title": "t(curiosity-inventory.header, {\\"context\\":\\"serviceLevel\\"})",
       "value": null,
     },
-    "upcomingEventDate": Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"upcomingEventDate\\"})",
-      "value": null,
-    },
   },
 }
 `;
diff --git a/src/config/__tests__/product.openshiftContainer.test.js b/src/config/__tests__/product.openshiftContainer.test.js
@@ -54,7 +54,7 @@ describe('Product OpenShift Container config', () => {
     const inventoryData = {
       productName: 'lorem',
       serviceLevel: 'hello world',
-      upcomingEventDate: 'lorem date obj'
+      nextEventDate: 'lorem date obj'
     };
 
     const filteredInventoryData = parseRowCellsListData({
@@ -67,7 +67,7 @@ describe('Product OpenShift Container config', () => {
     const fallbackInventoryData = {
       ...inventoryData,
       serviceLevel: null,
-      upcomingEventDate: null
+      nextEventDate: null
     };
 
     const fallbackFilteredInventoryData = parseRowCellsListData({

diff --git a/src/config/__tests__/product.rhel.test.js b/src/config/__tests__/product.rhel.test.js
@@ -54,7 +54,7 @@ describe('Product RHEL config', () => {
     const inventoryData = {
       productName: 'lorem',
       serviceLevel: 'hello world',
-      upcomingEventDate: 'lorem date obj'
+      nextEventDate: 'lorem date obj'
     };
 
     const filteredInventoryData = parseRowCellsListData({
@@ -67,7 +67,7 @@ describe('Product RHEL config', () => {
     const fallbackInventoryData = {
       ...inventoryData,
       serviceLevel: null,
-      upcomingEventDate: null
+      nextEventDate: null
     };
 
     const fallbackFilteredInventoryData = parseRowCellsListData({

diff --git a/src/config/product.openshiftContainer.js b/src/config/product.openshiftContainer.js
@@ -47,7 +47,7 @@ const config = {
     [RHSM_API_QUERY_TYPES.OFFSET]: 0
   },
   inventorySubscriptionsQuery: {
-    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.UPCOMING_EVENT_DATE,
+    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.NEXT_EVENT_DATE,
     [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING,
     [RHSM_API_QUERY_TYPES.LIMIT]: 100,
     [RHSM_API_QUERY_TYPES.OFFSET]: 0
@@ -186,11 +186,11 @@ const config = {
       cellWidth: 15
     },
     {
-      id: 'upcomingEventDate',
+      id: 'nextEventDate',
       cell: data =>
-        (data?.upcomingEventDate?.value &&
-          helpers.isDate(data?.upcomingEventDate?.value) &&
-          moment.utc(data?.upcomingEventDate?.value).format('YYYY-DD-MM')) ||
+        (data?.nextEventDate?.value &&
+          helpers.isDate(data?.nextEventDate?.value) &&
+          moment.utc(data?.nextEventDate?.value).format('YYYY-DD-MM')) ||
         '',
       isSortable: true,
       isWrappable: true,

diff --git a/src/config/product.rhel.js b/src/config/product.rhel.js
@@ -48,7 +48,7 @@ const config = {
     [RHSM_API_QUERY_TYPES.OFFSET]: 0
   },
   inventorySubscriptionsQuery: {
-    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.UPCOMING_EVENT_DATE,
+    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.NEXT_EVENT_DATE,
     [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING,
     [RHSM_API_QUERY_TYPES.LIMIT]: 100,
     [RHSM_API_QUERY_TYPES.OFFSET]: 0
@@ -197,11 +197,11 @@ const config = {
       cellWidth: 15
     },
     {
-      id: 'upcomingEventDate',
+      id: 'nextEventDate',
       cell: data =>
-        (data?.upcomingEventDate?.value &&
-          helpers.isDate(data?.upcomingEventDate?.value) &&
-          moment.utc(data?.upcomingEventDate?.value).format('YYYY-DD-MM')) ||
+        (data?.nextEventDate?.value &&
+          helpers.isDate(data?.nextEventDate?.value) &&
+          moment.utc(data?.nextEventDate?.value).format('YYYY-DD-MM')) ||
         '',
       isSortable: true,
       isWrappable: true,

diff --git a/src/config/product.satellite.js b/src/config/product.satellite.js
@@ -47,7 +47,7 @@ const config = {
     [RHSM_API_QUERY_TYPES.OFFSET]: 0
   },
   inventorySubscriptionsQuery: {
-    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.UPCOMING_EVENT_DATE,
+    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.NEXT_EVENT_DATE,
     [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING,
     [RHSM_API_QUERY_TYPES.LIMIT]: 100,
     [RHSM_API_QUERY_TYPES.OFFSET]: 0