remove org dashboard feature flag (#2654)

* remove organization dashboard feature flags and always display org dashboard related components

* remove posthog mocking where applicable

Author: gumaerc

frontends/main/src/app-pages/DashboardPage/DashboardLayout.test.tsx

@@ -21,17 +21,11 @@ import {
 } from "@/common/urls"
 import { faker } from "@faker-js/faker/locale/en"
 import invariant from "tiny-invariant"
-import { useFeatureFlagEnabled } from "posthog-js/react"
 import { OrganizationPage, ContractPage } from "@mitodl/mitxonline-api-axios/v2"
 
 jest.mock("posthog-js/react")
-const mockedUseFeatureFlagEnabled = jest.mocked(useFeatureFlagEnabled)
 
 describe("DashboardLayout", () => {
-  beforeEach(() => {
-    mockedUseFeatureFlagEnabled.mockReturnValue(false)
-  })
-
   type SetupOptions = {
     initialUrl?: string
     organizations?: OrganizationPage[]
@@ -68,9 +62,6 @@ describe("DashboardLayout", () => {
   })
 
   test("Renders the expected tab links and labels", async () => {
-    // Enable organization dashboard feature flag for this test
-    mockedUseFeatureFlagEnabled.mockReturnValue(true)
-
     const organizations = [
       mitxOnlineFactories.organizations.organization({
         slug: "org-test-org",

frontends/main/src/app-pages/DashboardPage/DashboardLayout.tsx

@@ -36,8 +36,6 @@ import {
 import dynamic from "next/dynamic"
 import { MitxOnlineUser, mitxUserQueries } from "api/mitxonline-hooks/user"
 import { useUserMe } from "api/hooks/user"
-import { useFeatureFlagEnabled } from "posthog-js/react"
-import { FeatureFlags } from "@/common/feature_flags"
 import { contractQueries } from "api/mitxonline-hooks/contracts"
 import { useQuery } from "@tanstack/react-query"
 import { ContractPage } from "@mitodl/mitxonline-api-axios/v2"
@@ -241,12 +239,11 @@ type TabData = {
   }
 }
 const getTabData = (
-  orgsEnabled: boolean = false,
   user?: MitxOnlineUser,
   contracts?: ContractPage[],
 ): TabData[] => {
   const orgTabs =
-    orgsEnabled && user && contracts
+    user && contracts
       ? user?.b2b_organizations.map((org) => {
           const orgContracts = contracts?.filter(
             (contract) => contract.organization === org.id,
@@ -317,7 +314,6 @@ const DashboardPage: React.FC<{
 }> = ({ children }) => {
   const pathname = usePathname()
   const { isLoading: isLoadingUser, data: user } = useUserMe()
-  const orgsEnabled = useFeatureFlagEnabled(FeatureFlags.OrganizationDashboard)
   const { data: mitxOnlineUser, isLoading: isLoadingMitxOnlineUser } = useQuery(
     {
       ...mitxUserQueries.me(),
@@ -330,15 +326,9 @@ const DashboardPage: React.FC<{
   const tabData = useMemo(
     () =>
       isLoadingMitxOnlineUser || isLoadingContracts
-        ? getTabData(orgsEnabled)
-        : getTabData(orgsEnabled, mitxOnlineUser, contracts),
-    [
-      isLoadingMitxOnlineUser,
-      isLoadingContracts,
-      orgsEnabled,
-      mitxOnlineUser,
-      contracts,
-    ],
+        ? getTabData()
+        : getTabData(mitxOnlineUser, contracts),
+    [isLoadingMitxOnlineUser, isLoadingContracts, mitxOnlineUser, contracts],
   )
 
   const tabValue = useMemo(() => {

frontends/main/src/app-pages/DashboardPage/HomeContent.test.tsx

@@ -210,7 +210,6 @@ describe("HomeContent", () => {
       setupAPIs()
       mockedUseFeatureFlagEnabled.mockImplementation((flag) => {
         if (flag === "enrollment-dashboard") return enrollmentsEnabled
-        if (flag === "mitlearn-organization-dashboard") return false // Disable org cards to avoid image issues
         return false
       })
 

frontends/main/src/app-pages/DashboardPage/HomeContent.tsx

@@ -70,7 +70,6 @@ const HomeContent: React.FC = () => {
   const { isLoading: isLoadingProfile, data: user } = useUserMe()
   const topics = user?.profile?.preference_search_filters.topic
   const certification = user?.profile?.preference_search_filters.certification
-  const showOrgs = useFeatureFlagEnabled(FeatureFlags.OrganizationDashboard)
   const showEnrollments = useFeatureFlagEnabled(
     FeatureFlags.EnrollmentDashboard,
   )
@@ -89,7 +88,7 @@ const HomeContent: React.FC = () => {
           </ButtonLink>
         </HomeHeaderRight>
       </HomeHeader>
-      {showOrgs ? <OrganizationCards /> : null}
+      <OrganizationCards />
       {showEnrollments ? <EnrollmentDisplay /> : null}
       <Suspense>
         <StyledResourceCarousel

frontends/main/src/app-pages/DashboardPage/OrganizationContent.test.tsx

@@ -3,7 +3,6 @@ import { renderWithProviders, screen, within, waitFor } from "@/test-utils"
 import OrganizationContent from "./OrganizationContent"
 import { setMockResponse } from "api/test-utils"
 import { urls, factories } from "api/mitxonline-test-utils"
-import { useFeatureFlagEnabled } from "posthog-js/react"
 import {
   organizationCoursesWithContracts,
   mitxonlineProgram,
@@ -23,14 +22,8 @@ import { faker } from "@faker-js/faker/locale/en"
 const makeCourseEnrollment = factories.enrollment.courseEnrollment
 const makeGrade = factories.enrollment.grade
 
-jest.mock("posthog-js/react")
-const mockedUseFeatureFlagEnabled = jest
-  .mocked(useFeatureFlagEnabled)
-  .mockImplementation(() => false)
-
 describe("OrganizationContent", () => {
   beforeEach(() => {
-    mockedUseFeatureFlagEnabled.mockReturnValue(true)
     setMockResponse.get(urls.enrollment.enrollmentsList(), [])
     setMockResponse.get(urls.enrollment.enrollmentsListV2(), [])
     setMockResponse.get(urls.programEnrollments.enrollmentsList(), [])

frontends/main/src/app-pages/DashboardPage/OrganizationContent.tsx

@@ -3,8 +3,6 @@
 import React, { useEffect } from "react"
 import DOMPurify from "isomorphic-dompurify"
 import Image from "next/image"
-import { useFeatureFlagEnabled } from "posthog-js/react"
-import { FeatureFlags } from "@/common/feature_flags"
 import { useQueries, useQuery } from "@tanstack/react-query"
 import {
   programsQueries,
@@ -360,9 +358,6 @@ type OrganizationContentInternalProps = {
 const OrganizationContentInternal: React.FC<
   OrganizationContentInternalProps
 > = ({ org }) => {
-  const isOrgDashboardEnabled = useFeatureFlagEnabled(
-    FeatureFlags.OrganizationDashboard,
-  )
   const orgId = org.id
   const contracts = useQuery(contractQueries.contractsList())
   const orgContracts = contracts.data?.filter(
@@ -379,8 +374,6 @@ const OrganizationContentInternal: React.FC<
     programCollectionQueries.programCollectionsList({}),
   )
 
-  if (!isOrgDashboardEnabled) return null
-
   const transformedPrograms = programs.data?.results
     .filter((program) => program.collections.length === 0)
     .map((program) => transform.mitxonlineProgram(program))

frontends/main/src/common/feature_flags.ts

@@ -8,7 +8,6 @@ export enum FeatureFlags {
   RecommendationBot = "recommendation-bot",
   HomePageRecommendationBot = "home-page-recommendation-bot",
   EnrollmentDashboard = "enrollment-dashboard",
-  OrganizationDashboard = "mitlearn-organization-dashboard",
   VideoShorts = "video-shorts",
   ProductPageCourse = "product-page-course",
 }