update copy in settings and turn on nav bar redesign by default

Author: chriscollins3456

datahub-web-react/src/app/settings/Preferences.tsx

@@ -113,12 +113,12 @@ export const Preferences = () => {
                         <Card style={{ marginTop: 20 }}>
                             <UserSettingRow>
                                 <span>
-                                    <SettingText>Try DataHub 2.0 (beta)</SettingText>
+                                    <SettingText>Try New User Experience</SettingText>
                                     <div>
                                         <DescriptionText>
-                                            Enable an early preview of DataHub 2.0 - a complete makeover for your app
-                                            with a sleek new design and advanced features. Flip the switch and refresh
-                                            your browser to try it out!
+                                            Enable an early preview of the new DataHub UX - a complete makeover for your
+                                            app with a sleek new design and advanced features. Flip the switch and
+                                            refresh your browser to try it out!
                                         </DescriptionText>
                                     </div>
                                 </span>

datahub-web-react/src/app/settingsV2/Preferences.tsx

@@ -113,12 +113,12 @@ export const Preferences = () => {
                         <Card style={{ marginTop: 20 }}>
                             <UserSettingRow>
                                 <span>
-                                    <SettingText>Try Acryl 2.0 (beta)</SettingText>
+                                    <SettingText>Try New User Experience</SettingText>
                                     <div>
                                         <DescriptionText>
-                                            Enable an early preview of Acryl 2.0 - a complete makeover for your app with
-                                            a sleek new design and advanced features. Flip the switch and refresh your
-                                            browser to try it out!
+                                            Enable an early preview of the new DataHub UX - a complete makeover for your
+                                            app with a sleek new design and advanced features. Flip the switch and
+                                            refresh your browser to try it out!
                                         </DescriptionText>
                                     </div>
                                 </span>

datahub-web-react/src/app/useShowNavBarRedesign.tsx

@@ -1,14 +1,16 @@
 import { useEffect } from 'react';
 import { useAppConfig } from './useAppConfig';
+import { useIsThemeV2 } from './useIsThemeV2';
 
 export function useShowNavBarRedesign() {
     const appConfig = useAppConfig();
+    const isThemeV2Enabled = useIsThemeV2();
 
     if (!appConfig.loaded) {
         return loadFromLocalStorage();
     }
 
-    return appConfig.config.featureFlags.showNavBarRedesign;
+    return appConfig.config.featureFlags.showNavBarRedesign && isThemeV2Enabled;
 }
 
 export function useSetNavBarRedesignEnabled() {

metadata-service/configuration/src/main/resources/application.yaml

@@ -492,7 +492,7 @@ featureFlags:
   editableDatasetNameEnabled: ${EDITABLE_DATASET_NAME_ENABLED:false} # Enables the ability to edit the dataset name in the UI
   showManageStructuredProperties: ${SHOW_MANAGE_STRUCTURED_PROPERTIES:true} # If turned on, show the manage structured properties button on the govern dropdown
   hideDbtSourceInLineage: ${HIDE_DBT_SOURCE_IN_LINEAGE:false} # If turned on, dbt sources will not be shown in lineage
-  showNavBarRedesign: ${SHOW_NAV_BAR_REDESIGN:false} # If turned on, show the newly designed nav bar in the V2 experience
+  showNavBarRedesign: ${SHOW_NAV_BAR_REDESIGN:true} # If turned on, show the newly designed nav bar in the V2 experience
   showAutoCompleteResults: ${SHOW_AUTO_COMPLETE_RESULTS:true} # If turned on, show the auto complete results in the search bar
   entityVersioning: ${ENTITY_VERSIONING_ENABLED:false} # Enables entity versioning APIs, validators, and side effects