Updated ListQueries method in DB layer

server/datastore/mysql/queries.go

@@ -358,12 +358,20 @@ func (ds *Datastore) ListQueries(ctx context.Context, opt fleet.ListQueryOptions
 	if opt.OnlyObserverCanRun {
 		sql += " AND q.observer_can_run=true"
 	}
+
+	args := []interface{}{false, aggregatedStatsTypeQuery}
+	whereClause := " AND team_id_char = ''"
+	if opt.TeamID != nil {
+		args = append(args, fmt.Sprint(*opt.TeamID))
+		whereClause = " AND team_id_char = ?"
+	}
+	sql += whereClause
+
 	sql = appendListOptionsToSQL(sql, &opt.ListOptions)
 
 	results := []*fleet.Query{}
 
-	if err := sqlx.SelectContext(ctx, ds.reader(ctx), &results, sql, false, aggregatedStatsTypeQuery); err != nil {
+	if err := sqlx.SelectContext(ctx, ds.reader(ctx), &results, sql, args...); err != nil {
-		fmt.Println(err)
 		return nil, ctxerr.Wrap(ctx, err, "listing queries")
 	}
 

server/fleet/app.go

@@ -761,6 +761,9 @@ func (l ListOptions) UsesCursorPagination() bool {
 type ListQueryOptions struct {
 	ListOptions
 
+	// TeamID which team the queries belong to. If teamID is nil, then it is assumed the 'global'
+	// team
+	TeamID             *uint
 	OnlyObserverCanRun bool
 }