Skip to content
Merged
Changes from all commits
Commits
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
32 changes: 30 additions & 2 deletions cmd/sheets.go
Original file line number Diff line number Diff line change
Expand Up @@ -2612,9 +2612,27 @@ func runSheetsAddChart(cmd *cobra.Command, args []string) error {
spec := &sheets.ChartSpec{Title: title}

if chartType == "PIE" {
// PIE: first column = labels (domain), remaining columns = data (series)
if gridRange.EndColumnIndex-gridRange.StartColumnIndex < 2 {
return p.PrintError(fmt.Errorf("PIE chart requires at least 2 columns (labels + data), got range with %d column(s)", gridRange.EndColumnIndex-gridRange.StartColumnIndex))
}
domainRange := &sheets.GridRange{
SheetId: gridRange.SheetId,
StartRowIndex: gridRange.StartRowIndex,
EndRowIndex: gridRange.EndRowIndex,
StartColumnIndex: gridRange.StartColumnIndex,
EndColumnIndex: gridRange.StartColumnIndex + 1,
}
seriesRange := &sheets.GridRange{
SheetId: gridRange.SheetId,
StartRowIndex: gridRange.StartRowIndex,
EndRowIndex: gridRange.EndRowIndex,
StartColumnIndex: gridRange.StartColumnIndex + 1,
EndColumnIndex: gridRange.EndColumnIndex,
}
spec.PieChart = &sheets.PieChartSpec{
Domain: chartData,
Series: &sheets.ChartData{SourceRange: sourceRange},
Domain: &sheets.ChartData{SourceRange: &sheets.ChartSourceRange{Sources: []*sheets.GridRange{domainRange}}},
Series: &sheets.ChartData{SourceRange: &sheets.ChartSourceRange{Sources: []*sheets.GridRange{seriesRange}}},
}
} else {
spec.BasicChart = &sheets.BasicChartSpec{
Expand Down Expand Up @@ -2823,6 +2841,12 @@ func runSheetsAddConditionalFormat(cmd *cobra.Command, args []string) error {
return p.PrintError(err)
}

// Validate --value is provided for rules that require it
needsValue := map[string]bool{">": true, "<": true, "=": true, "!=": true, "contains": true, "not-contains": true, "formula": true}
if needsValue[rule] && value == "" {
return p.PrintError(fmt.Errorf("--value is required for rule type %q", rule))
}

_, gridRange, err := parseRange(svc, spreadsheetID, rangeStr)
if err != nil {
return p.PrintError(err)
Expand Down Expand Up @@ -3016,6 +3040,10 @@ func runSheetsDeleteConditionalFormat(cmd *cobra.Command, args []string) error {
sheetName, _ := cmd.Flags().GetString("sheet")
index, _ := cmd.Flags().GetInt64("index")

if index < 0 {
return p.PrintError(fmt.Errorf("--index must be >= 0, got %d", index))
}

sheetID, err := getSheetID(svc, spreadsheetID, sheetName)
if err != nil {
return p.PrintError(err)
Expand Down
Loading