Resource tab optimization

src/components/InventoryDetail/ApplicationDetails.js

@@ -14,7 +14,7 @@ const ApplicationDetails = ({ onTabSelect, appList, ...props }) => {
     const history = useHistory();
     const dispatch = useDispatch();
     const searchParams = new URLSearchParams(search);
-    const items = useSelector(({ entityDetails }) => entityDetails?.activeApps);
+    const items = useSelector(({ entityDetails }) => entityDetails?.activeApps.filter(({ isVisible }) => isVisible !== false));
     const activeApp = useSelector(({ entityDetails }) => entityDetails?.activeApp);
     const defaultApp = activeApp?.appName || appList?.find(({ pageId, name }) => items?.[0]?.name === (
         pageId || name))?.name || items?.[0]?.name;

src/components/InventoryDetail/InventoryDetail.js

@@ -2,14 +2,15 @@ import React, { useEffect, Fragment } from 'react';
 import { useParams } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { loadEntity, deleteEntity } from '../../store/actions';
+import { loadEntity, deleteEntity, setRosTabVisibility } from '../../store/actions';
 import './InventoryDetail.scss';
 import SystemNotFound from './SystemNotFound';
 import TopBar from './TopBar';
 import FactsInfo from './FactsInfo';
 import { reloadWrapper } from '../../Utilities/index';
 import { addNotification } from '@redhat-cloud-services/frontend-components-notifications/redux';
 import ApplicationDetails from './ApplicationDetails';
+import { getEntitySystemProfile } from '../../api/api';
 import './InventoryDetail.scss';
 
 /**
@@ -41,7 +42,16 @@ const InventoryDetail = ({
     useEffect(() => {
         const currId = inventoryId || location.pathname.replace(/\/$/, '').split('/').pop();
         if (!entity || !(entity?.id === currId) || !loaded) {
-            dispatch(loadEntity(currId, { hasItems: true }, { showTags }));
+            const action = loadEntity(currId, { hasItems: true }, { showTags });
+            dispatch(action);
+            action.payload.then(() => {
+                getEntitySystemProfile(currId).then(result => {
+                    const cloudProviderObj = (typeof result.results[0].system_profile.cloud_provider !== 'undefined')
+                        && result.results[0].system_profile.cloud_provider;
+                    dispatch(setRosTabVisibility((cloudProviderObj === 'aws' || cloudProviderObj === 'azure')));
+                    return result;
+                });
+            });
         }
     }, []);
     return <div className="ins-entity-detail">

src/components/InventoryTable/InventoryTable.js

@@ -129,8 +129,6 @@ const InventoryTable = forwardRef(({ // eslint-disable-line react/display-name
     const onRefreshData = (options = {}, disableOnRefresh) => {
         const { activeFilters } = store.getState().entities;
         const cachedProps = cache.current?.getProps() || {};
-
-        // eslint-disable-next-line camelcase
         const currPerPage = options?.per_page || options?.perPage || cachedProps.perPage;
 
         const params = {

src/store/action-types.js

@@ -65,3 +65,4 @@ export const CLEAR_FILTERS = 'CLEAR_FILTERS';
 export const TOGGLE_TAG_MODAL = 'TOGGLE_TAG_MODAL';
 export const CONFIG_CHANGED = 'CONFIG_CHANGED';
 export const TOGGLE_DRAWER = 'TOGGLE_INVENTORY_DRAWER';
+export const SET_ROS_TAB_VISBILITY = 'SET_ROS_TAB_VISBILITY';

src/store/inventory-actions.js

@@ -10,7 +10,8 @@ import {
     CLEAR_FILTERS,
     TOGGLE_TAG_MODAL,
     CONFIG_CHANGED,
-    TOGGLE_DRAWER
+    TOGGLE_DRAWER,
+    SET_ROS_TAB_VISBILITY
 } from './action-types';
 import {
     getEntities as defaultGetEntities,
@@ -193,6 +194,11 @@ export const deleteEntity = (systems, displayName) => ({
     }
 });
 
+export const setRosTabVisibility = (shouldShowRosTab) => ({
+    type: SET_ROS_TAB_VISBILITY,
+    payload: shouldShowRosTab
+});
+
 export const configChanged = (config) => ({
     type: CONFIG_CHANGED,
     payload: config

src/store/reducers.js

@@ -1,4 +1,11 @@
-import { INVENTORY_ACTION_TYPES, ACTION_TYPES, SELECT_ENTITY, SET_INVENTORY_FILTER, SET_PAGINATION } from './action-types';
+import {
+    INVENTORY_ACTION_TYPES,
+    ACTION_TYPES,
+    SELECT_ENTITY,
+    SET_INVENTORY_FILTER,
+    SET_PAGINATION,
+    SET_ROS_TAB_VISBILITY
+} from './action-types';
 import systemProfileStore from './systemProfileStore';
 import {
     ComplianceTab,
@@ -64,6 +71,7 @@ function entityLoaded(state) {
             (!insights.chrome.isProd || (insights.chrome.isProd && insights?.chrome?.isBeta())) && {
                 title: 'Resource Optimization',
                 name: 'ros',
+                isVisible: false,
                 component: RosTab
             }
         ].filter(Boolean)
@@ -95,6 +103,17 @@ function entitySelected(state, { payload }) {
     };
 }
 
+function resourceOptTabVisibility(state, { payload }) {
+    return {
+        ...state,
+        activeApps: state.activeApps?.map((entity) => entity.name === 'ros' ? ({
+            ...entity,
+            isVisible: payload
+        }) : entity
+        )
+    };
+}
+
 function entityDeleted(state, { meta }) {
     const selected = state.selected || (new Map());
     meta.systems.forEach(id => selected.delete(id));
@@ -105,11 +124,7 @@ function entityDeleted(state, { meta }) {
     };
 }
 
-function onEntitiesLoaded(state, { payload, meta }) {
-    if (meta?.lastDateRequest < state?.lastDateRequest) {
-        return state;
-    }
-
+function onEntitiesLoaded(state, { payload }) {
     return {
         ...state,
         rows: mergeArraysByKey([state.rows, payload.results.map(result => {
@@ -160,7 +175,8 @@ export const tableReducer = applyReducerHash(
 
 export const entitesDetailReducer = () => applyReducerHash(
     {
-        [INVENTORY_ACTION_TYPES.LOAD_ENTITY_FULFILLED]: entityLoaded
+        [INVENTORY_ACTION_TYPES.LOAD_ENTITY_FULFILLED]: entityLoaded,
+        [SET_ROS_TAB_VISBILITY]: resourceOptTabVisibility
     },
     defaultState
 );