fix: incorporated adam's feedback

openedx · Sep 22, 2023 · 7db485e · 7db485e
1 parent aeaf98f
commit 7db485e
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 118 deletions.
diff --git a/src/components/EnterpriseApp/EnterpriseAppRoutes.jsx b/src/components/EnterpriseApp/EnterpriseAppRoutes.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { Switch, Route } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
@@ -13,8 +13,9 @@ import { SubscriptionManagementPage } from '../subscriptions';
 import { PlotlyAnalyticsPage } from '../PlotlyAnalytics';
 import { ROUTE_NAMES } from './data/constants';
 import BulkEnrollmentResultsDownloadPage from '../BulkEnrollmentResultsDownloadPage';
+import { EnterpriseSubsidiesContext } from '../EnterpriseSubsidiesContext';
 import ContentHighlights from '../ContentHighlights';
-import LearnerCreditManagementRoutes from '../learner-credit-management/LearnerCreditManagementRoutes';
+import LearnerCreditManagementRoutes from '../learner-credit-management';
 
 const EnterpriseAppRoutes = ({
  baseUrl,
@@ -26,88 +27,93 @@ const EnterpriseAppRoutes = ({
  enableSubscriptionManagementPage,
  enableAnalyticsPage,
  enableContentHighlightsPage,
-}) => (
- <Switch>
- <Route
- exact
- path={`${baseUrl}/admin/learners/:actionSlug?`}
- component={AdminPage}
- />
+}) => {
+ const { canManageLearnerCredit } = useContext(EnterpriseSubsidiesContext);
+ return (
+ <Switch>
+ <Route
+ exact
+ path={`${baseUrl}/admin/learners/:actionSlug?`}
+ component={AdminPage}
+ />
+
+ {enableCodeManagementPage && [
+ <Route
+ key="request-codes"
+ exact
+ path={`${baseUrl}/admin/${ROUTE_NAMES.codeManagement}/request-codes`}
+ render={routeProps => (
+ <RequestCodesPage
+ {...routeProps}
+ emailAddress={email}
+ enterpriseName={enterpriseName}
+ />
+ )}
+ />,
+ <Route
+ key="code-management"
+ path={`${baseUrl}/admin/${ROUTE_NAMES.codeManagement}`}
+ component={CodeManagementPage}
+ />,
+ ]}
 
- {enableCodeManagementPage && [
+  {enableReportingPage && (
  <Route
- key="request-codes"
+ key="reporting-config"
  exact
- path={`${baseUrl}/admin/${ROUTE_NAMES.codeManagement}/request-codes`}
- render={routeProps => (
- <RequestCodesPage
- {...routeProps}
- emailAddress={email}
- enterpriseName={enterpriseName}
- />
+ path={`${baseUrl}/admin/${ROUTE_NAMES.reporting}`}
+ render={routeProps => (enterpriseId
+ ? <ReportingConfig {...routeProps} enterpriseId={enterpriseId} />
+ : <LoadingMessage className="overview" />
  )}
- />,
- <Route
- key="code-management"
- path={`${baseUrl}/admin/${ROUTE_NAMES.codeManagement}`}
- component={CodeManagementPage}
- />,
- ]}
-
- {enableReportingPage && (
- <Route
- key="reporting-config"
- exact
- path={`${baseUrl}/admin/${ROUTE_NAMES.reporting}`}
- render={routeProps => (enterpriseId
- ? <ReportingConfig {...routeProps} enterpriseId={enterpriseId} />
- : <LoadingMessage className="overview" />
+ />
  )}
- />
- )}
 
- {enableSubscriptionManagementPage && (
- <Route
- key="subscription-management"
- path={`${baseUrl}/admin/${ROUTE_NAMES.subscriptionManagement}`}
- component={SubscriptionManagementPage}
- />
- )}
+  {enableSubscriptionManagementPage && (
+  <Route
+  key="subscription-management"
+  path={`${baseUrl}/admin/${ROUTE_NAMES.subscriptionManagement}`}
+  component={SubscriptionManagementPage}
+  />
+  )}
 
- {enableAnalyticsPage && (
- <Route
- key="analytics"
- exact
- path={`${baseUrl}/admin/${ROUTE_NAMES.analytics}`}
- component={PlotlyAnalyticsPage}
- />
- )}
+  {enableAnalyticsPage && (
+  <Route
+  key="analytics"
+  exact
+  path={`${baseUrl}/admin/${ROUTE_NAMES.analytics}`}
+  component={PlotlyAnalyticsPage}
+  />
+  )}
 
- <Route
- exact
- path={`${baseUrl}/admin/${ROUTE_NAMES.bulkEnrollmentResults}/:bulkEnrollmentJobId`}
- component={BulkEnrollmentResultsDownloadPage}
- />
+  <Route
+  exact
+  path={`${baseUrl}/admin/${ROUTE_NAMES.bulkEnrollmentResults}/:bulkEnrollmentJobId`}
+  component={BulkEnrollmentResultsDownloadPage}
+  />
 
- <Route
- path={`${baseUrl}/admin/${ROUTE_NAMES.settings}`}
- component={SettingsPage}
- />
+  <Route
+  path={`${baseUrl}/admin/${ROUTE_NAMES.settings}`}
+  component={SettingsPage}
+  />
 
- <LearnerCreditManagementRoutes
- baseUrl={baseUrl}
- />
+ {canManageLearnerCredit && (
+ <LearnerCreditManagementRoutes
+ baseUrl={baseUrl}
+ />
+ )}
 
- {enableContentHighlightsPage && (
- <Route
- path={`${baseUrl}/admin/${ROUTE_NAMES.contentHighlights}`}
- component={ContentHighlights}
- />
- )}
+  {enableContentHighlightsPage && (
+  <Route
+  path={`${baseUrl}/admin/${ROUTE_NAMES.contentHighlights}`}
+  component={ContentHighlights}
+  />
+  )}
 
- <Route path="" component={NotFoundPage} />
- </Switch>
-);
+ <Route path="" component={NotFoundPage} />
+ </Switch>
+ );
+};
 
 EnterpriseAppRoutes.propTypes = {
  baseUrl: PropTypes.string.isRequired,

diff --git a/src/components/learner-credit-management/BudgetDetailPage.jsx b/src/components/learner-credit-management/BudgetDetailPage.jsx
@@ -23,17 +23,18 @@ const PAGE_TITLE = 'Learner Credit Budget Detail';
 const BudgetDetailPage = ({
  enterpriseUUID,
  enterpriseSlug,
+ enableLearnerPortal,
 }) => {
- const { id } = useParams();
- const offerId = isUUID(id) ? null : id;
- const budgetId = isUUID(id) ? id : null;
+ const { budgetId } = useParams();
+ const enterpriseOfferId = isUUID(budgetId) ? null : budgetId;
+ const subsidyAccessPolicyId = isUUID(budgetId) ? budgetId : null;
 
  const { isLoading } = useContext(EnterpriseSubsidiesContext);
  const {
  isLoading: isLoadingOfferRedemptions,
  offerRedemptions,
  fetchOfferRedemptions,
- } = useOfferRedemptions(enterpriseUUID, offerId, budgetId);
+ } = useOfferRedemptions(enterpriseUUID, enterpriseOfferId, subsidyAccessPolicyId);
  if (isLoading) {
  return <LoadingMessage className="offers" />;
  }
@@ -47,7 +48,7 @@ const BudgetDetailPage = ({
  <Row className="m-3">
  <Col xs="12">
  <Breadcrumb
- ariaLabel="Breadcrumb"
+ ariaLabel="Learner Credit Management breadcrumb navigation"
  links={links}
  linkAs={Link}
  activeLabel="Overview"
@@ -60,7 +61,7 @@ const BudgetDetailPage = ({
  fetchTableData={fetchOfferRedemptions}
  enterpriseUUID={enterpriseUUID}
  enterpriseSlug={enterpriseSlug}
- enableLearnerPortal
+ enableLearnerPortal={enableLearnerPortal}
  />
  </>
  );
@@ -69,11 +70,13 @@ const BudgetDetailPage = ({
 const mapStateToProps = state => ({
  enterpriseUUID: state.portalConfiguration.enterpriseId,
  enterpriseSlug: state.portalConfiguration.enterpriseSlug,
+ enableLearnerPortal: state.portalConfiguration.enableLearnerPortal,
 });
 
 BudgetDetailPage.propTypes = {
  enterpriseUUID: PropTypes.string.isRequired,
  enterpriseSlug: PropTypes.string.isRequired,
+ enableLearnerPortal: PropTypes.bool.isRequired,
 };
 
 export default connect(mapStateToProps)(BudgetDetailPage);
diff --git a/src/components/learner-credit-management/LearnerCreditManagementRoutes.jsx b/src/components/learner-credit-management/LearnerCreditManagementRoutes.jsx
diff --git a/src/components/learner-credit-management/index.js b/src/components/learner-credit-management/index.js
diff --git a/src/components/learner-credit-management/index.jsx b/src/components/learner-credit-management/index.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { Route } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { ROUTE_NAMES } from '../EnterpriseApp/data/constants';
+import MultipleBudgetsPage from './MultipleBudgetsPage';
+import BudgetDetailPage from './BudgetDetailPage';
+
+const LearnerCreditManagementRoutes = ({ baseUrl }) => (
+ <>
+ <Route
+ exact
+ path={`${baseUrl}/admin/${ROUTE_NAMES.learnerCredit}`}
+ component={MultipleBudgetsPage}
+ />
+
+ <Route
+ exact
+ path={`${baseUrl}/admin/${ROUTE_NAMES.learnerCredit}/:budgetId`}
+ component={BudgetDetailPage}
+ />
+ </>
+);
+
+LearnerCreditManagementRoutes.propTypes = {
+ baseUrl: PropTypes.string.isRequired,
+};
+
+export default LearnerCreditManagementRoutes;