wip

Author: pyramation

packages/kubernetes-dashboard/components/resources/pods.tsx

@@ -17,7 +17,7 @@ import {
   XCircle
 } from 'lucide-react'
 import { type Pod as K8sPod } from 'kubernetesjs'
-import { usePods, useDeletePod, usePodLogs } from '@/hooks'
+import { usePods, useDeletePod, usePodLogs, useKubernetes } from '@/hooks'
 
 interface Pod {
   name: string
@@ -34,6 +34,7 @@ export function PodsView() {
   const [selectedPod, setSelectedPod] = useState<Pod | null>(null)
 
   // Use TanStack Query hooks
+  const { namespace } = useKubernetes()
   const { data, isLoading, error, refetch } = usePods()
   const deletePodMutation = useDeletePod()
 
@@ -230,7 +231,7 @@ export function PodsView() {
             </div>
           ) : pods.length === 0 ? (
             <div className="flex flex-col items-center justify-center py-8 text-muted-foreground">
-              <p className="text-sm">No pods found in the default namespace</p>
+              <p className="text-sm">No pods found {namespace === '_all' ? 'in any namespace' : `in the ${namespace} namespace`}</p>
               <Button variant="outline" size="sm" onClick={handleRefresh} className="mt-4">
                 <RefreshCw className="h-4 w-4 mr-2" />
                 Refresh

packages/kubernetes-dashboard/components/templates/template-dialog.tsx

@@ -14,10 +14,8 @@ import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { Alert, AlertDescription } from '@/components/ui/alert'
 import { Loader2, CheckCircle, XCircle } from 'lucide-react'
-import { KubernetesClient, type Deployment, type Service } from 'kubernetesjs'
-
-// Create APIClient instance
-const k8sClient = new KubernetesClient({ restEndpoint: '/api/k8s' })
+import { type Deployment, type Service } from 'kubernetesjs'
+import { useKubernetes } from '@/hooks'
 
 interface Template {
   id: string
@@ -38,6 +36,7 @@ interface TemplateDialogProps {
 }
 
 export function TemplateDialog({ template, open, onOpenChange }: TemplateDialogProps) {
+  const { client: k8sClient, namespace: contextNamespace } = useKubernetes()
 
   // Deploy template function
   const deployTemplate = async (params: {
@@ -138,7 +137,7 @@ export function TemplateDialog({ template, open, onOpenChange }: TemplateDialogP
     }
   }
   const [deploymentName, setDeploymentName] = useState(`${template.id}-deployment`)
-  const [namespace, setNamespace] = useState('default')
+  const [namespace, setNamespace] = useState(contextNamespace === '_all' ? 'default' : contextNamespace)
   const [isDeploying, setIsDeploying] = useState(false)
   const [deploymentStatus, setDeploymentStatus] = useState<'idle' | 'success' | 'error'>('idle')
   const [errorMessage, setErrorMessage] = useState('')
@@ -150,7 +149,7 @@ export function TemplateDialog({ template, open, onOpenChange }: TemplateDialogP
   useEffect(() => {
     if (open) {
       setDeploymentName(`${template.id}-deployment`)
-      setNamespace('default')
+      setNamespace(contextNamespace === '_all' ? 'default' : contextNamespace)
       setDeploymentStatus('idle')
       setErrorMessage('')
     }

packages/kubernetes-dashboard/hooks/usePods.ts

@@ -13,7 +13,7 @@ export function usePods(namespace?: string) {
     queryKey: [...PODS_KEY, ns],
     queryFn: async () => {
       if (ns === '_all') {
-        const result = await client.listCoreV1PodForAllNamespaces({
+        const result = await client.listPods({
           query: {},
         })
         return result