fix review comments

Signed-off-by: farodin91 <[email protected]>
headlamp-k8s · Dec 7, 2024 · 5c0ccb3 · 5c0ccb3
1 parent 12851f2
commit 5c0ccb3
Show file tree

Hide file tree

Showing 23 changed files with 216 additions and 287 deletions.
diff --git a/frontend/src/components/Sidebar/prepareRoutes.ts b/frontend/src/components/Sidebar/prepareRoutes.ts
@@ -167,12 +167,12 @@ function prepareRoutes(
       ],
     },
     {
-      name: 'gateway',
+      name: 'gatewayapi',
       label: t('glossary|Gateway'),
       icon: 'mdi:lan-connect',
       subList: [
         {
-          name: 'k8sgateways',
+          name: 'gateways',
           label: t('glossary|Gateways'),
         },
         {

diff --git a/frontend/src/components/gateway/ClassDetails.stories.tsx b/frontend/src/components/gateway/ClassDetails.stories.tsx
@@ -21,9 +21,8 @@ export default {
     msw: {
       handlers: {
         storyBase: [
-          http.get(
-            'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gatewayclasses',
-            () => HttpResponse.error()
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gatewayclasses', () =>
+            HttpResponse.error()
           ),
           http.get('http://localhost:4466/api/v1/namespaces/default/events', () =>
             HttpResponse.json({
@@ -51,7 +50,7 @@ Basic.parameters = {
     handlers: {
       story: [
         http.get(
-          'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gatewayclasses/default-gateway-class',
+          'http://localhost:4466/apis/gateway.networking.k8s.io/v1/gatewayclasses/default-gateway-class',
           () => HttpResponse.json(DEFAULT_GATEWAY_CLASS)
         ),
       ],

diff --git a/frontend/src/components/gateway/ClassList.stories.tsx b/frontend/src/components/gateway/ClassList.stories.tsx
@@ -21,14 +21,12 @@ export default {
     msw: {
       handlers: {
         story: [
-          http.get(
-            'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gatewayclasses',
-            () =>
-              HttpResponse.json({
-                kind: 'GatewayClassList',
-                metadata: {},
-                items: [DEFAULT_GATEWAY_CLASS],
-              })
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gatewayclasses', () =>
+            HttpResponse.json({
+              kind: 'GatewayClassList',
+              metadata: {},
+              items: [DEFAULT_GATEWAY_CLASS],
+            })
           ),
         ],
       },

diff --git a/frontend/src/components/gateway/ClassList.tsx b/frontend/src/components/gateway/ClassList.tsx
@@ -64,9 +64,9 @@ export default function GatewayClassList() {
           getValue: (gatewayClass: GatewayClass) =>
             gatewayClass.status?.conditions?.find(
               ({ status }: { status: string }) => status === 'True'
-            ) ?? null,
+            )?.type || null,
           render: (gatewayClass: GatewayClass) =>
-            makeGatewayStatusLabel(gatewayClass.status?.conditions),
+            makeGatewayStatusLabel(gatewayClass.status?.conditions || null),
         },
         'age',
       ]}

diff --git a/frontend/src/components/gateway/GRPCRouteDetails.stories.tsx b/frontend/src/components/gateway/GRPCRouteDetails.stories.tsx
@@ -21,10 +21,10 @@ export default {
     msw: {
       handlers: {
         baseStory: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/grpcroutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/grpcroutes', () =>
             HttpResponse.json({})
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/grpcroutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/grpcroutes', () =>
             HttpResponse.error()
           ),
           http.get('http://localhost:4466/api/v1/namespaces/default/events', () =>
@@ -57,7 +57,7 @@ Basic.parameters = {
     handlers: {
       story: [
         http.get(
-          'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/grpcroutes/default-grpcroute',
+          'http://localhost:4466/apis/gateway.networking.k8s.io/v1/grpcroutes/default-grpcroute',
           () => HttpResponse.json(DEFAULT_GRPC_ROUTE)
         ),
       ],

diff --git a/frontend/src/components/gateway/GRPCRouteList.stories.tsx b/frontend/src/components/gateway/GRPCRouteList.stories.tsx
@@ -22,14 +22,14 @@ export default {
       handlers: {
         storyBase: [],
         story: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/grpcroutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/grpcroutes', () =>
             HttpResponse.json({
               kind: 'GRPCRouteList',
               metadata: {},
               items: [DEFAULT_GRPC_ROUTE],
             })
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/grpcroutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/grpcroutes', () =>
             HttpResponse.error()
           ),
         ],

diff --git a/frontend/src/components/gateway/GatewayDetails.stories.tsx b/frontend/src/components/gateway/GatewayDetails.stories.tsx
@@ -21,10 +21,10 @@ export default {
     msw: {
       handlers: {
         baseStory: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gateways', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gateways', () =>
             HttpResponse.json({})
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gateways', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gateways', () =>
             HttpResponse.error()
           ),
           http.get('http://localhost:4466/api/v1/namespaces/default/events', () =>
@@ -57,7 +57,7 @@ Basic.parameters = {
     handlers: {
       story: [
         http.get(
-          'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gateways/default-gateway',
+          'http://localhost:4466/apis/gateway.networking.k8s.io/v1/gateways/default-gateway',
           () => HttpResponse.json(DEFAULT_GATEWAY)
         ),
       ],

diff --git a/frontend/src/components/gateway/GatewayDetails.tsx b/frontend/src/components/gateway/GatewayDetails.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { KubeCondition } from '../../lib/k8s/cluster';
 import Gateway, {
-  GatewayAddress,
   GatewayListener,
   GatewayListenerStatus,
+  GatewayStatusAddress,
 } from '../../lib/k8s/gateway';
 import { EmptyContent, StatusLabel, StatusLabelProps } from '../common';
 import Link from '../common/Link';
@@ -91,11 +91,11 @@ export default function GatewayDetails(props: { name?: string; namespace?: strin
                   columns={[
                     {
                       label: t('translation|Type'),
-                      getter: (data: GatewayAddress) => data.type,
+                      getter: (data: GatewayStatusAddress) => data.type,
                     },
                     {
                       label: t('translation|Value'),
-                      getter: (data: GatewayAddress) => data.value,
+                      getter: (data: GatewayStatusAddress) => data.value,
                     },
                   ]}
                   data={item?.getAddresses() || []}

diff --git a/frontend/src/components/gateway/GatewayList.stories.tsx b/frontend/src/components/gateway/GatewayList.stories.tsx
@@ -22,14 +22,14 @@ export default {
       handlers: {
         storyBase: [],
         story: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gateways', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gateways', () =>
             HttpResponse.json({
               kind: 'GatewayList',
               metadata: {},
               items: [DEFAULT_GATEWAY],
             })
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/gateways', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/gateways', () =>
             HttpResponse.error()
           ),
         ],

diff --git a/frontend/src/components/gateway/GatewayList.tsx b/frontend/src/components/gateway/GatewayList.tsx
@@ -30,10 +30,9 @@ export default function GatewayList() {
           id: 'conditions',
           label: t('translation|Conditions'),
           getValue: (gateway: Gateway) =>
-            gateway.status?.conditions?.find(
-              ({ status }: { status: string }) => status === 'True'
-            ) ?? null,
-          render: (gateway: Gateway) => makeGatewayStatusLabel(gateway.status?.conditions),
+            gateway.status?.conditions?.find(({ status }: { status: string }) => status === 'True')
+              ?.type || null,
+          render: (gateway: Gateway) => makeGatewayStatusLabel(gateway.status?.conditions || null),
         },
         {
           id: 'listeners',

diff --git a/frontend/src/components/gateway/HTTPRouteDetails.stories.tsx b/frontend/src/components/gateway/HTTPRouteDetails.stories.tsx
@@ -21,10 +21,10 @@ export default {
     msw: {
       handlers: {
         baseStory: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/httproutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/httproutes', () =>
             HttpResponse.json({})
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/httproutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/httproutes', () =>
             HttpResponse.error()
           ),
           http.get('http://localhost:4466/api/v1/namespaces/default/events', () =>
@@ -57,7 +57,7 @@ Basic.parameters = {
     handlers: {
       story: [
         http.get(
-          'http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/httproutes/default-httproute',
+          'http://localhost:4466/apis/gateway.networking.k8s.io/v1/httproutes/default-httproute',
           () => HttpResponse.json(DEFAULT_HTTP_ROUTE)
         ),
       ],

diff --git a/frontend/src/components/gateway/HTTPRouteDetails.tsx b/frontend/src/components/gateway/HTTPRouteDetails.tsx
@@ -11,6 +11,11 @@ function HTTPRouteRuleTable(props: { rule: HTTPRouteRule }) {
   const { t } = useTranslation(['glossary', 'translation']);
 
   const mainRows = [
+    {
+      name: rule.name,
+      withHighlightStyle: true,
+      hide: rule.name === undefined,
+    },
     {
       name: t('translation|BackendRefs'),
       value: rule.backendRefs?.length,

diff --git a/frontend/src/components/gateway/HTTPRouteList.stories.tsx b/frontend/src/components/gateway/HTTPRouteList.stories.tsx
@@ -22,14 +22,14 @@ export default {
       handlers: {
         storyBase: [],
         story: [
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/httproutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/httproutes', () =>
             HttpResponse.json({
               kind: 'HTTPRouteList',
               metadata: {},
               items: [DEFAULT_HTTP_ROUTE],
             })
           ),
-          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1beta1/httproutes', () =>
+          http.get('http://localhost:4466/apis/gateway.networking.k8s.io/v1/httproutes', () =>
             HttpResponse.error()
           ),
         ],