feat: add setting hidden option (#25480)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
PostHog · Oct 15, 2024 · 6d7a20b · 6d7a20b
1 parent f975dd7
commit 6d7a20b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 18 deletions.
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-user--dark.png b/frontend/__snapshots__/scenes-other-settings--settings-user--dark.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-user--light.png b/frontend/__snapshots__/scenes-other-settings--settings-user--light.png
diff --git a/frontend/src/scenes/settings/SettingsMap.tsx b/frontend/src/scenes/settings/SettingsMap.tsx
@@ -3,6 +3,8 @@ import { PersonsJoinMode } from 'scenes/settings/environment/PersonsJoinMode'
 import { PersonsOnEvents } from 'scenes/settings/environment/PersonsOnEvents'
 import { SessionsTableVersion } from 'scenes/settings/environment/SessionsTableVersion'
 
+import { Realm } from '~/types'
+
 import {
     AutocaptureSettings,
     ExceptionAutocaptureSettings,
@@ -469,6 +471,7 @@ export const SETTINGS_MAP: SettingSection[] = [
                 id: 'optout',
                 title: 'Anonymize data collection',
                 component: <OptOutCapture />,
+                hideOn: [Realm.Cloud],
             },
             {
                 id: 'hedgehog-mode',

diff --git a/frontend/src/scenes/settings/settingsLogic.ts b/frontend/src/scenes/settings/settingsLogic.ts
@@ -2,9 +2,12 @@ import { actions, connect, kea, key, listeners, path, props, reducers, selectors
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { copyToClipboard } from 'lib/utils/copyToClipboard'
+import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
 
+import { Realm } from '~/types'
+
 import type { settingsLogicType } from './settingsLogicType'
 import { SETTINGS_MAP } from './SettingsMap'
 import { Setting, SettingId, SettingLevelId, SettingSection, SettingSectionId, SettingsLogicProps } from './types'
@@ -14,7 +17,7 @@ export const settingsLogic = kea<settingsLogicType>([
     key((props) => props.logicKey ?? 'global'),
     path((key) => ['scenes', 'settings', 'settingsLogic', key]),
     connect({
-        values: [featureFlagLogic, ['featureFlags'], userLogic, ['hasAvailableFeature']],
+        values: [featureFlagLogic, ['featureFlags'], userLogic, ['hasAvailableFeature'], preflightLogic, ['preflight']],
     }),
 
     actions({
@@ -112,8 +115,17 @@ export const settingsLogic = kea<settingsLogicType>([
                 s.settingId,
                 s.featureFlags,
                 s.hasAvailableFeature,
+                s.preflight,
             ],
-            (selectedLevel, selectedSectionId, sections, settingId, featureFlags, hasAvailableFeature): Setting[] => {
+            (
+                selectedLevel,
+                selectedSectionId,
+                sections,
+                settingId,
+                featureFlags,
+                hasAvailableFeature,
+                preflight
+            ): Setting[] => {
                 let settings: Setting[] = []
 
                 if (selectedSectionId) {
@@ -128,22 +140,29 @@ export const settingsLogic = kea<settingsLogicType>([
                     return settings.filter((x) => x.id === settingId)
                 }
 
-                return settings.filter((x) => {
-                    const isFlagConditionMet = !x.flag
-                        ? true // No flag condition
-                        : x.flag.startsWith('!')
-                        ? !featureFlags[FEATURE_FLAGS[x.flag.slice(1)]] // Negated flag condition (!-prefixed)
-                        : featureFlags[FEATURE_FLAGS[x.flag]] // Regular flag condition
-                    if (x.flag && x.features) {
-                        return x.features.some((feat) => hasAvailableFeature(feat)) || isFlagConditionMet
-                    } else if (x.features) {
-                        return x.features.some((feat) => hasAvailableFeature(feat))
-                    } else if (x.flag) {
-                        return isFlagConditionMet
-                    }
+                return settings
+                    .filter((x) => {
+                        const isFlagConditionMet = !x.flag
+                            ? true // No flag condition
+                            : x.flag.startsWith('!')
+                            ? !featureFlags[FEATURE_FLAGS[x.flag.slice(1)]] // Negated flag condition (!-prefixed)
+                            : featureFlags[FEATURE_FLAGS[x.flag]] // Regular flag condition
+                        if (x.flag && x.features) {
+                            return x.features.some((feat) => hasAvailableFeature(feat)) || isFlagConditionMet
+                        } else if (x.features) {
+                            return x.features.some((feat) => hasAvailableFeature(feat))
+                        } else if (x.flag) {
+                            return isFlagConditionMet
+                        }
 
-                    return true
-                })
+                        return true
+                    })
+                    .filter((x) => {
+                        if (x.hideOn?.includes(Realm.Cloud) && preflight?.cloud) {
+                            return false
+                        }
+                        return true
+                    })
             },
         ],
     }),

diff --git a/frontend/src/scenes/settings/types.ts b/frontend/src/scenes/settings/types.ts
@@ -1,6 +1,6 @@
 import { EitherMembershipLevel, FEATURE_FLAGS } from 'lib/constants'
 
-import { AvailableFeature } from '~/types'
+import { AvailableFeature, Realm } from '~/types'
 
 export type SettingsLogicProps = {
     logicKey?: string
@@ -110,6 +110,7 @@ export type Setting = {
      */
     flag?: FeatureFlagKey | `!${FeatureFlagKey}`
     features?: AvailableFeature[]
+    hideOn?: Realm[]
 }
 
 export type SettingSection = {