Commit abcca71e authored by Fernando's avatar Fernando

Implement backend code review changes

* Implement code review changes from
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25300

That MR was abandoned in favor of
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25407
parent 9cfdefdc
---
title: Fix broken license policy page
merge_request: 25300
author:
type: fixed
...@@ -28,8 +28,8 @@ module Projects ...@@ -28,8 +28,8 @@ module Projects
def create def create
result = ::Projects::Licenses::CreatePolicyService result = ::Projects::Licenses::CreatePolicyService
.new(project, current_user, software_license_policy_params) .new(project, current_user, software_license_policy_params)
.execute .execute
if result[:status] == :success if result[:status] == :success
render json: LicenseEntity.represent(result[:software_license_policy]), status: :created render json: LicenseEntity.represent(result[:software_license_policy]), status: :created
...@@ -40,8 +40,8 @@ module Projects ...@@ -40,8 +40,8 @@ module Projects
def update def update
result = ::Projects::Licenses::UpdatePolicyService result = ::Projects::Licenses::UpdatePolicyService
.new(project, current_user, software_license_policy_params) .new(project, current_user, software_license_policy_params)
.execute(params[:id]) .execute(params[:id])
if result[:status] == :success if result[:status] == :success
render json: LicenseEntity.represent(result[:software_license_policy]), status: :ok render json: LicenseEntity.represent(result[:software_license_policy]), status: :ok
...@@ -87,7 +87,7 @@ module Projects ...@@ -87,7 +87,7 @@ module Projects
def write_license_policies_endpoint def write_license_policies_endpoint
if can?(current_user, :admin_software_license_policy, @project) if can?(current_user, :admin_software_license_policy, @project)
api_v4_projects_managed_licenses_path(id: @project.id) expose_path(api_v4_projects_managed_licenses_path(id: @project.id))
else else
'' ''
end end
...@@ -95,11 +95,11 @@ module Projects ...@@ -95,11 +95,11 @@ module Projects
def licenses_app_data def licenses_app_data
{ {
project_licenses_endpoint: project_licenses_path(@project, detected: true, format: :json), project_licenses_endpoint: project_licenses_path(@project, detected: true, format: :json),
read_license_policies_endpoint: api_v4_projects_managed_licenses_path(id: @project.id), read_license_policies_endpoint: expose_path(api_v4_projects_managed_licenses_path(id: @project.id)),
write_license_policies_endpoint: write_license_policies_endpoint, write_license_policies_endpoint: write_license_policies_endpoint,
documentation_path: help_page_path('user/application_security/license_compliance/index'), documentation_path: help_page_path('user/application_security/license_compliance/index'),
empty_state_svg_path: helpers.image_path('illustrations/Dependency-list-empty-state.svg') empty_state_svg_path: helpers.image_path('illustrations/Dependency-list-empty-state.svg')
} }
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment