feat: ship analytics 2.0

openedx · Oct 9, 2024 · d7951e6 · d7951e6
1 parent fdacee1
commit d7951e6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
@@ -16,7 +16,7 @@ import Skills from './tabs/Skills';
 import { useEnterpriseAnalyticsAggregatesData } from './data/hooks';
 import { GRANULARITY, CALCULATION } from './data/constants';
 
-const PAGE_TITLE = 'AnalyticsV2';
+const PAGE_TITLE = 'Analytics';
 
 const AnalyticsV2Page = ({ enterpriseId }) => {
  const [activeTab, setActiveTab] = useState('enrollments');

diff --git a/src/components/EnterpriseApp/EnterpriseAppRoutes.jsx b/src/components/EnterpriseApp/EnterpriseAppRoutes.jsx
@@ -81,17 +81,17 @@ const EnterpriseAppRoutes = ({
  />
  )}
 
- {enableAnalyticsPage && enterpriseAppPage === ROUTE_NAMES.analytics && (
+ {enableAnalyticsPage && enterpriseAppPage === ROUTE_NAMES.legacyAnalytics && (
  <Route
- key="analytics"
+ key="legacy-analytics"
  path="/"
  element={features.ANALYTICS_SUPPORTED ? <PlotlyAnalyticsPage /> : <FeatureNotSupportedPage />}
  />
  )}
 
- {enableAnalyticsPage && enterpriseAppPage === ROUTE_NAMES.analyticsv2 && (
+ {enableAnalyticsPage && enterpriseAppPage === ROUTE_NAMES.analytics && (
  <Route
- key="analyticsv2"
+ key="analytics"
  path="/"
  element={features.ANALYTICS_SUPPORTED
  ? <AnalyticsV2Page enterpriseId={enterpriseId} />

diff --git a/src/components/EnterpriseApp/EnterpriseAppRoutes.test.jsx b/src/components/EnterpriseApp/EnterpriseAppRoutes.test.jsx
@@ -16,7 +16,7 @@ jest.mock('../PlotlyAnalytics', () => ({
  PlotlyAnalyticsPage: () => <div>PlotlyAnalyticsPage Mock Component</div>,
 }));
 
-let mockEnterpriseAppPage = 'analyticsv2';
+let mockEnterpriseAppPage = 'analytics';
 
 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
@@ -67,11 +67,4 @@ describe('EnterpriseAppRoutes', () => {
  renderWithProviders(defaultProps);
  expect(screen.getByText('AdminPage Mock Component')).toBeInTheDocument();
  });
-
- it('renders Analytics when ANALYTICS_SUPPORTED is true', () => {
- mockEnterpriseAppPage = 'analytics';
- features.ANALYTICS_SUPPORTED = true;
- renderWithProviders(defaultProps);
- expect(screen.getByText('PlotlyAnalyticsPage Mock Component')).toBeInTheDocument();
- });
 });
diff --git a/src/components/EnterpriseApp/data/constants.js b/src/components/EnterpriseApp/data/constants.js
@@ -1,8 +1,8 @@
 /* eslint-disable import/prefer-default-export */
 
 export const ROUTE_NAMES = {
+ legacyAnalytics: 'legacy-analytics',
  analytics: 'analytics',
- analyticsv2: 'analyticsv2',
  appearance: 'appearance',
  bulkEnrollment: 'enrollment',
  bulkEnrollmentResults: 'bulk-enrollment-results',

diff --git a/src/components/Sidebar/index.jsx b/src/components/Sidebar/index.jsx
@@ -124,12 +124,6 @@ const Sidebar = ({
  icon: <Icon src={InsertChartOutlined} />,
  hidden: !features.ANALYTICS || !enableAnalyticsScreen,
  },
- {
- title: 'AnalyticsV2',
- to: `${baseUrl}/admin/${ROUTE_NAMES.analyticsv2}`,
- icon: <Icon src={InsertChartOutlined} />,
- hidden: !features.ANALYTICS_V2,
- },
  {
  title: 'Code Management',
  to: `${baseUrl}/admin/${ROUTE_NAMES.codeManagement}`,

diff --git a/src/config/index.js b/src/config/index.js
@@ -44,7 +44,6 @@ const features = {
  CODE_MANAGEMENT: process.env.FEATURE_CODE_MANAGEMENT || hasFeatureFlagEnabled('CODE_MANAGEMENT'),
  REPORTING_CONFIGURATIONS: process.env.FEATURE_REPORTING_CONFIGURATIONS || hasFeatureFlagEnabled('REPORTING_CONFIGURATIONS'),
  ANALYTICS: process.env.FEATURE_ANALYTICS || hasFeatureFlagEnabled('ANALYTICS'),
- ANALYTICS_V2: process.env.FEATURE_ANALYTICS_V2 || hasFeatureFlagEnabled('ANALYTICS_V2'),
  ANALYTICS_SUPPORTED: process.env.ANALYTICS_SUPPORTED || hasFeatureFlagEnabled('ANALYTICS_SUPPORTED'),
  SAML_CONFIGURATION: process.env.FEATURE_SAML_CONFIGURATION || hasFeatureFlagEnabled('SAML_CONFIGURATION'),
  SUPPORT: process.env.FEATURE_SUPPORT || hasFeatureFlagEnabled('SUPPORT'),