diff --git a/backend/core/models/project.go b/backend/core/models/project.go index f5cf6779abc..7e67c342027 100644 --- a/backend/core/models/project.go +++ b/backend/core/models/project.go @@ -94,6 +94,7 @@ type ProjectScopeOutput struct { type ProjectScope struct { Name string `json:"name"` Scopes []struct { - ScopeID string `json:"scopeId"` + ScopeID string `json:"scopeId"` + ScopeName string `json:"scopeName"` } `json:"scopes"` } diff --git a/backend/helpers/srvhelper/scope_config_service_helper.go b/backend/helpers/srvhelper/scope_config_service_helper.go index 59d8bc93f8e..ede55822520 100644 --- a/backend/helpers/srvhelper/scope_config_service_helper.go +++ b/backend/helpers/srvhelper/scope_config_service_helper.go @@ -88,15 +88,23 @@ func (scopeConfigSrv *ScopeConfigSrvHelper[C, S, SC]) GetProjectsByScopeConfig(p } if project, exists := projectMap[bp.ProjectName]; exists { project.Scopes = append(project.Scopes, struct { - ScopeID string `json:"scopeId"` - }{ScopeID: bs.ScopeId}) + ScopeID string `json:"scopeId"` + ScopeName string `json:"scopeName"` + }{ + ScopeID: bs.ScopeId, + ScopeName: (*s).ScopeName(), + }) } else { projectMap[bp.ProjectName] = &models.ProjectScope{ Name: bp.ProjectName, Scopes: []struct { - ScopeID string `json:"scopeId"` + ScopeID string `json:"scopeId"` + ScopeName string `json:"scopeName"` }{ - {ScopeID: bs.ScopeId}, + { + ScopeID: bs.ScopeId, + ScopeName: (*s).ScopeName(), + }, }, } } diff --git a/backend/server/services/remote/plugin/scope_config_api.go b/backend/server/services/remote/plugin/scope_config_api.go index 952f0e42c0a..9646261ffb1 100644 --- a/backend/server/services/remote/plugin/scope_config_api.go +++ b/backend/server/services/remote/plugin/scope_config_api.go @@ -128,15 +128,23 @@ func (pa *pluginAPI) GetProjectsByScopeConfig(input *plugin.ApiResourceInput) (* } if project, exists := projectMap[bp.ProjectName]; exists { project.Scopes = append(project.Scopes, struct { - ScopeID string `json:"scopeId"` - }{ScopeID: bs.ScopeId}) + ScopeID string `json:"scopeId"` + ScopeName string `json:"scopeName"` + }{ + ScopeID: bs.ScopeId, + ScopeName: scope.ScopeName(), + }) } else { projectMap[bp.ProjectName] = &coreModels.ProjectScope{ Name: bp.ProjectName, Scopes: []struct { - ScopeID string `json:"scopeId"` + ScopeID string `json:"scopeId"` + ScopeName string `json:"scopeName"` }{ - {ScopeID: bs.ScopeId}, + { + ScopeID: bs.ScopeId, + ScopeName: scope.ScopeName(), + }, }, } }