fix: vertical view for secrets and filter credentials by label (#3392)

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
akuity · Jan 30, 2025 · 0a0f08a · 0a0f08a
1 parent 68fa8e2
commit 0a0f08a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/internal/api/list_credentials_v1alpha1.go b/internal/api/list_credentials_v1alpha1.go
@@ -8,6 +8,8 @@ import (
 
 	"connectrpc.com/connect"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/selection"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kargoapi "github.com/akuity/kargo/api/v1alpha1"
@@ -32,12 +34,31 @@ func (s *server) ListCredentials(
 		return nil, err
 	}
 
+	credsLabelSelector := labels.NewSelector()
+
+	credsLabelSelectorRequirement, err := labels.NewRequirement(
+		kargoapi.CredentialTypeLabelKey,
+		selection.In,
+		[]string{
+			kargoapi.CredentialTypeLabelValueGit,
+			kargoapi.CredentialTypeLabelValueHelm,
+			kargoapi.CredentialTypeLabelValueImage,
+		})
+
+	if err != nil {
+		return nil, err
+	}
+
+	credsLabelSelector = credsLabelSelector.Add(*credsLabelSelectorRequirement)
+
 	var secretsList corev1.SecretList
 	if err := s.client.List(
 		ctx,
 		&secretsList,
 		client.InNamespace(req.Msg.GetProject()),
-		client.HasLabels{kargoapi.CredentialTypeLabelKey},
+		&client.ListOptions{
+			LabelSelector: credsLabelSelector,
+		},
 	); err != nil {
 		return nil, fmt.Errorf("list secrets: %w", err)
 	}

diff --git a/ui/src/features/project/credentials/credentials-list.tsx b/ui/src/features/project/credentials/credentials-list.tsx
@@ -49,7 +49,7 @@ export const CredentialsList = () => {
 
   return (
     <div className='p-4'>
-      <Flex gap={16}>
+      <Flex gap={16} vertical>
         <Card
           title={
             <Flex align='center'>
@@ -73,14 +73,14 @@ export const CredentialsList = () => {
               </Button>
             </Flex>
           }
-          className='w-1/2'
         >
           <Table
             scroll={{ x: 'max-content' }}
             key={specificCredentials.length}
             dataSource={specificCredentials}
             rowKey={(record: Secret) => record?.metadata?.name || ''}
             loading={listCredentialsQuery.isLoading}
+            pagination={{ defaultPageSize: 5 }}
             columns={[
               {
                 title: 'Name',
@@ -208,7 +208,6 @@ export const CredentialsList = () => {
               </Button>
             </Flex>
           }
-          className='w-1/2'
         >
           <Table
             scroll={{ x: 'max-content' }}