Skip to content

feat(sheets): add tab management commands #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexknowshtml wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(sheets): add tab management commands #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/cmd/sheets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ type SheetsCmd struct {
Create SheetsCreateCmd `cmd:"" name:"create" aliases:"new" help:"Create a new spreadsheet"`
Copy SheetsCopyCmd `cmd:"" name:"copy" aliases:"cp,duplicate" help:"Copy a Google Sheet"`
Export SheetsExportCmd `cmd:"" name:"export" aliases:"download,dl" help:"Export a Google Sheet (pdf|xlsx|csv) via Drive"`
AddTab SheetsAddTabCmd `cmd:"" name:"add-tab" help:"Add a new tab/sheet to a spreadsheet"`
RenameTab SheetsRenameTabCmd `cmd:"" name:"rename-tab" help:"Rename a tab/sheet in a spreadsheet"`
DeleteTab SheetsDeleteTabCmd `cmd:"" name:"delete-tab" help:"Delete a tab/sheet from a spreadsheet (use --force to skip confirmation)"`
AddTab SheetsAddTabCmd `cmd:"" name:"add-tab" aliases:"add-sheet" help:"Add a new tab/sheet to a spreadsheet"`
RenameTab SheetsRenameTabCmd `cmd:"" name:"rename-tab" aliases:"rename-sheet" help:"Rename a tab/sheet in a spreadsheet"`
DeleteTab SheetsDeleteTabCmd `cmd:"" name:"delete-tab" aliases:"delete-sheet" help:"Delete a tab/sheet from a spreadsheet (use --force to skip confirmation)"`
}

type SheetsExportCmd struct {
Expand Down
60 changes: 36 additions & 24 deletions internal/cmd/sheets_tab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cmd

import (
"context"
"fmt"
"os"
"strings"

Expand All @@ -14,6 +15,7 @@ import (
type SheetsAddTabCmd struct {
SpreadsheetID string `arg:"" name:"spreadsheetId" help:"Spreadsheet ID"`
TabName string `arg:"" name:"tabName" help:"Name for the new tab/sheet"`
Index *int64 `name:"index" help:"Tab position (0-based; 0 = first tab)"`
}

func (c *SheetsAddTabCmd) Run(ctx context.Context, flags *RootFlags) error {
Expand All @@ -28,10 +30,14 @@ func (c *SheetsAddTabCmd) Run(ctx context.Context, flags *RootFlags) error {
return usage("empty tabName")
}

if err := dryRunExit(ctx, flags, "sheets.add-tab", map[string]any{
dryRunPayload := map[string]any{
"spreadsheet_id": spreadsheetID,
"tab_name": tabName,
}); err != nil {
}
if c.Index != nil {
dryRunPayload["index"] = *c.Index
}
if err := dryRunExit(ctx, flags, "sheets.add-tab", dryRunPayload); err != nil {
return err
}

Expand All @@ -45,13 +51,19 @@ func (c *SheetsAddTabCmd) Run(ctx context.Context, flags *RootFlags) error {
return err
}

props := &sheets.SheetProperties{
Title: tabName,
}
if c.Index != nil {
props.Index = *c.Index
props.ForceSendFields = []string{"Index"}
}

req := &sheets.BatchUpdateSpreadsheetRequest{
Requests: []*sheets.Request{
{
AddSheet: &sheets.AddSheetRequest{
Properties: &sheets.SheetProperties{
Title: tabName,
},
Properties: props,
},
},
},
Expand All @@ -62,20 +74,25 @@ func (c *SheetsAddTabCmd) Run(ctx context.Context, flags *RootFlags) error {
return err
}

var newSheetID int64
var resultTitle string
var resultSheetID int64
var resultIndex int64
if len(resp.Replies) > 0 && resp.Replies[0].AddSheet != nil {
newSheetID = resp.Replies[0].AddSheet.Properties.SheetId
p := resp.Replies[0].AddSheet.Properties
resultTitle = p.Title
resultSheetID = p.SheetId
resultIndex = p.Index
}

if outfmt.IsJSON(ctx) {
return outfmt.WriteJSON(ctx, os.Stdout, map[string]any{
"spreadsheetId": spreadsheetID,
"tabName": tabName,
"sheetId": newSheetID,
"title": resultTitle,
"sheetId": resultSheetID,
"index": resultIndex,
})
}

u.Out().Printf("Added tab %q (sheetId %d) to spreadsheet %s", tabName, newSheetID, spreadsheetID)
u.Out().Printf("Added tab %q (sheetId %d, index %d) to spreadsheet %s", resultTitle, resultSheetID, resultIndex, spreadsheetID)
return nil
}

Expand Down Expand Up @@ -148,10 +165,9 @@ func (c *SheetsRenameTabCmd) Run(ctx context.Context, flags *RootFlags) error {

if outfmt.IsJSON(ctx) {
return outfmt.WriteJSON(ctx, os.Stdout, map[string]any{
"spreadsheetId": spreadsheetID,
"oldName": oldName,
"newName": newName,
"sheetId": sheetID,
"sheetId": sheetID,
"oldTitle": oldName,
"newTitle": newName,
})
}

Expand Down Expand Up @@ -195,15 +211,11 @@ func (c *SheetsDeleteTabCmd) Run(ctx context.Context, flags *RootFlags) error {
return usagef("unknown tab %q", tabName)
}

if err := dryRunExit(ctx, flags, "sheets.delete-tab", map[string]any{
if err := dryRunAndConfirmDestructive(ctx, flags, "sheets.delete-tab", map[string]any{
"spreadsheet_id": spreadsheetID,
"tab_name": tabName,
"sheet_id": sheetID,
}); err != nil {
return err
}

if err := confirmDestructiveChecked(ctx, flagsWithoutDryRun(flags), "delete sheet tab "+tabName); err != nil {
}, fmt.Sprintf("delete sheet tab %s", tabName)); err != nil {
return err
}

Expand All @@ -223,9 +235,9 @@ func (c *SheetsDeleteTabCmd) Run(ctx context.Context, flags *RootFlags) error {

if outfmt.IsJSON(ctx) {
return outfmt.WriteJSON(ctx, os.Stdout, map[string]any{
"spreadsheetId": spreadsheetID,
"tabName": tabName,
"sheetId": sheetID,
"sheetId": sheetID,
"title": tabName,
"deleted": true,
})
}

Expand Down
16 changes: 15 additions & 1 deletion internal/cmd/sheets_tab_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestSheetsTabCommands(t *testing.T) {
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]any{
"replies": []map[string]any{
{"addSheet": map[string]any{"properties": map[string]any{"sheetId": 99, "title": "NewTab"}}},
{"addSheet": map[string]any{"properties": map[string]any{"sheetId": 99, "title": "NewTab", "index": 0}}},
},
})
return
Expand Down Expand Up @@ -86,6 +86,20 @@ func TestSheetsTabCommands(t *testing.T) {
}
})

t.Run("add-tab with index", func(t *testing.T) {
gotRequests = nil
cmd := &SheetsAddTabCmd{}
if err := runKong(t, cmd, []string{"s1", "NewTab", "--index", "2"}, ctx, flags); err != nil {
t.Fatalf("add-tab with index: %v", err)
}
if len(gotRequests) != 1 || gotRequests[0].AddSheet == nil {
t.Fatalf("expected addSheet request, got %+v", gotRequests)
}
if gotRequests[0].AddSheet.Properties.Index != 2 {
t.Fatalf("unexpected index: %d, want 2", gotRequests[0].AddSheet.Properties.Index)
}
})

t.Run("rename-tab", func(t *testing.T) {
gotRequests = nil
cmd := &SheetsRenameTabCmd{}
Expand Down
Loading