diff --git a/web/packages/teleport/src/Navigation/categories.ts b/web/packages/teleport/src/Navigation/categories.ts index b1c2f7e8f7783..f2373fb8a12a1 100644 --- a/web/packages/teleport/src/Navigation/categories.ts +++ b/web/packages/teleport/src/Navigation/categories.ts @@ -20,7 +20,8 @@ export enum NavigationCategory { } export enum ManagementSection { - Access = 'Access', + Access = 'Access Management', + Identity = 'Identity Governance & Security', Activity = 'Activity', Billing = 'Billing', Clusters = 'Clusters', @@ -28,6 +29,7 @@ export enum ManagementSection { export const MANAGEMENT_NAVIGATION_SECTIONS = [ ManagementSection.Access, + ManagementSection.Identity, ManagementSection.Activity, ManagementSection.Billing, ManagementSection.Clusters, diff --git a/web/packages/teleport/src/features.tsx b/web/packages/teleport/src/features.tsx index f88adba65f611..3233fcd541f8c 100644 --- a/web/packages/teleport/src/features.tsx +++ b/web/packages/teleport/src/features.tsx @@ -322,7 +322,7 @@ export class FeatureRoles implements TeleportFeature { section = ManagementSection.Access; route = { - title: 'Manage Roles', + title: 'Manage User Roles', path: cfg.routes.roles, exact: true, component: Roles, @@ -369,7 +369,7 @@ export class FeatureAuthConnectors implements TeleportFeature { export class FeatureLocks implements TeleportFeature { category = NavigationCategory.Management; - section = ManagementSection.Access; + section = ManagementSection.Identity; route = { title: 'Manage Session & Identity Locks', @@ -601,7 +601,7 @@ export class FeatureTrust implements TeleportFeature { class FeatureDeviceTrust implements TeleportFeature { category = NavigationCategory.Management; - section = ManagementSection.Access; + section = ManagementSection.Identity; route = { title: 'Manage Trusted Devices', path: cfg.routes.deviceTrust, @@ -686,14 +686,16 @@ export function getOSSFeatures(): TeleportFeature[] { // - Access new FeatureUsers(), new FeatureRoles(), - new FeatureDeviceTrust(), new FeatureAuthConnectors(), - new FeatureLocks(), - new FeatureNewLock(), new FeatureIntegrations(), new FeatureDiscover(), new FeatureIntegrationEnroll(), + // - Identity + new FeatureLocks(), + new FeatureNewLock(), + new FeatureDeviceTrust(), + // - Activity new FeatureRecordings(), new FeatureAudit(), diff --git a/web/packages/teleport/src/types.ts b/web/packages/teleport/src/types.ts index 36ed3a97da85f..3e6c199c65d1a 100644 --- a/web/packages/teleport/src/types.ts +++ b/web/packages/teleport/src/types.ts @@ -47,19 +47,22 @@ export enum NavTitle { ActiveSessions = 'Active Sessions', Resources = 'Resources', - // Management - // Access + // Access Management Users = 'Users', - Roles = 'Roles', - TrustedDevices = 'Trusted Devices', + Roles = 'User Roles', AuthConnectors = 'Auth Connectors', - SessionAndIdentityLocks = 'Session & Identity Locks', Integrations = 'Integrations', EnrollNewResource = 'Enroll New Resource', EnrollNewIntegration = 'Enroll New Integration', + + // Identity Governance & Security + AccessLists = 'Access Lists', + SessionAndIdentityLocks = 'Session & Identity Locks', + TrustedDevices = 'Trusted Devices', + + // Resources Requests NewRequest = 'New Request', ReviewRequests = 'Review Requests', - AccessLists = 'Access Lists', // Activity SessionRecordings = 'Session Recordings',