Merge branch 'master' into update-preview

PostHog · Apr 29, 2024 · f61985d · f61985d
2 parents 37ff74c + e5716a8
commit f61985d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/...ts__/scenes-app-insights--funnel-left-to-right-breakdown-edit--dark--webkit.png b/...ts__/scenes-app-insights--funnel-left-to-right-breakdown-edit--dark--webkit.png
diff --git a/...s__/scenes-app-insights--funnel-left-to-right-breakdown-edit--light--webkit.png b/...s__/scenes-app-insights--funnel-left-to-right-breakdown-edit--light--webkit.png
diff --git a/frontend/src/scenes/pipeline/Pipeline.tsx b/frontend/src/scenes/pipeline/Pipeline.tsx
@@ -11,6 +11,7 @@ import { AppsManagement } from './AppsManagement'
 import { Destinations } from './Destinations'
 import { FrontendApps } from './FrontendApps'
 import { ImportApps } from './ImportApps'
+import { importAppsLogic } from './importAppsLogic'
 import { NewButton } from './NewButton'
 import { Overview } from './Overview'
 import { humanFriendlyTabName, pipelineLogic } from './pipelineLogic'
@@ -19,13 +20,20 @@ import { Transformations } from './Transformations'
 
 export function Pipeline(): JSX.Element {
     const { currentTab, canEnableNewDestinations, canGloballyManagePlugins } = useValues(pipelineLogic)
+    const { hasEnabledImportApps } = useValues(importAppsLogic)
 
     let tabToContent: Partial<Record<PipelineTab, JSX.Element>> = {
         [PipelineTab.Overview]: <Overview />,
         [PipelineTab.Transformations]: <Transformations />,
         [PipelineTab.Destinations]: <Destinations />,
         [PipelineTab.SiteApps]: <FrontendApps />,
-        [PipelineTab.ImportApps]: <ImportApps />, // TODO: only show if some enabled
+    }
+    // Import apps are deprecated, we only show the tab if there are some still enabled
+    if (hasEnabledImportApps) {
+        tabToContent = {
+            ...tabToContent,
+            [PipelineTab.ImportApps]: <ImportApps />,
+        }
     }
     if (canGloballyManagePlugins) {
         tabToContent = {

diff --git a/frontend/src/scenes/pipeline/importAppsLogic.tsx b/frontend/src/scenes/pipeline/importAppsLogic.tsx
@@ -80,6 +80,7 @@ export const importAppsLogic = kea<importAppsLogicType>([
                 return enabledFirst
             },
         ],
+        hasEnabledImportApps: [(s) => [s.importApps], (importApps) => importApps.some((app) => app.enabled)],
     }),
     afterMount(({ actions }) => {
         actions.loadPlugins()