rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add cursor pagination flags to proboctl list commands

Browse Source 
Replace the limit-driven auto-walking Paginate helper with explicit
cursor-pagination flags (--first/--after, --last/--before) that mirror
the GraphQL connection arguments. List commands now return a single
keyset page with its page info, and emit cursors so callers can page
forward and backward. --before no longer requires --last: both --first
and --last default to 50 when omitted.

Also split the tracker-pattern stats into enriched with and without a
description so the enrichment backlog is visible at a glance.

Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
Émile Ré
2026-06-09 13:10:12 +02:00
parent 4f6fcb42f9
commit ab3750fca4
4 changed files with 200 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/proboctl/commonthirdparty/list.go vendored
View File

@@ -33,7 +33,6 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
flagKeyword string
flagSort string
flagOrder string
flagLimit int
)
cmd := &cobra.Command{
@@ -49,7 +48,8 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
cmd.Flags().StringVar(&flagKeyword, "keyword", "", "Filter by name/slug substring")
cmd.Flags().StringVar(&flagSort, "sort", "name", "Sort field: name, created, updated")
cmd.Flags().StringVar(&flagOrder, "order", "", "Sort order: asc, desc (default depends on field)")
cmd.Flags().IntVarP(&flagLimit, "limit", "L", 50, "Maximum rows to return (0 for all)")
pageFlags := cmdutil.AddPageFlags(cmd)
cmd.RunE = func(cmd *cobra.Command, args []string) error {
if err := clicmdutil.ValidateOutputFlag(output); err != nil {
@@ -61,6 +61,11 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
return err
}
cursor, err := cmdutil.NewCursorFromFlags(pageFlags, orderBy)
if err != nil {
return err
}
filter := coredata.NewCommonThirdPartyFilter(optionalString(flagName))
if flagCategory != "" {
@@ -81,15 +86,17 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
return err
}
var parties coredata.CommonThirdParties
var (
parties coredata.CommonThirdParties
pageInfo cmdutil.PageInfo
)
if err := pgClient.WithConn(
cmd.Context(),
func(ctx context.Context, conn pg.Querier) error {
rows, err := cmdutil.Paginate(
p, err := cmdutil.FetchPage(
ctx,
orderBy,
flagLimit,
cursor,
func(ctx context.Context, cursor *page.Cursor[coredata.CommonThirdPartyOrderField]) ([]*coredata.CommonThirdParty, error) {
var ts coredata.CommonThirdParties
if err := ts.Load(ctx, conn, cursor, filter); err != nil {
@@ -103,7 +110,8 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
return err
}
parties = rows
parties = p.Data
pageInfo = cmdutil.NewPageInfo(p)
return nil
},
@@ -112,7 +120,7 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
}
if *output == clicmdutil.OutputJSON {
return clicmdutil.PrintJSON(f.IOStreams.Out, parties)
return clicmdutil.PrintJSON(f.IOStreams.Out, cmdutil.PageOutput{Items: parties, PageInfo: pageInfo})
}
if len(parties) == 0 {
@@ -133,6 +141,7 @@ func newCmdList(f *cmdutil.Factory) *cobra.Command {
}
_, _ = fmt.Fprintln(f.IOStreams.Out, table.Render())
cmdutil.PrintPageInfo(f.IOStreams.Out, pageInfo)
_, _ = fmt.Fprintf(f.IOStreams.ErrOut, "Showing %d common third parties.\n", len(parties))
return nil