diff --git a/src/embed/app.spec.ts b/src/embed/app.spec.ts index 3f3f660a..4a066d5f 100644 --- a/src/embed/app.spec.ts +++ b/src/embed/app.spec.ts @@ -530,7 +530,7 @@ describe('App embed tests', () => { homePage: HomePage.Focused, }, } as AppViewConfig, - `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&navigationVersion=v2&homepageVersion=v4${defaultParams}${defaultParamsPost}#/home`, + `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&homepageVersion=v4${defaultParams}${defaultParamsPost}#/home`, ); }); @@ -1390,27 +1390,27 @@ describe('App embed tests', () => { ); }); - test('Should add homepageVersion=v3 & navigationVersion=v3 & modularHomeExperience=true when homePage is ModularWithStylingChanges to the iframe src', async () => { + test('Should add homepageVersion=v3 & modularHomeExperience=false to the iframe src when homePage is ModularWithStylingChanges', async () => { await testUrlParams( { ...defaultViewConfig, // primaryNavbarVersion is not included under - // discoveryExperience, then it set navigationVersion=v2 and - // modularHomeExperience=false. + // discoveryExperience, so navigationVersion is left unset and + // the server's GA default applies, while modularHomeExperience is set to false. discoveryExperience: { homePage: HomePage.ModularWithStylingChanges, }, } as AppViewConfig, - `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&navigationVersion=v2&homepageVersion=v3${defaultParams}${defaultParamsPost}#/home` + `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&homepageVersion=v3${defaultParams}${defaultParamsPost}#/home` ); }); - test('Should add navigationVersion=v2 when primaryNavbarVersion is not added to the iframe src', async () => { + test('Should not add navigationVersion when primaryNavbarVersion is not added to the iframe src', async () => { await testUrlParams( { ...defaultViewConfig, } as AppViewConfig, - `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&navigationVersion=v2${defaultParams}${defaultParamsPost}#/home` + `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false${defaultParams}${defaultParamsPost}#/home` ); }); @@ -1441,7 +1441,7 @@ describe('App embed tests', () => { { ...defaultViewConfig, } as AppViewConfig, - `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false&navigationVersion=v2${defaultParams}${defaultParamsPost}#/home` + `http://${thoughtSpotHost}/?embedApp=true&primaryNavHidden=true&profileAndHelpInNavBarHidden=false&modularHomeExperience=false${defaultParams}${defaultParamsPost}#/home` ); }); diff --git a/src/embed/app.ts b/src/embed/app.ts index c9549e5f..b400a73b 100644 --- a/src/embed/app.ts +++ b/src/embed/app.ts @@ -1181,15 +1181,9 @@ export class AppEmbed extends V1Embed { params[Param.ModularHomeExperienceEnabled] = modularHomeExperience; } - // Set navigation to v2 by default to avoid problems like the app - // switcher (9-dot menu) not showing when v3 navigation is turned on - // at the cluster level. - // To use v3 navigation, we must manually set the discoveryExperience - // settings. - params[Param.NavigationVersion] = 'v2'; - // Set homePageVersion to v2 by default to reset the LD flag value - // for the homepageVersion. - params[Param.HomepageVersion] = 'v2'; + // Don't force a navigation/homepage version by default. Let the + // server's GA default take over (v3 on 26.8+, v2 on older clusters). + // Only override when the user explicitly sets discoveryExperience. if (discoveryExperience) { // primaryNavbarVersion v3 will enabled the new left navigation if (discoveryExperience.primaryNavbarVersion === PrimaryNavbarVersion.Sliding) {