chore: revert back unused code in UI (#3143)

* fix code smells Signed-off-by: at670475 <[email protected]> * revert back changes Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: at670475 <[email protected]>
zowe · Oct 16, 2023 · 620f670 · 620f670
1 parent 52d2cfa
commit 620f670
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 84 deletions.
diff --git a/api-catalog-ui/frontend/src/actions/user-actions.jsx b/api-catalog-ui/frontend/src/actions/user-actions.jsx
@@ -11,7 +11,6 @@
 import userConstants from '../constants/user-constants';
 import { userService } from '../services';
 import history from '../helpers/history';
-import { isAPIPortal } from '../utils/utilFunctions';
 
 function login(credentials) {
     function request(user) {
@@ -42,11 +41,7 @@ function login(credentials) {
                     showUpdatePassSuccess = true;
                 }
                 dispatch(success(token, showUpdatePassSuccess));
-                let path = '/dashboard';
-                if (isAPIPortal()) {
-                    path = '/homepage';
-                }
-                history.push(path);
+                history.push('/dashboard');
             },
             (error) => {
                 if (error.messageNumber === 'ZWEAT413E') {

diff --git a/api-catalog-ui/frontend/src/actions/user-actions.test.jsx b/api-catalog-ui/frontend/src/actions/user-actions.test.jsx
@@ -49,24 +49,6 @@ describe('>>> User actions tests', () => {
         expect(dispatch.mock.calls[0][0]).toStrictEqual(expectedAction);
     });
 
-    it('should use portal routing', async () => {
-        process.env.REACT_APP_API_PORTAL = true;
-        const dispatch = jest.fn();
-        const expectedAction = { type: 'USERS_LOGIN_REQUEST', user: { password: 'password', username: 'user' } };
-
-        userService.login = jest.fn().mockResolvedValue('token');
-
-        const pushSpy = jest.spyOn(history, 'push');
-
-        await userActions.login(credentials)(dispatch);
-
-        expect(dispatch.mock.calls[0][0]).toStrictEqual(expectedAction);
-
-        expect(pushSpy).toHaveBeenCalledWith('/homepage');
-
-        pushSpy.mockRestore();
-    });
-
     it('should use normal routing', async () => {
         const dispatch = jest.fn();
         const expectedAction = { type: 'USERS_LOGIN_REQUEST', user: { password: 'password', username: 'user' } };

diff --git a/api-catalog-ui/frontend/src/components/App/App.jsx b/api-catalog-ui/frontend/src/components/App/App.jsx
@@ -33,12 +33,8 @@ class App extends Component {
     render() {
         const { history } = this.props;
         const isLoading = true;
-        let headerPath = '/(dashboard|service/.*)/';
-        let dashboardPath = '/dashboard';
-        if (isAPIPortal()) {
-            headerPath = '/(homepage|service/.*)/';
-            dashboardPath = '/homepage';
-        }
+        const headerPath = '/(dashboard|service/.*)/';
+        const dashboardPath = '/dashboard';
         return (
             <div className="App">
                 <BigShield history={history}>

diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx
@@ -60,11 +60,7 @@ export default class DetailPage extends Component {
     // eslint-disable-next-line react/sort-comp
     handleGoBack = () => {
         const { history } = this.props;
-        let path = '/dashboard';
-        if (isAPIPortal()) {
-            path = '/homepage';
-        }
-        history.push(path);
+        history.push('/dashboard');
     };
 
     handleLinkClick = (e, id) => {

diff --git a/api-catalog-ui/frontend/src/components/ErrorBoundary/BigShield/BigShield.jsx b/api-catalog-ui/frontend/src/components/ErrorBoundary/BigShield/BigShield.jsx
@@ -12,7 +12,6 @@ import { Typography, Button } from '@material-ui/core';
 import ArrowBackIosNewIcon from '@material-ui/icons/ArrowBackIos';
 import PropTypes from 'prop-types';
 import './BigShield.css';
-import { isAPIPortal } from '../../../utils/utilFunctions';
 
 export default class BigShield extends Component {
     constructor(props) {
@@ -33,20 +32,13 @@ export default class BigShield extends Component {
     handleGoToHome = () => {
         const { history } = this.props;
         this.setState({ error: null });
-        let path = '/dashboard';
-        if (isAPIPortal()) {
-            path = '/homepage';
-        }
-        history.push(path);
+        history.push('/dashboard');
     };
 
     render() {
         const iconBack = <ArrowBackIosNewIcon />;
         const { history } = this.props;
-        let path = '/dashboard';
-        if (isAPIPortal()) {
-            path = '/homepage';
-        }
+        const path = '/dashboard';
         let disableButton = true;
         if (history !== undefined && history !== null) {
             if (

diff --git a/api-catalog-ui/frontend/src/components/ErrorBoundary/BigShield/BigShield.test.jsx b/api-catalog-ui/frontend/src/components/ErrorBoundary/BigShield/BigShield.test.jsx
@@ -57,31 +57,6 @@ describe('>>> BigShield component tests', () => {
         expect(container.textContent).toMatch(errorMessageMatch);
     });
 
-    it('Should go back to portal homepage when enabled', () => {
-        process.env.REACT_APP_API_PORTAL = true;
-        const historyMock = { push: jest.fn() };
-
-        const container = document.createElement('div');
-        act(() => {
-            render(
-                <BigShield history={historyMock}>
-                    <Child history={historyMock} />
-                </BigShield>,
-                container
-            );
-        });
-
-        const button = container.querySelector('button');
-
-        expect(button.textContent).toBe('Go to Dashboard');
-
-        act(() => {
-            button.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-        });
-
-        expect(historyMock.push).toHaveBeenCalledWith('/homepage');
-    });
-
     it('Should go back to dashboard', () => {
         const historyMock = { push: jest.fn() };
 

diff --git a/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.jsx b/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.jsx
@@ -11,16 +11,11 @@ import { Component } from 'react';
 import { IconButton, Typography } from '@material-ui/core';
 import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
 import PropTypes from 'prop-types';
-import { isAPIPortal } from '../../utils/utilFunctions';
 
 export default class PageNotFound extends Component {
     handleGoToHome = () => {
         const { history } = this.props;
-        let path = '/dashboard';
-        if (isAPIPortal()) {
-            path = '/homepage';
-        }
-        history.push(path);
+        history.push('/dashboard');
     };
 
     render() {

diff --git a/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.test.jsx b/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.test.jsx
@@ -17,12 +17,4 @@ describe('>>> Detailed Page component tests', () => {
         wrapper.find('[data-testid="go-home-button"]').simulate('click');
         expect(historyMock.push.mock.calls[0]).toEqual(['/dashboard']);
     });
-
-    it('should handle a dashboard button click when portal enabled', () => {
-        process.env.REACT_APP_API_PORTAL = true;
-        const historyMock = { push: jest.fn() };
-        const wrapper = shallow(<PageNotFound history={historyMock} />);
-        wrapper.find('[data-testid="go-home-button"]').simulate('click');
-        expect(historyMock.push.mock.calls[0]).toEqual(['/homepage']);
-    });
 });