AXON-201: updates

Author: cabella-dot

src/container.ts

@@ -65,7 +65,7 @@ import { VSCWelcomeActionApi } from './webview/welcome/vscWelcomeActionApi';
 import { VSCWelcomeWebviewControllerFactory } from './webview/welcome/vscWelcomeWebviewControllerFactory';
 import { WelcomeAction } from './lib/ipc/fromUI/welcome';
 import { WelcomeInitMessage } from './lib/ipc/toUI/welcome';
-import { FeatureFlagClient, Features } from './util/featureFlags';
+import { Experiments, FeatureFlagClient, Features } from './util/featureFlags';
 import { EventBuilder } from './util/featureFlags/eventBuilder';
 import { AtlascodeUriHandler } from './uriHandler';
 import { CheckoutHelper } from './bitbucket/interfaces';
@@ -200,6 +200,7 @@ export class Container {
             .finally(() => {
                 this.initializeUriHandler(context, this._analyticsApi, this._bitbucketHelper);
                 this.initializeNewSidebarView(context, config);
+                this.initializeAAExperiment();
             });
 
         context.subscriptions.push((this._helpExplorer = new HelpExplorer()));
@@ -209,7 +210,9 @@ export class Container {
         const telemetryConfig = workspace.getConfiguration('telemetry');
         return telemetryConfig.get<boolean>('enableTelemetry', true);
     }
-
+    static initializeAAExperiment() {
+        FeatureFlagClient.checkExperimentValue(Experiments.AtlascodeAA);
+    }
     static initializeUriHandler(
         context: ExtensionContext,
         analyticsApi: VSCAnalyticsApi,

src/extension.ts

@@ -62,36 +62,9 @@ export async function activate(context: ExtensionContext) {
         Container.clientManager.requestSite(site);
     });
 
-    FeatureFlagClient.checkExperimentValue(Experiments.AtlascodeAA);
     // new user for auth exp
     if (previousVersion === undefined) {
-        let onboardingFlow = FeatureFlagClient.checkExperimentValue(Experiments.NewAuthUI);
-        Logger.debug(`Onboarding Experiment flow: ${onboardingFlow}`);
-        if (!onboardingFlow) {
-            onboardingFlow = 'control';
-        }
-
-        switch (onboardingFlow) {
-            case 'settings': {
-                commands.executeCommand(Commands.ShowConfigPage);
-                break;
-            }
-            case 'legacy': {
-                commands.executeCommand(Commands.ShowOnboardingPage);
-                break;
-            }
-            case 'new': {
-                commands.executeCommand(Commands.ShowOnboardingPage);
-                break;
-            }
-            default: {
-                // control
-                if (window.state.focused) {
-                    commands.executeCommand(Commands.ShowOnboardingPage);
-                }
-                break;
-            }
-        }
+        initializeNewAuthExperiment();
     } else {
         showWelcomePage(atlascodeVersion, previousVersion);
     }
@@ -193,6 +166,35 @@ async function sendAnalytics(version: string, globalState: Memento) {
     });
 }
 
+function initializeNewAuthExperiment() {
+    let onboardingFlow = FeatureFlagClient.checkExperimentValue(Experiments.NewAuthUI);
+    Logger.debug(`Onboarding Experiment flow: ${onboardingFlow}`);
+    if (!onboardingFlow) {
+        onboardingFlow = 'control';
+    }
+
+    switch (onboardingFlow) {
+        case 'settings': {
+            commands.executeCommand(Commands.ShowConfigPage);
+            break;
+        }
+        case 'legacy': {
+            commands.executeCommand(Commands.ShowOnboardingPage);
+            break;
+        }
+        case 'new': {
+            commands.executeCommand(Commands.ShowOnboardingPage);
+            break;
+        }
+        default: {
+            // control
+            if (window.state.focused) {
+                commands.executeCommand(Commands.ShowOnboardingPage);
+            }
+            break;
+        }
+    }
+}
 // this method is called when your extension is deactivated
 export function deactivate() {
     FeatureFlagClient.dispose();

src/react/atlascode/onboarding/OnboardingPage.tsx

@@ -60,7 +60,6 @@ export const OnboardingPage: React.FunctionComponent = () => {
     const [state, controller] = useOnboardingController();
     const { authDialogController, authDialogOpen, authDialogProduct, authDialogEntry } = useAuthDialog();
     const [activeStep, setActiveStep] = React.useState(0);
-    // const [authExpEnabled, setAuthExpEnabled] = React.useState(false);
     const [useAuthUI, setUseAuthUI] = React.useState(false);
     const [jiraSignInText, setJiraSignInText] = useState('Sign In to Jira Cloud');
     const [bitbucketSignInText, setBitbucketSignInText] = useState('Sign In to Bitbucket Cloud');