Merge branch 'master' into feat/toolbar-3000

PostHog · Nov 15, 2023 · 8ab811d · 8ab811d
2 parents 864f101 + 6b1d662
commit 8ab811d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/ci-frontend.yml b/.github/workflows/ci-frontend.yml
@@ -67,6 +67,7 @@ jobs:
                   build-script: 'build'
                   compression: 'none'
                   pattern: 'frontend/dist/toolbar.js'
+
     jest:
         runs-on: ubuntu-latest
         name: Jest test (${{ matrix.chunk }})

diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
@@ -143,7 +143,6 @@ export const FEATURE_FLAGS = {
     NOTEBOOKS: 'notebooks', // owner: #team-monitoring
     EARLY_ACCESS_FEATURE_SITE_BUTTON: 'early-access-feature-site-button', // owner: @neilkakkar
     HEDGEHOG_MODE_DEBUG: 'hedgehog-mode-debug', // owner: @benjackwhite
-    AUTO_REDIRECT: 'auto-redirect', // owner: @lharries
     GENERIC_SIGNUP_BENEFITS: 'generic-signup-benefits', // experiment, owner: @raquelmsmith
     WEB_ANALYTICS: 'web-analytics', // owner @robbie-c #team-web-analytics
     HIGH_FREQUENCY_BATCH_EXPORTS: 'high-frequency-batch-exports', // owner: @tomasfarias

diff --git a/frontend/src/scenes/authentication/Login.tsx b/frontend/src/scenes/authentication/Login.tsx
@@ -14,8 +14,6 @@ import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import RegionSelect from './RegionSelect'
 import { redirectIfLoggedInOtherInstance } from './redirectToLoggedInInstance'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { FEATURE_FLAGS } from 'lib/constants'
 import { captureException } from '@sentry/react'
 import { SupportModalButton } from './SupportModalButton'
 
@@ -54,19 +52,17 @@ export function Login(): JSX.Element {
     const { precheck } = useActions(loginLogic)
     const { precheckResponse, precheckResponseLoading, login, isLoginSubmitting, generalError } = useValues(loginLogic)
     const { preflight } = useValues(preflightLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
 
     const passwordInputRef = useRef<HTMLInputElement>(null)
     const isPasswordHidden = precheckResponse.status === 'pending' || precheckResponse.sso_enforcement
 
     useEffect(() => {
-        try {
-            // Turn on E2E test when this flag is removed
-            if (featureFlags[FEATURE_FLAGS.AUTO_REDIRECT]) {
+        if (preflight?.cloud) {
+            try {
                 redirectIfLoggedInOtherInstance()
+            } catch (e) {
+                captureException(e)
             }
-        } catch (e) {
-            captureException(e)
         }
     }, [])
 

diff --git a/frontend/src/scenes/surveys/SurveyEdit.tsx b/frontend/src/scenes/surveys/SurveyEdit.tsx
@@ -602,6 +602,17 @@ export default function SurveyEdit(): JSX.Element {
                                                                           textPlaceholder="ex: We really appreciate it."
                                                                       />
                                                                   </PureField>
+                                                                  <PureField label="Auto disappear">
+                                                                      <LemonCheckbox
+                                                                          checked={!!survey.appearance.autoDisappear}
+                                                                          onChange={(checked) =>
+                                                                              setSurveyValue('appearance', {
+                                                                                  ...survey.appearance,
+                                                                                  autoDisappear: checked,
+                                                                              })
+                                                                          }
+                                                                      />
+                                                                  </PureField>
                                                               </>
                                                           ),
                                                       },

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -2196,6 +2196,7 @@ export interface SurveyAppearance {
     displayThankYouMessage?: boolean
     thankYouMessageHeader?: string
     thankYouMessageDescription?: string
+    autoDisappear?: boolean
     position?: string
 }