Fix XLSX export column order (#2695)

Co-authored-by: Egor Ryashin <[email protected]>

runtime/queries/metricsview.go

@@ -373,9 +373,10 @@ func writeXLSX(meta []*runtimev1.MetricsViewColumn, data []*structpb.Struct, wri
 	}
 
 	row := make([]interface{}, 0, len(meta))
-	for i, s := range data {
-		for _, f := range s.Fields {
-			value, err := convertToXLSXValue(f)
+	for i, structs := range data {
+		for _, field := range meta {
+			pbvalue := structs.Fields[field.Name]
+			value, err := convertToXLSXValue(pbvalue)
 			if err != nil {
 				return err
 			}

runtime/server/queries_metrics_rows_test.go

@@ -1,10 +1,13 @@
 package server
 
 import (
+	"bytes"
 	"testing"
 
 	runtimev1 "github.com/rilldata/rill/proto/gen/rill/runtime/v1"
+	"github.com/rilldata/rill/runtime/queries"
 	"github.com/stretchr/testify/require"
+	"github.com/xuri/excelize/v2"
 )
 
 func TestServer_MetricsViewRows(t *testing.T) {
@@ -35,3 +38,28 @@ func TestServer_MetricsViewRows_Granularity(t *testing.T) {
 	require.Equal(t, 12, len(tr.Meta))
 	require.Equal(t, "timestamp__day", tr.Meta[0].Name)
 }
+
+func TestServer_MetricsViewRows_export(t *testing.T) {
+	t.Parallel()
+	server, instanceId := getMetricsTestServer(t, "ad_bids_2rows")
+
+	ctx := testCtx()
+	q := &queries.MetricsViewRows{
+		MetricsViewName: "ad_bids_metrics",
+		TimeGranularity: runtimev1.TimeGrain_TIME_GRAIN_DAY,
+	}
+
+	var buf bytes.Buffer
+
+	err := q.Export(ctx, server.runtime, instanceId, 0, runtimev1.ExportFormat_EXPORT_FORMAT_XLSX, &buf)
+	require.NoError(t, err)
+
+	file, err := excelize.OpenReader(&buf)
+	rows, err := file.GetRows("Sheet1")
+	require.NoError(t, err)
+
+	require.Equal(t, 3, len(rows))
+	require.Equal(t, []string{"timestamp", "publisher", "domain", "bid_price", "volume", "impressions", "ad words", "clicks", "numeric_dim", "device"}, rows[0][2:])
+	require.Equal(t, []string{"2022-01-01T14:49:50.459Z", "", "msn.com", "2", "4", "2", "cars", "", "1", "iphone"}, rows[1][2:])
+	require.Equal(t, []string{"2022-01-02T11:58:12.475Z", "Yahoo", "yahoo.com", "2", "4", "1", "cars", "1", "1"}, rows[2][2:])
+}