Merge pull request #8 from Pearson-Advance/vue/PADV-694

PADV-694 - Fix error related to the path
Pearson-Advance · Sep 14, 2023 · 2600904 · 2600904
2 parents 7d51455 + 2f244e7
commit 2600904
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/.env b/.env
@@ -17,3 +17,4 @@ USER_INFO_COOKIE_NAME=''
 APP_ID=''
 MFE_CONFIG_API_URL=''
 ACCOUNT_PROFILE_URL=''
+INSTITUTION_PORTAL_PATH=''
diff --git a/.env.development b/.env.development
@@ -18,3 +18,4 @@ USER_INFO_COOKIE_NAME='edx-user-info'
 APP_ID=''
 ACCOUNT_PROFILE_URL='http://localhost:1995/u'
 MFE_CONFIG_API_URL='http://localhost:18000/api/mfe_config/v1'
+INSTITUTION_PORTAL_PATH=''
diff --git a/.env.test b/.env.test
@@ -18,3 +18,4 @@ USER_INFO_COOKIE_NAME='edx-user-info'
 APP_ID=''
 MFE_CONFIG_API_URL=''
 ACCOUNT_PROFILE_URL='http://localhost:1995/u'
+INSTITUTION_PORTAL_PATH='/institution-portal'
diff --git a/src/features/Main/Sidebar/index.jsx b/src/features/Main/Sidebar/index.jsx
@@ -20,7 +20,7 @@ export const Sidebar = () => {
   return (
     <header className="vertical-nav">
       <div className="logo">
-        <a href={`${config.BASE_URL}`}>
+        <a href={`${config.LMS_BASE_URL}`}>
           <img src={`${getConfig().LOGO_URL}`} alt="icon" />
         </a>
       </div>

diff --git a/src/features/Main/index.jsx b/src/features/Main/index.jsx
@@ -4,10 +4,11 @@ import { Sidebar } from 'features/Main/Sidebar';
 import { Header } from 'features/Main/Header';
 import { Footer } from 'features/Main/Footer';
 import StudentsPage from 'features/Students/StudentsPage';
+import { getConfig } from '@edx/frontend-platform';
 import './index.scss';
 
 const Main = () => (
-  <BrowserRouter>
+  <BrowserRouter basename={getConfig().INSTITUTION_PORTAL_PATH}>
     <div className="pageWrapper">
       <Sidebar />
       <main>

diff --git a/src/features/Students/StudentsPage/index.jsx b/src/features/Students/StudentsPage/index.jsx
@@ -31,7 +31,6 @@ const initialState = {
   data: [],
   status: RequestStatus.SUCCESS,
   error: null,
-  itemsPerPage: 10,
   currentPage: 1,
   numPages: 0,
   filters: {
@@ -46,7 +45,7 @@ const reducer = (state, action) => {
       return { ...state, status: RequestStatus.LOADING };
     case 'FETCH_SUCCESS': {
       const { results, count } = action.payload;
-      const numPages = Math.ceil(count / state.itemsPerPage);
+      const numPages = count;
       return {
         ...state,
         status: RequestStatus.SUCCESS,