fix(queryTypes): issues/10 rhsm to query type (#361)

* graphCard, c3graphCard, filter to query name * queryTypes, rhsmTypes, filter to query, align naming * toolbar, apply query SLA type * viewReducer, apply query types
RedHatInsights · Aug 4, 2020 · 861ccb2 · 861ccb2
1 parent bd5874d
commit 861ccb2
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 89 deletions.
diff --git a/src/components/c3GraphCard/c3GraphCard.js b/src/components/c3GraphCard/c3GraphCard.js
@@ -67,7 +67,7 @@ class C3GraphCard extends React.Component {
     const { viewId } = this.props;
 
     store.dispatch({
-      type: reduxTypes.rhsm.SET_FILTER_GRANULARITY_RHSM,
+      type: reduxTypes.query.SET_QUERY_GRANULARITY_RHSM,
       viewId,
       [rhsmApiTypes.RHSM_API_QUERY_GRANULARITY]: value
     });

diff --git a/src/components/graphCard/graphCard.js b/src/components/graphCard/graphCard.js
@@ -67,7 +67,7 @@ class GraphCard extends React.Component {
     const { viewId } = this.props;
 
     store.dispatch({
-      type: reduxTypes.rhsm.SET_FILTER_GRANULARITY_RHSM,
+      type: reduxTypes.query.SET_QUERY_GRANULARITY_RHSM,
       viewId,
       [rhsmApiTypes.RHSM_API_QUERY_GRANULARITY]: value
     });

diff --git a/src/components/toolbar/toolbar.js b/src/components/toolbar/toolbar.js
@@ -22,7 +22,7 @@ class Toolbar extends React.Component {
    * @event onClear
    */
   onClear = () => {
-    this.dispatchFilter(reduxTypes.rhsm.SET_FILTER_SLA_RHSM, { [rhsmApiTypes.RHSM_API_QUERY_SLA]: null });
+    this.dispatchFilter(reduxTypes.query.SET_QUERY_SLA_RHSM, { [rhsmApiTypes.RHSM_API_QUERY_SLA]: null });
   };
 
   /**
@@ -34,7 +34,7 @@ class Toolbar extends React.Component {
   onSlaSelect = event => {
     const { value } = event;
 
-    this.dispatchFilter(reduxTypes.rhsm.SET_FILTER_SLA_RHSM, { [rhsmApiTypes.RHSM_API_QUERY_SLA]: value });
+    this.dispatchFilter(reduxTypes.query.SET_QUERY_SLA_RHSM, { [rhsmApiTypes.RHSM_API_QUERY_SLA]: value });
   };
 
   /**

diff --git a/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap
@@ -1,17 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ViewReducer should handle specific defined types: defined type SET_CLEAR_FILTERS 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_CLEAR 1`] = `
 Object {
   "result": Object {
     "query": Object {
       "test_id": Object {},
     },
   },
-  "type": "SET_CLEAR_FILTERS",
+  "type": "SET_QUERY_CLEAR",
 }
 `;
 
-exports[`ViewReducer should handle specific defined types: defined type SET_FILTER_GRANULARITY_RHSM 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_GRANULARITY_RHSM 1`] = `
 Object {
   "result": Object {
     "query": Object {
@@ -20,58 +20,58 @@ Object {
       },
     },
   },
-  "type": "SET_FILTER_GRANULARITY_RHSM",
+  "type": "SET_QUERY_GRANULARITY_RHSM",
 }
 `;
 
-exports[`ViewReducer should handle specific defined types: defined type SET_FILTER_SLA_RHSM 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_PAGE_LIMIT_RHSM 1`] = `
 Object {
   "result": Object {
     "query": Object {
       "test_id": Object {
-        "sla": "lorem sla",
+        "limit": 10,
       },
     },
   },
-  "type": "SET_FILTER_SLA_RHSM",
+  "type": "SET_QUERY_PAGE_LIMIT_RHSM",
 }
 `;
 
-exports[`ViewReducer should handle specific defined types: defined type SET_FILTER_USAGE_RHSM 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_PAGE_OFFSET_RHSM 1`] = `
 Object {
   "result": Object {
     "query": Object {
       "test_id": Object {
-        "usage": undefined,
+        "offset": 10,
       },
     },
   },
-  "type": "SET_FILTER_USAGE_RHSM",
+  "type": "SET_QUERY_PAGE_OFFSET_RHSM",
 }
 `;
 
-exports[`ViewReducer should handle specific defined types: defined type SET_PAGE_LIMIT_RHSM 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_SLA_RHSM 1`] = `
 Object {
   "result": Object {
     "query": Object {
       "test_id": Object {
-        "limit": undefined,
+        "sla": "lorem sla",
       },
     },
   },
-  "type": "SET_PAGE_LIMIT_RHSM",
+  "type": "SET_QUERY_SLA_RHSM",
 }
 `;
 
-exports[`ViewReducer should handle specific defined types: defined type SET_PAGE_OFFSET_RHSM 1`] = `
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_USAGE_RHSM 1`] = `
 Object {
   "result": Object {
     "query": Object {
       "test_id": Object {
-        "offset": undefined,
+        "usage": "ipsum usage",
       },
     },
   },
-  "type": "SET_PAGE_OFFSET_RHSM",
+  "type": "SET_QUERY_USAGE_RHSM",
 }
 `;
diff --git a/src/redux/reducers/__tests__/viewReducer.test.js b/src/redux/reducers/__tests__/viewReducer.test.js
@@ -1,5 +1,12 @@
 import viewReducer from '../viewReducer';
-import { rhsmTypes as types } from '../../types';
+import { queryTypes as types } from '../../types';
+import {
+  RHSM_API_QUERY_GRANULARITY,
+  RHSM_API_QUERY_LIMIT,
+  RHSM_API_QUERY_OFFSET,
+  RHSM_API_QUERY_SLA,
+  RHSM_API_QUERY_USAGE
+} from '../../../types/rhsmApiTypes';
 
 describe('ViewReducer', () => {
   it('should return the initial state', () => {
@@ -8,19 +15,22 @@ describe('ViewReducer', () => {
 
   it('should handle specific defined types', () => {
     const specificTypes = [
-      types.SET_FILTER_GRANULARITY_RHSM,
-      types.SET_FILTER_SLA_RHSM,
-      types.SET_FILTER_USAGE_RHSM,
-      types.SET_CLEAR_FILTERS,
-      types.SET_PAGE_LIMIT_RHSM,
-      types.SET_PAGE_OFFSET_RHSM
+      types.SET_QUERY_GRANULARITY_RHSM,
+      types.SET_QUERY_SLA_RHSM,
+      types.SET_QUERY_USAGE_RHSM,
+      types.SET_QUERY_CLEAR,
+      types.SET_QUERY_PAGE_LIMIT_RHSM,
+      types.SET_QUERY_PAGE_OFFSET_RHSM
     ];
 
     specificTypes.forEach(value => {
       const dispatched = {
         type: value,
-        granularity: 'lorem granularity',
-        sla: 'lorem sla',
+        [RHSM_API_QUERY_GRANULARITY]: 'lorem granularity',
+        [RHSM_API_QUERY_SLA]: 'lorem sla',
+        [RHSM_API_QUERY_USAGE]: 'ipsum usage',
+        [RHSM_API_QUERY_LIMIT]: 10,
+        [RHSM_API_QUERY_OFFSET]: 10,
         viewId: 'test_id'
       };
 

diff --git a/src/redux/reducers/viewReducer.js b/src/redux/reducers/viewReducer.js
@@ -27,63 +27,63 @@ const initialState = {
  */
 const viewReducer = (state = initialState, action) => {
   switch (action.type) {
-    case reduxTypes.rhsm.SET_FILTER_GRANULARITY_RHSM:
+    case reduxTypes.query.SET_QUERY_CLEAR:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_GRANULARITY]: action[RHSM_API_QUERY_GRANULARITY]
+            ...action.clearFilters
           }
         },
         {
           state,
           reset: false
         }
       );
-    case reduxTypes.rhsm.SET_FILTER_SLA_RHSM:
+    case reduxTypes.query.SET_QUERY_GRANULARITY_RHSM:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_SLA]: action[RHSM_API_QUERY_SLA]
+            [RHSM_API_QUERY_GRANULARITY]: action[RHSM_API_QUERY_GRANULARITY]
           }
         },
         {
           state,
           reset: false
         }
       );
-    case reduxTypes.rhsm.SET_FILTER_USAGE_RHSM:
+    case reduxTypes.query.SET_QUERY_SLA_RHSM:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_USAGE]: action[RHSM_API_QUERY_USAGE]
+            [RHSM_API_QUERY_SLA]: action[RHSM_API_QUERY_SLA]
           }
         },
         {
           state,
           reset: false
         }
       );
-    case reduxTypes.rhsm.SET_CLEAR_FILTERS:
+    case reduxTypes.query.SET_QUERY_USAGE_RHSM:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            ...action.clearFilters
+            [RHSM_API_QUERY_USAGE]: action[RHSM_API_QUERY_USAGE]
           }
         },
         {
           state,
           reset: false
         }
       );
-    case reduxTypes.rhsm.SET_PAGE_LIMIT_RHSM:
+    case reduxTypes.query.SET_QUERY_PAGE_LIMIT_RHSM:
       return reduxHelpers.setStateProp(
         'query',
         {
@@ -97,7 +97,7 @@ const viewReducer = (state = initialState, action) => {
           reset: false
         }
       );
-    case reduxTypes.rhsm.SET_PAGE_OFFSET_RHSM:
+    case reduxTypes.query.SET_QUERY_PAGE_OFFSET_RHSM:
       return reduxHelpers.setStateProp(
         'query',
         {

diff --git a/src/redux/types/__tests__/__snapshots__/index.test.js.snap b/src/redux/types/__tests__/__snapshots__/index.test.js.snap
@@ -23,18 +23,20 @@ Object {
       "PLATFORM_REMOVE_NOTIFICATION": "@@INSIGHTS-CORE/NOTIFICATIONS/REMOVE_NOTIFICATION",
       "PLATFORM_SET_NAV": "PLATFORM_SET_NAV",
     },
+    "query": Object {
+      "SET_QUERY_CLEAR": "SET_QUERY_CLEAR",
+      "SET_QUERY_GRANULARITY_RHSM": "SET_QUERY_GRANULARITY_RHSM",
+      "SET_QUERY_PAGE_LIMIT_RHSM": "SET_QUERY_PAGE_LIMIT_RHSM",
+      "SET_QUERY_PAGE_OFFSET_RHSM": "SET_QUERY_PAGE_OFFSET_RHSM",
+      "SET_QUERY_SLA_RHSM": "SET_QUERY_SLA_RHSM",
+      "SET_QUERY_USAGE_RHSM": "SET_QUERY_USAGE_RHSM",
+    },
     "rhsm": Object {
       "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
       "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
       "GET_GRAPH_REPORT_RHSM": "GET_GRAPH_REPORT_RHSM",
       "GET_HOSTS_INVENTORY_GUESTS_RHSM": "GET_HOSTS_INVENTORY_GUESTS_RHSM",
       "GET_HOSTS_INVENTORY_RHSM": "GET_HOSTS_INVENTORY_RHSM",
-      "SET_CLEAR_FILTERS": "SET_CLEAR_FILTERS",
-      "SET_FILTER_GRANULARITY_RHSM": "SET_FILTER_GRANULARITY_RHSM",
-      "SET_FILTER_SLA_RHSM": "SET_FILTER_SLA_RHSM",
-      "SET_FILTER_USAGE_RHSM": "SET_FILTER_USAGE_RHSM",
-      "SET_PAGE_LIMIT_RHSM": "SET_PAGE_LIMIT_RHSM",
-      "SET_PAGE_OFFSET_RHSM": "SET_PAGE_OFFSET_RHSM",
     },
     "user": Object {
       "DELETE_USER_OPTIN": "DELETE_USER_OPTIN",
@@ -57,6 +59,14 @@ Object {
     "PLATFORM_REMOVE_NOTIFICATION": "@@INSIGHTS-CORE/NOTIFICATIONS/REMOVE_NOTIFICATION",
     "PLATFORM_SET_NAV": "PLATFORM_SET_NAV",
   },
+  "queryTypes": Object {
+    "SET_QUERY_CLEAR": "SET_QUERY_CLEAR",
+    "SET_QUERY_GRANULARITY_RHSM": "SET_QUERY_GRANULARITY_RHSM",
+    "SET_QUERY_PAGE_LIMIT_RHSM": "SET_QUERY_PAGE_LIMIT_RHSM",
+    "SET_QUERY_PAGE_OFFSET_RHSM": "SET_QUERY_PAGE_OFFSET_RHSM",
+    "SET_QUERY_SLA_RHSM": "SET_QUERY_SLA_RHSM",
+    "SET_QUERY_USAGE_RHSM": "SET_QUERY_USAGE_RHSM",
+  },
   "reduxTypes": Object {
     "app": Object {
       "STATUS_4XX": "4XX",
@@ -74,18 +84,20 @@ Object {
       "PLATFORM_REMOVE_NOTIFICATION": "@@INSIGHTS-CORE/NOTIFICATIONS/REMOVE_NOTIFICATION",
       "PLATFORM_SET_NAV": "PLATFORM_SET_NAV",
     },
+    "query": Object {
+      "SET_QUERY_CLEAR": "SET_QUERY_CLEAR",
+      "SET_QUERY_GRANULARITY_RHSM": "SET_QUERY_GRANULARITY_RHSM",
+      "SET_QUERY_PAGE_LIMIT_RHSM": "SET_QUERY_PAGE_LIMIT_RHSM",
+      "SET_QUERY_PAGE_OFFSET_RHSM": "SET_QUERY_PAGE_OFFSET_RHSM",
+      "SET_QUERY_SLA_RHSM": "SET_QUERY_SLA_RHSM",
+      "SET_QUERY_USAGE_RHSM": "SET_QUERY_USAGE_RHSM",
+    },
     "rhsm": Object {
       "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
       "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
       "GET_GRAPH_REPORT_RHSM": "GET_GRAPH_REPORT_RHSM",
       "GET_HOSTS_INVENTORY_GUESTS_RHSM": "GET_HOSTS_INVENTORY_GUESTS_RHSM",
       "GET_HOSTS_INVENTORY_RHSM": "GET_HOSTS_INVENTORY_RHSM",
-      "SET_CLEAR_FILTERS": "SET_CLEAR_FILTERS",
-      "SET_FILTER_GRANULARITY_RHSM": "SET_FILTER_GRANULARITY_RHSM",
-      "SET_FILTER_SLA_RHSM": "SET_FILTER_SLA_RHSM",
-      "SET_FILTER_USAGE_RHSM": "SET_FILTER_USAGE_RHSM",
-      "SET_PAGE_LIMIT_RHSM": "SET_PAGE_LIMIT_RHSM",
-      "SET_PAGE_OFFSET_RHSM": "SET_PAGE_OFFSET_RHSM",
     },
     "user": Object {
       "DELETE_USER_OPTIN": "DELETE_USER_OPTIN",
@@ -102,12 +114,6 @@ Object {
     "GET_GRAPH_REPORT_RHSM": "GET_GRAPH_REPORT_RHSM",
     "GET_HOSTS_INVENTORY_GUESTS_RHSM": "GET_HOSTS_INVENTORY_GUESTS_RHSM",
     "GET_HOSTS_INVENTORY_RHSM": "GET_HOSTS_INVENTORY_RHSM",
-    "SET_CLEAR_FILTERS": "SET_CLEAR_FILTERS",
-    "SET_FILTER_GRANULARITY_RHSM": "SET_FILTER_GRANULARITY_RHSM",
-    "SET_FILTER_SLA_RHSM": "SET_FILTER_SLA_RHSM",
-    "SET_FILTER_USAGE_RHSM": "SET_FILTER_USAGE_RHSM",
-    "SET_PAGE_LIMIT_RHSM": "SET_PAGE_LIMIT_RHSM",
-    "SET_PAGE_OFFSET_RHSM": "SET_PAGE_OFFSET_RHSM",
   },
   "userTypes": Object {
     "DELETE_USER_OPTIN": "DELETE_USER_OPTIN",
@@ -138,18 +144,20 @@ Object {
     "PLATFORM_REMOVE_NOTIFICATION": "@@INSIGHTS-CORE/NOTIFICATIONS/REMOVE_NOTIFICATION",
     "PLATFORM_SET_NAV": "PLATFORM_SET_NAV",
   },
+  "query": Object {
+    "SET_QUERY_CLEAR": "SET_QUERY_CLEAR",
+    "SET_QUERY_GRANULARITY_RHSM": "SET_QUERY_GRANULARITY_RHSM",
+    "SET_QUERY_PAGE_LIMIT_RHSM": "SET_QUERY_PAGE_LIMIT_RHSM",
+    "SET_QUERY_PAGE_OFFSET_RHSM": "SET_QUERY_PAGE_OFFSET_RHSM",
+    "SET_QUERY_SLA_RHSM": "SET_QUERY_SLA_RHSM",
+    "SET_QUERY_USAGE_RHSM": "SET_QUERY_USAGE_RHSM",
+  },
   "rhsm": Object {
     "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
     "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
     "GET_GRAPH_REPORT_RHSM": "GET_GRAPH_REPORT_RHSM",
     "GET_HOSTS_INVENTORY_GUESTS_RHSM": "GET_HOSTS_INVENTORY_GUESTS_RHSM",
     "GET_HOSTS_INVENTORY_RHSM": "GET_HOSTS_INVENTORY_RHSM",
-    "SET_CLEAR_FILTERS": "SET_CLEAR_FILTERS",
-    "SET_FILTER_GRANULARITY_RHSM": "SET_FILTER_GRANULARITY_RHSM",
-    "SET_FILTER_SLA_RHSM": "SET_FILTER_SLA_RHSM",
-    "SET_FILTER_USAGE_RHSM": "SET_FILTER_USAGE_RHSM",
-    "SET_PAGE_LIMIT_RHSM": "SET_PAGE_LIMIT_RHSM",
-    "SET_PAGE_OFFSET_RHSM": "SET_PAGE_OFFSET_RHSM",
   },
   "user": Object {
     "DELETE_USER_OPTIN": "DELETE_USER_OPTIN",

diff --git a/src/redux/types/index.js b/src/redux/types/index.js
@@ -1,15 +1,17 @@
 import { appTypes } from './appTypes';
 import { graphTypes } from './graphTypes';
 import { platformTypes } from './platformTypes';
+import { queryTypes } from './queryTypes';
 import { rhsmTypes } from './rhsmTypes';
 import { userTypes } from './userTypes';
 
 const reduxTypes = {
   app: appTypes,
   graph: graphTypes,
   platform: platformTypes,
+  query: queryTypes,
   rhsm: rhsmTypes,
   user: userTypes
 };
 
-export { reduxTypes as default, reduxTypes, appTypes, graphTypes, platformTypes, rhsmTypes, userTypes };
+export { reduxTypes as default, reduxTypes, appTypes, graphTypes, platformTypes, queryTypes, rhsmTypes, userTypes };