add variable info to instaceBrick details

Author: mirkoCrobu

internal/orchestrator/bricks/bricks.go

@@ -18,7 +18,6 @@ package bricks
 import (
 	"errors"
 	"fmt"
-	"maps"
 	"slices"
 
 	"github.com/arduino/go-paths-helper"
@@ -91,30 +90,43 @@ func (s *Service) AppBrickInstancesList(a *app.ArduinoApp) (AppBrickInstancesRes
 	return res, nil
 }
 
-func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (BrickInstance, error) {
+func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (BrickInstanceDetails, error) {
 	brick, found := s.bricksIndex.FindBrickByID(brickID)
 	if !found {
-		return BrickInstance{}, ErrBrickNotFound
+		return BrickInstanceDetails{}, ErrBrickNotFound
 	}
 	// Check if the brick is already added in the app
 	brickIndex := slices.IndexFunc(a.Descriptor.Bricks, func(b app.Brick) bool { return b.ID == brickID })
 	if brickIndex == -1 {
-		return BrickInstance{}, fmt.Errorf("brick %s not added in the app", brickID)
+		return BrickInstanceDetails{}, fmt.Errorf("brick %s not added in the app", brickID)
 	}
 
-	variables := make(map[string]string, len(brick.Variables))
+	variables := make(map[string]BrickVariable, len(brick.Variables))
 	for _, v := range brick.Variables {
-		variables[v.Name] = v.DefaultValue
+		variables[v.Name] = BrickVariable{
+			DefaultValue: v.DefaultValue,
+			Description:  v.Description,
+			Required:     v.IsRequired(),
+		}
 	}
 	// Add/Update the variables with the ones from the app descriptor
-	maps.Copy(variables, a.Descriptor.Bricks[brickIndex].Variables)
-
+	appVars := a.Descriptor.Bricks[brickIndex].Variables
+	for varName, appValue := range appVars {
+		if v, ok := variables[varName]; ok {
+			v.DefaultValue = appValue
+			variables[varName] = v
+		} else {
+			variables[varName] = BrickVariable{
+				DefaultValue: appValue,
+			}
+		}
+	}
 	modelID := a.Descriptor.Bricks[brickIndex].Model
 	if modelID == "" {
 		modelID = brick.ModelName
 	}
 
-	return BrickInstance{
+	return BrickInstanceDetails{
 		ID:        brickID,
 		Name:      brick.Name,
 		Author:    "Arduino", // TODO: for now we only support our bricks

internal/orchestrator/bricks/types.go

@@ -43,6 +43,16 @@ type BrickInstance struct {
 	ModelID   string            `json:"model,omitempty"`
 }
 
+type BrickInstanceDetails struct {
+	ID        string                   `json:"id"`
+	Name      string                   `json:"name"`
+	Author    string                   `json:"author"`
+	Category  string                   `json:"category"`
+	Status    string                   `json:"status"`
+	Variables map[string]BrickVariable `json:"variables,omitempty"`
+	ModelID   string                   `json:"model,omitempty"`
+}
+
 type BrickVariable struct {
 	DefaultValue string `json:"default_value,omitempty"`
 	Description  string `json:"description,omitempty"`