fix(viewReducer): ent-3509 date range for inventory (#597)

* productView(s), propTypes, default props for date ranges * rhsmApiTypes, query check, include beginning, ending params * viewReducer, move date range to global query
RedHatInsights · Apr 26, 2021 · 126bcf0 · 126bcf0
1 parent e0dc0eb
commit 126bcf0
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 57 deletions.
diff --git a/...components/productView/__tests__/__snapshots__/productViewOpenShiftContainer.test.js.snap b/...components/productView/__tests__/__snapshots__/productViewOpenShiftContainer.test.js.snap
@@ -26,6 +26,8 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
         productId="OpenShift Container Platform"
         query={
           Object {
+            "beginning": "2019-06-20T00:00:00.000Z",
+            "ending": "2019-07-20T23:59:59.999Z",
             "uom": "cores",
           }
         }
@@ -173,7 +175,9 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
             productId="OpenShift Container Platform"
             query={
               Object {
+                "beginning": "2019-06-20T00:00:00.000Z",
                 "dir": "asc",
+                "ending": "2019-07-20T23:59:59.999Z",
                 "limit": 100,
                 "offset": 0,
                 "sort": "last_seen",
@@ -215,7 +219,9 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
             productId="OpenShift Container Platform"
             query={
               Object {
+                "beginning": "2019-06-20T00:00:00.000Z",
                 "dir": "asc",
+                "ending": "2019-07-20T23:59:59.999Z",
                 "limit": 100,
                 "offset": 0,
                 "sort": "upcoming_event_date",
@@ -413,7 +419,9 @@ exports[`ProductViewOpenShiftContainer Component should render a non-connected c
             productId="OpenShift-metrics"
             query={
               Object {
+                "beginning": "2019-07-01T00:00:00.000Z",
                 "dir": "asc",
+                "ending": "2019-07-31T23:59:59.999Z",
                 "limit": 100,
                 "offset": 0,
                 "sort": "last_seen",
@@ -737,6 +745,8 @@ Array [
       },
     ],
     "query": Object {
+      "beginning": "2019-06-20T00:00:00.000Z",
+      "ending": "2019-07-20T23:59:59.999Z",
       "uom": "cores",
     },
   },
@@ -769,7 +779,10 @@ Array [
         "isWrappable": true,
       },
     ],
-    "query": Object {},
+    "query": Object {
+      "beginning": "2019-07-01T00:00:00.000Z",
+      "ending": "2019-07-31T23:59:59.999Z",
+    },
   },
 ]
 `;
diff --git a/...components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap b/...components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap
@@ -5,8 +5,6 @@ exports[`ProductViewOpenShiftDedicated Component should render a non-connected c
   productConfig={
     Object {
       "graphTallyQuery": Object {
-        "beginning": "2019-07-01T00:00:00.000Z",
-        "ending": "2019-07-31T23:59:59.999Z",
         "granularity": "daily",
       },
       "initialGraphFilters": Array [
@@ -46,7 +44,10 @@ exports[`ProductViewOpenShiftDedicated Component should render a non-connected c
         "offset": 0,
         "sort": "last_seen",
       },
-      "query": Object {},
+      "query": Object {
+        "beginning": "2019-07-01T00:00:00.000Z",
+        "ending": "2019-07-31T23:59:59.999Z",
+      },
     }
   }
   routeDetail={
@@ -171,7 +172,7 @@ exports[`ProductViewOpenShiftDedicated Component should render a non-connected c
         ]
       }
       t={[Function]}
-      value="2019-07-01T00:00:00.000Z"
+      value="t(curiosity-toolbar.granularityRange, {\\"context\\":\\"current\\"})"
       viewId="toolbarFieldRangeGranularity"
     />
   }
@@ -327,6 +328,9 @@ Object {
       "isWrappable": true,
     },
   ],
-  "query": Object {},
+  "query": Object {
+    "beginning": "2019-07-01T00:00:00.000Z",
+    "ending": "2019-07-31T23:59:59.999Z",
+  },
 }
 `;
diff --git a/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap
@@ -5,8 +5,6 @@ exports[`ProductViewRhel Component should render a non-connected component: non-
   productConfig={
     Object {
       "graphTallyQuery": Object {
-        "beginning": "2019-06-20T00:00:00.000Z",
-        "ending": "2019-07-20T23:59:59.999Z",
         "granularity": "daily",
       },
       "initialGraphFilters": Array [
@@ -115,7 +113,10 @@ exports[`ProductViewRhel Component should render a non-connected component: non-
         "offset": 0,
         "sort": "upcoming_event_date",
       },
-      "query": Object {},
+      "query": Object {
+        "beginning": "2019-06-20T00:00:00.000Z",
+        "ending": "2019-07-20T23:59:59.999Z",
+      },
     }
   }
   routeDetail={
@@ -602,6 +603,9 @@ Object {
       "isWrappable": true,
     },
   ],
-  "query": Object {},
+  "query": Object {
+    "beginning": "2019-06-20T00:00:00.000Z",
+    "ending": "2019-07-20T23:59:59.999Z",
+  },
 }
 `;
diff --git a/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap
@@ -5,8 +5,6 @@ exports[`ProductViewSatellite Component should render a non-connected component:
   productConfig={
     Object {
       "graphTallyQuery": Object {
-        "beginning": "2019-06-20T00:00:00.000Z",
-        "ending": "2019-07-20T23:59:59.999Z",
         "granularity": "daily",
       },
       "initialGraphFilters": Array [
@@ -115,7 +113,10 @@ exports[`ProductViewSatellite Component should render a non-connected component:
         "offset": 0,
         "sort": "upcoming_event_date",
       },
-      "query": Object {},
+      "query": Object {
+        "beginning": "2019-06-20T00:00:00.000Z",
+        "ending": "2019-07-20T23:59:59.999Z",
+      },
     }
   }
   routeDetail={
@@ -602,6 +603,9 @@ Object {
       "isWrappable": true,
     },
   ],
-  "query": Object {},
+  "query": Object {
+    "beginning": "2019-06-20T00:00:00.000Z",
+    "ending": "2019-07-20T23:59:59.999Z",
+  },
 }
 `;
diff --git a/src/components/productView/productView.js b/src/components/productView/productView.js
@@ -153,9 +153,7 @@ const ProductView = ({ productConfig, routeDetail, t, toolbarGraph, toolbarProdu
 ProductView.propTypes = {
   productConfig: PropTypes.shape({
     graphTallyQuery: PropTypes.shape({
-      [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)]),
-      [RHSM_API_QUERY_TYPES.START_DATE]: PropTypes.string,
-      [RHSM_API_QUERY_TYPES.END_DATE]: PropTypes.string
+      [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)])
     }),
     inventoryHostsQuery: PropTypes.shape({
       [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
@@ -169,7 +167,10 @@ ProductView.propTypes = {
       [RHSM_API_QUERY_TYPES.SORT]: PropTypes.oneOf([...Object.values(RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES)]),
       [RHSM_API_QUERY_TYPES.DIRECTION]: PropTypes.oneOf([...Object.values(SORT_DIRECTION_TYPES)])
     }),
-    query: PropTypes.object,
+    query: PropTypes.shape({
+      [RHSM_API_QUERY_TYPES.START_DATE]: PropTypes.string,
+      [RHSM_API_QUERY_TYPES.END_DATE]: PropTypes.string
+    }),
     initialToolbarFilters: Toolbar.propTypes.filterOptions,
     initialGraphFilters: GraphCard.propTypes.filterGraphData,
     initialGuestsFilters: GuestsList.propTypes.filterGuestsData,

diff --git a/src/components/productView/productViewOpenShiftContainer.js b/src/components/productView/productViewOpenShiftContainer.js
@@ -172,12 +172,13 @@ ProductViewOpenShiftContainer.propTypes = {
   productConfig: PropTypes.arrayOf(
     PropTypes.shape({
       productContextFilterUom: PropTypes.bool,
-      query: PropTypes.object,
-      graphTallyQuery: PropTypes.shape({
-        [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)]),
+      query: PropTypes.shape({
         [RHSM_API_QUERY_TYPES.START_DATE]: PropTypes.string,
         [RHSM_API_QUERY_TYPES.END_DATE]: PropTypes.string
       }),
+      graphTallyQuery: PropTypes.shape({
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)])
+      }),
       inventoryHostsQuery: PropTypes.shape({
         [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
         [RHSM_API_QUERY_TYPES.OFFSET]: PropTypes.number,
@@ -222,15 +223,15 @@ ProductViewOpenShiftContainer.defaultProps = {
     {
       productContextFilterUom: true,
       query: {
-        [RHSM_API_QUERY_TYPES.UOM]: RHSM_API_QUERY_UOM_TYPES.CORES
-      },
-      graphTallyQuery: {
-        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+        [RHSM_API_QUERY_TYPES.UOM]: RHSM_API_QUERY_UOM_TYPES.CORES,
         [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers
           .getRangedDateTime(GRANULARITY_TYPES.DAILY)
           .startDate.toISOString(),
         [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
       },
+      graphTallyQuery: {
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY
+      },
       inventoryHostsQuery: {
         [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
         [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
@@ -396,12 +397,13 @@ ProductViewOpenShiftContainer.defaultProps = {
       viewId: 'viewOpenShift'
     },
     {
-      query: {},
-      graphTallyQuery: {
-        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+      query: {
         [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers.getRangedMonthDateTime('current').value.startDate.toISOString(),
         [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedMonthDateTime('current').value.endDate.toISOString()
       },
+      graphTallyQuery: {
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY
+      },
       inventoryHostsQuery: {
         [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
         [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,

diff --git a/src/components/productView/productViewOpenShiftDedicated.js b/src/components/productView/productViewOpenShiftDedicated.js
@@ -60,12 +60,13 @@ ProductViewOpenShiftDedicated.propTypes = {
  */
 ProductViewOpenShiftDedicated.defaultProps = {
   productConfig: {
-    query: {},
-    graphTallyQuery: {
-      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+    query: {
       [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers.getRangedMonthDateTime('current').value.startDate.toISOString(),
       [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedMonthDateTime('current').value.endDate.toISOString()
     },
+    graphTallyQuery: {
+      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY
+    },
     inventoryHostsQuery: {
       [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
       [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,

diff --git a/src/components/productView/productViewRhel.js b/src/components/productView/productViewRhel.js
@@ -55,12 +55,13 @@ ProductViewRhel.propTypes = {
  */
 ProductViewRhel.defaultProps = {
   productConfig: {
-    query: {},
-    graphTallyQuery: {
-      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+    query: {
       [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).startDate.toISOString(),
       [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
     },
+    graphTallyQuery: {
+      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY
+    },
     inventoryHostsQuery: {
       [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
       [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,

diff --git a/src/components/productView/productViewSatellite.js b/src/components/productView/productViewSatellite.js
@@ -55,12 +55,13 @@ ProductViewSatellite.propTypes = {
  */
 ProductViewSatellite.defaultProps = {
   productConfig: {
-    query: {},
-    graphTallyQuery: {
-      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+    query: {
       [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).startDate.toISOString(),
       [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
     },
+    graphTallyQuery: {
+      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY
+    },
     inventoryHostsQuery: {
       [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
       [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,

diff --git a/src/components/toolbar/toolbarFieldRangedMonthly.js b/src/components/toolbar/toolbarFieldRangedMonthly.js
@@ -28,10 +28,7 @@ const toolbarFieldOptions = dateHelpers.getRangedMonthDateTime().listDateTimeRan
  * @returns {Node}
  */
 const ToolbarFieldRangedMonthly = ({ options, t, value, viewId }) => {
-  const updatedValue = useSelector(
-    ({ view }) => view.graphTallyQuery?.[viewId]?.[RHSM_API_QUERY_TYPES.START_DATE],
-    value
-  );
+  const updatedValue = useSelector(({ view }) => view.query?.[viewId]?.[RHSM_API_QUERY_TYPES.START_DATE], value);
 
   const updatedOptions = options.map(option => ({
     ...option,

diff --git a/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap
@@ -304,11 +304,7 @@ Object {
 exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_RHSM_beginning 1`] = `
 Object {
   "result": Object {
-    "graphTallyQuery": Object {
-      "test_id": Object {
-        "beginning": "2018-02-01T00:00:00.000Z",
-      },
-    },
+    "graphTallyQuery": Object {},
     "inventoryGuestsQuery": Object {},
     "inventoryHostsQuery": Object {
       "test_id": Object {
@@ -324,7 +320,11 @@ Object {
         "sort": "ipsum sort",
       },
     },
-    "query": Object {},
+    "query": Object {
+      "test_id": Object {
+        "beginning": "2018-02-01T00:00:00.000Z",
+      },
+    },
   },
   "type": "SET_QUERY_RHSM_beginning",
 }
@@ -333,11 +333,7 @@ Object {
 exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_RHSM_ending 1`] = `
 Object {
   "result": Object {
-    "graphTallyQuery": Object {
-      "test_id": Object {
-        "ending": "2021-02-01T23:59:59.999Z",
-      },
-    },
+    "graphTallyQuery": Object {},
     "inventoryGuestsQuery": Object {},
     "inventoryHostsQuery": Object {
       "test_id": Object {
@@ -353,7 +349,11 @@ Object {
         "sort": "ipsum sort",
       },
     },
-    "query": Object {},
+    "query": Object {
+      "test_id": Object {
+        "ending": "2021-02-01T23:59:59.999Z",
+      },
+    },
   },
   "type": "SET_QUERY_RHSM_ending",
 }

diff --git a/src/redux/reducers/viewReducer.js b/src/redux/reducers/viewReducer.js
@@ -113,10 +113,10 @@ const viewReducer = (state = initialState, action) => {
       );
     case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.START_DATE]:
       return reduxHelpers.setStateProp(
-        'graphTallyQuery',
+        'query',
         {
           [action.viewId]: {
-            ...state.graphTallyQuery[action.viewId],
+            ...state.query[action.viewId],
             [RHSM_API_QUERY_TYPES.START_DATE]: action[RHSM_API_QUERY_TYPES.START_DATE]
           }
         },
@@ -127,10 +127,10 @@ const viewReducer = (state = initialState, action) => {
       );
     case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.END_DATE]:
       return reduxHelpers.setStateProp(
-        'graphTallyQuery',
+        'query',
         {
           [action.viewId]: {
-            ...state.graphTallyQuery[action.viewId],
+            ...state.query[action.viewId],
             [RHSM_API_QUERY_TYPES.END_DATE]: action[RHSM_API_QUERY_TYPES.END_DATE]
           }
         },