fix: removed usage of subs catalog consolidation feature flag

openedx · Feb 12, 2024 · 6098d3b · 6098d3b
1 parent 975df0b
commit 6098d3b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 52 deletions.
diff --git a/src/components/catalogInfoModal/CatalogInfoModal.test.jsx b/src/components/catalogInfoModal/CatalogInfoModal.test.jsx
@@ -130,7 +130,7 @@ describe('Course info modal works as expected', () => {
       </IntlProvider>,
     );
     expect(
-      screen.queryByText('Included in business catalog'),
+      screen.queryByText('Included in subscription catalog'),
     ).toBeInTheDocument();
   });
   test('Renders Course info modal with no catalogs', () => {

diff --git a/src/components/catalogModalBanner/CatalogCourseModalBanner.jsx b/src/components/catalogModalBanner/CatalogCourseModalBanner.jsx
@@ -11,7 +11,6 @@ import {
   checkAvailability,
   checkSubscriptions,
 } from '../../utils/catalogUtils';
-import features from '../../config';
 
 const nowDate = new Date(Date.now());
 
@@ -68,11 +67,9 @@ const CatalogCourseModalBanner = ({
             messages['CatalogCourseModalBanner.bannerCatalogText'],
           )}
         </div>
-        {!features.CONSOLIDATE_SUBS_CATALOG && (
         <div className="banner-subtitle small">
           {checkSubscriptions(courseAssociatedCatalogs)}
         </div>
-        )}
       </div>
       <div className="banner-section slash">/</div>
     </>

diff --git a/src/components/catalogModalBanner/CatalogProgramModalBanner.jsx b/src/components/catalogModalBanner/CatalogProgramModalBanner.jsx
@@ -6,7 +6,6 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Assignment, BookOpen, MoneyOutline } from '@edx/paragon/icons';
 import messages from './CatalogCourseModalBanner.messages';
 import { checkSubscriptions } from '../../utils/catalogUtils';
-import features from '../../config';
 
 const CatalogProgramModalBanner = ({
   intl,
@@ -55,11 +54,9 @@ const CatalogProgramModalBanner = ({
           messages['CatalogCourseModalBanner.bannerCatalogText'],
         )}
       </div>
-      {!features.CONSOLIDATE_SUBS_CATALOG && (
       <div className="banner-subtitle small">
         {checkSubscriptions(courseAssociatedCatalogs)}
       </div>
-      )}
     </div>
     )}
   </div>

diff --git a/src/components/catalogSearchResults/CatalogSearchResults.test.jsx b/src/components/catalogSearchResults/CatalogSearchResults.test.jsx
@@ -281,8 +281,8 @@ describe('Main Catalogs view works as expected', () => {
     const listViewToggleButton = screen.getByLabelText('Card');
     userEvent.click(listViewToggleButton);
 
-    await act(() => screen.findByText('Business'));
-    expect(screen.queryByText('Business')).toBeInTheDocument();
+    await act(() => screen.findByText('Subscription'));
+    expect(screen.queryByText('Subscription')).toBeInTheDocument();
   });
   test('all courses rendered in card view when search results available', () => {
     render(

diff --git a/src/components/catalogSearchResults/associatedComponents/catalogBadges/CatalogBadges.jsx b/src/components/catalogSearchResults/associatedComponents/catalogBadges/CatalogBadges.jsx
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import messages from '../../CatalogSearchResults.messages';
-import features from '../../../../config';
 
 const CatalogBadges = ({ row }) => {
   const intl = useIntl();
@@ -24,14 +23,6 @@ const CatalogBadges = ({ row }) => {
           {intl.formatMessage(messages['catalogSearchResults.subscriptionBadge'])}
         </Badge>
       )}
-      {!features.CONSOLIDATE_SUBS_CATALOG
-        && row.original.enterprise_catalog_query_titles.includes(
-          process.env.EDX_FOR_ONLINE_EDU_TITLE,
-        ) && (
-        <Badge variant="light" className="padded-catalog">
-          {intl.formatMessage(messages['catalogSearchResults.educationBadge'])}
-        </Badge>
-      )}
     </div>
   );
 };

diff --git a/src/components/courseCard/CourseCard.jsx b/src/components/courseCard/CourseCard.jsx
@@ -8,7 +8,6 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import messages from './CourseCard.messages';
 import { CONTENT_TYPE_COURSE } from '../../constants';
 import defaultCardHeader from '../../static/default-card-header-light.png';
-import features from '../../config';
 
 const CourseCard = ({
   intl, onClick, original, learningType,
@@ -40,7 +39,6 @@ const CourseCard = ({
 
   const imageSrc = card_image_url || defaultCardHeader;
   const altText = `${title} course image`;
-  const businessBadgeMessageKey = features.CONSOLIDATE_SUBS_CATALOG ? 'courseCard.subscriptionBadge' : 'courseCard.businessBadge';
 
   return (
     <Card
@@ -76,15 +74,7 @@ const CourseCard = ({
               variant="secondary"
               className="business-catalog padded-catalog"
             >
-              {intl.formatMessage(messages[businessBadgeMessageKey])}
-            </Badge>
-          )}
-          {!features.CONSOLIDATE_SUBS_CATALOG
-            && enterprise_catalog_query_titles?.includes(
-              process.env.EDX_FOR_ONLINE_EDU_TITLE,
-            ) && (
-            <Badge variant="light" className="padded-catalog">
-              {intl.formatMessage(messages['courseCard.educationBadge'])}
+              {intl.formatMessage(messages['courseCard.subscriptionBadge'])}
             </Badge>
           )}
         </div>

diff --git a/src/components/courseCard/CourseCard.test.jsx b/src/components/courseCard/CourseCard.test.jsx
@@ -77,7 +77,7 @@ describe('Course card works as expected', () => {
       screen.queryByText(defaultProps.original.partners[0].name),
     ).toBeInTheDocument();
     expect(screen.queryByText('$100 • Self paced')).toBeInTheDocument();
-    expect(screen.queryByText('Business')).toBeInTheDocument();
+    expect(screen.queryByText('Subscription')).toBeInTheDocument();
   });
   test('test card renders default image', async () => {
     render(

diff --git a/src/components/programCard/ProgramCard.jsx b/src/components/programCard/ProgramCard.jsx
@@ -11,7 +11,6 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import defaultCardHeader from '@edx/brand/paragon/images/card-imagecap-fallback.png';
 import messages from './ProgramCard.messages';
 import { getCourses } from '../../utils/common';
-import features from '../../config';
 
 const ProgramCard = ({ intl, onClick, original }) => {
   const {
@@ -29,9 +28,6 @@ const ProgramCard = ({ intl, onClick, original }) => {
   const businessCatalogRequested = enterprise_catalog_query_titles?.includes(
     process.env.EDX_FOR_BUSINESS_TITLE,
   );
-  const eduCatalogRequested = enterprise_catalog_query_titles?.includes(
-    process.env.EDX_FOR_ONLINE_EDU_TITLE,
-  );
   const imageSrc = card_image_url || defaultCardHeader;
 
   return (
@@ -79,12 +75,6 @@ const ProgramCard = ({ intl, onClick, original }) => {
               {intl.formatMessage(messages['ProgramCard.subscriptionBadge'])}
             </Badge>
           )}
-          {!features.CONSOLIDATE_SUBS_CATALOG
-           && eduCatalogRequested && (
-           <Badge className="padded-catalog" variant="light">
-             {intl.formatMessage(messages['ProgramCard.educationBadge'])}
-           </Badge>
-          )}
         </div>
       </Card.Section>
     </Card>

diff --git a/src/utils/catalogUtils.js b/src/utils/catalogUtils.js
@@ -4,20 +4,11 @@ import { EXEC_ED_TITLE } from '../constants';
 const nowDate = new Date(Date.now());
 
 function checkSubscriptions(courseAssociatedCatalogs) {
-  const inBusiness = courseAssociatedCatalogs.includes(
+  const inSubscription = courseAssociatedCatalogs.includes(
     process.env.EDX_FOR_BUSINESS_TITLE,
   );
-  const inEducation = courseAssociatedCatalogs.includes(
-    process.env.EDX_FOR_ONLINE_EDU_TITLE,
-  );
-  if (inBusiness && inEducation) {
-    return 'Included in education and business catalog';
-  }
-  if (inBusiness) {
-    return 'Included in business catalog';
-  }
-  if (inEducation) {
-    return 'Included in education catalog';
+  if (inSubscription) {
+    return 'Included in subscription catalog';
   }
   return false;
 }