Redesign the agent edit page

Author: Dilusha-Madushan

api/agent.yaml

@@ -1325,6 +1325,76 @@ paths:
         "500":
           description: Internal server error
 
+  /agents/{id}/roles:
+    get:
+      tags:
+        - Agents
+      summary: List roles assigned to the agent
+      description: |
+        Returns a paginated list of role names assigned to the agent, both directly and through
+        group membership. Use the group and role APIs to manage the underlying assignments.
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
+            format: uuid
+          description: "The unique identifier of the agent"
+          example: "9a475e1e-b0cb-4b29-8df5-2e5b24fb0ed3"
+        - $ref: '#/components/parameters/limitQueryParam'
+        - $ref: '#/components/parameters/offsetQueryParam'
+      responses:
+        "200":
+          description: List of roles assigned to the agent
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AgentRoleListResponse'
+              example:
+                totalResults: 2
+                startIndex: 1
+                count: 2
+                roles:
+                  - "agent-operator"
+                  - "billing-viewer"
+                links: []
+        "400":
+          description: Bad request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+              examples:
+                missing-id:
+                  summary: Missing agent ID
+                  value:
+                    code: "AGT-1008"
+                    message:
+                      key: "error.agentservice.missing_agent_id"
+                      defaultValue: "Missing agent ID"
+                    description:
+                      key: "error.agentservice.missing_agent_id_description"
+                      defaultValue: "The agent ID is required"
+        "404":
+          description: Agent not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+              example:
+                code: "AGT-1004"
+                message:
+                  key: "error.agentservice.agent_not_found"
+                  defaultValue: "Agent not found"
+                description:
+                  key: "error.agentservice.agent_not_found_description"
+                  defaultValue: "The agent with the specified id does not exist"
+        "401":
+          $ref: '#/components/responses/Unauthorized'
+        "500":
+          description: Internal server error
+
   /agent-types:
     get:
       tags:
@@ -2237,6 +2307,28 @@ components:
           items:
             $ref: '#/components/schemas/Link'
 
+    AgentRoleListResponse:
+      type: object
+      properties:
+        totalResults:
+          type: integer
+          example: 2
+        startIndex:
+          type: integer
+          example: 1
+        count:
+          type: integer
+          example: 2
+        roles:
+          type: array
+          items:
+            type: string
+          example: ["agent-operator", "billing-viewer"]
+        links:
+          type: array
+          items:
+            $ref: '#/components/schemas/Link'
+
     AssertionConfig:
       type: object
       description: |

backend/cmd/server/servicemanager.go

@@ -409,8 +409,8 @@ func registerServices(mux *http.ServeMux, cacheManager cache.CacheManagerInterfa
 	}
 	exporters = append(exporters, applicationExporter)
 
-	agentService, agentExporter, err := agent.Initialize(
-		mux, entityService, inboundClientService, ouService)
+	agentService, agentExporter, err := agent.Initialize(mux, entityService, inboundClientService, ouService,
+		roleService)
 	if err != nil {
 		logger.Fatal(ctx, "Failed to initialize AgentService", log.Error(err))
 	}

backend/internal/agent/handler.go

@@ -193,6 +193,28 @@ func (h *agentHandler) HandleAgentGroupsRequest(w http.ResponseWriter, r *http.R
 	sysutils.WriteSuccessResponse(ctx, w, http.StatusOK, resp)
 }
 
+// HandleAgentRolesRequest handles GET /agents/{id}/roles.
+func (h *agentHandler) HandleAgentRolesRequest(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	id := r.PathValue("id")
+	if id == "" {
+		writeServiceError(ctx, w, &ErrorMissingAgentID)
+		return
+	}
+	limit, offset, svcErr := parsePaginationParams(r.URL.Query())
+	if svcErr != nil {
+		writeServiceError(ctx, w, svcErr)
+		return
+	}
+
+	resp, svcErr := h.service.GetAgentRoles(ctx, id, limit, offset)
+	if svcErr != nil {
+		writeServiceError(ctx, w, svcErr)
+		return
+	}
+	sysutils.WriteSuccessResponse(ctx, w, http.StatusOK, resp)
+}
+
 // parsePaginationParams parses limit and offset query parameters.
 func parsePaginationParams(query url.Values) (int, int, *tidcommon.ServiceError) {
 	limit := 0

backend/internal/agent/handler_test.go

@@ -52,6 +52,9 @@ type InlineStubAgentService struct {
 	OnGetAgentGroups func(
 		ctx context.Context, id string, limit, offset int,
 	) (*model.AgentGroupListResponse, *tidcommon.ServiceError)
+	OnGetAgentRoles func(
+		ctx context.Context, id string, limit, offset int,
+	) (*model.AgentRoleListResponse, *tidcommon.ServiceError)
 }
 
 func (s *InlineStubAgentService) CreateAgent(
@@ -104,6 +107,14 @@ func (s *InlineStubAgentService) GetAgentGroups(
 	return &model.AgentGroupListResponse{}, nil
 }
 
+func (s *InlineStubAgentService) GetAgentRoles(
+	ctx context.Context, id string, limit, offset int) (*model.AgentRoleListResponse, *tidcommon.ServiceError) {
+	if s.OnGetAgentRoles != nil {
+		return s.OnGetAgentRoles(ctx, id, limit, offset)
+	}
+	return &model.AgentRoleListResponse{}, nil
+}
+
 func (s *InlineStubAgentService) ValidateAgent(
 	ctx context.Context, agent *model.Agent, flowID string,
 ) (string, string, inboundmodel.InboundClient, *tidcommon.ServiceError) {
@@ -351,3 +362,56 @@ func TestHandleAgentGroupsRequest_ServiceError(t *testing.T) {
 	assert.Equal(t, http.StatusNotFound, w.Code)
 	assert.Contains(t, w.Body.String(), ErrorAgentNotFound.Code)
 }
+
+func TestHandleAgentRolesRequest_Success(t *testing.T) {
+	stubService := &InlineStubAgentService{}
+	handler := newAgentHandler(stubService)
+	req := httptest.NewRequest(http.MethodGet, "/agents/agent-123/roles", nil)
+	req.SetPathValue("id", "agent-123")
+	w := httptest.NewRecorder()
+
+	handler.HandleAgentRolesRequest(w, req)
+	assert.Equal(t, http.StatusOK, w.Code)
+}
+
+func TestHandleAgentRolesRequest_MissingID(t *testing.T) {
+	stubService := &InlineStubAgentService{}
+	handler := newAgentHandler(stubService)
+	req := httptest.NewRequest(http.MethodGet, "/agents//roles", nil)
+	req.SetPathValue("id", "")
+	w := httptest.NewRecorder()
+
+	handler.HandleAgentRolesRequest(w, req)
+	assert.Equal(t, http.StatusBadRequest, w.Code)
+	assert.Contains(t, w.Body.String(), ErrorMissingAgentID.Code)
+}
+
+func TestHandleAgentRolesRequest_InvalidLimit(t *testing.T) {
+	stubService := &InlineStubAgentService{}
+	handler := newAgentHandler(stubService)
+	req := httptest.NewRequest(http.MethodGet, "/agents/agent1/roles?limit=abc", nil)
+	req.SetPathValue("id", "agent1")
+	w := httptest.NewRecorder()
+
+	handler.HandleAgentRolesRequest(w, req)
+	assert.Equal(t, http.StatusBadRequest, w.Code)
+	assert.Contains(t, w.Body.String(), ErrorInvalidLimit.Code)
+}
+
+func TestHandleAgentRolesRequest_ServiceError(t *testing.T) {
+	stubService := &InlineStubAgentService{
+		OnGetAgentRoles: func(
+			ctx context.Context, id string, limit, offset int,
+		) (*model.AgentRoleListResponse, *tidcommon.ServiceError) {
+			return nil, &ErrorAgentNotFound
+		},
+	}
+	handler := newAgentHandler(stubService)
+	req := httptest.NewRequest(http.MethodGet, "/agents/agent1/roles", nil)
+	req.SetPathValue("id", "agent1")
+	w := httptest.NewRecorder()
+
+	handler.HandleAgentRolesRequest(w, req)
+	assert.Equal(t, http.StatusNotFound, w.Code)
+	assert.Contains(t, w.Body.String(), ErrorAgentNotFound.Code)
+}

backend/internal/agent/init.go

@@ -25,6 +25,7 @@ import (
 	"github.com/thunder-id/thunderid/internal/entity"
 	"github.com/thunder-id/thunderid/internal/inboundclient"
 	oupkg "github.com/thunder-id/thunderid/internal/ou"
+	"github.com/thunder-id/thunderid/internal/role"
 	serverconst "github.com/thunder-id/thunderid/internal/system/constants"
 	declarativeresource "github.com/thunder-id/thunderid/internal/system/declarative_resource"
 	"github.com/thunder-id/thunderid/internal/system/middleware"
@@ -36,8 +37,9 @@ func Initialize(
 	entityService entity.EntityServiceInterface,
 	inboundClientService inboundclient.InboundClientServiceInterface,
 	ouService oupkg.OrganizationUnitServiceInterface,
+	roleService role.RoleServiceInterface,
 ) (AgentServiceInterface, declarativeresource.ResourceExporter, error) {
-	service := newAgentService(entityService, inboundClientService, ouService)
+	service := newAgentService(entityService, inboundClientService, ouService, roleService)
 
 	storeMode := getAgentStoreMode()
 	if storeMode == serverconst.StoreModeComposite || storeMode == serverconst.StoreModeDeclarative {
@@ -93,4 +95,6 @@ func registerRoutes(mux *http.ServeMux, h *agentHandler) {
 	}
 	mux.HandleFunc(middleware.WithCORS("GET /agents/{id}/groups",
 		h.HandleAgentGroupsRequest, groupsOpts))
+	mux.HandleFunc(middleware.WithCORS("GET /agents/{id}/roles",
+		h.HandleAgentRolesRequest, groupsOpts))
 }

backend/internal/agent/init_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/thunder-id/thunderid/tests/mocks/entitymock"
 	"github.com/thunder-id/thunderid/tests/mocks/inboundclientmock"
 	"github.com/thunder-id/thunderid/tests/mocks/oumock"
+	"github.com/thunder-id/thunderid/tests/mocks/rolemock"
 )
 
 func setupAgentConfig(t *testing.T, agentStore string, declarativeEnabled bool) {
@@ -100,12 +101,13 @@ func (suite *InitializeTestSuite) TestInitialize_DeclarativeMode_EntityLoadError
 	mockEntity := entitymock.NewEntityServiceInterfaceMock(suite.T())
 	mockInbound := inboundclientmock.NewInboundClientServiceInterfaceMock(suite.T())
 	mockOU := oumock.NewOrganizationUnitServiceInterfaceMock(suite.T())
+	mockRole := rolemock.NewRoleServiceInterfaceMock(suite.T())
 
 	mockEntity.On("LoadDeclarativeResources", mock.Anything).
 		Return(errors.New("entity load error")).Once()
 
 	mux := http.NewServeMux()
-	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU)
+	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU, mockRole)
 
 	suite.Error(err)
 	suite.Equal("entity load error", err.Error())
@@ -125,13 +127,14 @@ func (suite *InitializeTestSuite) TestInitialize_InboundLoadError_AllDeclarative
 			mockEntity := entitymock.NewEntityServiceInterfaceMock(suite.T())
 			mockInbound := inboundclientmock.NewInboundClientServiceInterfaceMock(suite.T())
 			mockOU := oumock.NewOrganizationUnitServiceInterfaceMock(suite.T())
+			mockRole := rolemock.NewRoleServiceInterfaceMock(suite.T())
 
 			mockEntity.On("LoadDeclarativeResources", mock.Anything).Return(nil).Once()
 			mockInbound.On("LoadDeclarativeResources", mock.Anything, mock.Anything).
 				Return(errors.New("inbound load error")).Once()
 
 			mux := http.NewServeMux()
-			svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU)
+			svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU, mockRole)
 
 			suite.Error(err)
 			suite.Equal("inbound load error", err.Error())
@@ -149,12 +152,13 @@ func (suite *InitializeTestSuite) TestInitialize_DeclarativeMode_Success() {
 	mockEntity := entitymock.NewEntityServiceInterfaceMock(suite.T())
 	mockInbound := inboundclientmock.NewInboundClientServiceInterfaceMock(suite.T())
 	mockOU := oumock.NewOrganizationUnitServiceInterfaceMock(suite.T())
+	mockRole := rolemock.NewRoleServiceInterfaceMock(suite.T())
 
 	mockEntity.On("LoadDeclarativeResources", mock.Anything).Return(nil).Once()
 	mockInbound.On("LoadDeclarativeResources", mock.Anything, mock.Anything).Return(nil).Once()
 
 	mux := http.NewServeMux()
-	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU)
+	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU, mockRole)
 
 	suite.NoError(err)
 	suite.NotNil(svc)
@@ -169,12 +173,13 @@ func (suite *InitializeTestSuite) TestInitialize_CompositeMode_EntityLoadError()
 	mockEntity := entitymock.NewEntityServiceInterfaceMock(suite.T())
 	mockInbound := inboundclientmock.NewInboundClientServiceInterfaceMock(suite.T())
 	mockOU := oumock.NewOrganizationUnitServiceInterfaceMock(suite.T())
+	mockRole := rolemock.NewRoleServiceInterfaceMock(suite.T())
 
 	mockEntity.On("LoadDeclarativeResources", mock.Anything).
 		Return(errors.New("entity composite load error")).Once()
 
 	mux := http.NewServeMux()
-	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU)
+	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU, mockRole)
 
 	suite.Error(err)
 	suite.Equal("entity composite load error", err.Error())
@@ -189,9 +194,10 @@ func (suite *InitializeTestSuite) TestInitialize_MutableMode_SkipsDeclarativeLoa
 	mockEntity := entitymock.NewEntityServiceInterfaceMock(suite.T())
 	mockInbound := inboundclientmock.NewInboundClientServiceInterfaceMock(suite.T())
 	mockOU := oumock.NewOrganizationUnitServiceInterfaceMock(suite.T())
+	mockRole := rolemock.NewRoleServiceInterfaceMock(suite.T())
 
 	mux := http.NewServeMux()
-	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU)
+	svc, exporter, err := Initialize(mux, mockEntity, mockInbound, mockOU, mockRole)
 
 	suite.NoError(err)
 	suite.NotNil(svc)

backend/internal/agent/model/agent.go

@@ -162,3 +162,14 @@ type AgentGroupListResponse struct {
 	Groups       []AgentGroup `json:"groups"`
 	Links        []utils.Link `json:"links"`
 }
+
+// AgentRoleListResponse is the paginated response for an agent's assigned roles (direct and
+// group-inherited). Roles are represented by name only, matching what the underlying role
+// lookup returns.
+type AgentRoleListResponse struct {
+	TotalResults int          `json:"totalResults"`
+	StartIndex   int          `json:"startIndex"`
+	Count        int          `json:"count"`
+	Roles        []string     `json:"roles"`
+	Links        []utils.Link `json:"links"`
+}