From 1ce0c4f8742538fe37971ae2ddeda32173fa7095 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 3 Feb 2025 10:18:45 +0100 Subject: [PATCH] cleanup Signed-off-by: ac892247 --- .../src/actions/catalog-tile-actions.jsx | 12 ++--- .../src/actions/catalog-tile-actions.test.jsx | 8 +-- .../src/components/Dashboard/Dashboard.jsx | 2 - .../Dashboard/DashboardContainer.jsx | 4 +- .../DetailPage/DetailPageContainer.jsx | 4 +- .../components/ServiceTab/InstanceInfo.jsx | 8 +-- .../ServiceTab/InstanceInfo.test.jsx | 10 ++-- .../src/components/ServiceTab/ServiceTab.jsx | 5 +- .../ServiceTab/ServiceTabContainer.jsx | 16 +----- .../ServiceTab/ServiceTabContainer.test.jsx | 16 ++---- .../ServiceNavigationBar.test.jsx | 34 ------------ .../ServicesNavigationBarContainer.jsx | 3 +- .../components/Swagger/SwaggerContainer.jsx | 1 - .../Swagger/SwaggerContainer.test.jsx | 10 ++-- .../Swagger/SwaggerUIApiml.test.jsx | 26 +++++----- .../frontend/src/components/Tile/Tile.jsx | 12 +---- .../src/components/Tile/Tile.test.jsx | 5 +- .../src/reducers/loading-reducer.test.jsx | 4 +- .../frontend/src/reducers/tiles-reducer.jsx | 9 +--- .../src/reducers/tiles-reducer.test.jsx | 52 +++++-------------- 20 files changed, 57 insertions(+), 184 deletions(-) diff --git a/api-catalog-ui/frontend/src/actions/catalog-tile-actions.jsx b/api-catalog-ui/frontend/src/actions/catalog-tile-actions.jsx index 4534ffba23..65bf7484cd 100644 --- a/api-catalog-ui/frontend/src/actions/catalog-tile-actions.jsx +++ b/api-catalog-ui/frontend/src/actions/catalog-tile-actions.jsx @@ -15,8 +15,9 @@ import { FETCH_TILES_REQUEST, FETCH_TILES_STOP, FETCH_TILES_SUCCESS, - STORE_CURRENT_TILEID, - FETCH_NEW_SERVICE_REQUEST, FETCH_NEW_SERVICE_SUCCESS, FETCH_SERVICE_STOP, + FETCH_NEW_SERVICE_REQUEST, + FETCH_NEW_SERVICE_SUCCESS, + FETCH_SERVICE_STOP, FETCH_SERVICE_FAILED } from '../constants/catalog-tile-constants'; @@ -57,13 +58,6 @@ export function fetchNewServiceSuccess(service) { }; } -export function storeCurrentTileId(currentId) { - return { - type: STORE_CURRENT_TILEID, - payload: currentId, - }; -} - export function fetchTilesStop() { // dismiss the notification if it is displayed toast.dismiss(fetchRetryToastId); diff --git a/api-catalog-ui/frontend/src/actions/catalog-tile-actions.test.jsx b/api-catalog-ui/frontend/src/actions/catalog-tile-actions.test.jsx index e709d5c24d..9510ade875 100644 --- a/api-catalog-ui/frontend/src/actions/catalog-tile-actions.test.jsx +++ b/api-catalog-ui/frontend/src/actions/catalog-tile-actions.test.jsx @@ -56,20 +56,20 @@ describe('>>> Catalog tiles actions tests', () => { it('should create when start fetching new tiles', () => { const expectedAction = { - type: constants.FETCH_NEW_TILES_REQUEST, + type: constants.FETCH_NEW_SERVICE_REQUEST, payload: '', }; - expect(actions.fetchNewTiles('')).toEqual(expectedAction); + expect(actions.fetchNewService('')).toEqual(expectedAction); }); it('should create when fetching new tiles is successful', () => { const expectedAction = { - type: constants.FETCH_TILES_NEW_SUCCESS, + type: constants.FETCH_NEW_SERVICE_SUCCESS, payload: [], }; - expect(actions.fetchNewTilesSuccess([])).toEqual(expectedAction); + expect(actions.fetchNewServiceSuccess([])).toEqual(expectedAction); }); it('should create when storing current tile ID', () => { diff --git a/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx b/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx index 5aef8e3deb..eca4184df8 100644 --- a/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx +++ b/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx @@ -36,7 +36,6 @@ function Dashboard({ refreshedStaticApisError, clearError, authentication, - storeCurrentTileId, selectEnabler, clear, refreshedStaticApi, @@ -146,7 +145,6 @@ function Dashboard({ .filter((tile) => tile.services.includes(service)) .map((tile) => ( ({ refreshedStaticApisError: state.refreshStaticApisReducer.error, refreshTimestamp: state.refreshStaticApisReducer.refreshTimestamp, authentication: state.authenticationReducer, - currentTileId: state.tilesReducer.currentTileId, }); @@ -51,7 +50,6 @@ const mapDispatchToProps = { wizardToggleDisplay, selectEnabler, closeAlert: () => userActions.closeAlert(), - storeCurrentTileId: (id) => storeCurrentTileId(id), selectService: (service, tileId) => selectService(service, tileId), fetchNewService: (id) => fetchNewService(id) }; diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx index 2747d10a85..6dbd74a599 100644 --- a/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx +++ b/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx @@ -12,7 +12,7 @@ import { fetchTilesFailed, fetchTilesStart, fetchTilesStop, - fetchTilesSuccess, storeCurrentTileId, fetchNewService, fetchServiceStop, fetchServiceFailed, + fetchTilesSuccess, fetchNewService, fetchServiceStop, fetchServiceFailed, } from '../../actions/catalog-tile-actions'; import {clearService, selectService} from '../../actions/selected-service-actions'; import { createLoadingSelector } from '../../selectors/selectors'; @@ -29,7 +29,6 @@ const mapStateToProps = (state) => ({ selectedTile: state.selectedServiceReducer.selectedTile, selectedService: state.selectedServiceReducer.selectedService, isLoading: loadingSelector(state), - currentTileId: state.tilesReducer.currentTileId, authentication: state.authenticationReducer, service: state.tilesReducer.service, serviceLoading: state.tilesReducer.serviceLoading, @@ -43,7 +42,6 @@ const mapDispatchToProps = (dispatch) => ({ fetchTilesStop: () => dispatch(fetchTilesStop()), clearService: () => dispatch(clearService()), selectService: (service, tileId) => dispatch(selectService(service, tileId)), - storeCurrentTileId: (id) => storeCurrentTileId(id), fetchServiceStop: () => dispatch(fetchServiceStop()), fetchNewService: (id) => dispatch(fetchNewService(id)), fetchServiceFailed: (id) => dispatch(fetchServiceFailed(id)), diff --git a/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.jsx b/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.jsx index 8c1456e491..f42a720b62 100644 --- a/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.jsx +++ b/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.jsx @@ -12,9 +12,7 @@ import { Component } from 'react'; import './InstanceInfo.css'; import Shield from '../ErrorBoundary/Shield/Shield'; -export default class InstanceInfo extends Component { - render() { - const { service, selectedVersion, tiles } = this.props; +function InstanceInfo({ service, selectedVersion, tiles }) { const apiInfo = service.apis[selectedVersion || service.defaultApiVersion] || service.apis.default; @@ -46,5 +44,7 @@ export default class InstanceInfo extends Component { ); - } + } + +export default InstanceInfo; diff --git a/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.test.jsx b/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.test.jsx index e2401d2438..691e9f927a 100644 --- a/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.test.jsx +++ b/api-catalog-ui/frontend/src/components/ServiceTab/InstanceInfo.test.jsx @@ -23,7 +23,6 @@ describe('>>> InstanceInfo component tests', () => { selectedService.apis = { v1: { apiId: 'zowe.apiml.gateway' }, }; - const selectService = jest.fn(); const tiles = [ { activeServices: 1, @@ -32,10 +31,9 @@ describe('>>> InstanceInfo component tests', () => { ]; const instanceInfo = shallow( ); @@ -50,10 +48,9 @@ describe('>>> InstanceInfo component tests', () => { v1: { apiId: 'zowe.apiml.gateway' }, }; selectedService.defaultApiVersion = ['v1']; - const selectService = jest.fn(); const tiles = [{}]; const instanceInfo = shallow( - + ); expect(instanceInfo.find('span').at(1).prop('children')).toEqual('zowe.apiml.gateway'); @@ -64,10 +61,9 @@ describe('>>> InstanceInfo component tests', () => { default: { apiId: 'zowe.apiml.gateway' }, }; selectedService.defaultApiVersion = null; - const selectService = jest.fn(); const tiles = [{}]; const instanceInfo = shallow( - + ); expect(instanceInfo.find('span').at(1).prop('children')).toEqual('zowe.apiml.gateway'); diff --git a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTab.jsx b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTab.jsx index d5395eb75a..e9c703a530 100644 --- a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTab.jsx +++ b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTab.jsx @@ -14,7 +14,7 @@ import SwaggerContainer from '../Swagger/SwaggerContainer'; import GraphQLContainer from '../GraphQL/GraphQLUIApimlContainer'; import ServiceVersionDiffContainer from '../ServiceVersionDiff/ServiceVersionDiffContainer'; -function ServiceTab({isLoading,service}) { +function ServiceTab({service}) { const containsVersion = () => { return service && 'apiVersions' in service && service.apiVersions; @@ -25,7 +25,6 @@ function ServiceTab({isLoading,service}) { const [isDialogOpen, setIsDialogOpen] = useState(false); const basePath = () => { - console.log(service) if (!service?.basePath) { if (service?.instances?.[0]?.includes('gateway')) { // Return the basePath right away, since it's a GW instance (either primary or additional) @@ -235,7 +234,7 @@ function ServiceTab({isLoading,service}) { )} {graphqlUrl !== null && } - {!isLoading && graphqlUrl === null && selectedVersion !== 'diff' && ( + {graphqlUrl === null && selectedVersion !== 'diff' && ( )} {graphqlUrl === null && selectedVersion === 'diff' && isDialogOpen && containsVersion() && ( diff --git a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.jsx b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.jsx index 13c23eea9f..acb214fdad 100644 --- a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.jsx +++ b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.jsx @@ -8,26 +8,12 @@ * Copyright Contributors to the Zowe Project. */ import { connect } from 'react-redux'; -import { fetchTilesStop } from '../../actions/catalog-tile-actions'; -import { selectService } from '../../actions/selected-service-actions'; import ServiceTab from './ServiceTab'; -import {createLoadingSelector} from "../../selectors/selectors"; -const loadingSelector = createLoadingSelector(['FETCH_TILES']); const mapStateToProps = (state) => ({ - selectedService: state.selectedServiceReducer.selectedService, - selectedTile: state.selectedServiceReducer.selectedTile, - currentTileId: state.tilesReducer.currentTileId, - services: state.tilesReducer.services, - isLoading: loadingSelector(state), service: state.tilesReducer.service, }); -const mapDispatchToProps = (dispatch) => ({ - fetchTilesStop: () => dispatch(fetchTilesStop()), - selectService: (service, tileId) => dispatch(selectService(service, tileId)), -}); - const withRouter = (ServiceTab) =>{ return (props) =>{ @@ -35,4 +21,4 @@ const withRouter = (ServiceTab) =>{ } } -export default withRouter(connect(mapStateToProps, mapDispatchToProps)(ServiceTab)); +export default withRouter(connect(mapStateToProps)(ServiceTab)); diff --git a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.test.jsx b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.test.jsx index 83e671f1d5..95833224ee 100644 --- a/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.test.jsx +++ b/api-catalog-ui/frontend/src/components/ServiceTab/ServiceTabContainer.test.jsx @@ -32,21 +32,11 @@ describe('ServiceTab Container', () => { store = mockStore({ tilesReducer: { tiles, - }, - selectedServiceReducer: { - selectedTile: 'tile', - selectedService: { + service: { serviceId: 'service', - }, - }, + } + } }); - const history = { - location: { - pathname: {}, - }, - push: jest.fn(), - listen: jest.fn(), - }; container = render( diff --git a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServiceNavigationBar.test.jsx b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServiceNavigationBar.test.jsx index 2071b12557..b35a6e53a4 100644 --- a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServiceNavigationBar.test.jsx +++ b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServiceNavigationBar.test.jsx @@ -89,16 +89,6 @@ describe('>>> ServiceNavigationBar component tests', () => { expect(clear).toHaveBeenCalled(); }); - // it('should trigger filterText on handleSearch', async () => { - // const filterText = jest.fn(); - // useLocation.mockReturnValue({ - // pathname: '/mock/path/1234', - // }); - // render( - // - // ); - // expect(filterText).toHaveBeenCalled(); - // }); it('should display label', () => { useLocation.mockReturnValue({ @@ -112,29 +102,5 @@ describe('>>> ServiceNavigationBar component tests', () => { }); - it('should set current tile id', () => { - localStorage.setItem('serviceId', 'apicatalog'); - const storeCurrentTileId = jest.fn(); - const clear = jest.fn(); - useLocation.mockReturnValue({ - pathname: '/mock/path/1234', - }); - render( - - }/> - - ); - screen.debug(); - fireEvent.click(screen.getByText('API Catalog')); - expect(storeCurrentTileId).toHaveBeenCalled(); - }); }); diff --git a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBarContainer.jsx b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBarContainer.jsx index d0545c905e..fb738e640b 100644 --- a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBarContainer.jsx +++ b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBarContainer.jsx @@ -11,7 +11,7 @@ import { connect } from 'react-redux'; import ServicesNavigationBar from './ServicesNavigationBar'; import { getFilteredServices } from '../../selectors/selectors'; import { clear, filterText } from '../../actions/filter-actions'; -import {fetchNewService, storeCurrentTileId} from '../../actions/catalog-tile-actions'; +import {fetchNewService} from '../../actions/catalog-tile-actions'; import {selectService} from "../../actions/selected-service-actions"; const mapStateToProps = (state) => ({ @@ -22,7 +22,6 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = (dispatch) => ({ filterText: (text) => dispatch(filterText(text)), clear: () => dispatch(clear()), - storeCurrentTileId: (id) => dispatch(storeCurrentTileId(id)), selectService: (service, tileId) => dispatch(selectService(service, tileId)), fetchNewService: (id) => dispatch(fetchNewService(id)) }); diff --git a/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.jsx b/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.jsx index c295204f25..1ffad4617f 100644 --- a/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.jsx +++ b/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.jsx @@ -11,7 +11,6 @@ import { connect } from 'react-redux'; import SwaggerUIApiml from './SwaggerUIApiml'; const mapStateToProps = (state) => ({ - selectedService: state.selectedServiceReducer.selectedService, service: state.tilesReducer.service, tiles: state.tilesReducer.tiles, }); diff --git a/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.test.jsx b/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.test.jsx index 0c2c0b8439..013f5e9697 100644 --- a/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.test.jsx +++ b/api-catalog-ui/frontend/src/components/Swagger/SwaggerContainer.test.jsx @@ -20,14 +20,12 @@ describe('Swagger Container', () => { let container; beforeEach(() => { store = mockStore({ - selectedServiceReducer: { - selectedService: { - apis: [], - serviceId: 'service', - }, - }, tilesReducer: { tiles: [{}], + service: { + apis: [], + serviceId: 'service', + } }, }); container = render( diff --git a/api-catalog-ui/frontend/src/components/Swagger/SwaggerUIApiml.test.jsx b/api-catalog-ui/frontend/src/components/Swagger/SwaggerUIApiml.test.jsx index 83af5fda25..2ac5a76986 100644 --- a/api-catalog-ui/frontend/src/components/Swagger/SwaggerUIApiml.test.jsx +++ b/api-catalog-ui/frontend/src/components/Swagger/SwaggerUIApiml.test.jsx @@ -11,7 +11,7 @@ import { act } from 'react'; import { createRoot } from 'react-dom/client'; import { shallow } from 'enzyme'; import { describe, expect, it, jest } from '@jest/globals'; -import SwaggerUI from './SwaggerUIApiml'; +import SwaggerUIApiml from "./SwaggerUIApiml"; describe('>>> Swagger component tests', () => { afterEach(() => { @@ -38,7 +38,7 @@ describe('>>> Swagger component tests', () => { }; const wrapper = shallow(
- +
); const swaggerDiv = wrapper.find('#swaggerContainer'); @@ -72,7 +72,7 @@ describe('>>> Swagger component tests', () => { }; const wrapper = shallow(
- +
); const swaggerDiv = wrapper.find('#swaggerContainer'); @@ -105,7 +105,7 @@ describe('>>> Swagger component tests', () => { const container = document.createElement('div'); document.body.appendChild(container); const root = createRoot(container); - await act(async () => root.render()); + await act(async () => root.render()); expect(container.textContent).toContain(`API documentation could not be retrieved`); }); @@ -127,7 +127,7 @@ describe('>>> Swagger component tests', () => { const container = document.createElement('div'); document.body.appendChild(container); const root = createRoot(container); - await act(async () => root.render()); + await act(async () => root.render()); expect(container.textContent).toEqual(`API documentation could not be retrieved. Invalid JSON`); }); @@ -172,7 +172,7 @@ describe('>>> Swagger component tests', () => { document.body.appendChild(container); await act(async () => - createRoot(container).render(, container) + createRoot(container).render(, container) ); expect(container.textContent).toContain(`Servershttp://localhost${endpoint}`); }); @@ -239,11 +239,11 @@ describe('>>> Swagger component tests', () => { document.body.appendChild(container); const tiles = [{}]; await act(async () => - createRoot(container).render(, container) + createRoot(container).render(, container) ); expect(container.textContent).toContain(`Servershttp://localhost${endpoint1}`); await act(async () => - createRoot(container).render(, container) + createRoot(container).render(, container) ); expect(container.textContent).toContain(`Servershttp://localhost${endpoint2}`); }); @@ -280,7 +280,7 @@ describe('>>> Swagger component tests', () => { const wrapper = shallow(
- +
); const swaggerDiv = wrapper.find('#swaggerContainer'); @@ -309,7 +309,7 @@ describe('>>> Swagger component tests', () => { jest.spyOn(document, 'getElementById').mockImplementation(() => null); const wrapper = shallow(
- +
); const swaggerDiv = wrapper.find('span'); @@ -340,7 +340,7 @@ describe('>>> Swagger component tests', () => { }; const wrapper = shallow(
- +
); @@ -349,7 +349,7 @@ describe('>>> Swagger component tests', () => { const container = document.createElement('div'); await act(async () => - createRoot(container).render(, container) + createRoot(container).render(, container) ); expect(container.textContent).toContain(`Servershttp://localhost${endpoint}`); @@ -377,7 +377,7 @@ describe('>>> Swagger component tests', () => { const createElement = jest.spyOn(document, 'createElement'); const wrapper = shallow(
- +
); const swaggerDiv = wrapper.find('span'); diff --git a/api-catalog-ui/frontend/src/components/Tile/Tile.jsx b/api-catalog-ui/frontend/src/components/Tile/Tile.jsx index e70b163dcf..dbc951a455 100644 --- a/api-catalog-ui/frontend/src/components/Tile/Tile.jsx +++ b/api-catalog-ui/frontend/src/components/Tile/Tile.jsx @@ -13,7 +13,7 @@ import ReportProblemIcon from '@material-ui/icons/ReportProblem'; import HelpOutlineIcon from '@material-ui/icons/HelpOutline'; import {useNavigate} from "react-router"; -function Tile({tile, service, storeCurrentTileId,selectService,fetchTilesStart,fetchNewService}) { +function Tile({service,fetchNewService}) { const navigate = useNavigate(); const getTileStatus = (service) => { const unknownIcon = <> @@ -43,9 +43,6 @@ function Tile({tile, service, storeCurrentTileId,selectService,fetchTilesStart,f const handleClick = () => { const tileRoute = `/service/${service.serviceId}`; - storeCurrentTileId(tile.id); - // fetchTilesStart(tile.id); - console.log(service) fetchNewService(service.serviceId); // selectService(service, tile.id); navigate(tileRoute); @@ -79,10 +76,3 @@ function Tile({tile, service, storeCurrentTileId,selectService,fetchTilesStart,f } export default Tile; - -// Tile.propTypes = { -// service: PropTypes.shape({ -// title: PropTypes.string, -// sso: PropTypes.bool, -// }).isRequired, -// }; diff --git a/api-catalog-ui/frontend/src/components/Tile/Tile.test.jsx b/api-catalog-ui/frontend/src/components/Tile/Tile.test.jsx index 1d8a7d07be..3f311478ed 100644 --- a/api-catalog-ui/frontend/src/components/Tile/Tile.test.jsx +++ b/api-catalog-ui/frontend/src/components/Tile/Tile.test.jsx @@ -77,13 +77,10 @@ describe('>>> Tile component tests', () => { }); it('should handle tile click', () => { - const storeCurrentTileId = jest.fn(); render( ); fireEvent.click(screen.getByTestId('tile')) diff --git a/api-catalog-ui/frontend/src/reducers/loading-reducer.test.jsx b/api-catalog-ui/frontend/src/reducers/loading-reducer.test.jsx index a2f11b3118..861d85945d 100644 --- a/api-catalog-ui/frontend/src/reducers/loading-reducer.test.jsx +++ b/api-catalog-ui/frontend/src/reducers/loading-reducer.test.jsx @@ -14,13 +14,13 @@ describe('>>> Loading reducer tests', () => { it('should return current state if not a *_REQUEST', () => { const state = { payload: 'payload' }; const action = { type: 'FETCH_TILES_SUCCESS' }; - const expectedState = { FETCH_TILES: false, payload: 'payload' }; + const expectedState = { FETCH: false, payload: 'payload' }; expect(loadingReducer(state, action)).toEqual(expectedState); }); it('should return isRequest if state if state is a *_REQUEST', () => { const state = { payload: 'payload' }; - const expectedState = { FETCH_TILES: true, payload: 'payload' }; + const expectedState = { FETCH: true, payload: 'payload' }; const action = { type: 'FETCH_TILES_REQUEST' }; expect(loadingReducer(state, action)).toEqual(expectedState); diff --git a/api-catalog-ui/frontend/src/reducers/tiles-reducer.jsx b/api-catalog-ui/frontend/src/reducers/tiles-reducer.jsx index dc4c03b972..b613a39760 100644 --- a/api-catalog-ui/frontend/src/reducers/tiles-reducer.jsx +++ b/api-catalog-ui/frontend/src/reducers/tiles-reducer.jsx @@ -14,7 +14,7 @@ import { FETCH_TILES_RETRY, FETCH_TILES_STOP, FETCH_TILES_SUCCESS, - STORE_CURRENT_TILEID, FETCH_NEW_SERVICE_REQUEST, + FETCH_NEW_SERVICE_REQUEST, FETCH_NEW_SERVICE_SUCCESS, FETCH_SERVICE_STOP, FETCH_SERVICE_FAILED @@ -25,7 +25,6 @@ const tilesReducerDefaultState = { tiles: [], services: [], id: '', - currentTileId: '', error: null, }; @@ -34,7 +33,6 @@ const tilesReducer = (state = tilesReducerDefaultState, action = {}) => { case FETCH_TILES_SUCCESS: return { ...state, - currentTileId: state.currentTileId, services: [...state.services], tiles: [...action.payload], tilesLoading: false, @@ -47,13 +45,10 @@ const tilesReducer = (state = tilesReducerDefaultState, action = {}) => { error: null, serviceLoading: false, }; - case STORE_CURRENT_TILEID: - return { ...state, currentTileId: action.payload, error: null }; case FETCH_TILES_FAILED: return { tiles: state.tiles, services: state.services, - currentTileId: state.currentTileId, id: '', error: action.payload, }; @@ -66,7 +61,6 @@ const tilesReducer = (state = tilesReducerDefaultState, action = {}) => { return { tiles: [], services: state.services, - currentTileId: state.currentTileId, id: action.payload, tilesLoading: true, error: null, @@ -75,7 +69,6 @@ const tilesReducer = (state = tilesReducerDefaultState, action = {}) => { return { services: [], tiles: state.tiles, - currentTileId: state.currentTileId, id: action.payload, serviceLoading: true, error: null, diff --git a/api-catalog-ui/frontend/src/reducers/tiles-reducer.test.jsx b/api-catalog-ui/frontend/src/reducers/tiles-reducer.test.jsx index 12d6c34902..10e2b83907 100644 --- a/api-catalog-ui/frontend/src/reducers/tiles-reducer.test.jsx +++ b/api-catalog-ui/frontend/src/reducers/tiles-reducer.test.jsx @@ -15,9 +15,7 @@ import { FETCH_TILES_STOP, FETCH_TILES_SUCCESS, FETCH_TILES_RETRY, - FETCH_NEW_TILES_REQUEST, - FETCH_TILES_NEW_SUCCESS, - STORE_CURRENT_TILEID, + FETCH_NEW_SERVICE_REQUEST, FETCH_NEW_SERVICE_SUCCESS, } from '../constants/catalog-tile-constants'; describe('>>> Tile reducer tests', () => { @@ -49,6 +47,8 @@ describe('>>> Tile reducer tests', () => { id: '', tiles: [], error: null, + services: undefined, + tilesLoading: true }; // NOTE: Updates might be redundant @@ -96,6 +96,7 @@ describe('>>> Tile reducer tests', () => { tiles: [sampleTile], services: [sampleTile], error: null, + tilesLoading: false, }; expect( @@ -157,63 +158,35 @@ describe('>>> Tile reducer tests', () => { ).toEqual(expectedState); }); - it('should handle STORE_CURRENT_TILEID', () => { + it('should handle FETCH_NEW_SERVICE_SUCCESS', () => { const expectedState = { id: '', - tiles: [], - services: [], + service: sampleTile.services[0], error: null, - currentTileId: [sampleTile], + serviceLoading: false }; expect( tilesReducer( { id: '', - tiles: [], - services: [], error: null, - currentTileId: sampleTile.id, }, { - type: STORE_CURRENT_TILEID, - payload: [sampleTile], - } - ) - ).toEqual(expectedState); - }); - - it('should handle FETCH_TILES_NEW_SUCCESS', () => { - const expectedState = { - id: '', - tiles: [sampleTile], - services: [sampleTile], - error: null, - }; - - expect( - tilesReducer( - { - id: '', - tiles: [sampleTile], - services: [sampleTile], - error: null, - }, - { - type: FETCH_TILES_NEW_SUCCESS, - payload: [sampleTile], + type: FETCH_NEW_SERVICE_SUCCESS, + payload: sampleTile.services[0], } ) ).toEqual(expectedState); }); - it('should handle FETCH_NEW_TILES_REQUEST', () => { + it('should handle FETCH_NEW_SERVICE_REQUEST', () => { const expectedState = { tiles: [], id: '', - currentTileId: 'id', error: null, services: [], + serviceLoading: true, }; expect( @@ -223,12 +196,11 @@ describe('>>> Tile reducer tests', () => { tiles: [], updates: [], error: null, - currentTileId: 'id', services: [], polling: false, }, { - type: FETCH_NEW_TILES_REQUEST, + type: FETCH_NEW_SERVICE_REQUEST, payload: '', } )