Merge remote-tracking branch 'remotes/from/ce/main'

Author: hc-github-team-secure-vault-core

ui/app/routes/vault/cluster/support/upgrade-info.ts

@@ -4,6 +4,8 @@
  */
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
+
+import type FlagsService from 'vault/services/flags';
 import type RouterService from '@ember/routing/router-service';
 import type Controller from '@ember/controller';
 import type { Breadcrumb } from 'vault/vault/app-types';
@@ -20,11 +22,12 @@ interface RouteController extends Controller {
 type ParentModel = ModelFrom<VaultClusterSupportUpgradeRoute>;
 
 export default class VaultClusterSupportUpgradeInfoRoute extends Route {
+  @service declare readonly flags: FlagsService;
   @service declare readonly router: RouterService;
   @service declare readonly version: VersionService;
 
   beforeModel() {
-    if (this.version.isCommunity) {
+    if (this.version.isCommunity || this.flags.isHvdManaged) {
       this.router.transitionTo('vault.cluster.dashboard');
       return;
     }

ui/app/routes/vault/cluster/support/upgrade.ts

@@ -5,12 +5,13 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
+import { DisplayedInfo } from 'vault/components/upgrade-path-analyzer/upgrade-path-analyzer';
+
 import type Controller from '@ember/controller';
 import type { Breadcrumb } from 'vault/vault/app-types';
 import type FlagsService from 'vault/services/flags';
 import type RouterService from '@ember/routing/router-service';
 import type VersionService from 'vault/services/version';
-import { DisplayedInfo } from 'vault/components/upgrade-path-analyzer/upgrade-path-analyzer';
 
 interface RouteController extends Controller {
   breadcrumbs: Array<Breadcrumb>;