Address CR

gravitational · Oct 21, 2024 · 7b9a051 · 7b9a051
1 parent a7f49c2
commit 7b9a051
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/web/packages/design/src/Link/Link.jsx b/web/packages/design/src/Link/Link.jsx
@@ -31,7 +31,6 @@ const StyledButtonLink = styled.a.attrs({
   rel: 'noreferrer',
 })`
   color: ${({ theme }) => theme.colors.buttons.link.default};
-  font-weight: normal;
   background: none;
   text-decoration: underline;
   text-transform: none;

diff --git a/...ges/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx b/...ges/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx
@@ -152,6 +152,20 @@ export const FailedResourceRequest = () => (
   </MemoryRouter>
 );
 
+export const FailedUnsupportedKubeResourceKind = () => (
+  <MemoryRouter>
+    <RequestCheckoutWithSlider
+      {...baseProps}
+      isResourceRequest={true}
+      fetchResourceRequestRolesAttempt={{
+        status: 'failed',
+        statusText:
+          'Your Teleport roles request_mode field restricts you from requesting kinds [kube_cluster] for Kubernetes cluster "pumpkin-kube-cluster". Allowed kinds: [pod secret]',
+      }}
+    />
+  </MemoryRouter>
+);
+
 export const Success = () => (
   <MemoryRouter initialEntries={['']}>
     <RequestCheckoutWithSlider

diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx
@@ -52,7 +52,7 @@ import { AssumeStartTime } from '../../AssumeStartTime/AssumeStartTime';
 import { AccessDurationRequest } from '../../AccessDuration';
 import {
   checkForUnsupportedKubeRequestModes,
-  excludeKubeClusterWithNamespaces,
+  isKubeClusterWithNamespaces,
   type KubeNamespaceRequest,
 } from '../kube';
 
@@ -217,9 +217,9 @@ export function RequestCheckout<T extends PendingListItem>({
     createAttempt.status === 'processing' ||
     fetchResourceRequestRolesAttempt.status === 'processing';
 
-  const numResourcesSelected = data.filter(item =>
-    excludeKubeClusterWithNamespaces(item, data)
-  );
+  const numResourcesSelected = data.filter(
+    item => !isKubeClusterWithNamespaces(item, data)
+  ).length;
 
   const DefaultHeader = () => {
     return (
@@ -233,8 +233,8 @@ export function RequestCheckout<T extends PendingListItem>({
         />
         <Box>
           <H2>
-            {numResourcesSelected.length}{' '}
-            {pluralize(numResourcesSelected.length, 'Resource')} Selected
+            {numResourcesSelected} {pluralize(numResourcesSelected, 'Resource')}{' '}
+            Selected
           </H2>
         </Box>
       </Flex>
@@ -297,8 +297,8 @@ export function RequestCheckout<T extends PendingListItem>({
             <Alert kind="danger">
               You can only request Kubernetes resource kind{' '}
               {unsupportedKubeRequestModes} for cluster{' '}
-              {affectedKubeClusterName}, but the web UI does not support these
-              kinds yet. Use the{' '}
+              {affectedKubeClusterName}, but is not supported through this UI.
+              Use the{' '}
               <ExternalLink
                 target="_blank"
                 href="https://goteleport.com/docs/admin-guides/access-controls/access-requests/resource-requests/#step-26-search-for-resources"

diff --git a/web/packages/shared/components/AccessRequests/NewRequest/kube.ts b/web/packages/shared/components/AccessRequests/NewRequest/kube.ts
@@ -26,24 +26,21 @@ export type KubeNamespaceRequest = {
 };
 
 /**
- * Returns true if the currItem is a kube cluster or is a namespace
- * of the currItem.
+ * Returns true if the item is a kube cluster or is a namespace
+ * of the item.
  *
  * Technically you can request for both a kube_cluster and its subresources
  * but it's probably not what a user would expect from the web UI because
  * requesting for subresources means narrowing access versus requesting
  * access to the whole kube_cluster.
  */
-export function excludeKubeClusterWithNamespaces(
-  currItem: PendingListItem,
+export function isKubeClusterWithNamespaces(
+  item: PendingListItem,
   allItems: PendingListItem[]
 ) {
   return (
-    currItem.kind !== 'kube_cluster' ||
-    !(
-      currItem.kind === 'kube_cluster' &&
-      allItems.find(a => a.kind === 'namespace' && a.id == currItem.id)
-    )
+    item.kind === 'kube_cluster' &&
+    allItems.find(a => a.kind === 'namespace' && a.id == item.id)
   );
 }