fix: bugfix in responding with correct label ids

This commit is contained in:
allanice001
2025-12-15 18:04:22 +00:00
parent e5a664b812
commit 67d50d2b15
2 changed files with 65 additions and 57 deletions

View File

@@ -828,16 +828,16 @@ func ListNodePoolLabels(db *gorm.DB) http.HandlerFunc {
} }
out := make([]dto.LabelResponse, 0, len(np.Taints)) out := make([]dto.LabelResponse, 0, len(np.Taints))
for _, taint := range np.Taints { for _, label := range np.Labels {
out = append(out, dto.LabelResponse{ out = append(out, dto.LabelResponse{
AuditFields: common.AuditFields{ AuditFields: common.AuditFields{
ID: taint.ID, ID: label.ID,
OrganizationID: taint.OrganizationID, OrganizationID: label.OrganizationID,
CreatedAt: taint.CreatedAt, CreatedAt: label.CreatedAt,
UpdatedAt: taint.UpdatedAt, UpdatedAt: label.UpdatedAt,
}, },
Key: taint.Key, Key: label.Key,
Value: taint.Value, Value: label.Value,
}) })
} }
utils.WriteJSON(w, http.StatusOK, out) utils.WriteJSON(w, http.StatusOK, out)

View File

@@ -1,58 +1,66 @@
; ;
// src/pages/ClustersPage.tsx // src/pages/ClustersPage.tsx
import { useEffect, useMemo, useState } from "react" import { useEffect, useMemo, useState } from "react";
import { clustersApi } from "@/api/clusters" import { clustersApi } from "@/api/clusters";
import { dnsApi } from "@/api/dns" import { dnsApi } from "@/api/dns";
import { loadBalancersApi } from "@/api/loadbalancers" import { loadBalancersApi } from "@/api/loadbalancers";
import { nodePoolsApi } from "@/api/node_pools" import { nodePoolsApi } from "@/api/node_pools";
import { serversApi } from "@/api/servers" import { serversApi } from "@/api/servers";
import type { import type { DtoClusterResponse, DtoDomainResponse, DtoLoadBalancerResponse, DtoNodePoolResponse, DtoRecordSetResponse, DtoServerResponse } from "@/sdk";
DtoClusterResponse, import { zodResolver } from "@hookform/resolvers/zod";
DtoDomainResponse, import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
DtoLoadBalancerResponse, import { AlertCircle, CheckCircle2, CircleSlash2, FileCode2, Globe2, Loader2, MapPin, Pencil, Plus, Search, Server, Wrench } from "lucide-react";
DtoNodePoolResponse, import { useForm } from "react-hook-form";
DtoRecordSetResponse, import { toast } from "sonner";
DtoServerResponse import { z } from "zod";
} from "@/sdk"
import { zodResolver } from "@hookform/resolvers/zod"
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
import { import { truncateMiddle } from "@/lib/utils";
AlertCircle, import { Badge } from "@/components/ui/badge.tsx";
CheckCircle2, import { Button } from "@/components/ui/button.tsx";
CircleSlash2, import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog.tsx";
FileCode2, import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form.tsx";
Globe2, import { Input } from "@/components/ui/input.tsx";
Loader2, import { Label } from "@/components/ui/label.tsx";
MapPin, import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select.tsx";
Pencil, import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table.tsx";
Plus, import { Textarea } from "@/components/ui/textarea.tsx";
Search,
Server,
Wrench
} from "lucide-react"
import { useForm } from "react-hook-form"
import { toast } from "sonner" ;
import { z } from "zod"
import { truncateMiddle } from "@/lib/utils"
import { Badge } from "@/components/ui/badge.tsx"
import { Button } from "@/components/ui/button.tsx"
import {
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger
} from "@/components/ui/dialog.tsx"
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form.tsx"
import { Input } from "@/components/ui/input.tsx"
import { Label } from "@/components/ui/label.tsx"
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select.tsx"
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table.tsx"
import { Textarea } from "@/components/ui/textarea.tsx"
// --- Schemas --- // --- Schemas ---