Merge pull request #1139 from openedx/sundasMasterBranch-INF-1594

feat: fixed loading issue for wrong username

Author: sundasnoreen12

src/profile/ProfilePage.jsx

@@ -183,12 +183,19 @@ class ProfilePage extends React.Component {
       visibilityBio,
       requiresParentalConsent,
       isLoadingProfile,
+      username,
+      saveState,
+      navigate,
     } = this.props;
 
     if (isLoadingProfile) {
       return <PageLoading srMessage={this.props.intl.formatMessage(messages['profile.loading'])} />;
     }
 
+    if (!username && saveState === 'error' && navigate) {
+      navigate('/notfound');
+    }
+
     const commonFormProps = {
       openHandler: this.handleOpen,
       closeHandler: this.handleClose,
@@ -330,6 +337,7 @@ ProfilePage.propTypes = {
   // Account data
   requiresParentalConsent: PropTypes.bool,
   dateJoined: PropTypes.string,
+  username: PropTypes.string,
 
   // Bio form data
   bio: PropTypes.string,
@@ -395,6 +403,7 @@ ProfilePage.propTypes = {
   openForm: PropTypes.func.isRequired,
   closeForm: PropTypes.func.isRequired,
   updateDraft: PropTypes.func.isRequired,
+  navigate: PropTypes.func.isRequired,
 
   // Router
   params: PropTypes.shape({
@@ -407,6 +416,7 @@ ProfilePage.propTypes = {
 
 ProfilePage.defaultProps = {
   saveState: null,
+  username: '',
   savePhotoState: null,
   photoUploadError: {},
   profileImage: {},

src/profile/ProfilePage.test.jsx

@@ -9,13 +9,15 @@ import PropTypes from 'prop-types';
 import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import { BrowserRouter, useNavigate } from 'react-router-dom';
 
 import messages from '../i18n';
 import ProfilePage from './ProfilePage';
 
 const mockStore = configureMockStore([thunk]);
 const storeMocks = {
   loadingApp: require('./__mocks__/loadingApp.mockStore'),
+  invalidUser: require('./__mocks__/invalidUser.mockStore'),
   viewOwnProfile: require('./__mocks__/viewOwnProfile.mockStore'),
   viewOtherProfile: require('./__mocks__/viewOtherProfile.mockStore'),
   savingEditedBio: require('./__mocks__/savingEditedBio.mockStore'),
@@ -65,6 +67,23 @@ beforeEach(() => {
   analytics.sendTrackingLogEvent.mockReset();
 });
 
+const ProfileWrapper = ({ params, requiresParentalConsent }) => {
+  const navigate = useNavigate();
+  return (
+    <ProfilePage
+      {...requiredProfilePageProps}
+      params={params}
+      requiresParentalConsent={requiresParentalConsent}
+      navigate={navigate}
+    />
+  );
+};
+
+ProfileWrapper.propTypes = {
+  params: PropTypes.shape({}).isRequired,
+  requiresParentalConsent: PropTypes.bool.isRequired,
+};
+
 const ProfilePageWrapper = ({
   contextValue, store, params, requiresParentalConsent,
 }) => (
@@ -73,7 +92,12 @@ const ProfilePageWrapper = ({
   >
     <IntlProvider locale="en">
       <Provider store={store}>
-        <ProfilePage {...requiredProfilePageProps} params={params} requiresParentalConsent={requiresParentalConsent} />
+        <BrowserRouter>
+          <ProfileWrapper
+            params={params}
+            requiresParentalConsent={requiresParentalConsent}
+          />
+        </BrowserRouter>
       </Provider>
     </IntlProvider>
   </AppContext.Provider>
@@ -103,6 +127,16 @@ describe('<ProfilePage />', () => {
       expect(tree).toMatchSnapshot();
     });
 
+    it('successfully redirected to not found page.', () => {
+      const contextValue = {
+        authenticatedUser: { userId: 123, username: 'staff', administrator: true },
+        config: getConfig(),
+      };
+      const component = <ProfilePageWrapper contextValue={contextValue} store={mockStore(storeMocks.invalidUser)} />;
+      const { container: tree } = render(component);
+      expect(tree).toMatchSnapshot();
+    });
+
     it('viewing own profile', () => {
       const contextValue = {
         authenticatedUser: { userId: 123, username: 'staff', administrator: true },

src/profile/__mocks__/invalidUser.mockStore.js

@@ -0,0 +1,41 @@
+module.exports = {
+  userAccount: {
+    loading: false,
+    error: null,
+    username: 'staff',
+    email: null,
+    bio: null,
+    name: null,
+    country: null,
+    socialLinks: null,
+    profileImage: {
+      imageUrlMedium: null,
+      imageUrlLarge: null
+    },
+    levelOfEducation: null,
+    learningGoal: null
+  },
+  profilePage: {
+    errors: {},
+    saveState: 'error',
+    savePhotoState: null,
+    currentlyEditingField: null,
+    account: {
+      username: '',
+      socialLinks: []
+    },
+    preferences: {},
+    courseCertificates: [],
+    drafts: {},
+    isLoadingProfile: false,
+    isAuthenticatedUserProfile: true,
+  },
+  router: {
+    location: {
+      pathname: '/u/staffTest',
+      search: '',
+      hash: ''
+    },
+    action: 'POP'
+  }
+};