Skip to content

Fix the react forms for catalog items #9904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GilbertCherrie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the react forms for catalog items #9904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c14477b
Fix the react forms for catalog items
GilbertCherrie Mar 12, 2026
732ccef
Move new id code from haml to controller file
GilbertCherrie Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions app/controllers/catalog_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ def assert_privileges_for_servicetemplate_edit
def servicetemplate_edit
assert_privileges_for_servicetemplate_edit

checked_id = find_checked_items.first || params[:id]
@checked_id = find_checked_items.first || params[:id]
@sb[:cached_waypoint_ids] = MiqAeClass.waypoint_ids_for_state_machines
@record = checked_id.present? ? find_record_with_rbac(ServiceTemplate, checked_id) : ServiceTemplate.new
@record = @checked_id.present? ? find_record_with_rbac(ServiceTemplate, @checked_id) : ServiceTemplate.new
@sb[:st_form_active_tab] = "basic"
composite_type = @record.service_type == "composite"
new_atomic_item = params[:pressed] == "atomic_catalogitem_new" || (params[:button].present? && session[:edit][:new][:service_type] == "atomic")
if checked_id.present? && composite_type || checked_id.nil? && !new_atomic_item
if @checked_id.present? && composite_type || @checked_id.nil? && !new_atomic_item
st_edit
else
atomic_st_edit
Expand All @@ -118,8 +118,8 @@ def ot_orchestration_managers
def servicetemplate_copy
assert_privileges("catalogitem_edit")

checked_id = find_checked_items.first || params[:id]
@record = find_record_with_rbac(ServiceTemplate, checked_id)
@checked_id = find_checked_items.first || params[:id]
@record = find_record_with_rbac(ServiceTemplate, @checked_id)
if !@record.template_valid?
add_flash(_("This item is not valid and cannot be copied."), :error)
javascript_flash
Expand Down Expand Up @@ -233,6 +233,9 @@ def atomic_form_field_changed

# need to check req_id in session since we are using common code for prov requests and atomic ST screens
id = session[:edit][:req_id] || "new"
if @checked_id.nil?
@checked_id = 'new'
end
return unless load_edit("prov_edit__#{id}", "replace_cell__explorer")
get_form_vars
build_automate_tree(:automate_catalog) if automate_tree_needed?
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/_st_angular_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- role_allows = role_allows?(:feature => 'rbac_tenant_view') ? true : false
= react('AnsiblePlayBookEditCatalogForm', {:initialData => {:catalogFormId => params[:id], :allCatalogs => @available_catalogs, :zones => @zones, :currentRegion => @current_region, :tenantTree => @tenants_tree, :roleAllows => role_allows}})
= react('AnsiblePlayBookEditCatalogForm', {:initialData => {:catalogFormId => @checked_id, :allCatalogs => @available_catalogs, :zones => @zones, :currentRegion => @current_region, :tenantTree => @tenants_tree, :roleAllows => role_allows}})
2 changes: 1 addition & 1 deletion app/views/catalog/_tt_react_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- role_allows = role_allows?(:feature => 'rbac_tenant_view') ? true : false
= react('TerraformTemplateCatalogForm', {:initialData => {:catalogFormId => params[:id], :allCatalogs => @available_catalogs, :zones => @zones, :currentRegion => @current_region, :tenantTree => @tenants_tree, :roleAllows => role_allows}})
= react('TerraformTemplateCatalogForm', {:initialData => {:catalogFormId => @checked_id, :allCatalogs => @available_catalogs, :zones => @zones, :currentRegion => @current_region, :tenantTree => @tenants_tree, :roleAllows => role_allows}})