cleanup

Signed-off-by: ac892247 <[email protected]>
zowe · Feb 3, 2025 · 1ce0c4f · 1ce0c4f
1 parent 47a2fda
commit 1ce0c4f
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 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
@@ -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
@@ -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
@@ -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) => (
                                                 <Tile
-                                                    storeCurrentTileId={storeCurrentTileId}
                                                     service={service}
                                                     key={service}
                                                     tile={tile}

diff --git a/api-catalog-ui/frontend/src/components/Dashboard/DashboardContainer.jsx b/api-catalog-ui/frontend/src/components/Dashboard/DashboardContainer.jsx
@@ -14,7 +14,7 @@ import {
     fetchTilesStart,
     fetchTilesSuccess,
     fetchTilesStop,
-    storeCurrentTileId, fetchNewService,
+    fetchNewService,
 } from '../../actions/catalog-tile-actions';
 import {clearService, selectService} from '../../actions/selected-service-actions';
 import { filterText, clear } from '../../actions/filter-actions';
@@ -34,7 +34,6 @@ const mapStateToProps = (state) => ({
     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
@@ -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
@@ -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 {
                 </div>
             </Shield>
         );
-    }
+
 }
+
+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
@@ -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(
             <InstanceInfo
-                selectedService={selectedService}
+                service={selectedService}
                 selectedVersion="v1"
                 tiles={tiles}
-                selectService={selectService}
             />
         );
 
@@ -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(
-            <InstanceInfo selectedService={selectedService} selectService={selectService} tiles={tiles} />
+            <InstanceInfo service={selectedService} tiles={tiles} />
         );
 
         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(
-            <InstanceInfo selectedService={selectedService} selectService={selectService} tiles={tiles} />
+            <InstanceInfo service={selectedService} tiles={tiles} />
         );
 
         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
@@ -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}) {
                         </div>
                     )}
                     {graphqlUrl !== null && <GraphQLContainer graphqlUrl={graphqlUrl} />}
-                    {!isLoading && graphqlUrl === null && selectedVersion !== 'diff' && (
+                    {graphqlUrl === null && selectedVersion !== 'diff' && (
                         <SwaggerContainer selectedVersion={selectedVersion} />
                     )}
                     {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
@@ -8,31 +8,17 @@
  * 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) =>{
         return <ServiceTab {...props}/>
     }
 }
 
-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
@@ -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(
             <HashRouter>
                 <Provider store={store}>

diff --git 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(
-    //         <ServicesNavigationBar filterText={filterText} services={[]} currentTileId="apicatalog" clear={jest.fn()}/>
-    //     );
-    //     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(<BrowserRouter>
-            <Routes>
-                <Route path="*"
-                       element={<ServicesNavigationBar
-                           clear={clear}
-                           services={[tile]}
-                           match={match}
-                           currentTileId="apicatalog"
-                           storeCurrentTileId={storeCurrentTileId}
-                           selectService={jest.fn()}
-                       />}/>
-            </Routes>
-        </BrowserRouter>);
-        screen.debug();
-        fireEvent.click(screen.getByText('API Catalog'));
 
-        expect(storeCurrentTileId).toHaveBeenCalled();
-    });
 });
diff --git a/...talog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBarContainer.jsx b/...talog-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
@@ -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
@@ -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(