From fc6c11ee8e19bc3402080d5bbc1a89b3d94fbcfc Mon Sep 17 00:00:00 2001
From: Michelle Bergquist <11967646+michellescripts@users.noreply.github.com>
Date: Wed, 27 Nov 2024 09:41:30 -0700
Subject: [PATCH] Add OSS integration status (#49485)

- Add to oss features
- Move header null check to parent
---
 .../status/AwsOidc/AwsOidcDashboard.tsx       |  2 +-
 .../status/AwsOidc/AwsOidcHeader.tsx          |  8 ++------
 web/packages/teleport/src/features.tsx        | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
index 45779ea05ed70..98f5faa122bd4 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
@@ -28,7 +28,7 @@ export function AwsOidcDashboard() {
 
   return (
     <FeatureBox css={{ maxWidth: '1400px', paddingTop: '16px' }}>
-      <AwsOidcHeader integration={attempt.data} />
+      {attempt.data && <AwsOidcHeader integration={attempt.data} />}
       Status for integration type aws-oidc is not supported
     </FeatureBox>
   );
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
index 136e3ee354e09..8d95d16a691c4 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
@@ -27,11 +27,7 @@ import cfg from 'teleport/config';
 import { getStatusAndLabel } from 'teleport/Integrations/helpers';
 import { Integration } from 'teleport/services/integrations';
 
-export function AwsOidcHeader({
-  integration,
-}: {
-  integration: Integration | null;
-}) {
+export function AwsOidcHeader({ integration }: { integration: Integration }) {
   const { status, labelKind } = getStatusAndLabel(integration);
   return (
     <Flex alignItems="center">
@@ -45,7 +41,7 @@ export function AwsOidcHeader({
         </ButtonIcon>
       </HoverTooltip>
       <Text bold fontSize={6} mr={2}>
-        {integration?.name}
+        {integration.name}
       </Text>
       <Label kind={labelKind} aria-label="status" px={3}>
         {status}
diff --git a/web/packages/teleport/src/features.tsx b/web/packages/teleport/src/features.tsx
index c95464d41e959..54f3cb8f41916 100644
--- a/web/packages/teleport/src/features.tsx
+++ b/web/packages/teleport/src/features.tsx
@@ -45,6 +45,8 @@ import {
 import { NavigationCategory as SideNavigationCategory } from 'teleport/Navigation/SideNavigation/categories';
 import { IntegrationEnroll } from '@gravitational/teleport/src/Integrations/Enroll';
 
+import { IntegrationStatus } from 'teleport/Integrations/IntegrationStatus';
+
 import { NavTitle } from './types';
 
 import { AuditContainer as Audit } from './Audit';
@@ -632,6 +634,22 @@ class FeatureDeviceTrust implements TeleportFeature {
   };
 }
 
+class FeatureIntegrationStatus implements TeleportFeature {
+  category = NavigationCategory.Management;
+
+  parent = FeatureIntegrations;
+
+  route = {
+    title: 'Integration Status',
+    path: cfg.routes.integrationStatus,
+    component: IntegrationStatus,
+  };
+
+  hasAccess() {
+    return true;
+  }
+}
+
 // ****************************
 // Other Features
 // ****************************
@@ -706,6 +724,7 @@ export function getOSSFeatures(): TeleportFeature[] {
     new FeatureIntegrations(),
     new FeatureClusters(),
     new FeatureTrust(),
+    new FeatureIntegrationStatus(),
 
     // - Identity
     new AccessRequests(),