refactor(dotenv,redux): sw-1911 remove deprecated tally, capacity (#1254

)
RedHatInsights · Jan 18, 2024 · 190b05f · 190b05f
1 parent 37901f5
commit 190b05f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 100 deletions.
diff --git a/.env b/.env
@@ -36,10 +36,8 @@ REACT_APP_CONFIG_SERVICE_LOCALES_PATH=${UI_DEPLOY_PATH_PREFIX}/apps/subscription
 REACT_APP_CONFIG_SERVICE_LOCALES_EXPIRE=604800000
 
 REACT_APP_SERVICES_RHSM_VERSION=/api/rhsm-subscriptions/v1/version
-REACT_APP_SERVICES_RHSM_REPORT=/api/rhsm-subscriptions/v1/tally/products/
 REACT_APP_SERVICES_RHSM_TALLY=/api/rhsm-subscriptions/v1/tally/products/{0}/{1}
 REACT_APP_SERVICES_RHSM_CAPACITY=/api/rhsm-subscriptions/v1/capacity/products/{0}/{1}
-REACT_APP_SERVICES_RHSM_CAPACITY_DEPRECATED=/api/rhsm-subscriptions/v1/capacity/products/
 REACT_APP_SERVICES_RHSM_INVENTORY_INSTANCES=/api/rhsm-subscriptions/v1/instances/products/
 REACT_APP_SERVICES_RHSM_INVENTORY_INSTANCES_GUESTS=/api/rhsm-subscriptions/v1/instances/{0}/guests
 REACT_APP_SERVICES_RHSM_INVENTORY_SUBSCRIPTIONS=/api/rhsm-subscriptions/v1/subscriptions/products/

diff --git a/.env.development b/.env.development
@@ -9,10 +9,8 @@ REACT_APP_CONFIG_SERVICE_LOCALES=/locales/locales.json
 REACT_APP_CONFIG_SERVICE_LOCALES_PATH=/locales/{{lng}}.json
 
 REACT_APP_SERVICES_RHSM_VERSION=http://localhost:5000/api/rhsm-subscriptions/v1/version
-REACT_APP_SERVICES_RHSM_REPORT=http://localhost:5000/api/rhsm-subscriptions/v1/tally/products/
 REACT_APP_SERVICES_RHSM_TALLY=http://localhost:5000/api/rhsm-subscriptions/v1/tally/products/{0}/{1}
 REACT_APP_SERVICES_RHSM_CAPACITY=http://localhost:5000/api/rhsm-subscriptions/v1/capacity/products/{0}/{1}
-REACT_APP_SERVICES_RHSM_CAPACITY_DEPRECATED=http://localhost:5000/api/rhsm-subscriptions/v1/capacity/products/
 REACT_APP_SERVICES_RHSM_INVENTORY_INSTANCES=http://localhost:5000/api/rhsm-subscriptions/v1/instances/products/
 REACT_APP_SERVICES_RHSM_INVENTORY_INSTANCES_GUESTS=http://localhost:5000/api/rhsm-subscriptions/v1/instances/{0}/guests
 REACT_APP_SERVICES_RHSM_INVENTORY_SUBSCRIPTIONS=http://localhost:5000/api/rhsm-subscriptions/v1/subscriptions/products/

diff --git a/.env.proxy b/.env.proxy
@@ -1,4 +1,3 @@
-DEV_PORT=1337
 DEV_BRANCH=stage-beta
 UI_DEPLOY_PATH_PREFIX=/beta
 

diff --git a/src/redux/reducers/__tests__/__snapshots__/graphReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/graphReducer.test.js.snap
@@ -12,38 +12,17 @@ exports[`GraphReducer should handle all defined error types: rejected types GET_
       "status": 0,
     },
     "legend": {},
-    "reportCapacity": {},
     "tally": {},
   },
   "type": "GET_GRAPH_CAPACITY_RHSM_REJECTED",
 }
 `;
 
-exports[`GraphReducer should handle all defined error types: rejected types GET_GRAPH_REPORT_CAPACITY_RHSM 1`] = `
-{
-  "result": {
-    "capacity": {},
-    "legend": {},
-    "reportCapacity": {
-      "error": true,
-      "errorMessage": "MESSAGE",
-      "fulfilled": false,
-      "meta": {},
-      "pending": false,
-      "status": 0,
-    },
-    "tally": {},
-  },
-  "type": "GET_GRAPH_REPORT_CAPACITY_RHSM_REJECTED",
-}
-`;
-
 exports[`GraphReducer should handle all defined error types: rejected types GET_GRAPH_TALLY_RHSM 1`] = `
 {
   "result": {
     "capacity": {},
     "legend": {},
-    "reportCapacity": {},
     "tally": {
       "error": true,
       "errorMessage": "MESSAGE",
@@ -73,42 +52,17 @@ exports[`GraphReducer should handle all defined fulfilled types: fulfilled types
       "status": 0,
     },
     "legend": {},
-    "reportCapacity": {},
     "tally": {},
   },
   "type": "GET_GRAPH_CAPACITY_RHSM_FULFILLED",
 }
 `;
 
-exports[`GraphReducer should handle all defined fulfilled types: fulfilled types GET_GRAPH_REPORT_CAPACITY_RHSM 1`] = `
-{
-  "result": {
-    "capacity": {},
-    "legend": {},
-    "reportCapacity": {
-      "data": {
-        "test": "success",
-      },
-      "date": null,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": true,
-      "meta": {},
-      "pending": false,
-      "status": 0,
-    },
-    "tally": {},
-  },
-  "type": "GET_GRAPH_REPORT_CAPACITY_RHSM_FULFILLED",
-}
-`;
-
 exports[`GraphReducer should handle all defined fulfilled types: fulfilled types GET_GRAPH_TALLY_RHSM 1`] = `
 {
   "result": {
     "capacity": {},
     "legend": {},
-    "reportCapacity": {},
     "tally": {
       "data": {
         "test": "success",
@@ -137,37 +91,17 @@ exports[`GraphReducer should handle all defined pending types: pending types GET
       "pending": true,
     },
     "legend": {},
-    "reportCapacity": {},
     "tally": {},
   },
   "type": "GET_GRAPH_CAPACITY_RHSM_PENDING",
 }
 `;
 
-exports[`GraphReducer should handle all defined pending types: pending types GET_GRAPH_REPORT_CAPACITY_RHSM 1`] = `
-{
-  "result": {
-    "capacity": {},
-    "legend": {},
-    "reportCapacity": {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "meta": {},
-      "pending": true,
-    },
-    "tally": {},
-  },
-  "type": "GET_GRAPH_REPORT_CAPACITY_RHSM_PENDING",
-}
-`;
-
 exports[`GraphReducer should handle all defined pending types: pending types GET_GRAPH_TALLY_RHSM 1`] = `
 {
   "result": {
     "capacity": {},
     "legend": {},
-    "reportCapacity": {},
     "tally": {
       "error": false,
       "errorMessage": "",
@@ -187,7 +121,6 @@ exports[`GraphReducer should handle specific defined types: defined type SET_GRA
     "legend": {
       "lorem": true,
     },
-    "reportCapacity": {},
     "tally": {},
   },
   "type": "SET_GRAPH_LEGEND",

diff --git a/src/redux/reducers/__tests__/graphReducer.test.js b/src/redux/reducers/__tests__/graphReducer.test.js
@@ -24,11 +24,7 @@ describe('GraphReducer', () => {
   });
 
   it('should handle all defined error types', () => {
-    const specificTypes = [
-      types.GET_GRAPH_REPORT_CAPACITY_RHSM,
-      types.GET_GRAPH_CAPACITY_RHSM,
-      types.GET_GRAPH_TALLY_RHSM
-    ];
+    const specificTypes = [types.GET_GRAPH_CAPACITY_RHSM, types.GET_GRAPH_TALLY_RHSM];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -55,11 +51,7 @@ describe('GraphReducer', () => {
   });
 
   it('should handle all defined pending types', () => {
-    const specificTypes = [
-      types.GET_GRAPH_REPORT_CAPACITY_RHSM,
-      types.GET_GRAPH_CAPACITY_RHSM,
-      types.GET_GRAPH_TALLY_RHSM
-    ];
+    const specificTypes = [types.GET_GRAPH_CAPACITY_RHSM, types.GET_GRAPH_TALLY_RHSM];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -75,11 +67,7 @@ describe('GraphReducer', () => {
   });
 
   it('should handle all defined fulfilled types', () => {
-    const specificTypes = [
-      types.GET_GRAPH_REPORT_CAPACITY_RHSM,
-      types.GET_GRAPH_CAPACITY_RHSM,
-      types.GET_GRAPH_TALLY_RHSM
-    ];
+    const specificTypes = [types.GET_GRAPH_CAPACITY_RHSM, types.GET_GRAPH_TALLY_RHSM];
 
     specificTypes.forEach(value => {
       const dispatched = {

diff --git a/src/redux/reducers/graphReducer.js b/src/redux/reducers/graphReducer.js
@@ -12,12 +12,11 @@ import { reduxHelpers } from '../common/reduxHelpers';
  * Initial state.
  *
  * @private
- * @type {{reportCapacity: {}, legend: {}, tally: {}, capacity: {}}}
+ * @type {{legend: {}, tally: {}, capacity: {}}}
  */
 const initialState = {
   capacity: {},
   legend: {},
-  reportCapacity: {},
   tally: {}
 };
 
@@ -46,7 +45,6 @@ const graphReducer = (state = initialState, action) => {
       return reduxHelpers.generatedPromiseActionReducer(
         [
           { ref: 'capacity', type: rhsmTypes.GET_GRAPH_CAPACITY_RHSM },
-          { ref: 'reportCapacity', type: rhsmTypes.GET_GRAPH_REPORT_CAPACITY_RHSM },
           { ref: 'tally', type: rhsmTypes.GET_GRAPH_TALLY_RHSM }
         ],
         state,

diff --git a/src/redux/types/__tests__/__snapshots__/index.test.js.snap b/src/redux/types/__tests__/__snapshots__/index.test.js.snap
@@ -47,7 +47,6 @@ exports[`ReduxTypes should have specific type properties: all redux types 1`] =
     },
     "rhsm": {
       "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
-      "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
       "GET_GRAPH_TALLY_RHSM": "GET_GRAPH_TALLY_RHSM",
       "GET_INSTANCES_INVENTORY_GUESTS_RHSM": "GET_INSTANCES_INVENTORY_GUESTS_RHSM",
       "GET_INSTANCES_INVENTORY_RHSM": "GET_INSTANCES_INVENTORY_RHSM",
@@ -131,7 +130,6 @@ exports[`ReduxTypes should have specific type properties: all redux types 1`] =
     },
     "rhsm": {
       "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
-      "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
       "GET_GRAPH_TALLY_RHSM": "GET_GRAPH_TALLY_RHSM",
       "GET_INSTANCES_INVENTORY_GUESTS_RHSM": "GET_INSTANCES_INVENTORY_GUESTS_RHSM",
       "GET_INSTANCES_INVENTORY_RHSM": "GET_INSTANCES_INVENTORY_RHSM",
@@ -151,7 +149,6 @@ exports[`ReduxTypes should have specific type properties: all redux types 1`] =
   },
   "rhsmTypes": {
     "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
-    "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
     "GET_GRAPH_TALLY_RHSM": "GET_GRAPH_TALLY_RHSM",
     "GET_INSTANCES_INVENTORY_GUESTS_RHSM": "GET_INSTANCES_INVENTORY_GUESTS_RHSM",
     "GET_INSTANCES_INVENTORY_RHSM": "GET_INSTANCES_INVENTORY_RHSM",
@@ -210,7 +207,6 @@ exports[`ReduxTypes should have specific type properties: specific types 1`] = `
   },
   "rhsm": {
     "GET_GRAPH_CAPACITY_RHSM": "GET_GRAPH_CAPACITY_RHSM",
-    "GET_GRAPH_REPORT_CAPACITY_RHSM": "GET_GRAPH_REPORT_CAPACITY_RHSM",
     "GET_GRAPH_TALLY_RHSM": "GET_GRAPH_TALLY_RHSM",
     "GET_INSTANCES_INVENTORY_GUESTS_RHSM": "GET_INSTANCES_INVENTORY_GUESTS_RHSM",
     "GET_INSTANCES_INVENTORY_RHSM": "GET_INSTANCES_INVENTORY_RHSM",

diff --git a/src/redux/types/rhsmTypes.js b/src/redux/types/rhsmTypes.js
@@ -4,7 +4,6 @@
  */
 
 const GET_GRAPH_CAPACITY_RHSM = 'GET_GRAPH_CAPACITY_RHSM';
-const GET_GRAPH_REPORT_CAPACITY_RHSM = 'GET_GRAPH_REPORT_CAPACITY_RHSM';
 const GET_GRAPH_TALLY_RHSM = 'GET_GRAPH_TALLY_RHSM';
 const GET_INSTANCES_INVENTORY_RHSM = 'GET_INSTANCES_INVENTORY_RHSM';
 const GET_INSTANCES_INVENTORY_GUESTS_RHSM = 'GET_INSTANCES_INVENTORY_GUESTS_RHSM';
@@ -13,13 +12,11 @@ const GET_SUBSCRIPTIONS_INVENTORY_RHSM = 'GET_SUBSCRIPTIONS_INVENTORY_RHSM';
 /**
  * RHSM API action, reducer types.
  *
- * @type {{GET_GRAPH_REPORT_CAPACITY_RHSM: string, GET_GRAPH_CAPACITY_RHSM: string, GET_INSTANCES_INVENTORY_GUESTS_RHSM:
- *     string, GET_SUBSCRIPTIONS_INVENTORY_RHSM: string, GET_INSTANCES_INVENTORY_RHSM: string, GET_GRAPH_TALLY_RHSM:
- *     string}}
+ * @type {{GET_GRAPH_CAPACITY_RHSM: string, GET_INSTANCES_INVENTORY_GUESTS_RHSM: string,
+ *     GET_SUBSCRIPTIONS_INVENTORY_RHSM: string, GET_INSTANCES_INVENTORY_RHSM: string, GET_GRAPH_TALLY_RHSM: string}}
  */
 const rhsmTypes = {
   GET_GRAPH_CAPACITY_RHSM,
-  GET_GRAPH_REPORT_CAPACITY_RHSM,
   GET_GRAPH_TALLY_RHSM,
   GET_INSTANCES_INVENTORY_RHSM,
   GET_INSTANCES_INVENTORY_GUESTS_RHSM,
@@ -30,7 +27,6 @@ export {
   rhsmTypes as default,
   rhsmTypes,
   GET_GRAPH_CAPACITY_RHSM,
-  GET_GRAPH_REPORT_CAPACITY_RHSM,
   GET_GRAPH_TALLY_RHSM,
   GET_INSTANCES_INVENTORY_RHSM,
   GET_INSTANCES_INVENTORY_GUESTS_RHSM,